From 4a00c51bbfbd3d7b2e1e1621067b3f9a7c5893a6 Mon Sep 17 00:00:00 2001 From: David Allemang Date: Sun, 24 Oct 2021 20:31:41 -0400 Subject: [PATCH] Allow rendering color --- vis/src/main.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/vis/src/main.cpp b/vis/src/main.cpp index 246b4c9..afe97e7 100644 --- a/vis/src/main.cpp +++ b/vis/src/main.cpp @@ -98,6 +98,8 @@ struct Prop { cgl::Buffer vbo; cgl::Buffer> ibo; + vec3 color; + Prop() : vao(), vbo(), ibo() {} }; @@ -120,9 +122,9 @@ struct Renderer { template struct SliceProp : public Prop { - vec3 color; - - SliceProp(vec3 color) : Prop(), color(color) {} + SliceProp(vec3 color) : Prop() { + this->color = color; + } SliceProp(SliceProp &) = delete; @@ -173,8 +175,8 @@ struct SliceRenderer : public Renderer { void _draw(const Prop &prop) const override { glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, prop.vbo); -// glProgramUniform3fv(solid, 2, 1, &prop.color.front()); - glProgramUniform3f(solid, 2, 1.f, 1.f, 1.f); + glProgramUniform3fv(solid, 2, 1, &prop.color.front()); +// glProgramUniform3f(solid, 2, 1.f, 1.f, 1.f); prop.vao.bound([&]() { glDrawArrays(GL_POINTS, 0, prop.ibo.count() * N); });