From 5ea84fb9527b89d19f531d010ff1d54ee2ec628b Mon Sep 17 00:00:00 2001 From: David Back Date: Fri, 4 Jan 2019 15:39:27 -0800 Subject: [PATCH] CR fixes --- libraries/entities/src/EntityScriptingInterface.cpp | 5 ++--- libraries/entities/src/EntityScriptingInterface.h | 4 ++-- scripts/system/edit.js | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index f8e58a38fb..5e4168382e 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/libraries/entities/src/EntityScriptingInterface.cpp @@ -2273,10 +2273,9 @@ bool EntityScriptingInterface::verifyStaticCertificateProperties(const QUuid& en return result; } -const EntityPropertyInfo EntityScriptingInterface::getPropertyInfo(const QScriptValue& property) const { - const QString name = property.toString(); +const EntityPropertyInfo EntityScriptingInterface::getPropertyInfo(const QString& propertyName) const { EntityPropertyInfo propertyInfo; - EntityItemProperties::getPropertyInfo(name, propertyInfo); + EntityItemProperties::getPropertyInfo(propertyName, propertyInfo); return propertyInfo; } diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h index 025c52eadf..0e96cb2d25 100644 --- a/libraries/entities/src/EntityScriptingInterface.h +++ b/libraries/entities/src/EntityScriptingInterface.h @@ -1699,11 +1699,11 @@ public slots: * Get information about entity properties including a minimum to maximum range for numerical properties * as well as property enum value. * @function Entities.getPropertyInfo - * @param {string} property - The property name to get the information for. + * @param {string} propertyName - The name of the property to get the information for. * @returns {Entities.EntityPropertyInfo} The information data including propertyEnum, minimum, and maximum * if the property can be found, otherwise an empty object. */ - Q_INVOKABLE const EntityPropertyInfo getPropertyInfo(const QScriptValue& property) const; + Q_INVOKABLE const EntityPropertyInfo getPropertyInfo(const QString& propertyName) const; signals: /**jsdoc diff --git a/scripts/system/edit.js b/scripts/system/edit.js index b9c26201b5..aec3d8bc0b 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -420,7 +420,7 @@ const DEFAULT_ENTITY_PROPERTIES = { emitOrientation: { x: 0, y: 0, z: 0, w: 1 }, emitterShouldTrail: true, particleRadius: 0.25, - radiusFinish: 0.1, + radiusStart: 0, radiusSpread: 0, particleColor: { red: 255,