lauchmelder/Visualizer
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

optimized colormapping

Browse source
This commit is contained in:
Lauchmelder 2021-12-26 14:43:44 +01:00
parent a32a81ef7f
commit 7ba1abfca4
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Topology.cpp
View file

@ -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);
}
}

3
src/Topology.hpp
View file

@ -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;

2
vendor/lol vendored

@ -1 +1 @@
Subproject commit 7c16ca791347a88a9770eac74e8130ab81eb6a3e
Subproject commit 48d2dbcb7e2c126b67c2fabd82567cbbb89e1c22