History

addressed CR feedback

Thijs Wenker committed 8 years ago

Commit 80beb6c1 parent 1094b673 files · +74 −70Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+39−41
@@ -427,51 +427,51 @@ QScriptValue EntityScriptingInterface::getMultipleEntityPropertiesInternal(QScri · 426 unmodified lines
427427 EntityPsuedoPropertyFlags psuedoPropertyFlags;
428428 const auto readExtendedPropertyStringValue = [&](QScriptValue extendedProperty) {
429429 const auto extendedPropertyString = extendedProperty.toString();
430− if (extendedPropertyString == QString("id")) {
431− psuedoPropertyFlags |= EntityPsuedoPropertyFlag::id;
432− } else if (extendedPropertyString == QString("type")) {
433− psuedoPropertyFlags |= EntityPsuedoPropertyFlag::type;
434− } else if (extendedPropertyString == QString("created")) {
435− psuedoPropertyFlags |= EntityPsuedoPropertyFlag::created;
436− } else if (extendedPropertyString == QString("age")) {
437− psuedoPropertyFlags |= EntityPsuedoPropertyFlag::age;
438− } else if (extendedPropertyString == QString("ageAsText")) {
439− psuedoPropertyFlags |= EntityPsuedoPropertyFlag::ageAsText;
440− } else if (extendedPropertyString == QString("lastEdited")) {
441− psuedoPropertyFlags |= EntityPsuedoPropertyFlag::lastEdited;
442− } else if (extendedPropertyString == QString("boundingBox")) {
443− psuedoPropertyFlags |= EntityPsuedoPropertyFlag::boundingBox;
444− } else if (extendedPropertyString == QString("originalTextures")) {
445− psuedoPropertyFlags |= EntityPsuedoPropertyFlag::originalTextures;
446− } else if (extendedPropertyString == QString("renderInfo")) {
447− psuedoPropertyFlags |= EntityPsuedoPropertyFlag::renderInfo;
448− } else if (extendedPropertyString == QString("clientOnly")) {
449− psuedoPropertyFlags |= EntityPsuedoPropertyFlag::clientOnly;
450− } else if (extendedPropertyString == QString("owningAvatarID")) {
451− psuedoPropertyFlags |= EntityPsuedoPropertyFlag::owningAvatarID;
430+ if (extendedPropertyString == "id") {
431+ psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::ID);
432+ } else if (extendedPropertyString == "type") {
433+ psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::Type);
434+ } else if (extendedPropertyString == "created") {
435+ psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::Created);
436+ } else if (extendedPropertyString == "age") {
437+ psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::Age);
438+ } else if (extendedPropertyString == "ageAsText") {
439+ psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::AgeAsText);
440+ } else if (extendedPropertyString == "lastEdited") {
441+ psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::LastEdited);
442+ } else if (extendedPropertyString == "boundingBox") {
443+ psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::BoundingBox);
444+ } else if (extendedPropertyString == "originalTextures") {
445+ psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::OriginalTextures);
446+ } else if (extendedPropertyString == "renderInfo") {
447+ psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::RenderInfo);
448+ } else if (extendedPropertyString == "clientOnly") {
449+ psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::ClientOnly);
450+ } else if (extendedPropertyString == "owningAvatarID") {
451+ psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::OwningAvatarID);
452452 }
453453 };
454454
455455 if (extendedDesiredProperties.isString()) {
456456 readExtendedPropertyStringValue(extendedDesiredProperties);
457− psuedoPropertyFlags |= EntityPsuedoPropertyFlag::flagsActive;
457+ psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::FlagsActive);
458458 } else if (extendedDesiredProperties.isArray()) {
459459 const quint32 length = extendedDesiredProperties.property("length").toInt32();
460460 for (quint32 i = 0; i < length; i++) {
461461 readExtendedPropertyStringValue(extendedDesiredProperties.property(i));
462462 }
463− psuedoPropertyFlags |= EntityPsuedoPropertyFlag::flagsActive;
463+ psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::FlagsActive);
464464 }
465465
466466 EntityPropertyFlags desiredProperties = qScriptValueToValue<EntityPropertyFlags>(extendedDesiredProperties);
467− bool needsScriptSymantics = desiredProperties.getHasProperty(PROP_POSITION) ||
467+ bool needsScriptSemantics = desiredProperties.getHasProperty(PROP_POSITION) ||
468468 desiredProperties.getHasProperty(PROP_ROTATION) ||
469469 desiredProperties.getHasProperty(PROP_LOCAL_POSITION) ||
470470 desiredProperties.getHasProperty(PROP_LOCAL_ROTATION) ||
471471 desiredProperties.getHasProperty(PROP_LOCAL_VELOCITY) ||
472472 desiredProperties.getHasProperty(PROP_LOCAL_ANGULAR_VELOCITY) ||
473473 desiredProperties.getHasProperty(PROP_LOCAL_DIMENSIONS);
474− if (needsScriptSymantics) {
474+ if (needsScriptSemantics) {
475475 // if we are explicitly getting position or rotation, we need parent information to make sense of them.
476476 desiredProperties.setHasProperty(PROP_PARENT_ID);
477477 desiredProperties.setHasProperty(PROP_PARENT_JOINT_INDEX);
@@ -488,7 +488,7 @@ QScriptValue EntityScriptingInterface::getMultipleEntityPropertiesInternal(QScri · 10 unmodified lines
488488 const auto& entityID = entityIDs.at(i);
489489 const EntityItemPointer entity = _entityTree->findEntityByEntityItemID(EntityItemID(entityID));
490490 if (entity) {
491− if (!psuedoPropertyFlags && desiredProperties.isEmpty()) {
491+ if (psuedoPropertyFlags.none() && desiredProperties.isEmpty()) {
492492 // these are left out of EntityItem::getEntityProperties so that localPosition and localRotation
493493 // don't end up in json saves, etc. We still want them here, though.
494494 EncodeBitstreamParams params; // unknown
@@ -498,8 +498,8 @@ QScriptValue EntityScriptingInterface::getMultipleEntityPropertiesInternal(QScri · 3 unmodified lines
498498 desiredProperties.setHasProperty(PROP_LOCAL_VELOCITY);
499499 desiredProperties.setHasProperty(PROP_LOCAL_ANGULAR_VELOCITY);
500500 desiredProperties.setHasProperty(PROP_LOCAL_DIMENSIONS);
501− psuedoPropertyFlags = EntityPsuedoPropertyFlag::all;
502− needsScriptSymantics = true;
501+ psuedoPropertyFlags.set();
502+ needsScriptSemantics = true;
503503 }
504504
505505 auto properties = entity->getProperties(desiredProperties, true);
@@ -512,18 +512,16 @@ QScriptValue EntityScriptingInterface::getMultipleEntityPropertiesInternal(QScri · 6 unmodified lines
512512 }
513513 QScriptValue finalResult = engine->newArray(resultProperties.size());
514514 quint32 i = 0;
515− {
516− if (needsScriptSymantics) {
517− PROFILE_RANGE(script_entities, "EntityScriptingInterface::getMultipleEntityProperties>Script Semantics");
518− foreach(auto result, resultProperties) {
519− finalResult.setProperty(i++, convertPropertiesToScriptSemantics(result.properties, result.scalesWithParent)
520− .copyToScriptValue(engine, false, false, false, psuedoPropertyFlags));
521− }
522− } else {
523− PROFILE_RANGE(script_entities, "EntityScriptingInterface::getMultipleEntityProperties>Skip Script Semantics");
524− foreach(auto result, resultProperties) {
525− finalResult.setProperty(i++, result.properties.copyToScriptValue(engine, false, false, false, psuedoPropertyFlags));
526− }
515+ if (needsScriptSemantics) {
516+ PROFILE_RANGE(script_entities, "EntityScriptingInterface::getMultipleEntityProperties>Script Semantics");
517+ foreach(const auto& result, resultProperties) {
518+ finalResult.setProperty(i++, convertPropertiesToScriptSemantics(result.properties, result.scalesWithParent)
519+ .copyToScriptValue(engine, false, false, false, psuedoPropertyFlags));
520+ }
521+ } else {
522+ PROFILE_RANGE(script_entities, "EntityScriptingInterface::getMultipleEntityProperties>Skip Script Semantics");
523+ foreach(const auto& result, resultProperties) {
524+ finalResult.setProperty(i++, result.properties.copyToScriptValue(engine, false, false, false, psuedoPropertyFlags));
527525 }
528526 }
529527 return finalResult;