History

Adding a color indicator to whiteboard

ericrius1 committed 11 years ago

Commit cfca0fe1 parent 0b92bc14 files · +41 −35Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 4 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+5−10
@@ -416,20 +416,15 @@ void RayToEntityIntersectionResultFromScriptValue(const QScriptValue& object, Ra · 415 unmodified lines
416 QString faceName = object.property("face").toVariant().toString();416 QString faceName = object.property("face").toVariant().toString();
417 if (faceName == "MIN_X_FACE") {417 if (faceName == "MIN_X_FACE") {
418 value.face = MIN_X_FACE;418 value.face = MIN_X_FACE;
419 }419 } else if (faceName == "MAX_X_FACE") {
420 else if (faceName == "MAX_X_FACE") {
421 value.face = MAX_X_FACE;420 value.face = MAX_X_FACE;
422 }421 } else if (faceName == "MIN_Y_FACE") {
423 else if (faceName == "MIN_Y_FACE") {
424 value.face = MIN_Y_FACE;422 value.face = MIN_Y_FACE;
425 }423 } else if (faceName == "MAX_Y_FACE") {
426 else if (faceName == "MAX_Y_FACE") {
427 value.face = MAX_Y_FACE;424 value.face = MAX_Y_FACE;
428 }425 } else if (faceName == "MIN_Z_FACE") {
429 else if (faceName == "MIN_Z_FACE") {
430 value.face = MIN_Z_FACE;426 value.face = MIN_Z_FACE;
431 }427 } else {
432 else {
433 value.face = MAX_Z_FACE;428 value.face = MAX_Z_FACE;
434 };429 };
435 QScriptValue intersection = object.property("intersection");430 QScriptValue intersection = object.property("intersection");