Merge branch 'VtkShaders' into 'master'
Vtk shaders Starting merge request for vtk shaders, pulled from ricardo branch, implemented mostly by tansel, rebased on master, with cleaning and corrections made by me. This is a Work in Progress. do not merge. We need to review this altogether with @ricardo-ortiz This deprecates an old texture handling, but we need to work on integrating the new implementation, for example if there are no shaders. Also maybe look into getting rid of the use of static objects. @tanselhalic could you maybe give a description of your work on the shaders and the textures? Also please wait until this is merged to contribute your new changes, so we can start from a clean base again. Thank you all. Let's get this merged! See merge request !61
No related branches found
No related tags found
Showing
- CMake/SuperBuild/External_VTK.cmake 4 additions, 3 deletionsCMake/SuperBuild/External_VTK.cmake
- CMakeLists.txt 0 additions, 2 deletionsCMakeLists.txt
- Collision/SurfaceTree.hpp 0 additions, 1 deletionCollision/SurfaceTree.hpp
- Core/BaseMesh.cpp 8 additions, 1 deletionCore/BaseMesh.cpp
- Core/BaseMesh.h 6 additions, 0 deletionsCore/BaseMesh.h
- Core/CMakeLists.txt 5 additions, 1 deletionCore/CMakeLists.txt
- Core/Geometry.h 0 additions, 1 deletionCore/Geometry.h
- Core/ObjectSimulator.cpp 0 additions, 1 deletionCore/ObjectSimulator.cpp
- Core/RenderDetail.cpp 465 additions, 102 deletionsCore/RenderDetail.cpp
- Core/RenderDetail.h 288 additions, 117 deletionsCore/RenderDetail.h
- Core/SDK.h 1 addition, 1 deletionCore/SDK.h
- Examples/AVMNidus/CMakeLists.txt 3 additions, 3 deletionsExamples/AVMNidus/CMakeLists.txt
- Examples/AVMNidus/main.cpp 6 additions, 32 deletionsExamples/AVMNidus/main.cpp
- Examples/CMakeLists.txt 2 additions, 1 deletionExamples/CMakeLists.txt
- Examples/FEMSimulator/CMakeLists.txt 1 addition, 1 deletionExamples/FEMSimulator/CMakeLists.txt
- Examples/FEMSimulator/main.cpp 4 additions, 0 deletionsExamples/FEMSimulator/main.cpp
- Examples/LaparoscopicCamera/CMakeLists.txt 1 addition, 1 deletionExamples/LaparoscopicCamera/CMakeLists.txt
- Examples/LaparoscopicCamera/main.cpp 10 additions, 9 deletionsExamples/LaparoscopicCamera/main.cpp
- Examples/Shaders/CMakeLists.txt 38 additions, 0 deletionsExamples/Shaders/CMakeLists.txt
- Examples/Shaders/main.cpp 134 additions, 0 deletionsExamples/Shaders/main.cpp
Loading
Please register or sign in to comment