composite model is the canonical model

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

diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp
index dcfb4189a3199a210c2056768fcd34eb8176d16a..eb312eee8d19417ac97995e0abdcb09afa8ece20 100644 (file)
--- 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 <cstdint>
@@ -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;