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

Merge branch 'master' into hazeZone

Browse source
This commit is contained in:
Nissim 2017-10-20 13:33:01 -07:00
commit b976dbd224
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/hifi/toolbars/Toolbar.qml
View file

@ -19,7 +19,6 @@ Window {
shown: true shown: true
width: content.width width: content.width
height: content.height height: content.height
disableFade: true
// Disable this window from being able to call 'desktop.raise() and desktop.showDesktop' // Disable this window from being able to call 'desktop.raise() and desktop.showDesktop'
activator: Item {} activator: Item {}
property bool horizontal: true property bool horizontal: true
@ -127,7 +126,7 @@ Window {
sortButtons(); sortButtons();
shown = true; fadeIn(null);
return result; return result;
} }
@ -143,7 +142,7 @@ Window {
buttons.splice(index, 1); buttons.splice(index, 1);
if (buttons.length === 0) { if (buttons.length === 0) {
shown = false; fadeOut(null);
} }
} }
} }

7
interface/resources/qml/windows/Fadable.qml
View file

@ -36,9 +36,6 @@ FocusScope {
// Some dialogs should be destroyed when they become // Some dialogs should be destroyed when they become
// invisible, so handle that // invisible, so handle that
onVisibleChanged: { onVisibleChanged: {
if (disableFade) {
return;
}
// If someone directly set the visibility to false // If someone directly set the visibility to false
// toggle it back on and use the targetVisible flag to transition // toggle it back on and use the targetVisible flag to transition
// via fading. // via fading.
@ -66,9 +63,7 @@ FocusScope {
} }
onFadeTargetPropertyChanged: { onFadeTargetPropertyChanged: {
if (!disableFade) { visible = (fadeTargetProperty != 0.0);
visible = (fadeTargetProperty != 0.0);
}
} }
function fadeIn(callback) { function fadeIn(callback) {

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

@ -377,7 +377,8 @@ void FBXBaker::rewriteAndBakeSceneModels() {
bool hasColors { mesh.colors.size() > 0 }; bool hasColors { mesh.colors.size() > 0 };
bool hasTexCoords { mesh.texCoords.size() > 0 }; bool hasTexCoords { mesh.texCoords.size() > 0 };
bool hasTexCoords1 { mesh.texCoords1.size() > 0 }; bool hasTexCoords1 { mesh.texCoords1.size() > 0 };
bool hasPerFaceMaterials { mesh.parts.size() > 1 }; bool hasPerFaceMaterials { mesh.parts.size() > 1
|| extractedMesh.partMaterialTextures[0].first != 0 };
bool needsOriginalIndices { hasDeformers }; bool needsOriginalIndices { hasDeformers };
int normalsAttributeID { -1 }; int normalsAttributeID { -1 };
@ -594,6 +595,10 @@ void FBXBaker::rewriteAndBakeSceneTextures() {
QString fbxTextureFileName { textureChild.properties.at(0).toByteArray() }; QString fbxTextureFileName { textureChild.properties.at(0).toByteArray() };
QFileInfo textureFileInfo { fbxTextureFileName.replace("\\", "/") }; QFileInfo textureFileInfo { fbxTextureFileName.replace("\\", "/") };
if (hasErrors()) {
return;
}
if (textureFileInfo.suffix() == BAKED_TEXTURE_EXT.mid(1)) { if (textureFileInfo.suffix() == BAKED_TEXTURE_EXT.mid(1)) {
// re-baking an FBX that already references baked textures is a fail // re-baking an FBX that already references baked textures is a fail
// so we add an error and return from here // so we add an error and return from here
@ -602,6 +607,11 @@ void FBXBaker::rewriteAndBakeSceneTextures() {
return; return;
} }
if (!TextureBaker::getSupportedFormats().contains(textureFileInfo.suffix())) {
// this is a texture format we don't bake, skip it
handleWarning(fbxTextureFileName + " is not a bakeable texture format");
continue;
}
// make sure this texture points to something and isn't one we've already re-mapped // make sure this texture points to something and isn't one we've already re-mapped
if (!textureFileInfo.filePath().isEmpty()) { if (!textureFileInfo.filePath().isEmpty()) {