Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Type-OpenVolumeMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
3
Issues
3
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenFlipper-Free
Type-OpenVolumeMesh
Commits
1438b673
Commit
1438b673
authored
Feb 22, 2019
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'render-fixes' into 'master'
Render fixes See merge request
!18
parents
eab2727f
b20f7e9f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
ObjectTypes/VolumeMeshObject/VolumeMeshBufferManagerT_impl.hh
...ctTypes/VolumeMeshObject/VolumeMeshBufferManagerT_impl.hh
+3
-1
ObjectTypes/VolumeMeshObject/VolumeMeshNodeT_impl.hh
ObjectTypes/VolumeMeshObject/VolumeMeshNodeT_impl.hh
+2
-3
No files found.
ObjectTypes/VolumeMeshObject/VolumeMeshBufferManagerT_impl.hh
View file @
1438b673
...
...
@@ -352,7 +352,9 @@ void VolumeMeshBufferManager<VolumeMesh>::setOptionsFromDrawMode(ACG::SceneGraph
else
if
(
_drawMode
&
(
mDrawModes
.
facesFlatShaded
|
mDrawModes
.
facesTexturedShaded
|
mDrawModes
.
facesColoredPerFaceFlatShaded
))
enablePerFaceNormals
();
else
if
(
_drawMode
&
(
mDrawModes
.
cellsSmoothShaded
|
mDrawModes
.
facesSmoothShaded
|
mDrawModes
.
halffacesSmoothShaded
|
mDrawModes
.
cellsPhongShaded
|
mDrawModes
.
facesPhongShaded
|
mDrawModes
.
halffacesPhongShaded
))
mDrawModes
.
cellsPhongShaded
|
mDrawModes
.
facesPhongShaded
|
mDrawModes
.
halffacesPhongShaded
|
mDrawModes
.
cellsColoredPerCell
|
mDrawModes
.
cellsColoredPerFace
|
mDrawModes
.
cellsColoredPerHalfface
|
mDrawModes
.
cellsColoredPerVertex
|
mDrawModes
.
cellsTransparent
))
enablePerVertexNormals
();
else
disableNormals
();
...
...
ObjectTypes/VolumeMeshObject/VolumeMeshNodeT_impl.hh
View file @
1438b673
...
...
@@ -757,7 +757,7 @@ void VolumeMeshNodeT<VolumeMeshT>::getCellRenderObjects(IRenderer* _renderer, GL
ro
.
shaderDesc
.
clearTextures
();
ro
.
shaderDesc
.
shadeMode
=
SG_SHADE_
GOURAUD
;
ro
.
shaderDesc
.
shadeMode
=
SG_SHADE_
UNLIT
;
ro
.
depthRange
=
Vec2f
(
0.01
f
,
1.0
f
);
...
...
@@ -765,8 +765,7 @@ void VolumeMeshNodeT<VolumeMeshT>::getCellRenderObjects(IRenderer* _renderer, GL
{
ro
.
shaderDesc
.
vertexColors
=
true
;
ro
.
shaderDesc
.
numLights
=
-
1
;
ro
.
shaderDesc
.
shadeMode
=
SG_SHADE_GOURAUD
;
ro
.
shaderDesc
.
shadeMode
=
SG_SHADE_UNLIT
;
}
else
if
(
_drawMode
&
drawModes_
.
cellsSmoothShaded
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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