ParkerBritt/Enzo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: gl exploded mesh representation

Browse Source
This commit is contained in:
parker
2025-07-31 18:57:25 +01:00
parent 2bdada366b
commit 8a77048ea0
2 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/Gui/Viewport/GLMesh.cpp
View File

@@ -3,7 +3,9 @@
#include <iostream> #include <iostream>
#include "Engine/Operator/AttributeHandle.h" #include "Engine/Operator/AttributeHandle.h"
#include "Engine/Operator/Geometry.h" #include "Engine/Operator/Geometry.h"
#include "Engine/Types.h"
#include <CGAL/Polygon_mesh_processing/compute_normal.h> #include <CGAL/Polygon_mesh_processing/compute_normal.h>
#include "icecream.hpp"
@@ -71,20 +73,39 @@ void GLMesh::setPosBuffer(enzo::geo::Geometry& geometry)
PMP::parameters::vertex_point_map(heMesh.points()) PMP::parameters::vertex_point_map(heMesh.points())
); );
std::shared_ptr<enzo::ga::Attribute> PAttr = geometry.getAttribByName(enzo::ga::AttrOwner::POINT, "P");
enzo::ga::AttributeHandleVector3 PAttrHandle = enzo::ga::AttributeHandleVector3(PAttr);
auto pointPositions = PAttrHandle.getAllValues();
for (enzo::geo::V_index v : heMesh.vertices()) std::shared_ptr<enzo::ga::Attribute> pointAttr = geometry.getAttribByName(enzo::ga::AttrOwner::VERTEX, "point");
enzo::ga::AttributeHandleInt pointAttrHandle = enzo::ga::AttributeHandleInt(pointAttr);
auto vertexPointIndices = pointAttrHandle.getAllValues();
std::shared_ptr<enzo::ga::Attribute> vertexCountAttr = geometry.getAttribByName(enzo::ga::AttrOwner::PRIMITIVE, "vertexCount");
enzo::ga::AttributeHandleInt vertexCountHandle = enzo::ga::AttributeHandleInt(vertexCountAttr);
std::vector<int> vertexCounts = vertexCountHandle.getAllValues();
unsigned int vertexCount = 0;
for (int primIndx=0; primIndx<vertexCounts.size(); ++primIndx)
{ {
const enzo::geo::Point &p = heMesh.point(v); for(int i=0; i< vertexCounts[primIndx]; ++i)
const enzo::geo::Vector &n = vnormals[v]; {
unsigned int pointIndex = vertexPointIndices[vertexCount];
enzo::bt::Vector3& p = pointPositions[pointIndex];
IC(vertexCount, pointIndex);
IC(p.x(), p.y(), p.z());
vertices.push_back({ vertices.push_back({
{ p.x(), { p.x(),
p.y(), p.y(),
p.z()}, p.z()},
{ n.x(), { p.x(),
n.y(), p.y(),
n.z()} p.z()}
}); });
++vertexCount;
}
} }
glBufferData(GL_ARRAY_BUFFER, vertices.size()*sizeof(Vertex), vertices.data(), GL_STATIC_DRAW); glBufferData(GL_ARRAY_BUFFER, vertices.size()*sizeof(Vertex), vertices.data(), GL_STATIC_DRAW);
@@ -96,28 +117,24 @@ void GLMesh::setIndexBuffer(std::vector<int> pointIndices, std::vector<int> prim
bind(); bind();
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer);
indexData.clear(); indexData.clear();
std::cout << "index pointIndices\n-------\n";
size_t startIndex = 1; unsigned int startVert = 0;
// create triangle fan from potentially ngon inputs // create triangle fan from potentially ngon inputs
std::cout << "size: " << primVertexCounts.size() << "\n";
for(size_t primNum=0; primNum<primVertexCounts.size(); ++primNum) for(size_t primNum=0; primNum<primVertexCounts.size(); ++primNum)
{ {
int primVertexCount = primVertexCounts[primNum]; int primVertexCount = primVertexCounts[primNum];
std::cout << "startIndex: " << startIndex << "\n";
std::cout << "prim vertex count: " << primVertexCount << "\n";
for(size_t pointIndex=startIndex; pointIndex+2<startIndex+primVertexCount; ++pointIndex) for(size_t i=0; i<primVertexCount-1; ++i)
{ {
indexData.push_back(pointIndices.at(startIndex-1)); indexData.push_back(startVert);
indexData.push_back(pointIndices.at(pointIndex)); indexData.push_back(startVert+i);
indexData.push_back(pointIndices.at(pointIndex+1)); indexData.push_back(startVert+i+1);
std::cout << pointIndices.at(0) << " " << pointIndices.at(pointIndex) << " " << pointIndices.at(pointIndex+1) << "\n";
} }
startIndex += primVertexCount; startVert += primVertexCount;
} }
glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexData.size()*sizeof(GLint), indexData.data(), GL_STATIC_DRAW); glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexData.size()*sizeof(GLint), indexData.data(), GL_STATIC_DRAW);

3
src/Gui/Viewport/ViewportGLWidget.cpp
View File

@@ -95,11 +95,12 @@ void ViewportGLWidget::initializeGL()
void main() void main()
{ {
// FragColor = vec4(1.0f, 0.5f, 0.2f, 1.0f); // FragColor = vec4(1.0f, 0.5f, 0.2f, 1.0f);
// FragColor = vec4(Normal, 1.0f);
vec3 lightDir = normalize(vec3(1.0,1.0,1.0)); vec3 lightDir = normalize(vec3(1.0,1.0,1.0));
float brightness = remap(dot(Normal, lightDir), -1, 1, 0.5, 1); float brightness = remap(dot(Normal, lightDir), -1, 1, 0.5, 1);
color = vec4(vec3(brightness), 1.0f); color = vec4(vec3(brightness), 1.0f);
color = vec4(Normal, 1.0f);
} }
)"; )";
GLuint fragmentShader = glCreateShader(GL_FRAGMENT_SHADER); GLuint fragmentShader = glCreateShader(GL_FRAGMENT_SHADER);