X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FEntity.hpp;h=eb312eee8d19417ac97995e0abdcb09afa8ece20;hb=eba29c8ad489194cd1e3cd64b5f23424ad4384ef;hp=dcfb4189a3199a210c2056768fcd34eb8176d16a;hpb=cf5ce8220483bb062740eeaedde6474928fd5e0e;p=blank.git diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp index dcfb418..eb312ee 100644 --- a/src/world/Entity.hpp +++ b/src/world/Entity.hpp @@ -3,7 +3,7 @@ #include "Chunk.hpp" #include "EntityState.hpp" -#include "../model/CompositeInstance.hpp" +#include "../model/Instance.hpp" #include "../model/geometry.hpp" #include @@ -22,8 +22,8 @@ class Entity { public: Entity() noexcept; - CompositeInstance &GetModel() noexcept { return model; } - const CompositeInstance &GetModel() const noexcept { return model; } + Instance &GetModel() noexcept { return model; } + const Instance &GetModel() const noexcept { return model; } std::uint32_t ID() const noexcept { return id; } void ID(std::uint32_t i) noexcept { id = i; } @@ -83,7 +83,7 @@ public: } private: - CompositeInstance model; + Instance model; std::uint32_t id; std::string name;