Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Scott Wittenburg
VTK
Commits
52dc35a8
Commit
52dc35a8
authored
May 06, 2014
by
Ken Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some module changes override actor change bunny color
parent
0400abf7
Changes
52
Hide whitespace changes
Inline
Side-by-side
Showing
52 changed files
with
183 additions
and
50 deletions
+183
-50
Common/Color/module.cmake
Common/Color/module.cmake
+1
-1
Common/DataModel/module.cmake
Common/DataModel/module.cmake
+1
-1
Domains/Chemistry/module.cmake
Domains/Chemistry/module.cmake
+1
-1
Filters/Core/module.cmake
Filters/Core/module.cmake
+1
-1
Filters/Extraction/module.cmake
Filters/Extraction/module.cmake
+1
-1
Filters/FlowPaths/module.cmake
Filters/FlowPaths/module.cmake
+1
-1
Filters/General/module.cmake
Filters/General/module.cmake
+1
-1
Filters/Generic/module.cmake
Filters/Generic/module.cmake
+1
-1
Filters/Geometry/module.cmake
Filters/Geometry/module.cmake
+1
-1
Filters/Hybrid/module.cmake
Filters/Hybrid/module.cmake
+1
-1
Filters/Modeling/module.cmake
Filters/Modeling/module.cmake
+1
-1
Filters/Parallel/module.cmake
Filters/Parallel/module.cmake
+1
-1
Filters/Programmable/module.cmake
Filters/Programmable/module.cmake
+1
-1
Filters/ReebGraph/module.cmake
Filters/ReebGraph/module.cmake
+1
-1
Filters/Selection/module.cmake
Filters/Selection/module.cmake
+1
-1
Filters/Sources/module.cmake
Filters/Sources/module.cmake
+1
-1
GUISupport/MFC/module.cmake
GUISupport/MFC/module.cmake
+1
-1
GUISupport/Qt/module.cmake
GUISupport/Qt/module.cmake
+1
-1
GUISupport/QtOpenGL/module.cmake
GUISupport/QtOpenGL/module.cmake
+1
-1
Geovis/Core/module.cmake
Geovis/Core/module.cmake
+1
-1
IO/Exodus/module.cmake
IO/Exodus/module.cmake
+1
-1
IO/Export/module.cmake
IO/Export/module.cmake
+1
-1
IO/GDAL/module.cmake
IO/GDAL/module.cmake
+1
-1
IO/Geometry/module.cmake
IO/Geometry/module.cmake
+1
-1
IO/Import/module.cmake
IO/Import/module.cmake
+1
-1
IO/LSDyna/module.cmake
IO/LSDyna/module.cmake
+1
-1
IO/Legacy/module.cmake
IO/Legacy/module.cmake
+1
-1
IO/MPIImage/module.cmake
IO/MPIImage/module.cmake
+1
-1
IO/MPIParallel/module.cmake
IO/MPIParallel/module.cmake
+1
-1
IO/NetCDF/module.cmake
IO/NetCDF/module.cmake
+1
-1
IO/PLY/module.cmake
IO/PLY/module.cmake
+1
-1
IO/ParallelLSDyna/module.cmake
IO/ParallelLSDyna/module.cmake
+1
-1
IO/ParallelNetCDF/module.cmake
IO/ParallelNetCDF/module.cmake
+1
-1
IO/VPIC/module.cmake
IO/VPIC/module.cmake
+1
-1
IO/XML/module.cmake
IO/XML/module.cmake
+1
-1
Imaging/Core/module.cmake
Imaging/Core/module.cmake
+1
-1
Infovis/BoostGraphAlgorithms/module.cmake
Infovis/BoostGraphAlgorithms/module.cmake
+1
-1
Infovis/Core/module.cmake
Infovis/Core/module.cmake
+1
-1
Infovis/Layout/module.cmake
Infovis/Layout/module.cmake
+1
-1
Rendering/Context2D/module.cmake
Rendering/Context2D/module.cmake
+1
-1
Rendering/Core/module.cmake
Rendering/Core/module.cmake
+1
-1
Rendering/FreeTypeOpenGL/module.cmake
Rendering/FreeTypeOpenGL/module.cmake
+1
-1
Rendering/GL2PS/module.cmake
Rendering/GL2PS/module.cmake
+1
-1
Rendering/LIC/module.cmake
Rendering/LIC/module.cmake
+1
-1
Rendering/Matplotlib/module.cmake
Rendering/Matplotlib/module.cmake
+1
-1
Rendering/OpenGL/module.cmake
Rendering/OpenGL/module.cmake
+1
-0
Rendering/OpenGL2/CMakeLists.txt
Rendering/OpenGL2/CMakeLists.txt
+3
-0
Rendering/OpenGL2/Testing/Cxx/TestVBOPLYMapper.cxx
Rendering/OpenGL2/Testing/Cxx/TestVBOPLYMapper.cxx
+2
-2
Rendering/OpenGL2/module.cmake
Rendering/OpenGL2/module.cmake
+1
-1
Rendering/OpenGL2/vtkOpenGL2Actor.cxx
Rendering/OpenGL2/vtkOpenGL2Actor.cxx
+81
-0
Rendering/OpenGL2/vtkOpenGL2Actor.h
Rendering/OpenGL2/vtkOpenGL2Actor.h
+48
-0
Rendering/OpenGL2/vtkVBOPolyDataMapper.cxx
Rendering/OpenGL2/vtkVBOPolyDataMapper.cxx
+2
-2
No files found.
Common/Color/module.cmake
View file @
52dc35a8
...
...
@@ -4,7 +4,7 @@ vtk_module(vtkCommonColor
TEST_DEPENDS
vtkIOImage
vtkCommonExecutionModel
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingCore
vtkTestingRendering
vtkInteractionStyle
...
...
Common/DataModel/module.cmake
View file @
52dc35a8
...
...
@@ -16,5 +16,5 @@ vtk_module(vtkCommonDataModel
vtkIOLegacy
vtkIOXML
vtkRenderingCore
vtkRenderingOpenGL
vtkRenderingOpenGL
2
)
Domains/Chemistry/module.cmake
View file @
52dc35a8
...
...
@@ -11,5 +11,5 @@ vtk_module(vtkDomainsChemistry
vtkTestingCore
vtkTestingRendering
vtkInteractionStyle
vtkRenderingOpenGL
vtkRenderingOpenGL
2
)
Filters/Core/module.cmake
View file @
52dc35a8
...
...
@@ -14,5 +14,5 @@ vtk_module(vtkFiltersCore
vtkIOXML
vtkImagingCore
vtkFiltersGeneral
vtkRenderingOpenGL
vtkRenderingOpenGL
2
)
Filters/Extraction/module.cmake
View file @
52dc35a8
...
...
@@ -9,7 +9,7 @@ vtk_module(vtkFiltersExtraction
TEST_DEPENDS
vtkIOLegacy
vtkIOXML
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
)
Filters/FlowPaths/module.cmake
View file @
52dc35a8
...
...
@@ -12,5 +12,5 @@ vtk_module(vtkFiltersFlowPaths
vtkTestingCore
vtkTestingRendering
vtkInteractionStyle
vtkRenderingOpenGL
vtkRenderingOpenGL
2
)
Filters/General/module.cmake
View file @
52dc35a8
...
...
@@ -8,7 +8,7 @@ vtk_module(vtkFiltersGeneral
vtkIOLegacy
vtkIOXML
vtkInteractionStyle
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkRenderingFreeTypeOpenGL
vtkRenderingAnnotation
vtkRenderingLabel
...
...
Filters/Generic/module.cmake
View file @
52dc35a8
...
...
@@ -7,7 +7,7 @@ vtk_module(vtkFiltersGeneric
TEST_DEPENDS
vtkIOXML
vtkIOLegacy
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkRenderingFreeTypeOpenGL
vtkFiltersModeling
vtkRenderingLabel
...
...
Filters/Geometry/module.cmake
View file @
52dc35a8
...
...
@@ -5,7 +5,7 @@ vtk_module(vtkFiltersGeometry
vtkFiltersCore
TEST_DEPENDS
vtkIOXML
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
)
Filters/Hybrid/module.cmake
View file @
52dc35a8
...
...
@@ -7,7 +7,7 @@ vtk_module(vtkFiltersHybrid
vtkRenderingCore
# For vtkCamera in vtkDepthSortPolyData
TEST_DEPENDS
vtkIOXML
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkImagingCore
vtkTestingRendering
vtkInteractionStyle
...
...
Filters/Modeling/module.cmake
View file @
52dc35a8
...
...
@@ -7,7 +7,7 @@ vtk_module(vtkFiltersModeling
TEST_DEPENDS
vtkCommonColor
# For vtkBandedPolyDataContourFilter used in a test
vtkIOXML
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
)
Filters/Parallel/module.cmake
View file @
52dc35a8
...
...
@@ -11,7 +11,7 @@ vtk_module(vtkFiltersParallel
vtkParallelMPI
vtkTestingRendering
vtkInteractionStyle
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkRenderingParallel
vtkFiltersParallelMPI
vtkFiltersParallelImaging
...
...
Filters/Programmable/module.cmake
View file @
52dc35a8
...
...
@@ -4,7 +4,7 @@ vtk_module(vtkFiltersProgrammable
DEPENDS
vtkCommonExecutionModel
TEST_DEPENDS
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
)
Filters/ReebGraph/module.cmake
View file @
52dc35a8
...
...
@@ -2,7 +2,7 @@ vtk_module(vtkFiltersReebGraph
DEPENDS
vtkFiltersCore
TEST_DEPENDS
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
)
Filters/Selection/module.cmake
View file @
52dc35a8
...
...
@@ -8,7 +8,7 @@ vtk_module(vtkFiltersSelection
vtkFiltersExtraction
vtkIOLegacy
vtkIOXML
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkRenderingFreeTypeOpenGL
vtkRenderingAnnotation
vtkTestingRendering
...
...
Filters/Sources/module.cmake
View file @
52dc35a8
...
...
@@ -8,7 +8,7 @@ vtk_module(vtkFiltersSources
vtkTestingCore
vtkTestingRendering
vtkInteractionStyle
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkRenderingFreeTypeOpenGL
vtkFiltersModeling
vtkIOXML
...
...
GUISupport/MFC/module.cmake
View file @
52dc35a8
...
...
@@ -3,7 +3,7 @@ if(WIN32)
vtk_module
(
vtkGUISupportMFC
GROUPS
DEPENDS
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkInteractionStyle
EXCLUDE_FROM_WRAPPING
)
...
...
GUISupport/Qt/module.cmake
View file @
52dc35a8
...
...
@@ -3,7 +3,7 @@ vtk_module(vtkGUISupportQt
Qt
DEPENDS
vtkCommonExecutionModel
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkInteractionStyle
vtkImagingCore
PRIVATE_DEPENDS
...
...
GUISupport/QtOpenGL/module.cmake
View file @
52dc35a8
...
...
@@ -3,7 +3,7 @@ vtk_module(vtkGUISupportQtOpenGL
Qt
DEPENDS
vtkGUISupportQt
vtkRenderingOpenGL
vtkRenderingOpenGL
2
TEST_DEPENDS
vtkTestingCore
EXCLUDE_FROM_WRAPPING
...
...
Geovis/Core/module.cmake
View file @
52dc35a8
...
...
@@ -7,7 +7,7 @@ vtk_module(vtkGeovisCore
vtkInteractionStyle
vtkInfovisLayout
vtkViewsCore
vtkRenderingOpenGL
# For vtkOpenGLHardwareSupport in vtkGeoTerrain
vtkRenderingOpenGL
2
# For vtkOpenGLHardwareSupport in vtkGeoTerrain
vtklibproj4
TEST_DEPENDS
vtkViewsGeovis
...
...
IO/Exodus/module.cmake
View file @
52dc35a8
...
...
@@ -10,5 +10,5 @@ vtk_module(vtkIOExodus
TEST_DEPENDS
vtkTestingRendering
vtkInteractionStyle
vtkRenderingOpenGL
vtkRenderingOpenGL
2
)
IO/Export/module.cmake
View file @
52dc35a8
...
...
@@ -9,7 +9,7 @@ vtk_module(vtkIOExport
vtkRenderingFreeType
vtkRenderingGL2PS
vtkRenderingLabel
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkImagingCore
PRIVATE_DEPENDS
vtkIOImage
...
...
IO/GDAL/module.cmake
View file @
52dc35a8
...
...
@@ -4,7 +4,7 @@ vtk_module(vtkIOGDAL
vtkCommonExecutionModel
TEST_DEPENDS
vtkTestingCore
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
)
IO/Geometry/module.cmake
View file @
52dc35a8
...
...
@@ -14,7 +14,7 @@ vtk_module(vtkIOGeometry
vtkIOAMR
vtkIOLegacy
vtkFiltersGeometry
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
)
IO/Import/module.cmake
View file @
52dc35a8
...
...
@@ -7,7 +7,7 @@ vtk_module(vtkIOImport
PRIVATE_DEPENDS
vtkFiltersSources
TEST_DEPENDS
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
)
IO/LSDyna/module.cmake
View file @
52dc35a8
...
...
@@ -7,7 +7,7 @@ vtk_module(vtkIOLSDyna
PRIVATE_DEPENDS
vtksys
TEST_DEPENDS
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
)
IO/Legacy/module.cmake
View file @
52dc35a8
...
...
@@ -11,6 +11,6 @@ vtk_module(vtkIOLegacy
TEST_DEPENDS
vtkFiltersAMR
vtkInteractionStyle
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
)
IO/MPIImage/module.cmake
View file @
52dc35a8
...
...
@@ -12,5 +12,5 @@ vtk_module(vtkIOMPIImage
vtkTestingCore
vtkTestingRendering
vtkInteractionStyle
vtkRenderingOpenGL
vtkRenderingOpenGL
2
)
IO/MPIParallel/module.cmake
View file @
52dc35a8
...
...
@@ -9,7 +9,7 @@ vtk_module(vtkIOMPIParallel
PRIVATE_DEPENDS
vtksys
TEST_DEPENDS
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
)
IO/NetCDF/module.cmake
View file @
52dc35a8
...
...
@@ -10,7 +10,7 @@ vtk_module(vtkIONetCDF
vtknetcdf
TEST_DEPENDS
vtkCommonExecutionModel
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
)
IO/PLY/module.cmake
View file @
52dc35a8
...
...
@@ -6,7 +6,7 @@ vtk_module(vtkIOPLY
vtkCommonExecutionModel
vtkIOGeometry
TEST_DEPENDS
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkIOImage
vtkTestingRendering
vtkInteractionStyle
...
...
IO/ParallelLSDyna/module.cmake
View file @
52dc35a8
...
...
@@ -8,5 +8,5 @@ vtk_module(vtkIOParallelLSDyna
vtkRenderingParallel
vtkTestingRendering
vtkInteractionStyle
vtkRenderingOpenGL
vtkRenderingOpenGL
2
)
IO/ParallelNetCDF/module.cmake
View file @
52dc35a8
...
...
@@ -8,7 +8,7 @@ vtk_module(vtkIOParallelNetCDF
vtknetcdf
TEST_DEPENDS
vtkCommonExecutionModel
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
)
IO/VPIC/module.cmake
View file @
52dc35a8
...
...
@@ -4,7 +4,7 @@ vtk_module(vtkIOVPIC
vtkCommonExecutionModel
vtkParallelCore
TEST_DEPENDS
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
)
IO/XML/module.cmake
View file @
52dc35a8
...
...
@@ -14,7 +14,7 @@ vtk_module(vtkIOXML
vtkImagingSources
vtkInfovisCore
vtkIOLegacy
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingCore
vtkTestingRendering
vtkInteractionStyle
...
...
Imaging/Core/module.cmake
View file @
52dc35a8
...
...
@@ -11,7 +11,7 @@ vtk_module(vtkImagingCore
vtkFiltersModeling
vtkFiltersGeneral
vtkFiltersHybrid
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
vtkInteractionImage
...
...
Infovis/BoostGraphAlgorithms/module.cmake
View file @
52dc35a8
...
...
@@ -3,7 +3,7 @@ vtk_module(vtkInfovisBoostGraphAlgorithms
vtkInfovisCore
vtkCommonExecutionModel
TEST_DEPENDS
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
vtkIOInfovis
...
...
Infovis/Core/module.cmake
View file @
52dc35a8
...
...
@@ -8,7 +8,7 @@ vtk_module(vtkInfovisCore
vtkFiltersGeneral
TEST_DEPENDS
vtkInfovisLayout
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
vtkIOInfovis
...
...
Infovis/Layout/module.cmake
View file @
52dc35a8
...
...
@@ -8,7 +8,7 @@ vtk_module(vtkInfovisLayout
vtkInfovisCore
TEST_DEPENDS
vtkRenderingLabel
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkTestingRendering
vtkInteractionStyle
vtkIOInfovis
...
...
Rendering/Context2D/module.cmake
View file @
52dc35a8
...
...
@@ -8,6 +8,6 @@ vtk_module(vtkRenderingContext2D
vtkCommonDataModel
vtkCommonMath
vtkCommonTransforms
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkRenderingFreeType
)
Rendering/Core/module.cmake
View file @
52dc35a8
...
...
@@ -13,5 +13,5 @@ vtk_module(vtkRenderingCore
vtkIOXML
vtkTestingCore
vtkTestingRendering
vtkRenderingOpenGL
vtkRenderingOpenGL
2
)
Rendering/FreeTypeOpenGL/module.cmake
View file @
52dc35a8
...
...
@@ -5,7 +5,7 @@ vtk_module(vtkRenderingFreeTypeOpenGL
vtkRenderingCore
DEPENDS
vtkRenderingFreeType
vtkRenderingOpenGL
vtkRenderingOpenGL
2
TEST_DEPENDS
vtkTestingCore
vtkTestingRendering
...
...
Rendering/GL2PS/module.cmake
View file @
52dc35a8
...
...
@@ -3,7 +3,7 @@ vtk_module(vtkRenderingGL2PS
DEPENDS
vtkRenderingContext2D
PRIVATE_DEPENDS
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkRenderingFreeType
vtkgl2ps
TEST_DEPENDS
...
...
Rendering/LIC/module.cmake
View file @
52dc35a8
...
...
@@ -5,7 +5,7 @@ vtk_module(vtkRenderingLIC
vtkIOXML
vtkIOLegacy
vtkImagingSources
vtkRenderingOpenGL
vtkRenderingOpenGL
2
PRIVATE_DEPENDS
vtksys
TEST_DEPENDS
...
...
Rendering/Matplotlib/module.cmake
View file @
52dc35a8
...
...
@@ -14,7 +14,7 @@ vtk_module(vtkRenderingMatplotlib
vtkTestingRendering
vtkInteractionStyle
vtkRenderingGL2PS
vtkRenderingOpenGL
vtkRenderingOpenGL
2
vtkRenderingFreeTypeOpenGL
vtkViewsContext2D
)
Rendering/OpenGL/module.cmake
View file @
52dc35a8
...
...
@@ -25,4 +25,5 @@ vtk_module(vtkRenderingOpenGL
vtkFiltersProgrammable
vtkFiltersSources
vtkRenderingAnnotation
vtkRenderingOpenGL2
)
Rendering/OpenGL2/CMakeLists.txt
View file @
52dc35a8
...
...
@@ -18,6 +18,7 @@ set(Module_SRCS
vtkglShader.cxx
vtkglShaderProgram.cxx
vtkglTexture2D.cxx
vtkOpenGL2Actor.cxx
vtkOpenGL2Camera.cxx
vtkOpenGL2Light.cxx
vtkVBOPolyDataMapper.cxx
...
...
@@ -77,10 +78,12 @@ set_source_files_properties(
# tests.
if
(
VTK_REPLACE_OPENGL_OVERRIDES
)
set
(
opengl_overrides
Actor
Camera
Light
)
endif
()
vtk_add_override
(
vtkPolyDataMapper vtkVBOPolyDataMapper
)
foreach
(
_override
${
opengl_overrides
}
)
vtk_add_override
(
vtk
${
_override
}
vtkOpenGL2
${
_override
}
)
...
...
Rendering/OpenGL2/Testing/Cxx/TestVBOPLYMapper.cxx
View file @
52dc35a8
...
...
@@ -62,8 +62,8 @@ int TestVBOPLYMapper(int argc, char *argv[])
actor
->
GetProperty
()
->
SetDiffuseColor
(
1.0
,
0.65
,
0.7
);
actor
->
GetProperty
()
->
SetSpecularColor
(
1.0
,
1.0
,
1.0
);
actor
->
GetProperty
()
->
SetSpecular
(
0.5
);
actor
->
GetProperty
()
->
SetDiffuse
(
0.
5
);
actor
->
GetProperty
()
->
SetAmbient
(
0.
3
);
actor
->
GetProperty
()
->
SetDiffuse
(
0.
7
);
actor
->
GetProperty
()
->
SetAmbient
(
0.
5
);
actor
->
GetProperty
()
->
SetSpecularPower
(
20.0
);
actor
->
GetProperty
()
->
SetOpacity
(
1.0
);
...
...
Rendering/OpenGL2/module.cmake
View file @
52dc35a8
vtk_module
(
vtkRenderingOpenGL2
DEPENDS
vtkCommonExecutionModel
vtkRenderingOpenGL
IMPLEMENTS
vtkRenderingCore
PRIVATE_DEPENDS
...
...
@@ -13,6 +14,5 @@ vtk_module(vtkRenderingOpenGL2
vtkTestingRendering
vtkInteractionStyle
vtkIOPLY
vtkRenderingOpenGL
EXCLUDE_FROM_WRAPPING
)
Rendering/OpenGL2/vtkOpenGL2Actor.cxx
0 → 100644
View file @
52dc35a8
/*=========================================================================
Program: Visualization Toolkit
Module: vtkOpenGLActor.cxx
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#include "vtkOpenGL2Actor.h"
#include "vtkMapper.h"
#include "vtkMatrix4x4.h"
#include "vtkObjectFactory.h"
#include "vtkOpenGLRenderer.h"
#include "vtkProperty.h"
#include "vtkOpenGLError.h"
#include "vtkOpenGL.h"
#include <math.h>
vtkStandardNewMacro
(
vtkOpenGL2Actor
);
// Actual actor render method.
void
vtkOpenGL2Actor
::
Render
(
vtkRenderer
*
ren
,
vtkMapper
*
mapper
)
{
vtkOpenGLClearErrorMacro
();
// get opacity
double
opacity
=
this
->
GetProperty
()
->
GetOpacity
();
if
(
opacity
==
1.0
)
{
glDepthMask
(
GL_TRUE
);
}
else
{
// Add this check here for GL_SELECT mode
// If we are not picking, then don't write to the zbuffer
// because we probably haven't sorted the polygons. If we
// are picking, then translucency doesn't matter - we want to
// pick the thing closest to us.
GLint
param
;
glGetIntegerv
(
GL_RENDER_MODE
,
&
param
);
if
(
param
==
GL_SELECT
)
{
glDepthMask
(
GL_TRUE
);
}
else
{
if
(
ren
->
GetLastRenderingUsedDepthPeeling
())
{
glDepthMask
(
GL_TRUE
);
// transparency with depth peeling
}
else
{
glDepthMask
(
GL_FALSE
);
// transparency with alpha blending
}
}
}
// send a render to the mapper; update pipeline
mapper
->
Render
(
ren
,
this
);
if
(
opacity
!=
1.0
)
{
glDepthMask
(
GL_TRUE
);
}
vtkOpenGLCheckErrorMacro
(
"failed after Render"
);
}
//----------------------------------------------------------------------------
void
vtkOpenGL2Actor
::
PrintSelf
(
ostream
&
os
,
vtkIndent
indent
)
{
this
->
Superclass
::
PrintSelf
(
os
,
indent
);
}
Rendering/OpenGL2/vtkOpenGL2Actor.h
0 → 100644
View file @
52dc35a8
/*=========================================================================
Program: Visualization Toolkit
Module: vtkOpenGLActor.h
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// .NAME vtkOpenGLActor - OpenGL actor
// .SECTION Description
// vtkOpenGLActor is a concrete implementation of the abstract class vtkActor.
// vtkOpenGLActor interfaces to the OpenGL rendering library.
#ifndef __vtkOpenGL2Actor_h
#define __vtkOpenGL2Actor_h
#include "vtkRenderingOpenGL2Module.h" // For export macro
#include "vtkActor.h"
class
vtkOpenGLRenderer
;
class
VTKRENDERINGOPENGL2_EXPORT
vtkOpenGL2Actor
:
public
vtkActor
{
public:
static
vtkOpenGL2Actor
*
New
();
vtkTypeMacro
(
vtkOpenGL2Actor
,
vtkActor
);
virtual
void
PrintSelf
(
ostream
&
os
,
vtkIndent
indent
);
// Description:
// Actual actor render method.
void
Render
(
vtkRenderer
*
ren
,
vtkMapper
*
mapper
);
protected:
vtkOpenGL2Actor
()
{}
~
vtkOpenGL2Actor
()
{}
private:
vtkOpenGL2Actor
(
const
vtkOpenGL2Actor
&
);
// Not implemented.
void
operator
=
(
const
vtkOpenGL2Actor
&
);
// Not implemented.
};
#endif
Rendering/OpenGL2/vtkVBOPolyDataMapper.cxx
View file @
52dc35a8
...
...
@@ -355,12 +355,12 @@ void vtkVBOPolyDataMapper::SetCameraShaderParameters(vtkRenderer* ren, vtkActor
}
//-----------------------------------------------------------------------------
void
vtkVBOPolyDataMapper
::
SetPropertyShaderParameters
(
vtkRenderer
*
vtkNotUsed
(
ren
)
,
vtkActor
*
actor
)
void
vtkVBOPolyDataMapper
::
SetPropertyShaderParameters
(
vtkRenderer
*
ren
,
vtkActor
*
actor
)
{
// Query the actor for some of the properties that can be applied.
float
opacity
=
static_cast
<
float
>
(
actor
->
GetProperty
()
->
GetOpacity
());
double
*
aColor
=
actor
->
GetProperty
()
->
GetAmbientColor
();
double
aIntensity
=
actor
->
GetProperty
()
->
GetAmbient
();
double
aIntensity
=
actor
->
GetProperty
()
->
GetAmbient
();
// ignoring renderer ambient
vtkgl
::
Vector3ub
ambientColor
(
static_cast
<
unsigned
char
>
(
aColor
[
0
]
*
aIntensity
*
255.0
),
static_cast
<
unsigned
char
>
(
aColor
[
1
]
*
aIntensity
*
255.0
),