Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:43:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix issues with uv scale checking

Browse source
This commit is contained in:
sabrina-shanman 2019-01-14 10:11:21 -08:00
parent 00a9e9e92f
commit 5173577a92
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libraries/fbx/src/FBXSerializer.cpp
View file

@ -838,10 +838,10 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
} else if (subobject.name == "ModelUVScaling" && subobject.properties.length() >= MODEL_UV_SCALING_MIN_SIZE) { } else if (subobject.name == "ModelUVScaling" && subobject.properties.length() >= MODEL_UV_SCALING_MIN_SIZE) {
auto newScaling = glm::vec3(subobject.properties.at(0).value<double>(), subobject.properties.at(1).value<double>(), 1.0); auto newScaling = glm::vec3(subobject.properties.at(0).value<double>(), subobject.properties.at(1).value<double>(), 1.0);
if (newScaling.x == 0.0f) { if (newScaling.x == 0.0f) {
newScaling.x = 0.0f; newScaling.x = 1.0f;
} }
if (newScaling.y == 0.0f) { if (newScaling.y == 0.0f) {
newScaling.y = 0.0f; newScaling.y = 1.0f;
} }
tex.assign(tex.scaling, tex.scaling * newScaling); tex.assign(tex.scaling, tex.scaling * newScaling);
} else if (subobject.name == "Cropping" && subobject.properties.length() >= CROPPING_MIN_SIZE) { } else if (subobject.name == "Cropping" && subobject.properties.length() >= CROPPING_MIN_SIZE) {
@ -877,13 +877,13 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
} else if (property.properties.at(0) == SCALING) { } else if (property.properties.at(0) == SCALING) {
auto newScaling = getVec3(property.properties, index); auto newScaling = getVec3(property.properties, index);
if (newScaling.x == 0.0f) { if (newScaling.x == 0.0f) {
newScaling.x == 1.0f; newScaling.x = 1.0f;
} }
if (newScaling.y == 0.0f) { if (newScaling.y == 0.0f) {
newScaling.y == 1.0f; newScaling.y = 1.0f;
} }
if (newScaling.z == 0.0f) { if (newScaling.z == 0.0f) {
newScaling.z == 1.0f; newScaling.z = 1.0f;
} }
tex.assign(tex.scaling, tex.scaling * newScaling); tex.assign(tex.scaling, tex.scaling * newScaling);
} }
@ -1073,14 +1073,14 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
} else { // Vector (3d) } else { // Vector (3d)
scale = glm::vec3(property.properties.at(3).value<double>(), property.properties.at(4).value<double>(), property.properties.at(5).value<double>()); scale = glm::vec3(property.properties.at(3).value<double>(), property.properties.at(4).value<double>(), property.properties.at(5).value<double>());
} }
if (scale.x == 0.0) { if (scale.x == 0.0f) {
scale.x = 1.0; scale.x = 1.0f;
} }
if (scale.y == 0.0) { if (scale.y == 0.0f) {
scale.y = 1.0; scale.y = 1.0f;
} }
if (scale.z == 0.0) { if (scale.z == 0.0f) {
scale.z = 1.0; scale.z = 1.0f;
} }
materialParam.scaling *= scale; materialParam.scaling *= scale;
} }