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

feat: connect geometry position to GLMesh

Browse Source
This commit is contained in:
parker
2025-07-02 13:37:40 +01:00
parent f1d825d513
commit d614c1998c
6 changed files with 68 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Engine/Operator/AttributeHandle.h
View File

@@ -53,13 +53,19 @@ public:
// TODO:make this private (primitive friend classes only)
data_->push_back(value);
}
T getValue(uint pos)
std::vector<T> getData() const
{
return *data_;
}
T getValue(uint pos) const
{
// TODO:protect against invalid positions
// TODO: cast types
return data_->at(pos);
}
std::string getName()
std::string getName() const
{
return name_;
}

15
src/Engine/Operator/Geometry.cpp
View File

@@ -8,17 +8,24 @@
using namespace enzo;
geo::Geometry::Geometry()
{
addVector3Attribute(ga::AttrOwner::POINT, "P");
}
ga::AttributeHandle<int> geo::Geometry::addIntAttribute(ga::AttributeOwner owner, std::string name)
{
auto newAttribute = std::make_shared<ga::Attribute>(name, ga::AttrType::intT);
getOwnerVector(owner).push_back(newAttribute);
getAttributeStore(owner).push_back(newAttribute);
return ga::AttributeHandle<int>(newAttribute);
}
std::vector<std::shared_ptr<ga::Attribute>>& geo::Geometry::getOwnerVector(ga::AttributeOwner& owner)
ga::AttributeHandle<bt::Vector3> geo::Geometry::addVector3Attribute(ga::AttributeOwner owner, std::string name)
{
auto newAttribute = std::make_shared<ga::Attribute>(name, ga::AttrType::vectorT);
getAttributeStore(owner).push_back(newAttribute);
return ga::AttributeHandle<bt::Vector3>(newAttribute);
}
std::vector<std::shared_ptr<ga::Attribute>>& geo::Geometry::getAttributeStore(ga::AttributeOwner& owner)
{
switch(owner)
{
@@ -42,7 +49,7 @@ std::vector<std::shared_ptr<ga::Attribute>>& geo::Geometry::getOwnerVector(ga::A
std::shared_ptr<ga::Attribute> geo::Geometry::getAttribByName(ga::AttributeOwner owner, std::string name)
{
auto& vector = getOwnerVector(owner);
auto& vector = getAttributeStore(owner);
for(auto it=vector.begin(); it!=vector.end(); ++it)
{
if((*it)->getName()==name)

3
src/Engine/Operator/Geometry.h
View File

@@ -10,10 +10,11 @@ class Geometry
public:
Geometry();
ga::AttributeHandle<int> addIntAttribute(ga::AttributeOwner owner, std::string name);
ga::AttributeHandle<bt::Vector3> addVector3Attribute(ga::AttributeOwner owner, std::string name);
std::shared_ptr<ga::Attribute> getAttribByName(ga::AttributeOwner owner, std::string name);
private:
using attribVector = std::vector<std::shared_ptr<ga::Attribute>>;
attribVector& getOwnerVector(ga::AttributeOwner& owner);
attribVector& getAttributeStore(ga::AttributeOwner& owner);
attribVector pointAttributes_;
attribVector vertexAttributes_;
attribVector primitiveAttributes_;

33
src/gui/viewport/GLMesh.cpp
View File

@@ -15,6 +15,17 @@ void GLMesh::init()
initBuffers();
vertexPosData = {
-0.5f, -0.5f, 0.0f,
0.5f, -0.5f, 0.0f,
0.0f, 0.5f, 0.0f,
0.5f, 0.5f, 0.0f
};
// store data in the buffer
glBufferData(GL_ARRAY_BUFFER, vertexPosData.size()*sizeof(GLfloat), vertexPosData.data(), GL_STATIC_DRAW);
// unbind vertex array
glBindVertexArray(0);
}
@@ -22,12 +33,6 @@ void GLMesh::init()
void GLMesh::initBuffers()
{
vertexPosData = {
-0.5f, -0.5f, 0.0f,
0.5f, -0.5f, 0.0f,
0.0f, 0.5f, 0.0f,
0.5f, 0.5f, 0.0f
};
indexData =
{
@@ -38,8 +43,6 @@ void GLMesh::initBuffers()
glGenBuffers(1, &vertexBuffer);
// set purpose
glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
// store data in the buffer
glBufferData(GL_ARRAY_BUFFER, vertexPosData.size()*sizeof(GLfloat), vertexPosData.data(), GL_STATIC_DRAW);
// gives the shader a way to read buffer data
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3*sizeof(GLfloat), (void*)0);
@@ -52,6 +55,20 @@ void GLMesh::initBuffers()
}
void GLMesh::setPosBuffer(std::vector<enzo::bt::Vector3> data)
{
vertexPosData.clear();
for(auto vector : data)
{
vertexPosData.push_back(vector.x());
vertexPosData.push_back(vector.y());
vertexPosData.push_back(vector.z());
}
glBufferData(GL_ARRAY_BUFFER, vertexPosData.size()*sizeof(GLfloat), vertexPosData.data(), GL_STATIC_DRAW);
}
void GLMesh::bind()
{
glBindVertexArray(vao);

2
src/gui/viewport/GLMesh.h
View File

@@ -1,4 +1,5 @@
#pragma once
#include "Engine/Types.h"
#include <GL/gl.h>
#include <QOpenGLFunctions_3_2_Core>
@@ -16,6 +17,7 @@ public:
void init();
void initBuffers();
void setPosBuffer(std::vector<enzo::bt::Vector3> data);
void bind();
void unbind();
void draw();

20
src/gui/viewport/ViewportGLWidget.cpp
View File

@@ -1,4 +1,6 @@
#include "gui/viewport/ViewportGLWidget.h"
#include "Engine/Operator/AttributeHandle.h"
#include "Engine/Types.h"
#include "gui/viewport/GLMesh.h"
#include <glm/mat4x4.hpp>
#include <glm/ext/matrix_clip_space.hpp>
@@ -141,7 +143,25 @@ void ViewportGLWidget::paintGL()
std::unique_ptr<GLMesh> ViewportGLWidget::meshFromGeo(std::unique_ptr<enzo::geo::Geometry>& geometry)
{
using namespace enzo;
auto mesh = std::make_unique<GLMesh>();
std::shared_ptr<ga::Attribute> PAttr = geometry->getAttribByName(ga::AttrOwner::POINT, "P");
ga::AttributeHandleVector3 PAttrHandle = ga::AttributeHandleVector3(PAttr);
PAttrHandle.addValue(bt::Vector3(-0.5f, -0.5f, 0.0f));
PAttrHandle.addValue(bt::Vector3(0.5f, -0.5f, 0.0f));
PAttrHandle.addValue(bt::Vector3(0.0f, 0.5f, 0.0f));
PAttrHandle.addValue(bt::Vector3(0.5f, 0.5f, 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),
// });
return mesh;
}