Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 11:54:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix grab billboarding bug

Browse source
This commit is contained in:
SamGondelman 2018-12-05 15:05:01 -08:00
parent 98f9dc0ca4
commit abef5c4d61
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/entities/src/EntityItemProperties.cpp
View file

@ -1843,7 +1843,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
// Handle conversions from old 'textures' property to "imageURL" // Handle conversions from old 'textures' property to "imageURL"
{ {
QScriptValue V = object.property("textures"); QScriptValue V = object.property("textures");
if (V.isValid()) { if (_type == EntityTypes::Image && V.isValid() && !object.property("imageURL").isValid()) {
bool isValid = false; bool isValid = false;
QString textures = QString_convertFromScriptValue(V, isValid); QString textures = QString_convertFromScriptValue(V, isValid);
if (isValid) { if (isValid) {
@ -1862,7 +1862,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
// Handle old "faceCamera" and "isFacingAvatar" props // Handle old "faceCamera" and "isFacingAvatar" props
{ {
QScriptValue P = object.property("faceCamera"); QScriptValue P = object.property("faceCamera");
if (P.isValid()) { if (P.isValid() && !object.property("billboardMode").isValid()) {
bool newValue = P.toVariant().toBool(); bool newValue = P.toVariant().toBool();
bool oldValue = getBillboardMode() == BillboardMode::YAW; bool oldValue = getBillboardMode() == BillboardMode::YAW;
if (_defaultSettings || newValue != oldValue) { if (_defaultSettings || newValue != oldValue) {
@ -1872,7 +1872,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
} }
{ {
QScriptValue P = object.property("isFacingAvatar"); QScriptValue P = object.property("isFacingAvatar");
if (P.isValid()) { if (P.isValid() && !object.property("billboardMode").isValid() && !object.property("faceCamera").isValid()) {
bool newValue = P.toVariant().toBool(); bool newValue = P.toVariant().toBool();
bool oldValue = getBillboardMode() == BillboardMode::FULL; bool oldValue = getBillboardMode() == BillboardMode::FULL;
if (_defaultSettings || newValue != oldValue) { if (_defaultSettings || newValue != oldValue) {