From 97001e5460c1c418e67891c015fd57977a5e75fa Mon Sep 17 00:00:00 2001
From: Lauchmelder <robert.trololo@gmail.com>
Date: Sat, 25 Dec 2021 15:01:15 +0100
Subject: [PATCH] made texture scroll

---
 src/Application.cpp |  4 ++--
 src/Topology.cpp    | 12 ++++++++----
 src/Topology.hpp    |  4 +++-
 vendor/lol          |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/Application.cpp b/src/Application.cpp
index 5c400f4..59816a2 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -133,7 +133,7 @@ void Application::Init(int width, int height, const std::string& title)
 
 	data.camera = &camera;
 
-	topology = new Topology(glm::vec2(7.5f), glm::uvec2(100));
+	topology = new Topology(glm::vec2(15.0f, 7.5f), glm::uvec2(200, 100));
 	glm::uvec2 size = topology->GetSize();
 
 	float* pixels = topology->GetTopology();
@@ -141,7 +141,7 @@ void Application::Init(int width, int height, const std::string& title)
 	{
 		for (unsigned int x = 0; x < size.x; x++)
 		{
-			pixels[y * size.x + x] = 0.5f + (cos(x * 0.1f) + cos(y * 0.1f)) * 0.25f;
+			pixels[y * size.x + x] = 0.5f + (cos(x * glm::two_pi<float>() / ((float)size.x * 0.5f)) + cos(y * 0.1f)) * 0.25f;
 		}
 	}
 
diff --git a/src/Topology.cpp b/src/Topology.cpp
index 3016a0e..225d948 100644
--- a/src/Topology.cpp
+++ b/src/Topology.cpp
@@ -21,8 +21,8 @@ Topology::Topology(const glm::vec2& size, const glm::uvec2& subdivisions) :
 
 			vertices.push_back(xCoord);
 			vertices.push_back(yCoord);
-			vertices.push_back(Map(glm::vec2(0, subdivisions.x), glm::vec2(0.0f, 1.0f), x));
-			vertices.push_back(Map(glm::vec2(0, subdivisions.y), glm::vec2(0.0f, 1.0f), y));
+			vertices.push_back(Map(glm::vec2(-1, subdivisions.x + 1), glm::vec2(0.0f, 1.0f), x));
+			vertices.push_back(Map(glm::vec2(-1, subdivisions.y + 1), glm::vec2(0.0f, 1.0f), y));
 
 			if (y > 0 && x > 0)
 			{
@@ -65,12 +65,13 @@ Topology::Topology(const glm::vec2& size, const glm::uvec2& subdivisions) :
 
 				uniform mat4 view;
 				uniform mat4 projection;
+				uniform float offset;
 
 				uniform sampler2DShadow heightmap;
 
 				void main()
 				{
-					height = texture(heightmap, vec3(texCoord, 0.0f));
+					height = texture(heightmap, vec3(texCoord.x + offset, texCoord.y, 0.0f));
 					gl_Position = projection * view * vec4(position.x, 2.0f * height, position.y, 1.0f);
 				}
 			)",
@@ -101,13 +102,16 @@ Topology::~Topology()
 		delete texture;
 }
 
-void Topology::PreRender(const lol::CameraBase& camera) const
+void Topology::PreRender(const lol::CameraBase& camera) 
 {
 	if(texture != nullptr)
 		texture->Bind();
 
 	shader->SetUniform("view", camera.GetView());
 	shader->SetUniform("projection", camera.GetProjection());
+	shader->SetUniform("offset", offset);
+
+	offset += 0.01f;
 }
 
 void Topology::MakeTexture()
diff --git a/src/Topology.hpp b/src/Topology.hpp
index dc44822..40174a7 100644
--- a/src/Topology.hpp
+++ b/src/Topology.hpp
@@ -13,7 +13,7 @@ public:
 	Topology(const glm::vec2& size, const glm::uvec2& subdivision);
 	~Topology();
 
-	void PreRender(const lol::CameraBase& camera) const override;
+	void PreRender(const lol::CameraBase& camera) override;
 
 	inline float* GetTopology() const { return (float*)image.GetPixels(); };
 	inline const glm::uvec2& GetSize() const { return image.GetDimensions(); };
@@ -22,4 +22,6 @@ public:
 private:
 	lol::Image image;
 	lol::Texture* texture;
+
+	float offset = 0.0f;
 };
\ No newline at end of file
diff --git a/vendor/lol b/vendor/lol
index 1e44994..46e3ec5 160000
--- a/vendor/lol
+++ b/vendor/lol
@@ -1 +1 @@
-Subproject commit 1e44994bb409a647930593723ee950c1a85879cc
+Subproject commit 46e3ec58480fe6ead484708c13a936a02ddec44b