From 44affbe86c539e91d20711d1b465a16fa87ddfca Mon Sep 17 00:00:00 2001
From: Lauchmelder <robert.trololo@gmail.com>
Date: Mon, 27 Dec 2021 22:49:06 +0100
Subject: [PATCH] fixed range recalculation on scrolling plot

---
 src/Application.cpp   |  2 +-
 src/ScrollingPlot.cpp |  3 ++-
 src/Topology.cpp      | 21 +++++++++++++--------
 src/Topology.hpp      |  1 +
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/Application.cpp b/src/Application.cpp
index c398895..79578cf 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -131,7 +131,7 @@ void Application::Init(int width, int height, const std::string& title)
 	camera = OrbitingCamera(glm::vec3(0.0f, 0.0f, 0.0f), 6.0f);
 	camera.SetPerspective(100.0f, aspectRatio, 0.01f, 100.0f);
 	pitch = 65.0f;
-	yaw = 265.0f;
+	yaw = 85.0f;
 	distance = 10.0f;
 
 	data.camera = &camera;
diff --git a/src/ScrollingPlot.cpp b/src/ScrollingPlot.cpp
index 2a9cbe4..09bd7cd 100644
--- a/src/ScrollingPlot.cpp
+++ b/src/ScrollingPlot.cpp
@@ -11,12 +11,13 @@ ScrollingPlot::ScrollingPlot(
     Topology(manager, size, subdivision), domain(domain), dt(temporalResolution), func(func)
 {
     // Create initial texture for t = 0
-    for(unsigned int x = 0; x < subdivision.x; x++)
+    for (unsigned int x = 0; x < subdivision.x; x++)
     {
         CalculateStrip(x);
         t += dt;
     }
 
+    range = glm::vec2(-1.0f, 1.0f);
     MakeTexture();
 }
 
diff --git a/src/Topology.cpp b/src/Topology.cpp
index 51c1490..82b61ac 100644
--- a/src/Topology.cpp
+++ b/src/Topology.cpp
@@ -144,6 +144,19 @@ void Topology::PreRender(const lol::CameraBase& camera)
 	offset += 0.01f * scroll;
 }
 
+void Topology::CalculateRange()
+{
+	float* pixels = GetTopology();
+
+	range = glm::vec2(pixels[0]);
+	unsigned int size = image.GetDimensions().x * image.GetDimensions().y;
+	for (unsigned int i = 1; i < size; i++)
+	{
+		range.x = std::min(pixels[i], range.x);
+		range.y = std::max(pixels[i], range.y);
+	}
+}
+
 void Topology::SetColormap(const Colormap& cm)
 {
 	colormap = manager.Get<lol::Texture1D>(cm.id);
@@ -174,14 +187,6 @@ void Topology::MakeTexture()
 	// Calculate range (min, max values) of topology
 	float* pixels = (float*)image.GetPixels();
 
-	range = glm::vec2(pixels[0]);
-	unsigned int size = image.GetDimensions().x * image.GetDimensions().y;
-	for (unsigned int i = 1; i < size; i++)
-	{
-		range.x = std::min(pixels[i], range.x);
-		range.y = std::max(pixels[i], range.y);
-	}
-
 	if (texture != nullptr)
 		delete texture;
 
diff --git a/src/Topology.hpp b/src/Topology.hpp
index 86f1832..30223f3 100644
--- a/src/Topology.hpp
+++ b/src/Topology.hpp
@@ -23,6 +23,7 @@ public:
 	inline float* GetTopology() const { return (float*)image.GetPixels(); };
 	inline const glm::uvec2& GetSize() const { return image.GetDimensions(); };
 
+	void CalculateRange();
 	void SetColormap(const Colormap& cm);
 	void MakeTexture();