diff --git a/CMake/External/External_VTK.cmake b/CMake/External/External_VTK.cmake index 3fcbe0425a8b83590c1d5b9e694d7b636ed4ee5e..ab112241d86daf198c8659279fb7e0549404bc3e 100644 --- a/CMake/External/External_VTK.cmake +++ b/CMake/External/External_VTK.cmake @@ -10,7 +10,7 @@ endif() set(${PROJECT_NAME}_VTK_REPO_SOURCE "8.2" CACHE STRING "Select VTK Source Branch/Tag") -set(VTK_SOURCES "8.2;8.9;master;release;nightly-master" CACHE INTERNAL "List of available VTK branch,tags to get") +set(VTK_SOURCES "8.2;8.9;9.0;master;release;nightly-master" CACHE INTERNAL "List of available VTK branch,tags to get") set_property(CACHE ${PROJECT_NAME}_VTK_REPO_SOURCE PROPERTY STRINGS ${VTK_SOURCES}) @@ -75,6 +75,9 @@ else() if(${PROJECT_NAME}_VTK_REPO_SOURCE EQUAL "8.9") set(${PROJECT_NAME}_VTK_SOURCE GIT_REPOSITORY https://gitlab.kitware.com/vtk/vtk.git) set(${PROJECT_NAME}_VTK_HASH GIT_TAG 9b6a039f43404053a0653f742148d123f6ada7d6) + elseif(${PROJECT_NAME}_VTK_REPO_SOURCE EQUAL "9.0") + set(${PROJECT_NAME}_VTK_SOURCE GIT_REPOSITORY https://gitlab.kitware.com/vtk/vtk.git) + set(${PROJECT_NAME}_VTK_HASH GIT_TAG ab278e87b181e3a02082bea7361fbaa3ddafb3ad) else() set(${PROJECT_NAME}_VTK_SOURCE GIT_REPOSITORY https://gitlab.kitware.com/vtk/vtk.git) set(${PROJECT_NAME}_VTK_HASH GIT_TAG origin/${${PROJECT_NAME}_VTK_REPO_SOURCE}) diff --git a/CMakeLists.txt b/CMakeLists.txt index bac23b70716265dff58228959d5d4d392461969a..c69be8a786cca53d212cb591c4391710607f6f0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.9) -project(iMSTK VERSION 3.0.0 LANGUAGES C CXX) +project(iMSTK VERSION 2.0.0 LANGUAGES C CXX) if(UNIX AND NOT APPLE) set(LINUX TRUE) diff --git a/Examples/PBD/PBDCollisionMultipleObjects/PBDCollisionMultipleObjectsExample.cpp b/Examples/PBD/PBDCollisionMultipleObjects/PBDCollisionMultipleObjectsExample.cpp index ed1e6083bdab7216fe910523c411c34c906dbf94..e497925a05e2f6ee1981528fad234e87fd1adb9b 100644 --- a/Examples/PBD/PBDCollisionMultipleObjects/PBDCollisionMultipleObjectsExample.cpp +++ b/Examples/PBD/PBDCollisionMultipleObjects/PBDCollisionMultipleObjectsExample.cpp @@ -94,7 +94,7 @@ generateDragon(const std::shared_ptr<imstk::Scene>& scene, #if 0 // Wireframe color material->setDisplayMode(RenderMaterial::DisplayMode::WIREFRAME_SURFACE); - material->setDebugColor(getRandomColor()); // Wireframe color + material->setColor(getRandomColor()); // Wireframe color material->setLineWidth(2); #else material->setDisplayMode(RenderMaterial::DisplayMode::Surface); diff --git a/Examples/TaskGraph/Timing/taskGraphTimingExample.cpp b/Examples/TaskGraph/Timing/taskGraphTimingExample.cpp index b9f7862660cb6417b2f594442b9f75020a27b88a..56f4fdcd40a8d8bf9b53670656717906a844a578 100644 --- a/Examples/TaskGraph/Timing/taskGraphTimingExample.cpp +++ b/Examples/TaskGraph/Timing/taskGraphTimingExample.cpp @@ -110,7 +110,7 @@ main() sims[i].visualModel = std::make_shared<VisualModel>(sims[i].geometry); std::shared_ptr<RenderMaterial> material = std::make_shared<RenderMaterial>(); material->setDisplayMode(RenderMaterial::DisplayMode::Wireframe); - material->setDebugColor(Color::lerpRgb(startColor, endColor, static_cast<double>(i) / (numStrings - 1))); + material->setColor(Color::lerpRgb(startColor, endColor, static_cast<double>(i) / (numStrings - 1))); material->setLineWidth(2.0f); sims[i].visualModel->setRenderMaterial(material); sims[i].object->addVisualModel(sims[i].visualModel); diff --git a/Source/Rendering/Materials/imstkRenderMaterial.h b/Source/Rendering/Materials/imstkRenderMaterial.h index 1fedce105081fbe9ecefa4676fa3651a6a70a0bc..376c2f86f1b1a6e9a93e5e07b8cea8f30dbff2ae 100644 --- a/Source/Rendering/Materials/imstkRenderMaterial.h +++ b/Source/Rendering/Materials/imstkRenderMaterial.h @@ -108,12 +108,6 @@ public: const Color& getColor() const; void setColor(const Color& color); - /// - /// \brief Get/Set the color of the wireframe and points - /// - const Color& getDebugColor() const; - void setDebugColor(const Color& color); - /// /// \brief Get/Set the metalness ///