heightmap can now be disabled

src/Application.cpp

@@ -142,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 * glm::pi<float>() / ((float)size.y * 0.5f))) * 0.5f;
+			pixels[y * size.x + x] = cos(x * glm::two_pi<float>() / ((float)size.x * 0.5f)) - y / (float)size.y;
 		}
 	}
 
@@ -162,6 +162,9 @@ void Application::Launch()
 	
 		camera.SetPosition(pitch, yaw, distance);
 
+		topology->SetHeightMapping(enableHeightMap);
+		topology->SetColorMapping(enableColorMap);
+
 		glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
@@ -180,6 +183,12 @@ void Application::Launch()
 			ImGui::SliderFloat("Distance", &distance, 1.0f, 14.0f);
 		}
 
+		if(ImGui::CollapsingHeader("Topology"))
+		{
+			ImGui::Checkbox("Heightmap", &enableHeightMap);
+			ImGui::Checkbox("Colormap", &enableColorMap);
+		}
+
 		ImGui::End();
 
 		ImGui::Render();

src/Application.hpp

@@ -45,5 +45,8 @@ private:
 	OrbitingCamera camera;
 	float pitch, yaw, distance;
 
+	bool enableHeightMap = true;
+	bool enableColorMap = true;
+
 	Topology* topology;
 };

src/CMakeLists.txt

@@ -1,7 +1,8 @@
 add_executable(visualizer
 	"main.cpp" "Application.cpp" 
     "OrbitingCamera.cpp" 
- "Topology.cpp")
+ 	"Topology.cpp"
+)
 
 target_sources(visualizer PUBLIC 
 	${VENDOR_DIR}/imgui/backends/imgui_impl_opengl3.cpp

src/Topology.cpp

@@ -66,13 +66,14 @@ Topology::Topology(const glm::vec2& size, const glm::uvec2& subdivisions) :
 				uniform mat4 view;
 				uniform mat4 projection;
 				uniform float offset;
+				uniform float heightFactor;
 
 				uniform sampler2D heightmap;
 
 				void main()
 				{
 					height = texture(heightmap, vec2(texCoord.x + offset, texCoord.y)).x;
-					gl_Position = projection * view * vec4(position.x, 2.0f * height, position.y, 1.0f);
+					gl_Position = projection * view * vec4(position.x, heightFactor * height, position.y, 1.0f);
 				}
 			)",
 			R"(
@@ -111,6 +112,9 @@ void Topology::PreRender(const lol::CameraBase& camera)
 	shader->SetUniform("projection", camera.GetProjection());
 	shader->SetUniform("offset", offset);
 
+	shader->SetUniform("heightFactor", heightFactor);
+	shader->SetUniform("colorFactor", colorFactor);
+
 	offset += 0.01f;
 }
 

src/Topology.hpp

@@ -15,6 +15,9 @@ public:
 
 	void PreRender(const lol::CameraBase& camera) override;
 
+	inline void SetHeightMapping(bool enable) { heightFactor = enable ? 2.0f : 0.0f; }
+	inline void SetColorMapping(bool enable) { colorFactor = enable ? 1.0f : 0.0f; }
+
 	inline float* GetTopology() const { return (float*)image.GetPixels(); };
 	inline const glm::uvec2& GetSize() const { return image.GetDimensions(); };
 	void MakeTexture();
@@ -24,4 +27,6 @@ private:
 	lol::Texture* texture;
 
 	float offset = 0.0f;
+	float heightFactor = 2.0f;
+	float colorFactor = 1.0f;
 };