From e428f2145ac3b05345d42e3518a22d429ad0970e Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 10 Apr 2023 14:33:54 +0100
Subject: Add the plant/foliage game item concepts

---
 game/scenary/foliage.cpp | 33 +++++++++++++++++++++++++++++++++
 game/scenary/foliage.h   | 21 +++++++++++++++++++++
 game/scenary/plant.cpp   | 13 +++++++++++++
 game/scenary/plant.h     | 16 ++++++++++++++++
 4 files changed, 83 insertions(+)
 create mode 100644 game/scenary/foliage.cpp
 create mode 100644 game/scenary/foliage.h
 create mode 100644 game/scenary/plant.cpp
 create mode 100644 game/scenary/plant.h

(limited to 'game/scenary')

diff --git a/game/scenary/foliage.cpp b/game/scenary/foliage.cpp
new file mode 100644
index 0000000..d39d500
--- /dev/null
+++ b/game/scenary/foliage.cpp
@@ -0,0 +1,33 @@
+#include "foliage.h"
+#include "gfx/gl/sceneShader.h"
+#include "gfx/gl/shadowMapper.h"
+#include "gfx/models/texture.h"
+
+bool
+Foliage::persist(Persistence::PersistenceStore & store)
+{
+	return STORE_TYPE && STORE_HELPER(bodyMesh, Asset::MeshConstruct) && Asset::persist(store);
+}
+
+void
+Foliage::postLoad()
+{
+	texture = getTexture();
+}
+
+void
+Foliage::render(const SceneShader & shader, const Location & loc) const
+{
+	shader.basic.use(loc);
+	if (texture) {
+		texture->bind();
+	}
+	bodyMesh->Draw();
+}
+
+void
+Foliage::shadows(const ShadowMapper & mapper, const Location & loc) const
+{
+	mapper.dynamicPoint.use(loc);
+	bodyMesh->Draw();
+}
diff --git a/game/scenary/foliage.h b/game/scenary/foliage.h
new file mode 100644
index 0000000..229bccb
--- /dev/null
+++ b/game/scenary/foliage.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "assetFactory/asset.h"
+
+class SceneShader;
+class ShadowMapper;
+class Location;
+
+class Foliage : public Asset, public StdTypeDefs<Foliage> {
+	Mesh::Ptr bodyMesh;
+	std::shared_ptr<Texture> texture;
+
+public:
+	void render(const SceneShader &, const Location &) const;
+	void shadows(const ShadowMapper &, const Location &) const;
+
+protected:
+	friend Persistence::SelectionPtrBase<std::shared_ptr<Foliage>>;
+	bool persist(Persistence::PersistenceStore & store) override;
+	void postLoad() override;
+};
diff --git a/game/scenary/plant.cpp b/game/scenary/plant.cpp
new file mode 100644
index 0000000..2b01bee
--- /dev/null
+++ b/game/scenary/plant.cpp
@@ -0,0 +1,13 @@
+#include "plant.h"
+
+void
+Plant::render(const SceneShader & shader) const
+{
+	type->render(shader, position);
+}
+
+void
+Plant::shadows(const ShadowMapper & mapper) const
+{
+	type->shadows(mapper, position);
+}
diff --git a/game/scenary/plant.h b/game/scenary/plant.h
new file mode 100644
index 0000000..7f964eb
--- /dev/null
+++ b/game/scenary/plant.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "foliage.h"
+#include "gfx/renderable.h"
+#include "location.hpp"
+
+class Plant : public Renderable {
+	std::shared_ptr<const Foliage> type;
+	Location position;
+
+	void render(const SceneShader & shader) const override;
+	void shadows(const ShadowMapper & shadowMapper) const override;
+
+public:
+	Plant(std::shared_ptr<const Foliage> type, Location position) : type(std::move(type)), position(position) { }
+};
-- 
cgit v1.2.3


From 5215c297280e5440881bcc495ef75a86a5708b03 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 10 Apr 2023 18:31:57 +0100
Subject: Plants are world objects

---
 game/scenary/plant.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'game/scenary')

diff --git a/game/scenary/plant.h b/game/scenary/plant.h
index 7f964eb..55acca1 100644
--- a/game/scenary/plant.h
+++ b/game/scenary/plant.h
@@ -1,16 +1,22 @@
 #pragma once
 
 #include "foliage.h"
+#include "game/worldobject.h"
 #include "gfx/renderable.h"
 #include "location.hpp"
 
-class Plant : public Renderable {
+class Plant : public Renderable, public WorldObject {
 	std::shared_ptr<const Foliage> type;
 	Location position;
 
 	void render(const SceneShader & shader) const override;
 	void shadows(const ShadowMapper & shadowMapper) const override;
 
+	void
+	tick(TickDuration) override
+	{
+	}
+
 public:
 	Plant(std::shared_ptr<const Foliage> type, Location position) : type(std::move(type)), position(position) { }
 };
-- 
cgit v1.2.3


From f709098cd7a5fb7e88b96de18e609a2aebd56644 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Thu, 13 Apr 2023 02:16:39 +0100
Subject: Add missing forward declaration

---
 game/scenary/foliage.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'game/scenary')

diff --git a/game/scenary/foliage.h b/game/scenary/foliage.h
index 229bccb..b85aab2 100644
--- a/game/scenary/foliage.h
+++ b/game/scenary/foliage.h
@@ -5,6 +5,7 @@
 class SceneShader;
 class ShadowMapper;
 class Location;
+class Texture;
 
 class Foliage : public Asset, public StdTypeDefs<Foliage> {
 	Mesh::Ptr bodyMesh;
-- 
cgit v1.2.3