From 503ca43713914e45727b13a5708af5324d74da46 Mon Sep 17 00:00:00 2001
From: parker <parker.g.britt@gmail.com>
Date: Thu, 3 Jul 2025 00:27:48 +0100
Subject: [PATCH] feat: use attribute for glmesh indices

---
 src/Engine/Operator/Geometry.cpp      |  1 +
 src/gui/viewport/GLMesh.cpp           | 32 ++++++++++++++++-----------
 src/gui/viewport/GLMesh.h             |  1 +
 src/gui/viewport/ViewportGLWidget.cpp | 16 +++++++++-----
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/Engine/Operator/Geometry.cpp b/src/Engine/Operator/Geometry.cpp
index 5246ee7..97ccc4a 100644
--- a/src/Engine/Operator/Geometry.cpp
+++ b/src/Engine/Operator/Geometry.cpp
@@ -9,6 +9,7 @@ using namespace enzo;
 geo::Geometry::Geometry()
 {
     addVector3Attribute(ga::AttrOwner::POINT, "P");
+    addIntAttribute(ga::AttrOwner::VERTEX, "point");
 }
 
 ga::AttributeHandle<int> geo::Geometry::addIntAttribute(ga::AttributeOwner owner, std::string name)
diff --git a/src/gui/viewport/GLMesh.cpp b/src/gui/viewport/GLMesh.cpp
index 701f325..d30092c 100644
--- a/src/gui/viewport/GLMesh.cpp
+++ b/src/gui/viewport/GLMesh.cpp
@@ -15,21 +15,10 @@ void GLMesh::init()
 
     initBuffers();
 
-    std::vector<int> foo = {0,1,2,3,4};
-    for(int i=1;i+1<foo.size();++i)
-    {
-        indexData.push_back(foo.at(0));
-        indexData.push_back(foo.at(i));
-        indexData.push_back(foo.at(i+1));
-    }
-    // indexData =
-    // {
-    //     0, 1, 2, 1, 2, 3
-    // };
 
     // store data in the buffer
-    glBufferData(GL_ARRAY_BUFFER, vertexPosData.size()*sizeof(GLfloat), vertexPosData.data(), GL_STATIC_DRAW);
-    glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexData.size()*sizeof(GLint), indexData.data(), GL_STATIC_DRAW);
+    // glBufferData(GL_ARRAY_BUFFER, vertexPosData.size()*sizeof(GLfloat), vertexPosData.data(), GL_STATIC_DRAW);
+    // glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexData.size()*sizeof(GLint), indexData.data(), GL_STATIC_DRAW);
 
 
     // unbind vertex array
@@ -56,6 +45,7 @@ void GLMesh::initBuffers()
 
 void GLMesh::setPosBuffer(std::vector<enzo::bt::Vector3> data)
 {
+    bind();
     vertexPosData.clear();
     for(auto vector : data)
     {
@@ -65,6 +55,22 @@ void GLMesh::setPosBuffer(std::vector<enzo::bt::Vector3> data)
     }
 
     glBufferData(GL_ARRAY_BUFFER, vertexPosData.size()*sizeof(GLfloat), vertexPosData.data(), GL_STATIC_DRAW);
+    unbind();
+}
+
+void GLMesh::setIndexBuffer(std::vector<int> data)
+{
+    bind();
+    indexData.clear();
+    for(int i=1;i+1<data.size();++i)
+    {
+        indexData.push_back(data.at(0));
+        indexData.push_back(data.at(i));
+        indexData.push_back(data.at(i+1));
+    }
+
+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexData.size()*sizeof(GLint), indexData.data(), GL_STATIC_DRAW);
+    unbind();
 }
 
 
diff --git a/src/gui/viewport/GLMesh.h b/src/gui/viewport/GLMesh.h
index a0f585b..fe4dde2 100644
--- a/src/gui/viewport/GLMesh.h
+++ b/src/gui/viewport/GLMesh.h
@@ -18,6 +18,7 @@ public:
     void init();
     void initBuffers();
     void setPosBuffer(std::vector<enzo::bt::Vector3> data);
+    void setIndexBuffer(std::vector<int> data);
     void bind();
     void unbind();
     void draw();
diff --git a/src/gui/viewport/ViewportGLWidget.cpp b/src/gui/viewport/ViewportGLWidget.cpp
index ab1a183..9c189b2 100644
--- a/src/gui/viewport/ViewportGLWidget.cpp
+++ b/src/gui/viewport/ViewportGLWidget.cpp
@@ -156,12 +156,16 @@ std::unique_ptr<GLMesh> ViewportGLWidget::meshFromGeo(std::unique_ptr<enzo::geo:
     PAttrHandle.addValue(bt::Vector3(1.0f, 1.0f, 0.0f));
 
     mesh->setPosBuffer(PAttrHandle.getData());
-    // mesh->setPosBuffer(std::vector<bt::Vector3>{
-    //     bt::Vector3(-0.5f, -0.5f, 0.0f),
-    //     bt::Vector3(0.5f, -0.5f, 0.0f),
-    //     bt::Vector3(0.0f,  0.5f, 0.0f),
-    //     bt::Vector3(0.5f, 0.5f, 0.0f),
-    // });
+
+    std::shared_ptr<ga::Attribute> pointAttr = geometry->getAttribByName(ga::AttrOwner::VERTEX, "point");
+    ga::AttributeHandleInt pointAttrHandle = ga::AttributeHandleInt(pointAttr);
+    pointAttrHandle.addValue(0);
+    pointAttrHandle.addValue(1);
+    pointAttrHandle.addValue(2);
+    pointAttrHandle.addValue(3);
+    pointAttrHandle.addValue(4);
+    mesh->setIndexBuffer(pointAttrHandle.getData());
+
 
     return mesh; 
 }