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

CR fixes

Browse source
This commit is contained in:
David Back 2019-01-04 15:39:27 -08:00
parent 1d3006028a
commit 5ea84fb952
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -2273,10 +2273,9 @@ bool EntityScriptingInterface::verifyStaticCertificateProperties(const QUuid& en
return result; return result;
} }
const EntityPropertyInfo EntityScriptingInterface::getPropertyInfo(const QScriptValue& property) const { const EntityPropertyInfo EntityScriptingInterface::getPropertyInfo(const QString& propertyName) const {
const QString name = property.toString();
EntityPropertyInfo propertyInfo; EntityPropertyInfo propertyInfo;
EntityItemProperties::getPropertyInfo(name, propertyInfo); EntityItemProperties::getPropertyInfo(propertyName, propertyInfo);
return propertyInfo; return propertyInfo;
} }

4
libraries/entities/src/EntityScriptingInterface.h
View file

@ -1699,11 +1699,11 @@ public slots:
* Get information about entity properties including a minimum to maximum range for numerical properties * Get information about entity properties including a minimum to maximum range for numerical properties
* as well as property enum value. * as well as property enum value.
* @function Entities.getPropertyInfo * @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 * @returns {Entities.EntityPropertyInfo} The information data including propertyEnum, minimum, and maximum
* if the property can be found, otherwise an empty object. * 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: signals:
/**jsdoc /**jsdoc

2
scripts/system/edit.js
View file

@ -420,7 +420,7 @@ const DEFAULT_ENTITY_PROPERTIES = {
emitOrientation: { x: 0, y: 0, z: 0, w: 1 }, emitOrientation: { x: 0, y: 0, z: 0, w: 1 },
emitterShouldTrail: true, emitterShouldTrail: true,
particleRadius: 0.25, particleRadius: 0.25,
radiusFinish: 0.1, radiusStart: 0,
radiusSpread: 0, radiusSpread: 0,
particleColor: { particleColor: {
red: 255, red: 255,