From 523253aa13b9b8d188dfa5c2dd49dd17d99faf1b Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Mon, 8 Apr 2019 18:21:04 -0700 Subject: [PATCH 1/6] Added vhacd-util to all installers. --- tools/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index b9ae635a4f..a323dc46af 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -32,6 +32,7 @@ if (BUILD_TOOLS) skeleton-dump atp-client oven + vhacd-util ) else() set(ALL_TOOLS @@ -45,6 +46,7 @@ if (BUILD_TOOLS) skeleton-dump atp-client oven + vhacd-util nitpick ) endif() From 781949da4c1ed3ec1af9764d021c0edc8d617372 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Mon, 8 Apr 2019 18:33:33 -0700 Subject: [PATCH 2/6] Added package_libraries_for_deployment. --- tools/CMakeLists.txt | 12 +++++------- tools/vhacd-util/CMakeLists.txt | 4 +++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index a323dc46af..fd74786a5e 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -21,8 +21,8 @@ endfunction() if (BUILD_TOOLS) # Allow different tools for stable builds if (STABLE_BUILD) - set(ALL_TOOLS - udt-test + set(ALL_TOOLS + udt-test vhacd-util frame-optimizer gpu-frame-player @@ -32,11 +32,10 @@ if (BUILD_TOOLS) skeleton-dump atp-client oven - vhacd-util ) else() - set(ALL_TOOLS - udt-test + set(ALL_TOOLS + udt-test vhacd-util frame-optimizer gpu-frame-player @@ -46,11 +45,10 @@ if (BUILD_TOOLS) skeleton-dump atp-client oven - vhacd-util nitpick ) endif() - + foreach(TOOL ${ALL_TOOLS}) check_test(${TOOL}) if (${BUILD_TOOL_RESULT}) diff --git a/tools/vhacd-util/CMakeLists.txt b/tools/vhacd-util/CMakeLists.txt index 90cfdf878a..eccc496170 100644 --- a/tools/vhacd-util/CMakeLists.txt +++ b/tools/vhacd-util/CMakeLists.txt @@ -12,7 +12,9 @@ target_link_libraries(${TARGET_NAME} ${VHACD_LIBRARIES}) setup_memory_debugger() -if (UNIX AND NOT APPLE) +if (WIN32) + package_libraries_for_deployment() +elseif (UNIX AND NOT APPLE) include(FindOpenMP) if(OPENMP_FOUND) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") From 13f0b97d07915b97cddbcc2a208a6167f5f07486 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Tue, 9 Apr 2019 10:40:04 -0700 Subject: [PATCH 3/6] Added install_beside_console --- tools/vhacd-util/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/vhacd-util/CMakeLists.txt b/tools/vhacd-util/CMakeLists.txt index eccc496170..744e711694 100644 --- a/tools/vhacd-util/CMakeLists.txt +++ b/tools/vhacd-util/CMakeLists.txt @@ -22,3 +22,7 @@ elseif (UNIX AND NOT APPLE) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}") endif() endif () + +if (BUILD_SERVER) + install_beside_console() +endif () From 3e292c4b03f90940ad4b80d76fa098810ba8f2cc Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Tue, 9 Apr 2019 12:30:34 -0700 Subject: [PATCH 4/6] Install both oven and vhacd in both client and client+server builds. --- tools/oven/CMakeLists.txt | 4 +--- tools/vhacd-util/CMakeLists.txt | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/oven/CMakeLists.txt b/tools/oven/CMakeLists.txt index c9b1aca1d4..86fee8a067 100644 --- a/tools/oven/CMakeLists.txt +++ b/tools/oven/CMakeLists.txt @@ -18,6 +18,4 @@ elseif (APPLE) set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks") endif() -if (BUILD_SERVER) - install_beside_console() -endif () +install_beside_console() diff --git a/tools/vhacd-util/CMakeLists.txt b/tools/vhacd-util/CMakeLists.txt index 744e711694..79e1fcb774 100644 --- a/tools/vhacd-util/CMakeLists.txt +++ b/tools/vhacd-util/CMakeLists.txt @@ -23,6 +23,4 @@ elseif (UNIX AND NOT APPLE) endif() endif () -if (BUILD_SERVER) - install_beside_console() -endif () +install_beside_console() From 2d5cfbf4f50b8a65713f23498124ee952cf61923 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Tue, 16 Apr 2019 15:16:26 -0700 Subject: [PATCH 5/6] fix oven crash --- libraries/baking/src/FBXBaker.cpp | 7 ++++++- libraries/render-utils/src/Model.cpp | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libraries/baking/src/FBXBaker.cpp b/libraries/baking/src/FBXBaker.cpp index b7eb56c921..01897ee5e9 100644 --- a/libraries/baking/src/FBXBaker.cpp +++ b/libraries/baking/src/FBXBaker.cpp @@ -104,13 +104,15 @@ void FBXBaker::rewriteAndBakeSceneModels(const QVector& meshes, const int meshIndex = 0; for (FBXNode& rootChild : _rootNode.children) { if (rootChild.name == "Objects") { - for (auto object = rootChild.children.begin(); object != rootChild.children.end(); object++) { + auto object = rootChild.children.begin(); + while (object != rootChild.children.end()) { if (object->name == "Geometry") { if (object->properties.at(2) == "Mesh") { int meshNum = meshIndexToRuntimeOrder[meshIndex]; replaceMeshNodeWithDraco(*object, dracoMeshes[meshNum], dracoMaterialLists[meshNum]); meshIndex++; } + object++; } else if (object->name == "Model") { for (FBXNode& modelChild : object->children) { if (modelChild.name == "Properties60" || modelChild.name == "Properties70") { @@ -136,9 +138,12 @@ void FBXBaker::rewriteAndBakeSceneModels(const QVector& meshes, const meshIndex++; } } + object++; } else if (object->name == "Texture" || object->name == "Video") { // this is an embedded texture, we need to remove it from the FBX object = rootChild.children.erase(object); + } else { + object++; } if (hasErrors()) { diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 2a35b0d161..e2d78a8d94 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -1572,9 +1572,13 @@ void Model::applyMaterialMapping() { auto& materialMapping = getMaterialMapping(); for (auto& mapping : materialMapping) { - std::set shapeIDs = getMeshIDsFromMaterialID(QString(mapping.first.c_str())); auto networkMaterialResource = mapping.second; - if (!networkMaterialResource || shapeIDs.size() == 0) { + if (!networkMaterialResource) { + continue; + } + + std::set shapeIDs = getMeshIDsFromMaterialID(QString(mapping.first.c_str())); + if (shapeIDs.size() == 0) { continue; } From 7fa81ffef32c160ab7385e5cc574869e02baa8ec Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Thu, 18 Apr 2019 12:48:46 -0700 Subject: [PATCH 6/6] fix warnings --- interface/src/Application.cpp | 3 --- interface/src/Menu.cpp | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index d1add60647..7ba45da1fd 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -9320,6 +9320,3 @@ void Application::toggleAwayMode(){ #endif - - -#include "Application.moc" diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index e9aadea2b6..2c34ecd780 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -707,8 +707,7 @@ Menu::Menu() { // Developer > Timing >>> MenuWrapper* timingMenu = developerMenu->addMenu("Timing"); MenuWrapper* perfTimerMenu = timingMenu->addMenu("Performance Timer"); - addCheckableActionToQMenuAndActionHash(perfTimerMenu, MenuOption::DisplayDebugTimingDetails, 0, false, - qApp, SLOT(enablePerfStats(bool))); + addCheckableActionToQMenuAndActionHash(perfTimerMenu, MenuOption::DisplayDebugTimingDetails); addCheckableActionToQMenuAndActionHash(perfTimerMenu, MenuOption::OnlyDisplayTopTen, 0, true); addCheckableActionToQMenuAndActionHash(perfTimerMenu, MenuOption::ExpandUpdateTiming, 0, false); addCheckableActionToQMenuAndActionHash(perfTimerMenu, MenuOption::ExpandSimulationTiming, 0, false);