Commit 1cb5a963 authored by Ken Martin's avatar Ken Martin Committed by Kitware Robot

Merge topic 'move_sphere_stick_mappers'

ef8060e1 move the sphere and stick mappers from Chem to OpenGL2/CMakeLists
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !1901
parents 279ff7cd ef8060e1
Pipeline #24631 running with stage
in 491 minutes and 43 seconds
......@@ -6,38 +6,8 @@ include(vtkObjectFactory)
set(Module_SRCS
vtkOpenGLMoleculeMapper.cxx
vtkOpenGLSphereMapper.cxx
vtkOpenGLStickMapper.cxx
)
set(shader_files
glsl/vtkSphereMapperVS.glsl
glsl/vtkStickMapperVS.glsl
)
unset(shader_h_files)
foreach(file ${shader_files})
get_filename_component(file_we ${file} NAME_WE)
set(src ${CMAKE_CURRENT_SOURCE_DIR}/${file})
set(res ${CMAKE_CURRENT_BINARY_DIR}/${file_we}.cxx)
set(resh ${CMAKE_CURRENT_BINARY_DIR}/${file_we}.h)
list(APPEND shader_h_files ${resh})
add_custom_command(
OUTPUT ${res} ${resh}
DEPENDS ${src} vtkEncodeString
COMMAND vtkEncodeString
ARGS ${res} ${src} ${file_we}
--build-header VTKDOMAINSCHEMISTRYOPENGL2_EXPORT
vtkDomainsChemistryOpenGL2Module.h
)
list(APPEND Module_SRCS ${res})
set_source_files_properties(${file_we}
PROPERTIES
WRAP_EXCLUDE 1
WRAP_EXCLUDE_PYTHON 1
)
endforeach()
# Now for the object factory.
set(opengl_overrides
MoleculeMapper
......
......@@ -54,6 +54,8 @@ set(Module_SRCS
vtkOpenGLRenderWindow.cxx
vtkOpenGLRenderer.cxx
vtkOpenGLShaderCache.cxx
vtkOpenGLSphereMapper.cxx
vtkOpenGLStickMapper.cxx
vtkOpenGLTextActor.cxx
vtkOpenGLTextActor3D.cxx
vtkOpenGLTextMapper.cxx
......@@ -157,6 +159,8 @@ set(shader_files
glsl/vtkSSAAPassFS.glsl
glsl/vtkSobelGradientMagnitudePass1FS.glsl
glsl/vtkSobelGradientMagnitudePass2FS.glsl
glsl/vtkSphereMapperVS.glsl
glsl/vtkStickMapperVS.glsl
glsl/vtkTextureObjectFS.glsl
glsl/vtkTextureObjectVS.glsl
)
......
......@@ -19,10 +19,10 @@
#ifndef vtkOpenGLSphereMapper_h
#define vtkOpenGLSphereMapper_h
#include "vtkDomainsChemistryOpenGL2Module.h" // For export macro
#include "vtkRenderingOpenGL2Module.h" // For export macro
#include "vtkOpenGLPolyDataMapper.h"
class VTKDOMAINSCHEMISTRYOPENGL2_EXPORT vtkOpenGLSphereMapper : public vtkOpenGLPolyDataMapper
class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLSphereMapper : public vtkOpenGLPolyDataMapper
{
public:
static vtkOpenGLSphereMapper* New();
......
......@@ -19,10 +19,10 @@
#ifndef vtkOpenGLStickMapper_h
#define vtkOpenGLStickMapper_h
#include "vtkDomainsChemistryOpenGL2Module.h" // For export macro
#include "vtkRenderingOpenGL2Module.h" // For export macro
#include "vtkOpenGLPolyDataMapper.h"
class VTKDOMAINSCHEMISTRYOPENGL2_EXPORT vtkOpenGLStickMapper : public vtkOpenGLPolyDataMapper
class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLStickMapper : public vtkOpenGLPolyDataMapper
{
public:
static vtkOpenGLStickMapper* New();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment