From 7ba1abfca4ef19b27da89318f7c9fa31a040f300 Mon Sep 17 00:00:00 2001
From: Lauchmelder <robert.trololo@gmail.com>
Date: Sun, 26 Dec 2021 14:43:44 +0100
Subject: [PATCH] optimized colormapping

---
 src/Topology.cpp | 20 ++++++++++++++------
 src/Topology.hpp |  3 +++
 vendor/lol       |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/Topology.cpp b/src/Topology.cpp
index dbf1b7d..a4d95cf 100644
--- a/src/Topology.cpp
+++ b/src/Topology.cpp
@@ -111,13 +111,16 @@ Topology::Topology(const glm::vec2& size, const glm::uvec2& subdivisions) :
 	image = lol::Image(subdivisions.x, subdivisions.y, lol::PixelFormat::R, lol::PixelType::Float);
 
 	// Generate colormap
+	for(const Colormap& cm : colormaps)
+		RegisterColormap(cm);
+		
 	SetColormap(colormaps[0]);
 }
 
 Topology::~Topology()
 {
-	lol::ShaderManager::GetInstance().Return(TOPOLOGY_ID);
-	lol::ObjectManager<lol::Texture1D>::GetInstance().Return(MAGMA_ID);
+	lol::ShaderManager::GetInstance().Cleanup();
+	lol::ObjectManager<lol::Texture1D>::GetInstance().Cleanup();
 
 	if (texture != nullptr)
 		delete texture;
@@ -144,9 +147,14 @@ void Topology::PreRender(const lol::CameraBase& camera)
 void Topology::SetColormap(const Colormap& cm)
 {
 	colormap = lol::ObjectManager<lol::Texture1D>::GetInstance().Get(cm.id);
-	if(colormap == nullptr)
+}
+
+void Topology::RegisterColormap(const Colormap& cm)
+{
+	std::shared_ptr<lol::Texture1D> texColormap = lol::ObjectManager<lol::Texture1D>::GetInstance().Get(cm.id);
+	if(texColormap == nullptr)
 	{
-		colormap = std::make_shared<lol::Texture1D>(
+		texColormap = std::make_shared<lol::Texture1D>(
 			cm.data.size() / 3,
 			cm.data.data(),
 			lol::PixelFormat::RGB,
@@ -154,9 +162,9 @@ void Topology::SetColormap(const Colormap& cm)
 			lol::TextureFormat::RGB32F
 		);
 
-		colormap->SetWrap(lol::TextureWrap::ClampToEdge, lol::TextureWrap::Repeat);
+		texColormap->SetWrap(lol::TextureWrap::ClampToEdge, lol::TextureWrap::Repeat);
 
-		lol::ObjectManager<lol::Texture1D>::GetInstance().Register(cm.id, colormap);
+		lol::ObjectManager<lol::Texture1D>::GetInstance().Register(cm.id, texColormap);
 	}
 }
 
diff --git a/src/Topology.hpp b/src/Topology.hpp
index 97b1ee4..fe98171 100644
--- a/src/Topology.hpp
+++ b/src/Topology.hpp
@@ -26,6 +26,9 @@ public:
 	void SetColormap(const Colormap& cm);
 	void MakeTexture();
 
+private:
+	void RegisterColormap(const Colormap& cm);
+
 private:
 	lol::Image image;
 	lol::Texture2D* texture;
diff --git a/vendor/lol b/vendor/lol
index 7c16ca7..48d2dbc 160000
--- a/vendor/lol
+++ b/vendor/lol
@@ -1 +1 @@
-Subproject commit 7c16ca791347a88a9770eac74e8130ab81eb6a3e
+Subproject commit 48d2dbcb7e2c126b67c2fabd82567cbbb89e1c22