Skip to content
Snippets Groups Projects
Commit cef18f4e authored by Fabian Paus's avatar Fabian Paus
Browse files

Optimize mesh visualizer

parent 12ca0ca9
No related branches found
No related tags found
No related merge requests found
...@@ -40,6 +40,13 @@ namespace armarx::viz::coin ...@@ -40,6 +40,13 @@ namespace armarx::viz::coin
SoMaterial* materials; SoMaterial* materials;
SoCoordinate3* coords; SoCoordinate3* coords;
SoIndexedFaceSet* faceSet; SoIndexedFaceSet* faceSet;
std::vector<SbColor> matAmb;
std::vector<SbColor> matDif;
std::vector<float> transp;
std::vector<SbVec3f> vertexPositions;
std::vector<int32_t> faces;
std::vector<int32_t> matInx;
}; };
struct VisualizerMesh: TypedElementVisualizer<VisualizerMesh, ElementMesh, VisuDataMesh> struct VisualizerMesh: TypedElementVisualizer<VisualizerMesh, ElementMesh, VisuDataMesh>
...@@ -52,10 +59,12 @@ namespace armarx::viz::coin ...@@ -52,10 +59,12 @@ namespace armarx::viz::coin
{ {
colorSize = 1; colorSize = 1;
} }
// TODO: Optimize these temporary arrays away auto& matAmb = data->matAmb;
std::vector<SbColor> matAmb(colorSize); auto& matDif = data->matDif;
std::vector<SbColor> matDif(colorSize); auto& transp = data->transp;
std::vector<float> transp(colorSize); matAmb.resize(colorSize);
matDif.resize(colorSize);
transp.resize(colorSize);
const float conv = 1.0f / 255.0f; const float conv = 1.0f / 255.0f;
if (noColorsArray) if (noColorsArray)
...@@ -85,14 +94,15 @@ namespace armarx::viz::coin ...@@ -85,14 +94,15 @@ namespace armarx::viz::coin
} }
// Define colors for the faces // Define colors for the faces
SoMaterial* myMaterials = data->materials; SoMaterial* materials = data->materials;
myMaterials->diffuseColor.setValues(0, colorSize, matDif.data()); materials->diffuseColor.setValuesPointer(colorSize, matDif.data());
myMaterials->ambientColor.setValues(0, colorSize, matAmb.data()); materials->ambientColor.setValuesPointer(colorSize, matAmb.data());
myMaterials->transparency.setValues(0, colorSize, transp.data()); materials->transparency.setValuesPointer(colorSize, transp.data());
// define vertex array // define vertex array
int vertexSize = (int)element.vertices.size(); int vertexSize = (int)element.vertices.size();
std::vector<SbVec3f> vertexPositions(vertexSize); auto& vertexPositions = data->vertexPositions;
vertexPositions.resize(vertexSize);
for (int i = 0; i < vertexSize; i++) for (int i = 0; i < vertexSize; i++)
{ {
auto v = element.vertices[i]; auto v = element.vertices[i];
...@@ -100,11 +110,13 @@ namespace armarx::viz::coin ...@@ -100,11 +110,13 @@ namespace armarx::viz::coin
} }
// Define coordinates for vertices // Define coordinates for vertices
data->coords->point.setValues(0, vertexSize, vertexPositions.data()); data->coords->point.setValuesPointer(vertexSize, vertexPositions.data());
int facesSize = (int)element.faces.size(); int facesSize = (int)element.faces.size();
std::vector<int32_t> faces(facesSize * 4); auto& faces = data->faces;
std::vector<int32_t> matInx(facesSize * 4); faces.resize(facesSize * 4);
auto& matInx = data->matInx;
matInx.resize(facesSize * 4);
for (int i = 0; i < facesSize; i++) for (int i = 0; i < facesSize; i++)
{ {
...@@ -122,8 +134,8 @@ namespace armarx::viz::coin ...@@ -122,8 +134,8 @@ namespace armarx::viz::coin
} }
SoIndexedFaceSet* myFaceSet = data->faceSet; SoIndexedFaceSet* myFaceSet = data->faceSet;
myFaceSet->coordIndex.setValues(0, faces.size(), faces.data()); myFaceSet->coordIndex.setValuesPointer(faces.size(), faces.data());
myFaceSet->materialIndex.setValues(0, matInx.size(), matInx.data()); myFaceSet->materialIndex.setValuesPointer(matInx.size(), matInx.data());
} }
}; };
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment