Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
f0de14c2
Commit
f0de14c2
authored
Jan 03, 2016
by
Christopher Tenter
Browse files
fix edges_colored drawmode for for meshes
parent
5a1bda81
Pipeline
#668
passed with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
ACG/GL/DrawMeshT.cc
View file @
f0de14c2
...
...
@@ -2430,11 +2430,11 @@ void ACG::DrawMeshT<Mesh>::updateEdgeHalfedgeVertexDeclarations()
{
vertexDeclEdgeCol_
->
clear
();
vertexDeclEdgeCol_
->
addElement
(
GL_FLOAT
,
3
,
VERTEX_USAGE_POSITION
,
perEdgeVertexBuffer
());
vertexDeclEdgeCol_
->
addElement
(
GL_
UNSIGNED_BYTE
,
4
,
VERTEX_USAGE_COLOR
,
perEdgeColorBuffer
());
vertexDeclEdgeCol_
->
addElement
(
GL_
FLOAT
,
4
,
VERTEX_USAGE_COLOR
,
perEdgeColorBuffer
());
vertexDeclHalfedgeCol_
->
clear
();
vertexDeclHalfedgeCol_
->
addElement
(
GL_FLOAT
,
3
,
VERTEX_USAGE_POSITION
,
perHalfedgeVertexBuffer
());
vertexDeclHalfedgeCol_
->
addElement
(
GL_
UNSIGNED_BYTE
,
4
,
VERTEX_USAGE_COLOR
,
perHalfedgeColorBuffer
());
vertexDeclHalfedgeCol_
->
addElement
(
GL_
FLOAT
,
4
,
VERTEX_USAGE_COLOR
,
perHalfedgeColorBuffer
());
vertexDeclHalfedgePos_
->
clear
();
vertexDeclHalfedgePos_
->
addElement
(
GL_FLOAT
,
3
,
VERTEX_USAGE_POSITION
,
perHalfedgeVertexBuffer
());
...
...
ACG/Scenegraph/MeshNode2T.cc
View file @
f0de14c2
...
...
@@ -834,6 +834,7 @@ void ACG::SceneGraph::MeshNodeT<Mesh>::getRenderObjects( IRenderer* _renderer, G
ro
.
shaderDesc
.
vertexColors
=
true
;
// note: colored edges are in sysmem, so they are directly bound to the VertexDeclaration
drawMesh_
->
updateEdgeHalfedgeVertexDeclarations
();
ro
.
vertexDecl
=
drawMesh_
->
getEdgeColoredVertexDeclaration
();
ro
.
glDrawArrays
(
GL_LINES
,
0
,
int
(
mesh_
.
n_edges
()
*
2
));
...
...
@@ -855,6 +856,7 @@ void ACG::SceneGraph::MeshNodeT<Mesh>::getRenderObjects( IRenderer* _renderer, G
ro
.
shaderDesc
.
shadeMode
=
SG_SHADE_UNLIT
;
// buffers in system memory
drawMesh_
->
updateEdgeHalfedgeVertexDeclarations
();
if
(
props
->
colored
())
ro
.
vertexDecl
=
drawMesh_
->
getHalfedgeVertexDeclaration
();
else
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment