X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FEntity.hpp;h=a3811427332628250761bad32210bc64103ea9de;hb=dbfcb12348b80e2582f710acb1e4ed0011889ba2;hp=ef5e4e32eb92ce4667e233d85f3b485a3aeffcf6;hpb=5304d1e3c1a1e90d474307f4f7eea812a61e483c;p=blank.git

diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp
index ef5e4e3..a381142 100644
--- a/src/world/Entity.hpp
+++ b/src/world/Entity.hpp
@@ -2,7 +2,7 @@
 #define BLANK_WORLD_ENTITY_HPP_
 
 #include "Chunk.hpp"
-#include "../model/CompositeModel.hpp"
+#include "../model/CompositeInstance.hpp"
 #include "../model/geometry.hpp"
 
 #include <string>
@@ -20,8 +20,8 @@ class Entity {
 public:
 	Entity() noexcept;
 
-	CompositeModel &GetModel() noexcept { return model; }
-	const CompositeModel &GetModel() const noexcept { return model; }
+	CompositeInstance &GetModel() noexcept { return model; }
+	const CompositeInstance &GetModel() const noexcept { return model; }
 
 	const std::string &Name() const noexcept { return name; }
 	void Name(const std::string &n) { name = n; }
@@ -71,11 +71,11 @@ public:
 	void Update(int dt) noexcept;
 
 	void Render(const glm::mat4 &M, DirectionalLighting &prog) noexcept {
-		model.Render(M, prog);
+		if (model) model.Render(M, prog);
 	}
 
 private:
-	CompositeModel model;
+	CompositeInstance model;
 
 	std::string name;