X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FEntity.cpp;h=b06dbc38b50ccfbdebdc6df3c96a36afaeb483a2;hb=12744a2f68b3c9496076d6d7b6fb3581ff78472a;hp=6b23cacf8cccfc1d11aa9f86479be1df3523d174;hpb=b7d09e1e35ef90282c97509e0020b20db3c7ea9f;p=blank.git diff --git a/src/world/Entity.cpp b/src/world/Entity.cpp index 6b23cac..b06dbc3 100644 --- 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 @@ -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) { }