Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 06:13:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'blackProp' of github.com:samcake/hifi into blackProp

Browse source
This commit is contained in:
Sam Gateau 2019-04-19 16:57:57 -07:00
commit 4875e52eba
7 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -9320,6 +9320,3 @@ void Application::toggleAwayMode(){
#endif
#include "Application.moc"

3
interface/src/Menu.cpp
View file

@ -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);

7
libraries/baking/src/FBXBaker.cpp
View file

@ -104,13 +104,15 @@ void FBXBaker::rewriteAndBakeSceneModels(const QVector<hfm::Mesh>& 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<hfm::Mesh>& 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()) {

8
libraries/render-utils/src/Model.cpp
View file

@ -1572,9 +1572,13 @@ void Model::applyMaterialMapping() {
auto& materialMapping = getMaterialMapping();
for (auto& mapping : materialMapping) {
std::set<unsigned int> shapeIDs = getMeshIDsFromMaterialID(QString(mapping.first.c_str()));
auto networkMaterialResource = mapping.second;
if (!networkMaterialResource || shapeIDs.size() == 0) {
if (!networkMaterialResource) {
continue;
}
std::set<unsigned int> shapeIDs = getMeshIDsFromMaterialID(QString(mapping.first.c_str()));
if (shapeIDs.size() == 0) {
continue;
}

10
tools/CMakeLists.txt
View file

@ -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
@ -34,8 +34,8 @@ if (BUILD_TOOLS)
oven
)
else()
set(ALL_TOOLS
udt-test
set(ALL_TOOLS
udt-test
vhacd-util
frame-optimizer
gpu-frame-player
@ -48,7 +48,7 @@ if (BUILD_TOOLS)
nitpick
)
endif()
foreach(TOOL ${ALL_TOOLS})
check_test(${TOOL})
if (${BUILD_TOOL_RESULT})

4
tools/oven/CMakeLists.txt
View file

@ -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()

6
tools/vhacd-util/CMakeLists.txt
View file

@ -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}")
@ -20,3 +22,5 @@ if (UNIX AND NOT APPLE)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
endif()
endif ()
install_beside_console()