From babe2a2afb261af08e502fe99faa880d8fff3ea5 Mon Sep 17 00:00:00 2001
From: Lauchmelder <robert.trololo@gmail.com>
Date: Sat, 25 Dec 2021 16:51:55 +0100
Subject: [PATCH] changed texture format

---
 src/Application.cpp    | 10 ++++++----
 src/Application.hpp    |  2 +-
 src/OrbitingCamera.cpp |  7 +++++++
 src/OrbitingCamera.hpp |  4 +++-
 src/Topology.cpp       |  8 ++++----
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/Application.cpp b/src/Application.cpp
index 59816a2..d03d5ff 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -128,8 +128,9 @@ void Application::Init(int width, int height, const std::string& title)
 	float aspectRatio = (float)windowWidth / (float)windowHeight;
 	camera = OrbitingCamera(glm::vec3(0.0f, 0.0f, 0.0f), 6.0f);
 	camera.Update(100.0f, aspectRatio, 0.01f, 100.0f);
-	pitch = -50.0f;
-	yaw = 0.0f;
+	pitch = 45.0f;
+	yaw = 90.0f;
+	distance = 6.0f;
 
 	data.camera = &camera;
 
@@ -141,7 +142,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 * glm::two_pi<float>() / ((float)size.x * 0.5f)) + 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 * glm::pi<float>() / ((float)size.y * 0.5f))) * 0.5f;
 		}
 	}
 
@@ -159,7 +160,7 @@ void Application::Launch()
 	{
 		glfwPollEvents();
 	
-		camera.SetPosition(pitch, yaw);
+		camera.SetPosition(pitch, yaw, distance);
 
 		glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -176,6 +177,7 @@ void Application::Launch()
 		{
 			ImGui::SliderFloat("Yaw", &yaw, 0.0f, 360.0f);
 			ImGui::SliderFloat("Pitch", &pitch, 1.0f, 179.0f);
+			ImGui::SliderFloat("Distance", &distance, 1.0f, 14.0f);
 		}
 
 		ImGui::End();
diff --git a/src/Application.hpp b/src/Application.hpp
index c168669..d128821 100644
--- a/src/Application.hpp
+++ b/src/Application.hpp
@@ -43,7 +43,7 @@ private:
 	WindowData data;
 
 	OrbitingCamera camera;
-	float pitch, yaw;
+	float pitch, yaw, distance;
 
 	Topology* topology;
 };
\ No newline at end of file
diff --git a/src/OrbitingCamera.cpp b/src/OrbitingCamera.cpp
index 9cea28a..28fb8a4 100644
--- a/src/OrbitingCamera.cpp
+++ b/src/OrbitingCamera.cpp
@@ -27,6 +27,13 @@ void OrbitingCamera::Tilt(float amount)
 	CalculateMatrix();
 }
 
+void OrbitingCamera::Zoom(float amount)
+{
+	distance += amount;
+	if (amount <= 0.0f)
+		distance = amount;
+}
+
 void OrbitingCamera::CalculateMatrix()
 {
 	glm::vec3 position = distance * glm::vec3(
diff --git a/src/OrbitingCamera.hpp b/src/OrbitingCamera.hpp
index 3b5d066..853c15a 100644
--- a/src/OrbitingCamera.hpp
+++ b/src/OrbitingCamera.hpp
@@ -8,10 +8,11 @@ public:
 	OrbitingCamera() {}
 	OrbitingCamera(const glm::vec3& target, float distance, const glm::vec2& verticalRange = glm::vec2(1.0f, 179.0f));
 
-	inline void SetPosition(float pitch, float yaw)
+	inline void SetPosition(float pitch, float yaw, float distance)
 	{
 		this->pitch = pitch;
 		this->yaw = yaw;
+		this->distance = distance;
 
 		CalculateMatrix();
 	}
@@ -23,6 +24,7 @@ public:
 
 	void Pan(float amount);
 	void Tilt(float amount);
+	void Zoom(float amount);
 
 private:
 	void CalculateMatrix();
diff --git a/src/Topology.cpp b/src/Topology.cpp
index 225d948..69b883a 100644
--- a/src/Topology.cpp
+++ b/src/Topology.cpp
@@ -67,11 +67,11 @@ Topology::Topology(const glm::vec2& size, const glm::uvec2& subdivisions) :
 				uniform mat4 projection;
 				uniform float offset;
 
-				uniform sampler2DShadow heightmap;
+				uniform sampler2D heightmap;
 
 				void main()
 				{
-					height = texture(heightmap, vec3(texCoord.x + offset, texCoord.y, 0.0f));
+					height = texture(heightmap, vec2(texCoord.x + offset, texCoord.y)).x;
 					gl_Position = projection * view * vec4(position.x, 2.0f * height, position.y, 1.0f);
 				}
 			)",
@@ -93,7 +93,7 @@ Topology::Topology(const glm::vec2& size, const glm::uvec2& subdivisions) :
 	}
 
 	// Generate image
-	image = lol::Image(subdivisions.x, subdivisions.y, lol::PixelFormat::DepthComponent, lol::PixelType::Float);
+	image = lol::Image(subdivisions.x, subdivisions.y, lol::PixelFormat::R, lol::PixelType::Float);
 }
 
 Topology::~Topology()
@@ -119,5 +119,5 @@ void Topology::MakeTexture()
 	if (texture != nullptr)
 		delete texture;
 
-	texture = new lol::Texture(image, lol::TextureFormat::DepthComponent);
+	texture = new lol::Texture(image, lol::TextureFormat::R32F);
 }