Merge branch 'instancing-pt2'

3 files changed, 12 insertions, 12 deletions

diff --git a/game/scenary/foliage.cpp b/game/scenary/foliage.cpp
index 35be051..0913c6e 100644
--- a/game/scenary/foliage.cpp
+++ b/game/scenary/foliage.cpp
@@ -26,14 +26,15 @@ Foliage::render(const SceneShader & shader) const
 		if (texture) {
 			texture->bind();
 		}
-		glBindVertexArray(instanceVAO);
-		glDrawElementsInstanced(
-				bodyMesh->type(), bodyMesh->count(), GL_UNSIGNED_INT, nullptr, static_cast<GLsizei>(count));
-		glBindVertexArray(0);
+		bodyMesh->DrawInstanced(instanceVAO, static_cast<GLsizei>(count));
 	}
 }
 
 void
-Foliage::shadows(const ShadowMapper &) const
+Foliage::shadows(const ShadowMapper & mapper) const
 {
+	if (const auto count = instances.count()) {
+		mapper.dynamicPointInst.use();
+		bodyMesh->DrawInstanced(instanceVAO, static_cast<GLsizei>(count));
+	}
 }
diff --git a/game/scenary/plant.cpp b/game/scenary/plant.cpp
index 678d4a7..2a79807 100644
--- a/game/scenary/plant.cpp
+++ b/game/scenary/plant.cpp
@@ -1,7 +1,7 @@
 #include "plant.h"
+#include "location.hpp"
 
-Plant::Plant(std::shared_ptr<const Foliage> type, Location position) :
-	type {std::move(type)},
-	location {this->type->instances.acquire(glm::translate(position.pos) * rotate_ypr(position.rot))}
+Plant::Plant(std::shared_ptr<const Foliage> type, const Location & position) :
+	type {std::move(type)}, location {this->type->instances.acquire(position.getTransform())}
 {
 }
diff --git a/game/scenary/plant.h b/game/scenary/plant.h
index 77c5979..82ab0e5 100644
--- a/game/scenary/plant.h
+++ b/game/scenary/plant.h
@@ -2,9 +2,8 @@
 
 #include "foliage.h"
 #include "game/worldobject.h"
-#include "location.hpp"
-#include "maths.h"
-#include <glm/gtx/transform.hpp>
+
+class Location;
 
 class Plant : public WorldObject {
 	std::shared_ptr<const Foliage> type;
@@ -16,5 +15,5 @@ class Plant : public WorldObject {
 	}
 
 public:
-	Plant(std::shared_ptr<const Foliage> type, Location position);
+	Plant(std::shared_ptr<const Foliage> type, const Location & position);
 };