Diffusion MITK 8133b105fd75

Merge remote-tracking branch 'origin/bug-16900-CreateNewShaderModule' into…
8133b105fd75
Actions

Description

Merge remote-tracking branch 'origin/bug-16900-CreateNewShaderModule' into bug-16897-vtk61-update

Conflicts:
Core/Code/Controllers/mitkCoreActivator.cpp
Modules/CMakeLists.txt

Details

Provenance

zelzer

Authored on Mar 10 2014, 3:12 PM

Parents

rMITKb68213cb8a6c: Treat Uniform as alias for ApplicationUniform and read default values.
rMITK355de7805b25: Merge branch 'bug-17441-NonLocalMeansDenoisingTest'

Branches

Unknown

Tags

Unknown

Event Timeline

zelzer committed rMITK8133b105fd75: Merge remote-tracking branch 'origin/bug-16900-CreateNewShaderModule' into… (authored by zelzer).Mar 10 2014, 3:12 PM

Merged Changes

b68213cb8a6c Treat Uniform as alias for ApplicationUniform and read default values.
Author
zelzer
Browse Repository
No Builds
No Audits
94f4eb0fbd53 Fix memory corruption by using a smartpointer vor vtkShaderProgram2.
Author
zelzer
Browse Repository
No Builds
No Audits
7031416ae7bb Add default shader properties and apply their current values.
Author
zelzer
Browse Repository
No Builds
No Audits
a29e336efbb2 Provide the IShaderRepository as an optional core service.
Author
zelzer
Browse Repository
No Builds
No Audits
f0ee2613f241 Use LightObject as the base class for IShaderRepository::Shader.
Author
zelzer
Browse Repository
No Builds
No Audits
35885152f286 Initialize shader program member to with NULL.
Author
zelzer
Browse Repository
No Builds
No Audits
a722777033ad Changed code-style for better readability.
Author
zelzer
Browse Repository
No Builds
No Audits
fa1fbf30312d Remove deprecated error reporting macro.
Author
zelzer
Browse Repository
No Builds
No Audits
6afa6bc6d31e VtkShaders module should not export symbols. Auto-loaded with Mitk.
Author
zelzer
Browse Repository
No Builds
No Audits
56d807633dce Track IShaderRepository services and manager shader resources.
Author
zelzer
Browse Repository
No Builds
No Audits
49395c33fe2d Use VTK 6.1 from mitk.org.
Author
zelzer
Browse Repository
No Builds
No Audits
eca2dd4aa2f1 Merge remote-tracking branch 'origin/bug-16767-update-example-plugins' into bug…
Author
zelzer
Browse Repository
No Builds
No Audits
032db8856b0a revert adding SurfaceVtkShaderMapper
Author
• kolbch
Browse Repository
No Builds
No Audits
4aac8745a56b Activate shaders in mitkVtkMapper
Author
• kolbch
Browse Repository
No Builds
No Audits
3c30efe72471 CreateShaderProgram in interface
Author
• kolbch
Browse Repository
No Builds
No Audits
acb93c19d4c9 change GetShaderProgram To UpdateShaderProgram
Author
• kolbch
Browse Repository
No Builds
No Audits
240d84e14187 add mitkVtkShaderProgram
Author
• kolbch
Browse Repository
No Builds
No Audits
a4d0abbfe854 Rename Shaders module and move shaderProperty to core
Author
• kolbch
Browse Repository
No Builds
No Audits
a9e7a93607ba Activate shaderRepository service
Author
• kolbch
Browse Repository
No Builds
No Audits
28846e81284b Move Shader classes to Shaders Module
Author
• kolbch
Browse Repository
No Builds
No Audits
b71b350a6152 Add shader module with legacy vtk 6.0 classes
Author
• kolbch
Browse Repository
No Builds
No Audits

Changes (36)

Path

Size

Packages

CMakeExternals/

VTK.cmake

O1: MITK Reviewer Group I

Core/

Code/

Common/

mitkCoreServices.cpp

mitkCoreServices.h

Controllers/

mitkCoreActivator.cpp

DataManagement/

mitkShaderProperty.cpp

mitkShaderProperty.h

Interfaces/

mitkIShaderRepository.cpp

mitkIShaderRepository.h

Rendering/

mitkShaderRepository.cpp

mitkShaderRepository.h

mitkSurfaceVtkMapper3D.cpp

mitkVtkMapper.cpp

mitkVtkMapper.h

mitkVtkPropRenderer.cpp

Resources/

Shaders/

mitkShaderLighting.xml

files.cmake

Modules/

CMakeLists.txt

MapperExt/

vtkMitkOpenGLVolumeTextureMapper3D.cpp

mitkVtkShaderProgram.cpp

mitkVtkShaderProgram.h

vtkXMLMaterial.cpp

vtkXMLMaterial.h

vtkXMLMaterialParser.cpp

vtkXMLMaterialParser.h

vtkXMLShader.cpp

vtkXMLShader.h

	VtkShaders/
	Simulation/

	mitkVtkShadersActivator.cpp
	mitkSimulationActivator.cpp

	Modules/	VtkShaders/
	Core/	Code/

Resources/

Shaders/

mitkShaderLighting.xml

	mitkVtkShaderRepository.cpp/
	Rendering/


	mitkShaderRepository.cpp

	mitkVtkShaderRepository.h/
	Rendering/


	mitkShaderRepository.h

rMITK8133b105fd75

View Options

CMakeExternals/VTK.cmake

View Options

Core/Code/Common/mitkCoreServices.cpp

View Options

Core/Code/Common/mitkCoreServices.h

View Options

Core/Code/Controllers/mitkCoreActivator.cpp

View Options

Core/Code/DataManagement/mitkShaderProperty.cpp

View Options

Core/Code/DataManagement/mitkShaderProperty.h

View Options

Core/Code/Interfaces/mitkIShaderRepository.cpp

View Options

Core/Code/Interfaces/mitkIShaderRepository.h

View Options

Core/Code/Rendering/mitkShaderRepository.cpp

View Options

Core/Code/Rendering/mitkShaderRepository.h

View Options

Core/Code/Rendering/mitkSurfaceVtkMapper3D.cpp

View Options

Core/Code/Rendering/mitkVtkMapper.cpp

View Options

Core/Code/Rendering/mitkVtkMapper.h

View Options

Core/Code/Rendering/mitkVtkPropRenderer.cpp

View Options

Core/Code/Resources/Shaders/mitkShaderLighting.xml

View Options

Core/Code/files.cmake

View Options

Modules/CMakeLists.txt

View Options

Modules/MapperExt/vtkMitkOpenGLVolumeTextureMapper3D.cpp

View Options

Modules/VtkShaders/CMakeLists.txt

View Options

Modules/VtkShaders/Resources/Shaders/mitkShaderLighting.xml

View Options

Modules/VtkShaders/files.cmake

View Options

Modules/VtkShaders/mitkVtkShaderProgram.cpp

View Options

Modules/VtkShaders/mitkVtkShaderProgram.h

View Options

Modules/VtkShaders/mitkVtkShaderRepository.cpp

View Options

Modules/VtkShaders/mitkVtkShaderRepository.h

View Options

Modules/VtkShaders/mitkVtkShadersActivator.cpp

View Options

Modules/VtkShaders/vtkXMLMaterial.cpp

View Options

Modules/VtkShaders/vtkXMLMaterial.h

View Options

Modules/VtkShaders/vtkXMLMaterialParser.cpp

View Options

Modules/VtkShaders/vtkXMLMaterialParser.h

View Options

Modules/VtkShaders/vtkXMLShader.cpp

View Options

Modules/VtkShaders/vtkXMLShader.h

Merge remote-tracking branch 'origin/bug-16900-CreateNewShaderModule' into…8133b105fd75Actions

Description

Details

Event Timeline

Merged Changes

Changes (36)

rMITK8133b105fd75

CMakeExternals/VTK.cmake

Core/Code/Common/mitkCoreServices.cpp

Core/Code/Common/mitkCoreServices.h

Core/Code/Controllers/mitkCoreActivator.cpp

Core/Code/DataManagement/mitkShaderProperty.cpp

Core/Code/DataManagement/mitkShaderProperty.h

Core/Code/Interfaces/mitkIShaderRepository.cpp

Core/Code/Interfaces/mitkIShaderRepository.h

Core/Code/Rendering/mitkShaderRepository.cpp

Core/Code/Rendering/mitkShaderRepository.h

Core/Code/Rendering/mitkSurfaceVtkMapper3D.cpp

Core/Code/Rendering/mitkVtkMapper.cpp

Core/Code/Rendering/mitkVtkMapper.h

Core/Code/Rendering/mitkVtkPropRenderer.cpp

Core/Code/Resources/Shaders/mitkShaderLighting.xml

Core/Code/files.cmake

Modules/CMakeLists.txt

Modules/MapperExt/vtkMitkOpenGLVolumeTextureMapper3D.cpp

Modules/VtkShaders/CMakeLists.txt

Modules/VtkShaders/Resources/Shaders/mitkShaderLighting.xml

Modules/VtkShaders/files.cmake

Modules/VtkShaders/mitkVtkShaderProgram.cpp

Modules/VtkShaders/mitkVtkShaderProgram.h

Modules/VtkShaders/mitkVtkShaderRepository.cpp

Modules/VtkShaders/mitkVtkShaderRepository.h

Modules/VtkShaders/mitkVtkShadersActivator.cpp

Modules/VtkShaders/vtkXMLMaterial.cpp

Modules/VtkShaders/vtkXMLMaterial.h

Modules/VtkShaders/vtkXMLMaterialParser.cpp

Modules/VtkShaders/vtkXMLMaterialParser.h

Modules/VtkShaders/vtkXMLShader.cpp

Modules/VtkShaders/vtkXMLShader.h

Merge remote-tracking branch 'origin/bug-16900-CreateNewShaderModule' into…
8133b105fd75
Actions