diff --git a/apps/app_demo_slproject/source/AppDemoGui.cpp b/apps/app_demo_slproject/source/AppDemoGui.cpp index 55d5f5bd..c9f40bbf 100644 --- a/apps/app_demo_slproject/source/AppDemoGui.cpp +++ b/apps/app_demo_slproject/source/AppDemoGui.cpp @@ -1577,38 +1577,14 @@ void AppDemoGui::buildMenuBar(SLScene* s, SLSceneView* sv) { SLstring zip = "glTF-Sample-Models.zip"; - /*if (ImGui::MenuItem("Clear Coat Test", nullptr, sid == SID_glTF_ClearCoatTest)) - { - SLstring fileToLoad = AppDemo::configPath + "models/glTF-Sample-Models/2.0/ClearCoatTest/glTF/ClearCoatTest.gltf"; - if (Utils::fileExists(fileToLoad)) - s->onLoad(am, s, sv, SID_glTF_ClearCoatTest); - else - downloadModelAndLoadScene(s, sv, zip, pathSrc, pathDst, fileToLoad, SID_glTF_ClearCoatTest); - }*/ if (ImGui::MenuItem("Damaged Helmet", nullptr, sid == SID_glTF_DamagedHelmet)) - { s->onLoad(am, s, sv, SID_glTF_DamagedHelmet); - // SLstring fileToLoad = AppDemo::configPath + "models/glTF-Sample-Models/2.0/DamagedHelmet/glTF/DamagedHelmet.gltf"; - // loadSceneWithLargeModel(s, sv, zip, fileToLoad, SID_glTF_DamagedHelmet); - } if (ImGui::MenuItem("Flight Helmet", nullptr, sid == SID_glTF_FlightHelmet)) - { s->onLoad(am, s, sv, SID_glTF_FlightHelmet); - // SLstring fileToLoad = AppDemo::configPath + "models/glTF-Sample-Models/2.0/FlightHelmet/glTF/FlightHelmet.gltf"; - // loadSceneWithLargeModel(s, sv, zip, fileToLoad, SID_glTF_FlightHelmet); - } if (ImGui::MenuItem("Sponza Palace", nullptr, sid == SID_glTF_Sponza)) - { s->onLoad(am, s, sv, SID_glTF_Sponza); - // SLstring fileToLoad = AppDemo::configPath + "models/glTF-Sample-Models/2.0/Sponza/glTF/Sponza.gltf"; - // loadSceneWithLargeModel(s, sv, zip, fileToLoad, SID_glTF_Sponza); - } if (ImGui::MenuItem("Water Bottle", nullptr, sid == SID_glTF_WaterBottle)) - { s->onLoad(am, s, sv, SID_glTF_WaterBottle); - // SLstring fileToLoad = AppDemo::configPath + "models/glTF-Sample-Models/2.0/WaterBottle/glTF/WaterBottle.gltf"; - // loadSceneWithLargeModel(s, sv, zip, fileToLoad, SID_glTF_WaterBottle); - } ImGui::EndMenu(); } @@ -1618,11 +1594,7 @@ void AppDemoGui::buildMenuBar(SLScene* s, SLSceneView* sv) SLstring zip = "GLTF-FanucCRX.zip"; if (ImGui::MenuItem("Fanuc-CRX", nullptr, sid == SID_Robotics_FanucCRX_FK)) - { s->onLoad(am, s, sv, SID_Robotics_FanucCRX_FK); - // SLstring fileToLoad = AppDemo::configPath + "models/GLTF-FanucCRX/Fanuc-CRX.gltf"; - // loadSceneWithLargeModel(s, sv, zip, fileToLoad, SID_Robotics_FanucCRX_FK); - } ImGui::EndMenu(); } diff --git a/apps/source/AppDemo.cpp b/apps/source/AppDemo.cpp index a8efbca9..14d8a1ae 100644 --- a/apps/source/AppDemo.cpp +++ b/apps/source/AppDemo.cpp @@ -29,7 +29,7 @@ SLDeviceRotation AppDemo::devRot; SLDeviceLocation AppDemo::devLoc; SLstring AppDemo::name = "SLProjectApp"; SLstring AppDemo::appTag = "SLProject"; -SLstring AppDemo::version = "4.0.000"; +SLstring AppDemo::version = "4.1.000"; #ifdef _DEBUG SLstring AppDemo::configuration = "Debug"; #else diff --git a/docs/Doxyfile b/docs/Doxyfile index 414bd717..a435f3f7 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -47,7 +47,7 @@ PROJECT_NAME = SLProject # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 4.0.000 +PROJECT_NUMBER = 4.1.000 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a