simple preloader

[blank.git] / src / world / Entity.cpp

diff --git a/src/world/Entity.cpp b/src/world/Entity.cpp
index 6b23cacf8cccfc1d11aa9f86479be1df3523d174..49ad34bf07ef51c8eaaa5f99c64d89e6ab430827 100644 (file)
--- a/src/world/Entity.cpp
+++ b/src/world/Entity.cpp
@@ -1,6 +1,5 @@
 #include "Entity.hpp"
 
-#include "../model/geometry.hpp"
 #include "../model/Shape.hpp"
 
 #include <cmath>
@@ -8,7 +7,7 @@
 
 namespace {
 
-blank::Model::Buffer model_buffer;
+blank::EntityModel::Buffer model_buffer;
 
 }
 
@@ -17,11 +16,15 @@ namespace blank {
 Entity::Entity() noexcept
 : shape(nullptr)
 , model()
+, name("anonymous")
+, bounds()
 , velocity(0, 0, 0)
 , position(0, 0, 0)
 , chunk(0, 0, 0)
 , angular_velocity(1.0f, 0.0f, 0.0f, 0.0f)
-, rotation(1.0f) {
+, rotation(1.0f)
+, world_collision(false)
+, remove(false) {
 
 }
 
@@ -43,6 +46,11 @@ void Entity::Velocity(const glm::vec3 &vel) noexcept {
        velocity = vel;
 }
 
+void Entity::Position(const Chunk::Pos &c, const Block::Pos &pos) noexcept {
+       chunk = c;
+       position = pos;
+}
+
 void Entity::Position(const Block::Pos &pos) noexcept {
        position = pos;
        while (position.x >= Chunk::width) {