X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel%2FCompositeModel.hpp;fp=src%2Fmodel%2FCompositeModel.hpp;h=4b3d2a9b9549ddcc4b2b8940131d66d52a21303d;hb=3542823a1af7f5063d7cc8da84efa248eb889b8a;hp=947db0140b4a32219a26b44b57301070ed65ada9;hpb=1c2994622a6b73f90cbd3ec9c09ffb4d7724cab4;p=blank.git diff --git a/src/model/CompositeModel.hpp b/src/model/CompositeModel.hpp index 947db01..4b3d2a9 100644 --- a/src/model/CompositeModel.hpp +++ b/src/model/CompositeModel.hpp @@ -12,7 +12,7 @@ namespace blank { class CompositeInstance; -class EntityModel; +class EntityMesh; class CompositeModel { @@ -34,10 +34,10 @@ public: const glm::quat &Orientation() const noexcept { return orientation; } void Orientation(const glm::quat &o) noexcept { orientation = o; } - bool HasNodeModel() const noexcept { return node_model; } - void SetNodeModel(const EntityModel *m) noexcept { node_model = m; } + bool HasNodeMesh() const noexcept { return node_mesh; } + void SetNodeMesh(const EntityMesh *m) noexcept { node_mesh = m; } - const EntityModel &NodeModel() const noexcept { return *node_model; } + const EntityMesh &NodeMesh() const noexcept { return *node_mesh; } CompositeModel &AddPart(); bool HasParent() const noexcept { return parent; } @@ -51,7 +51,7 @@ public: private: CompositeModel *parent; - const EntityModel *node_model; + const EntityMesh *node_mesh; std::uint32_t id;