h hours m minutes s
+ * @property {string} ageAsText - The age of the entity since it was created, formatted as h hours m minutes s
* seconds
.
* @property {number} lifetime=-1 - How long an entity lives for, in seconds, before being automatically deleted. A value of
* -1
means that the entity lives for ever.
@@ -679,113 +679,113 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* @property {Uuid} lastEditedBy - The session ID of the avatar or agent that most recently created or edited the entity.
* Read-only.
*
- * @property {boolean} locked=false - true
if properties other than locked
cannot be changed and the
+ * @property {boolean} locked=false - true
if properties other than locked
cannot be changed and the
* entity cannot be deleted, false
if all properties can be changed and the entity can be deleted.
* @property {boolean} visible=true - true
if the entity is rendered, false
if it isn't.
- * @property {boolean} canCastShadow=true - true
if the entity can cast a shadow, false
if it can't.
- * Currently applicable only to {@link Entities.EntityProperties-Model|Model} and
- * {@link Entities.EntityProperties-Shape|Shape} entities. Shadows are cast if inside a
- * {@link Entities.EntityProperties-Zone|Zone} entity with castShadows
enabled in its keyLight
+ * @property {boolean} canCastShadow=true - true
if the entity can cast a shadow, false
if it can't.
+ * Currently applicable only to {@link Entities.EntityProperties-Model|Model} and
+ * {@link Entities.EntityProperties-Shape|Shape} entities. Shadows are cast if inside a
+ * {@link Entities.EntityProperties-Zone|Zone} entity with castShadows
enabled in its keyLight
* property.
- * @property {boolean} isVisibleInSecondaryCamera=true - true
if the entity is rendered in the secondary camera,
+ * @property {boolean} isVisibleInSecondaryCamera=true - true
if the entity is rendered in the secondary camera,
* false
if it isn't.
* @property {Entities.RenderLayer} renderLayer="world" - The layer that the entity renders in.
* @property {Entities.PrimitiveMode} primitiveMode="solid" - How the entity's geometry is rendered.
- * @property {boolean} ignorePickIntersection=false - true
if {@link Picks} and {@link RayPick} ignore the entity,
+ * @property {boolean} ignorePickIntersection=false - true
if {@link Picks} and {@link RayPick} ignore the entity,
* false
if they don't.
*
* @property {Vec3} position=0,0,0 - The position of the entity in world coordinates.
* @property {Quat} rotation=0,0,0,1 - The orientation of the entity in world coordinates.
- * @property {Vec3} registrationPoint=0.5,0.5,0.5 - The point in the entity that is set to the entity's position and is rotated
- * about, range {@link Vec3(0)|Vec3.ZERO} – {@link Vec3(0)|Vec3.ONE}. A value of {@link Vec3(0)|Vec3.ZERO} is the
+ * @property {Vec3} registrationPoint=0.5,0.5,0.5 - The point in the entity that is set to the entity's position and is rotated
+ * about, range {@link Vec3(0)|Vec3.ZERO} – {@link Vec3(0)|Vec3.ONE}. A value of {@link Vec3(0)|Vec3.ZERO} is the
* entity's minimum x, y, z corner; a value of {@link Vec3(0)|Vec3.ONE} is the entity's maximum x, y, z corner.
*
* @property {Vec3} naturalPosition=0,0,0 - The center of the entity's unscaled mesh model if it has one, otherwise
* {@link Vec3(0)|Vec3.ZERO}. Read-only.
- * @property {Vec3} naturalDimensions - The dimensions of the entity's unscaled mesh model if it has one, otherwise
+ * @property {Vec3} naturalDimensions - The dimensions of the entity's unscaled mesh model if it has one, otherwise
* {@link Vec3(0)|Vec3.ONE}. Read-only.
*
* @property {Vec3} velocity=0,0,0 - The linear velocity of the entity in m/s with respect to world coordinates.
- * @property {number} damping=0.39347 - How much the linear velocity of an entity slows down over time, range
- * 0.0
– 1.0
. A higher damping value slows down the entity more quickly. The default value
- * is for an exponential decay timescale of 2.0s, where it takes 2.0s for the movement to slow to 1/e = 0.368
+ * @property {number} damping=0.39347 - How much the linear velocity of an entity slows down over time, range
+ * 0.0
– 1.0
. A higher damping value slows down the entity more quickly. The default value
+ * is for an exponential decay timescale of 2.0s, where it takes 2.0s for the movement to slow to 1/e = 0.368
* of its initial value.
* @property {Vec3} angularVelocity=0,0,0 - The angular velocity of the entity in rad/s with respect to its axes, about its
* registration point.
- * @property {number} angularDamping=0.39347 - How much the angular velocity of an entity slows down over time, range
- * 0.0
– 1.0
. A higher damping value slows down the entity more quickly. The default value
- * is for an exponential decay timescale of 2.0s, where it takes 2.0s for the movement to slow to 1/e = 0.368
+ * @property {number} angularDamping=0.39347 - How much the angular velocity of an entity slows down over time, range
+ * 0.0
– 1.0
. A higher damping value slows down the entity more quickly. The default value
+ * is for an exponential decay timescale of 2.0s, where it takes 2.0s for the movement to slow to 1/e = 0.368
* of its initial value.
*
- * @property {Vec3} gravity=0,0,0 - The acceleration due to gravity in m/s2 that the entity should move with, in
- * world coordinates. Use a value of { x: 0, y: -9.8, z: 0 }
to simulate Earth's gravity. Gravity is applied
+ * @property {Vec3} gravity=0,0,0 - The acceleration due to gravity in m/s2 that the entity should move with, in
+ * world coordinates. Use a value of { x: 0, y: -9.8, z: 0 }
to simulate Earth's gravity. Gravity is applied
* to an entity's motion only if its dynamic
property is true
.
- * If changing an entity's gravity
from {@link Vec3(0)|Vec3.ZERO}, you need to give it a small
+ *
If changing an entity's gravity
from {@link Vec3(0)|Vec3.ZERO}, you need to give it a small
* velocity
in order to kick off physics simulation.
* @property {Vec3} acceleration - The current, measured acceleration of the entity, in m/s2.
* Deprecated: This property is deprecated and will be removed.
- * @property {number} restitution=0.5 - The "bounciness" of an entity when it collides, range 0.0
–
+ * @property {number} restitution=0.5 - The "bounciness" of an entity when it collides, range 0.0
–
* 0.99
. The higher the value, the more bouncy.
- * @property {number} friction=0.5 - How much an entity slows down when it's moving against another, range 0.0
- * – 10.0
. The higher the value, the more quickly it slows down. Examples: 0.1
for ice,
+ * @property {number} friction=0.5 - How much an entity slows down when it's moving against another, range 0.0
+ * – 10.0
. The higher the value, the more quickly it slows down. Examples: 0.1
for ice,
* 0.9
for sandpaper.
- * @property {number} density=1000 - The density of the entity in kg/m3, range 100
–
- * 10000
. Examples: 100
for balsa wood, 10000
for silver. The density is used in
+ * @property {number} density=1000 - The density of the entity in kg/m3, range 100
–
+ * 10000
. Examples: 100
for balsa wood, 10000
for silver. The density is used in
* conjunction with the entity's bounding box volume to work out its mass in the application of physics.
*
- * @property {boolean} collisionless=false - true
if the entity shouldn't collide, false
if it
+ * @property {boolean} collisionless=false - true
if the entity shouldn't collide, false
if it
* collides with items per its collisionMask
property.
* @property {boolean} ignoreForCollisions - Synonym for collisionless
.
* @property {CollisionMask} collisionMask=31 - What types of items the entity should collide with.
* @property {string} collidesWith="static,dynamic,kinematic,myAvatar,otherAvatar," - Synonym for collisionMask
,
* in text format.
- * @property {string} collisionSoundURL="" - The sound that's played when the entity experiences a collision. Valid file
+ * @property {string} collisionSoundURL="" - The sound that's played when the entity experiences a collision. Valid file
* formats are per {@link SoundObject}.
- * @property {boolean} dynamic=false - true
if the entity's movement is affected by collisions, false
- * if it isn't.
+ * @property {boolean} dynamic=false - true
if the entity's movement is affected by collisions, false
+ * if it isn't.
* @property {boolean} collisionsWillMove - A synonym for dynamic
.
*
* @property {string} href="" - A "hifi://" metaverse address that a user is teleported to when they click on the entity.
* @property {string} description="" - A description of the href
property value.
*
- * @property {string} userData="" - Used to store extra data about the entity in JSON format.
- * Warning: Other apps may also use this property, so make sure you handle data stored by other apps:
- * edit only your bit and leave the rest of the data intact. You can use JSON.parse()
to parse the string into
- * a JavaScript object which you can manipulate the properties of, and use JSON.stringify()
to convert the
+ * @property {string} userData="" - Used to store extra data about the entity in JSON format.
+ *
Warning: Other apps may also use this property, so make sure you handle data stored by other apps:
+ * edit only your bit and leave the rest of the data intact. You can use JSON.parse()
to parse the string into
+ * a JavaScript object which you can manipulate the properties of, and use JSON.stringify()
to convert the
* object into a string to put back in the property.
*
- * @property {string} privateUserData="" - Like userData
, but only accessible by server entity scripts, assignment
+ * @property {string} privateUserData="" - Like userData
, but only accessible by server entity scripts, assignment
* client scripts, and users who have "Can Get and Set Private User Data" permissions in the domain.
*
* @property {string} script="" - The URL of the client entity script, if any, that is attached to the entity.
- * @property {number} scriptTimestamp=0 - Used to indicate when the client entity script was loaded. Should be
- * an integer number of milliseconds since midnight GMT on January 1, 1970 (e.g., as supplied by Date.now()
.
- * If you update the property's value, the script
is re-downloaded and reloaded. This is how the "reload"
+ * @property {number} scriptTimestamp=0 - Used to indicate when the client entity script was loaded. Should be
+ * an integer number of milliseconds since midnight GMT on January 1, 1970 (e.g., as supplied by Date.now()
.
+ * If you update the property's value, the script
is re-downloaded and reloaded. This is how the "reload"
* button beside the "script URL" field in properties tab of the Create app works.
* @property {string} serverScripts="" - The URL of the server entity script, if any, that is attached to the entity.
*
- * @property {Uuid} parentID=Uuid.NULL - The ID of the entity or avatar that the entity is parented to. A value of
+ * @property {Uuid} parentID=Uuid.NULL - The ID of the entity or avatar that the entity is parented to. A value of
* {@link Uuid(0)|Uuid.NULL} is used if the entity is not parented.
- * @property {number} parentJointIndex=65535 - The joint of the entity or avatar that the entity is parented to. Use
+ * @property {number} parentJointIndex=65535 - The joint of the entity or avatar that the entity is parented to. Use
* 65535
or -1
to parent to the entity or avatar's position and orientation rather than a joint.
- * @property {Vec3} localPosition=0,0,0 - The position of the entity relative to its parent if the entity is parented,
- * otherwise the same value as position
. If the entity is parented to an avatar and is an avatar entity
+ * @property {Vec3} localPosition=0,0,0 - The position of the entity relative to its parent if the entity is parented,
+ * otherwise the same value as position
. If the entity is parented to an avatar and is an avatar entity
* so that it scales with the avatar, this value remains the original local position value while the avatar scale changes.
- * @property {Quat} localRotation=0,0,0,1 - The rotation of the entity relative to its parent if the entity is parented,
+ * @property {Quat} localRotation=0,0,0,1 - The rotation of the entity relative to its parent if the entity is parented,
* otherwise the same value as rotation
.
- * @property {Vec3} localVelocity=0,0,0 - The velocity of the entity relative to its parent if the entity is parented,
+ * @property {Vec3} localVelocity=0,0,0 - The velocity of the entity relative to its parent if the entity is parented,
* otherwise the same value as velocity
.
- * @property {Vec3} localAngularVelocity=0,0,0 - The angular velocity of the entity relative to its parent if the entity is
+ * @property {Vec3} localAngularVelocity=0,0,0 - The angular velocity of the entity relative to its parent if the entity is
* parented, otherwise the same value as angularVelocity
.
* @property {Vec3} localDimensions - The dimensions of the entity. If the entity is parented to an avatar and is an
- * avatar entity so that it scales with the avatar, this value remains the original dimensions value while the
+ * avatar entity so that it scales with the avatar, this value remains the original dimensions value while the
* avatar scale changes.
*
- * @property {Entities.BoundingBox} boundingBox - The axis-aligned bounding box that tightly encloses the entity.
+ * @property {Entities.BoundingBox} boundingBox - The axis-aligned bounding box that tightly encloses the entity.
* Read-only.
- * @property {AACube} queryAACube - The axis-aligned cube that determines where the entity lives in the entity server's octree.
- * The cube may be considerably larger than the entity in some situations, e.g., when the entity is grabbed by an avatar:
- * the position of the entity is determined through avatar mixer updates and so the AA cube is expanded in order to reduce
+ * @property {AACube} queryAACube - The axis-aligned cube that determines where the entity lives in the entity server's octree.
+ * The cube may be considerably larger than the entity in some situations, e.g., when the entity is grabbed by an avatar:
+ * the position of the entity is determined through avatar mixer updates and so the AA cube is expanded in order to reduce
* unnecessary entity server updates. Scripts should not change this property's value.
*
* @property {string} actionData="" - Base-64 encoded compressed dump of the actions associated with the entity. This property
@@ -793,16 +793,16 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* {@link Entities.addAction}. The size of this property increases with the number of actions. Because this property value
* has to fit within a Vircadia datagram packet, there is a limit to the number of actions that an entity can have;
* edits which would result in overflow are rejected. Read-only.
- * @property {Entities.RenderInfo} renderInfo - Information on the cost of rendering the entity. Currently information is only
+ * @property {Entities.RenderInfo} renderInfo - Information on the cost of rendering the entity. Currently information is only
* provided for Model
entities. Read-only.
*
- * @property {boolean} cloneable=false - true
if the domain or avatar entity can be cloned via
+ * @property {boolean} cloneable=false - true
if the domain or avatar entity can be cloned via
* {@link Entities.cloneEntity}, false
if it can't be.
* @property {number} cloneLifetime=300 - The entity lifetime for clones created from this entity.
* @property {number} cloneLimit=0 - The total number of clones of this entity that can exist in the domain at any given time.
- * @property {boolean} cloneDynamic=false - true
if clones created from this entity will have their
+ * @property {boolean} cloneDynamic=false - true
if clones created from this entity will have their
* dynamic
property set to true
, false
if they won't.
- * @property {boolean} cloneAvatarEntity=false - true
if clones created from this entity will be created as
+ * @property {boolean} cloneAvatarEntity=false - true
if clones created from this entity will be created as
* avatar entities, false
if they won't be.
* @property {Uuid} cloneOriginID - The ID of the entity that this entity was cloned from.
*
@@ -817,12 +817,12 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* @property {string} itemCategories="" - Certifiable category of the Marketplace item.
* @property {string} itemArtist="" - Certifiable artist that created the Marketplace item.
* @property {string} itemLicense="" - Certifiable license URL for the Marketplace item.
- * @property {number} limitedRun=4294967295 - Certifiable maximum integer number of editions (copies) of the Marketplace item
+ * @property {number} limitedRun=4294967295 - Certifiable maximum integer number of editions (copies) of the Marketplace item
* allowed to be sold.
- * @property {number} editionNumber=0 - Certifiable integer edition (copy) number or the Marketplace item. Each copy sold in
+ * @property {number} editionNumber=0 - Certifiable integer edition (copy) number or the Marketplace item. Each copy sold in
* the Marketplace is numbered sequentially, starting at 1.
- * @property {number} entityInstanceNumber=0 - Certifiable integer instance number for identical entities in a Marketplace
- * item. A Marketplace item may have multiple, identical parts. If so, then each is numbered sequentially with an instance
+ * @property {number} entityInstanceNumber=0 - Certifiable integer instance number for identical entities in a Marketplace
+ * item. A Marketplace item may have multiple, identical parts. If so, then each is numbered sequentially with an instance
* number.
* @property {string} marketplaceID="" - Certifiable UUID for the Marketplace item, as used in the URL of the item's download
* and its Marketplace Web page.
@@ -851,8 +851,8 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
/**jsdoc
* The "Box"
{@link Entities.EntityType|EntityType} is the same as the "Shape"
* {@link Entities.EntityType|EntityType} except that its shape
value is always set to "Cube"
- * when the entity is created. If its shape
property value is subsequently changed then the entity's
- * type
will be reported as "Sphere"
if the shape
is set to "Sphere"
,
+ * when the entity is created. If its shape
property value is subsequently changed then the entity's
+ * type
will be reported as "Sphere"
if the shape
is set to "Sphere"
,
* otherwise it will be reported as "Shape"
.
*
* @typedef {object} Entities.EntityProperties-Box
@@ -860,11 +860,11 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
*/
/**jsdoc
- * The "Light"
{@link Entities.EntityType|EntityType} adds local lighting effects. It has properties in addition
+ * The "Light"
{@link Entities.EntityType|EntityType} adds local lighting effects. It has properties in addition
* to the common {@link Entities.EntityProperties|EntityProperties}.
*
* @typedef {object} Entities.EntityProperties-Light
- * @property {Vec3} dimensions=0.1,0.1,0.1 - The dimensions of the entity. Surfaces outside these dimensions are not lit
+ * @property {Vec3} dimensions=0.1,0.1,0.1 - The dimensions of the entity. Surfaces outside these dimensions are not lit
* by the light.
* @property {Color} color=255,255,255 - The color of the light emitted.
* @property {number} intensity=1 - The brightness of the light.
@@ -917,46 +917,46 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
*/
/**jsdoc
- * The "Material"
{@link Entities.EntityType|EntityType} modifies existing materials on entities and avatars. It
+ * The "Material"
{@link Entities.EntityType|EntityType} modifies existing materials on entities and avatars. It
* has properties in addition to the common {@link Entities.EntityProperties|EntityProperties}.
* To apply a material to an entity, set the material entity's parentID
property to the entity ID.
* To apply a material to an avatar, set the material entity's parentID
property to the avatar's session UUID.
- * To apply a material to your avatar such that it persists across domains and log-ins, create the material as an avatar entity
- * by setting the entityHostType
parameter in {@link Entities.addEntity} to "avatar"
and set the
- * entity's parentID
property to MyAvatar.SELF_ID
.
+ * To apply a material to your avatar such that it persists across domains and log-ins, create the material as an avatar entity
+ * by setting the entityHostType
parameter in {@link Entities.addEntity} to "avatar"
and set the
+ * entity's parentID
property to MyAvatar.SELF_ID
.
* Material entities render as non-scalable spheres if they don't have their parent set.
*
* @typedef {object} Entities.EntityProperties-Material
* @property {Vec3} dimensions=0.1,0.1,0.1 - Used when materialMappingMode == "projected"
.
- * @property {string} materialURL="" - URL to a {@link Entities.MaterialResource|MaterialResource}. If you append
- * "#name"
to the URL, the material with that name in the {@link Entities.MaterialResource|MaterialResource}
- * will be applied to the entity. Alternatively, set the property value to "materialData"
to use the
+ * @property {string} materialURL="" - URL to a {@link Entities.MaterialResource|MaterialResource}. If you append
+ * "#name"
to the URL, the material with that name in the {@link Entities.MaterialResource|MaterialResource}
+ * will be applied to the entity. Alternatively, set the property value to "materialData"
to use the
* materialData
property for the {@link Entities.MaterialResource|MaterialResource} values.
- * @property {string} materialData="" - Used to store {@link Entities.MaterialResource|MaterialResource} data as a JSON string.
- * You can use JSON.parse()
to parse the string into a JavaScript object which you can manipulate the
+ * @property {string} materialData="" - Used to store {@link Entities.MaterialResource|MaterialResource} data as a JSON string.
+ * You can use JSON.parse()
to parse the string into a JavaScript object which you can manipulate the
* properties of, and use JSON.stringify()
to convert the object into a string to put in the property.
* @property {number} priority=0 - The priority for applying the material to its parent. Only the highest priority material is
- * applied, with materials of the same priority randomly assigned. Materials that come with the model have a priority of
+ * applied, with materials of the same priority randomly assigned. Materials that come with the model have a priority of
* 0
.
* @property {string} parentMaterialName="0" - Selects the mesh part or parts within the parent to which to apply the material.
* If in the format "mat::string"
, all mesh parts with material name "string"
are replaced.
- * If "all"
, then all mesh parts are replaced.
- * Otherwise the property value is parsed as an unsigned integer, specifying the mesh part index to modify.
- * If the string represents an array (starts with "["
and ends with "]"
), the string is split
- * at each ","
and each element parsed as either a number or a string if it starts with "mat::"
.
- * For example, "[0,1,mat::string,mat::string2]"
will replace mesh parts 0 and 1, and any mesh parts with
- * material "string"
or "string2"
. Do not put spaces around the commas. Invalid values are parsed
+ * If "all"
, then all mesh parts are replaced.
+ * Otherwise the property value is parsed as an unsigned integer, specifying the mesh part index to modify.
+ *
If the string represents an array (starts with "["
and ends with "]"
), the string is split
+ * at each ","
and each element parsed as either a number or a string if it starts with "mat::"
.
+ * For example, "[0,1,mat::string,mat::string2]"
will replace mesh parts 0 and 1, and any mesh parts with
+ * material "string"
or "string2"
. Do not put spaces around the commas. Invalid values are parsed
* to 0
.
- * @property {string} materialMappingMode="uv" - How the material is mapped to the entity. Either "uv"
or
- * "projected"
. In "uv"
mode, the material is evaluated within the UV space of the mesh it is
- * applied to. In "projected"
mode, the 3D transform (position, rotation, and dimensions) of the Material
+ * @property {string} materialMappingMode="uv" - How the material is mapped to the entity. Either "uv"
or
+ * "projected"
. In "uv"
mode, the material is evaluated within the UV space of the mesh it is
+ * applied to. In "projected"
mode, the 3D transform (position, rotation, and dimensions) of the Material
* entity is used to evaluate the texture coordinates for the material.
- * @property {Vec2} materialMappingPos=0,0 - Offset position in UV-space of the top left of the material, range
+ * @property {Vec2} materialMappingPos=0,0 - Offset position in UV-space of the top left of the material, range
* { x: 0, y: 0 }
– { x: 1, y: 1 }
.
* @property {Vec2} materialMappingScale=1,1 - How much to scale the material within the parent's UV-space.
* @property {number} materialMappingRot=0 - How much to rotate the material within the parent's UV-space, in degrees.
- * @property {boolean} materialRepeat=true - true
if the material repeats, false
if it doesn't. If
- * false
, fragments outside of texCoord 0 – 1 will be discarded. Works in both "uv"
and
+ * @property {boolean} materialRepeat=true - true
if the material repeats, false
if it doesn't. If
+ * false
, fragments outside of texCoord 0 – 1 will be discarded. Works in both "uv"
and
* "projected"
modes.
* @example Color a sphere using a Material entity.
* var entityID = Entities.addEntity({
@@ -983,17 +983,17 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
*/
/**jsdoc
- * The "Model"
{@link Entities.EntityType|EntityType} displays a glTF, FBX, or OBJ model. When adding an entity,
- * if no dimensions
value is specified then the model is automatically sized to its
- * {@link Entities.EntityProperties|naturalDimensions}
. It has properties in addition to the common
+ * The "Model"
{@link Entities.EntityType|EntityType} displays a glTF, FBX, or OBJ model. When adding an entity,
+ * if no dimensions
value is specified then the model is automatically sized to its
+ * {@link Entities.EntityProperties|naturalDimensions}
. It has properties in addition to the common
* {@link Entities.EntityProperties|EntityProperties}.
*
* @typedef {object} Entities.EntityProperties-Model
- * @property {Vec3} dimensions=0.1,0.1,0.1 - The dimensions of the entity. When adding an entity, if no dimensions
- * value is specified then the model is automatically sized to its
+ * @property {Vec3} dimensions=0.1,0.1,0.1 - The dimensions of the entity. When adding an entity, if no dimensions
+ * value is specified then the model is automatically sized to its
* {@link Entities.EntityProperties|naturalDimensions}
.
- * @property {string} modelURL="" - The URL of the glTF, FBX, or OBJ model. glTF models may be in JSON or binary format
- * (".gltf" or ".glb" URLs respectively). Baked models' URLs have ".baked" before the file type. Model files may also be
+ * @property {string} modelURL="" - The URL of the glTF, FBX, or OBJ model. glTF models may be in JSON or binary format
+ * (".gltf" or ".glb" URLs respectively). Baked models' URLs have ".baked" before the file type. Model files may also be
* compressed in GZ format, in which case the URL ends in ".gz".
* @property {Vec3} modelScale - The scale factor applied to the model's dimensions.
* Deprecated: This property is deprecated and will be removed.
@@ -1001,12 +1001,12 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* When editing this property, only coefficients that you are editing will change; it will not explicitly reset other
* coefficients.
* @property {string} textures="" - A JSON string of texture name, URL pairs used when rendering the model in place of the
- * model's original textures. Use a texture name from the originalTextures
property to override that texture.
- * Only the texture names and URLs to be overridden need be specified; original textures are used where there are no
- * overrides. You can use JSON.stringify()
to convert a JavaScript object of name, URL pairs into a JSON
+ * model's original textures. Use a texture name from the originalTextures
property to override that texture.
+ * Only the texture names and URLs to be overridden need be specified; original textures are used where there are no
+ * overrides. You can use JSON.stringify()
to convert a JavaScript object of name, URL pairs into a JSON
* string.
- * @property {string} originalTextures="{}" - A JSON string of texture name, URL pairs used in the model. The property value is
- * filled in after the entity has finished rezzing (i.e., textures have loaded). You can use JSON.parse()
to
+ * @property {string} originalTextures="{}" - A JSON string of texture name, URL pairs used in the model. The property value is
+ * filled in after the entity has finished rezzing (i.e., textures have loaded). You can use JSON.parse()
to
* parse the JSON string into a JavaScript object of name, URL pairs. Read-only.
* @property {Color} color=255,255,255 - Currently not used.
*
@@ -1016,28 +1016,28 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
*
* @property {Entities.AnimationProperties} animation - An animation to play on the model.
*
- * @property {Quat[]} jointRotations=[]] - Joint rotations applied to the model; []
if none are applied or the
- * model hasn't loaded. The array indexes are per {@link Entities.getJointIndex|getJointIndex}. Rotations are relative to
+ * @property {Quat[]} jointRotations=[]] - Joint rotations applied to the model; []
if none are applied or the
+ * model hasn't loaded. The array indexes are per {@link Entities.getJointIndex|getJointIndex}. Rotations are relative to
* each joint's parent.
- * Joint rotations can be set by {@link Entities.setLocalJointRotation|setLocalJointRotation} and similar functions, or
- * by setting the value of this property. If you set a joint rotation using this property, you also need to set the
+ *
Joint rotations can be set by {@link Entities.setLocalJointRotation|setLocalJointRotation} and similar functions, or
+ * by setting the value of this property. If you set a joint rotation using this property, you also need to set the
* corresponding jointRotationsSet
value to true
.
- * @property {boolean[]} jointRotationsSet=[]] - true
values for joints that have had rotations applied,
- * false
otherwise; []
if none are applied or the model hasn't loaded. The array indexes are per
+ * @property {boolean[]} jointRotationsSet=[]] - true
values for joints that have had rotations applied,
+ * false
otherwise; []
if none are applied or the model hasn't loaded. The array indexes are per
* {@link Entities.getJointIndex|getJointIndex}.
- * @property {Vec3[]} jointTranslations=[]] - Joint translations applied to the model; []
if none are applied or
- * the model hasn't loaded. The array indexes are per {@link Entities.getJointIndex|getJointIndex}. Translations are
+ * @property {Vec3[]} jointTranslations=[]] - Joint translations applied to the model; []
if none are applied or
+ * the model hasn't loaded. The array indexes are per {@link Entities.getJointIndex|getJointIndex}. Translations are
* relative to each joint's parent.
- * Joint translations can be set by {@link Entities.setLocalJointTranslation|setLocalJointTranslation} and similar
- * functions, or by setting the value of this property. If you set a joint translation using this property you also need to
+ *
Joint translations can be set by {@link Entities.setLocalJointTranslation|setLocalJointTranslation} and similar
+ * functions, or by setting the value of this property. If you set a joint translation using this property you also need to
* set the corresponding jointTranslationsSet
value to true
.
- * @property {boolean[]} jointTranslationsSet=[]] - true
values for joints that have had translations applied,
- * false
otherwise; []
if none are applied or the model hasn't loaded. The array indexes are per
+ * @property {boolean[]} jointTranslationsSet=[]] - true
values for joints that have had translations applied,
+ * false
otherwise; []
if none are applied or the model hasn't loaded. The array indexes are per
* {@link Entities.getJointIndex|getJointIndex}.
- * @property {boolean} relayParentJoints=false - true
if when the entity is parented to an avatar, the avatar's
- * joint rotations are applied to the entity's joints; false
if a parent avatar's joint rotations are not
+ * @property {boolean} relayParentJoints=false - true
if when the entity is parented to an avatar, the avatar's
+ * joint rotations are applied to the entity's joints; false
if a parent avatar's joint rotations are not
* applied to the entity's joints.
- * @property {boolean} groupCulled=false - true
if the mesh parts of the model are LOD culled as a group,
+ * @property {boolean} groupCulled=false - true
if the mesh parts of the model are LOD culled as a group,
* false
if separate mesh parts are LOD culled individually.
*
* @example Rez a Vive tracker puck.
@@ -1058,15 +1058,15 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
*
* @typedef {object} Entities.EntityProperties-ParticleEffect
* @property {boolean} isEmitting=true - true
if particles are being emitted, false
if they aren't.
- * @property {number} maxParticles=1000 - The maximum number of particles to render at one time. Older particles are deleted if
+ * @property {number} maxParticles=1000 - The maximum number of particles to render at one time. Older particles are deleted if
* necessary when new ones are created.
* @property {number} lifespan=3s - How long, in seconds, each particle lives.
* @property {number} emitRate=15 - The number of particles per second to emit.
* @property {number} emitSpeed=5 - The speed, in m/s, that each particle is emitted at.
- * @property {number} speedSpread=1 - The spread in speeds at which particles are emitted at. For example, if
- * emitSpeed == 5
and speedSpread == 1
, particles will be emitted with speeds in the range
+ * @property {number} speedSpread=1 - The spread in speeds at which particles are emitted at. For example, if
+ * emitSpeed == 5
and speedSpread == 1
, particles will be emitted with speeds in the range
* 4
– 6
m/s.
- * @property {Vec3} emitAcceleration=0,-9.8,0 - The acceleration that is applied to each particle during its lifetime. The
+ * @property {Vec3} emitAcceleration=0,-9.8,0 - The acceleration that is applied to each particle during its lifetime. The
* default is Earth's gravity value.
* @property {Vec3} accelerationSpread=0,0,0 - The spread in accelerations that each particle is given. For example, if
* emitAccelerations == {x: 0, y: -9.8, z: 0}
and accelerationSpread ==
@@ -1078,33 +1078,33 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* false
if they stay within the entity's dimensions.
*
* @property {Quat} emitOrientation=-0.707,0,0,0.707 - The orientation of particle emission relative to the entity's axes. By
- * default, particles emit along the entity's local z-axis, and azimuthStart
and azimuthFinish
- * are relative to the entity's local x-axis. The default value is a rotation of -90 degrees about the local x-axis, i.e.,
+ * default, particles emit along the entity's local z-axis, and azimuthStart
and azimuthFinish
+ * are relative to the entity's local x-axis. The default value is a rotation of -90 degrees about the local x-axis, i.e.,
* the particles emit vertically.
*
* @property {ShapeType} shapeType="ellipsoid" - The shape from which particles are emitted.
- * @property {string} compoundShapeURL="" - The model file to use for the compound shape if shapeType ==
+ * @property {string} compoundShapeURL="" - The model file to use for the compound shape if shapeType ==
* "compound"
.
* @property {Vec3} emitDimensions=0,0,0 - The dimensions of the shape from which particles are emitted.
* @property {number} emitRadiusStart=1 - The starting radius within the shape at which particles start being emitted;
* range 0.0
– 1.0
for the center to the surface, respectively.
- * Particles are emitted from the portion of the shape that lies between emitRadiusStart
and the
+ * Particles are emitted from the portion of the shape that lies between emitRadiusStart
and the
* shape's surface.
- * @property {number} polarStart=0 - The angle in radians from the entity's local z-axis at which particles start being emitted
- * within the shape; range 0
– Math.PI
. Particles are emitted from the portion of the
+ * @property {number} polarStart=0 - The angle in radians from the entity's local z-axis at which particles start being emitted
+ * within the shape; range 0
– Math.PI
. Particles are emitted from the portion of the
* shape that lies between polarStart
and polarFinish
. Only used if shapeType
is
* "ellipsoid"
or "sphere"
.
- * @property {number} polarFinish=0 - The angle in radians from the entity's local z-axis at which particles stop being emitted
- * within the shape; range 0
– Math.PI
. Particles are emitted from the portion of the
+ * @property {number} polarFinish=0 - The angle in radians from the entity's local z-axis at which particles stop being emitted
+ * within the shape; range 0
– Math.PI
. Particles are emitted from the portion of the
* shape that lies between polarStart
and polarFinish
. Only used if shapeType
is
* "ellipsoid"
or "sphere"
.
- * @property {number} azimuthStart=-Math.PI - The angle in radians from the entity's local x-axis about the entity's local
- * z-axis at which particles start being emitted; range -Math.PI
– Math.PI
. Particles are
- * emitted from the portion of the shape that lies between azimuthStart
and azimuthFinish
.
+ * @property {number} azimuthStart=-Math.PI - The angle in radians from the entity's local x-axis about the entity's local
+ * z-axis at which particles start being emitted; range -Math.PI
– Math.PI
. Particles are
+ * emitted from the portion of the shape that lies between azimuthStart
and azimuthFinish
.
* Only used if shapeType
is "ellipsoid"
, "sphere"
, or "circle"
.
* @property {number} azimuthFinish=Math.PI - The angle in radians from the entity's local x-axis about the entity's local
* z-axis at which particles stop being emitted; range -Math.PI
– Math.PI
. Particles are
- * emitted from the portion of the shape that lies between azimuthStart
and azimuthFinish
.
+ * emitted from the portion of the shape that lies between azimuthStart
and azimuthFinish
.
* Only used if shapeType
is "ellipsoid"
, "sphere"
, or "circle"
.
*
* @property {string} textures="" - The URL of a JPG or PNG image file to display for each particle. If you want transparency,
@@ -1114,40 +1114,40 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* particleRadius
value is used.
* @property {number} radiusFinish=null - The radius of each particle at the end of its life. If null
, the
* particleRadius
value is used.
- * @property {number} radiusSpread=0 - The spread in radius that each particle is given. For example, if
- * particleRadius == 0.5
and radiusSpread == 0.25
, each particle will have a radius in the range
+ * @property {number} radiusSpread=0 - The spread in radius that each particle is given. For example, if
+ * particleRadius == 0.5
and radiusSpread == 0.25
, each particle will have a radius in the range
* 0.25
– 0.75
.
* @property {Color} color=255,255,255 - The color of each particle at the middle of its life.
- * @property {ColorFloat} colorStart=null,null,null - The color of each particle at the start of its life. If any of the
+ * @property {ColorFloat} colorStart=null,null,null - The color of each particle at the start of its life. If any of the
* component values are undefined, the color
value is used.
- * @property {ColorFloat} colorFinish=null,null,null - The color of each particle at the end of its life. If any of the
+ * @property {ColorFloat} colorFinish=null,null,null - The color of each particle at the end of its life. If any of the
* component values are undefined, the color
value is used.
* @property {Color} colorSpread=0,0,0 - The spread in color that each particle is given. For example, if
* color == {red: 100, green: 100, blue: 100}
and colorSpread ==
- * {red: 10, green: 25, blue: 50}
, each particle will have a color in the range
+ * {red: 10, green: 25, blue: 50}
, each particle will have a color in the range
* {red: 90, green: 75, blue: 50}
– {red: 110, green: 125, blue: 150}
.
* @property {number} alpha=1 - The opacity of each particle at the middle of its life.
* @property {number} alphaStart=null - The opacity of each particle at the start of its life. If null
, the
* alpha
value is used.
* @property {number} alphaFinish=null - The opacity of each particle at the end of its life. If null
, the
* alpha
value is used.
- * @property {number} alphaSpread=0 - The spread in alpha that each particle is given. For example, if
- * alpha == 0.5
and alphaSpread == 0.25
, each particle will have an alpha in the range
+ * @property {number} alphaSpread=0 - The spread in alpha that each particle is given. For example, if
+ * alpha == 0.5
and alphaSpread == 0.25
, each particle will have an alpha in the range
* 0.25
– 0.75
.
* @property {Entities.Pulse} pulse - Color and alpha pulse.
* Deprecated: This property is deprecated and will be removed.
- * @property {number} particleSpin=0 - The rotation of each particle at the middle of its life, range -2 * Math.PI
+ * @property {number} particleSpin=0 - The rotation of each particle at the middle of its life, range -2 * Math.PI
* – 2 * Math.PI
radians.
- * @property {number} spinStart=null - The rotation of each particle at the start of its life, range -2 * Math.PI
+ * @property {number} spinStart=null - The rotation of each particle at the start of its life, range -2 * Math.PI
* – 2 * Math.PI
radians. If null
, the particleSpin
value is used.
- * @property {number} spinFinish=null - The rotation of each particle at the end of its life, range -2 * Math.PI
+ * @property {number} spinFinish=null - The rotation of each particle at the end of its life, range -2 * Math.PI
* – 2 * Math.PI
radians. If null
, the particleSpin
value is used.
- * @property {number} spinSpread=0 - The spread in spin that each particle is given, range 0
–
- * 2 * Math.PI
radians. For example, if particleSpin == Math.PI
and
- * spinSpread == Math.PI / 2
, each particle will have a rotation in the range Math.PI / 2
–
+ * @property {number} spinSpread=0 - The spread in spin that each particle is given, range 0
–
+ * 2 * Math.PI
radians. For example, if particleSpin == Math.PI
and
+ * spinSpread == Math.PI / 2
, each particle will have a rotation in the range Math.PI / 2
–
* 3 * Math.PI / 2
.
- * @property {boolean} rotateWithEntity=false - true
if the particles' rotations are relative to the entity's
- * instantaneous rotation, false
if they're relative to world coordinates. If true
with
+ * @property {boolean} rotateWithEntity=false - true
if the particles' rotations are relative to the entity's
+ * instantaneous rotation, false
if they're relative to world coordinates. If true
with
* particleSpin == 0
, the particles keep oriented per the entity's orientation.
*
* @example Create a ball of green smoke.
@@ -1173,27 +1173,27 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* points. It has properties in addition to the common {@link Entities.EntityProperties|EntityProperties}.
*
* @typedef {object} Entities.EntityProperties-PolyLine
- * @property {Vec3} dimensions=0.1,0.1,0.1 - The dimensions of the entity, i.e., the size of the bounding box that contains the
+ * @property {Vec3} dimensions=0.1,0.1,0.1 - The dimensions of the entity, i.e., the size of the bounding box that contains the
* lines drawn. Read-only.
* @property {Vec3[]} linePoints=[]] - The sequence of points to draw lines between. The values are relative to the entity's
* position. A maximum of 70 points can be specified.
- * @property {Vec3[]} normals=[]] - The normal vectors for the line's surface at the linePoints
. The values are
+ * @property {Vec3[]} normals=[]] - The normal vectors for the line's surface at the linePoints
. The values are
* relative to the entity's orientation. Must be specified in order for the entity to render.
- * @property {number[]} strokeWidths=[]] - The widths, in m, of the line at the linePoints
. Must be specified in
+ * @property {number[]} strokeWidths=[]] - The widths, in m, of the line at the linePoints
. Must be specified in
* order for the entity to render.
- * @property {Vec3[]} strokeColors=[]] - The base colors of each point, with values in the range 0.0,0.0,0.0
- * – 1.0,1.0,1.0
. These colors are multiplied with the color of the texture. If there are more line
+ * @property {Vec3[]} strokeColors=[]] - The base colors of each point, with values in the range 0.0,0.0,0.0
+ * – 1.0,1.0,1.0
. These colors are multiplied with the color of the texture. If there are more line
* points than stroke colors, the color
property value is used for the remaining points.
* Warning: The ordinate values are in the range 0.0
– 1.0
.
- * @property {Color} color=255,255,255 - Used as the color for each point if strokeColors
doesn't have a value for
+ * @property {Color} color=255,255,255 - Used as the color for each point if strokeColors
doesn't have a value for
* the point.
* @property {string} textures="" - The URL of a JPG or PNG texture to use for the lines. If you want transparency, use PNG
* format.
- * @property {boolean} isUVModeStretch=true - true
if the texture is stretched to fill the whole line,
+ * @property {boolean} isUVModeStretch=true - true
if the texture is stretched to fill the whole line,
* false
if the texture repeats along the line.
- * @property {boolean} glow=false - true
if the opacity of the strokes drops off away from the line center,
+ * @property {boolean} glow=false - true
if the opacity of the strokes drops off away from the line center,
* false
if it doesn't.
- * @property {boolean} faceCamera=false - true
if each line segment rotates to face the camera, false
+ * @property {boolean} faceCamera=false - true
if each line segment rotates to face the camera, false
* if they don't.
* @example Draw a textured "V".
* var entity = Entities.addEntity({
@@ -1228,34 +1228,34 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
*
* @typedef {object} Entities.EntityProperties-PolyVox
* @property {Vec3} dimensions=0.1,0.1,0.1 - The dimensions of the entity.
- * @property {Vec3} voxelVolumeSize=32,32,32 - Integer number of voxels along each axis of the entity, in the range
- * 1,1,1
to 128,128,128
. The dimensions of each voxel is
+ * @property {Vec3} voxelVolumeSize=32,32,32 - Integer number of voxels along each axis of the entity, in the range
+ * 1,1,1
to 128,128,128
. The dimensions of each voxel is
* dimensions / voxelVolumesize
.
- * @property {string} voxelData="ABAAEAAQAAAAHgAAEAB42u3BAQ0AAADCoPdPbQ8HFAAAAPBuEAAAAQ==" - Base-64 encoded compressed dump of
- * the PolyVox data. This property is typically not used in scripts directly; rather, functions that manipulate a PolyVox
+ * @property {string} voxelData="ABAAEAAQAAAAHgAAEAB42u3BAQ0AAADCoPdPbQ8HFAAAAPBuEAAAAQ==" - Base-64 encoded compressed dump of
+ * the PolyVox data. This property is typically not used in scripts directly; rather, functions that manipulate a PolyVox
* entity update it.
* The size of this property increases with the size and complexity of the PolyVox entity, with the size depending on how
* the particular entity's voxels compress. Because this property value has to fit within a Vircadia datagram packet,
* there is a limit to the size and complexity of a PolyVox entity; edits which would result in an overflow are rejected.
- * @property {Entities.PolyVoxSurfaceStyle} voxelSurfaceStyle=2 - The style of rendering the voxels' surface and how
+ * @property {Entities.PolyVoxSurfaceStyle} voxelSurfaceStyle=2 - The style of rendering the voxels' surface and how
* neighboring PolyVox entities are joined.
- * @property {string} xTextureURL="" - The URL of the texture to map to surfaces perpendicular to the entity's local x-axis.
+ * @property {string} xTextureURL="" - The URL of the texture to map to surfaces perpendicular to the entity's local x-axis.
* JPG or PNG format. If no texture is specified the surfaces display white.
- * @property {string} yTextureURL="" - The URL of the texture to map to surfaces perpendicular to the entity's local y-axis.
+ * @property {string} yTextureURL="" - The URL of the texture to map to surfaces perpendicular to the entity's local y-axis.
* JPG or PNG format. If no texture is specified the surfaces display white.
- * @property {string} zTextureURL="" - The URL of the texture to map to surfaces perpendicular to the entity's local z-axis.
+ * @property {string} zTextureURL="" - The URL of the texture to map to surfaces perpendicular to the entity's local z-axis.
* JPG or PNG format. If no texture is specified the surfaces display white.
- * @property {Uuid} xNNeighborID=Uuid.NULL - The ID of the neighboring PolyVox entity in the entity's -ve local x-axis
+ * @property {Uuid} xNNeighborID=Uuid.NULL - The ID of the neighboring PolyVox entity in the entity's -ve local x-axis
* direction, if you want them joined. Set to {@link Uuid(0)|Uuid.NULL} if there is none or you don't want to join them.
- * @property {Uuid} yNNeighborID=Uuid.NULL - The ID of the neighboring PolyVox entity in the entity's -ve local y-axis
+ * @property {Uuid} yNNeighborID=Uuid.NULL - The ID of the neighboring PolyVox entity in the entity's -ve local y-axis
* direction, if you want them joined. Set to {@link Uuid(0)|Uuid.NULL} if there is none or you don't want to join them.
- * @property {Uuid} zNNeighborID=Uuid.NULL - The ID of the neighboring PolyVox entity in the entity's -ve local z-axis
+ * @property {Uuid} zNNeighborID=Uuid.NULL - The ID of the neighboring PolyVox entity in the entity's -ve local z-axis
* direction, if you want them joined. Set to {@link Uuid(0)|Uuid.NULL} if there is none or you don't want to join them.
- * @property {Uuid} xPNeighborID=Uuid.NULL - The ID of the neighboring PolyVox entity in the entity's +ve local x-axis
+ * @property {Uuid} xPNeighborID=Uuid.NULL - The ID of the neighboring PolyVox entity in the entity's +ve local x-axis
* direction, if you want them joined. Set to {@link Uuid(0)|Uuid.NULL} if there is none or you don't want to join them.
- * @property {Uuid} yPNeighborID=Uuid.NULL - The ID of the neighboring PolyVox entity in the entity's +ve local y-axis
+ * @property {Uuid} yPNeighborID=Uuid.NULL - The ID of the neighboring PolyVox entity in the entity's +ve local y-axis
* direction, if you want them joined. Set to {@link Uuid(0)|Uuid.NULL} if there is none or you don't want to join them.
- * @property {Uuid} zPNeighborID=Uuid.NULL - The ID of the neighboring PolyVox entity in the entity's +ve local z-axis
+ * @property {Uuid} zPNeighborID=Uuid.NULL - The ID of the neighboring PolyVox entity in the entity's +ve local z-axis
* direction, if you want them joined. Set to {@link Uuid(0)|Uuid.NULL} if there is none or you don't want to join them.
* @example Create a textured PolyVox sphere.
* var position = Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, y: 0.5, z: -8 }));
@@ -1296,8 +1296,8 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
/**jsdoc
* The "Sphere"
{@link Entities.EntityType|EntityType} is the same as the "Shape"
* {@link Entities.EntityType|EntityType} except that its shape
value is always set to "Sphere"
- * when the entity is created. If its shape
property value is subsequently changed then the entity's
- * type
will be reported as "Box"
if the shape
is set to "Cube"
,
+ * when the entity is created. If its shape
property value is subsequently changed then the entity's
+ * type
will be reported as "Box"
if the shape
is set to "Cube"
,
* otherwise it will be reported as "Shape"
.
*
* @typedef {object} Entities.EntityProperties-Sphere
@@ -1323,7 +1323,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* @property {number} rightMargin=0.0 - The right margin, in meters.
* @property {number} topMargin=0.0 - The top margin, in meters.
* @property {number} bottomMargin=0.0 - The bottom margin, in meters.
- * @property {boolean} unlit=false - true
if the entity is unaffected by lighting, false
if it is lit
+ * @property {boolean} unlit=false - true
if the entity is unaffected by lighting, false
if it is lit
* by the key light and local lights.
* @property {string} font="" - The font to render the text with. It can be one of the following: "Courier"
,
* "Inconsolata"
, "Roboto"
, "Timeless"
, or a path to a .sdff file.
@@ -1331,10 +1331,10 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* @property {Color} textEffectColor=255,255,255 - The color of the effect.
* @property {number} textEffectThickness=0.2 - The magnitude of the text effect, range 0.0
– 0.5
.
* @property {BillboardMode} billboardMode="none" - Whether the entity is billboarded to face the camera.
- * @property {boolean} faceCamera - true
if billboardMode
is "yaw"
, false
+ * @property {boolean} faceCamera - true
if billboardMode
is "yaw"
, false
* if it isn't. Setting this property to false
sets the billboardMode
to "none"
.
* Deprecated: This property is deprecated and will be removed.
- * @property {boolean} isFacingAvatar - true
if billboardMode
is "full"
,
+ * @property {boolean} isFacingAvatar - true
if billboardMode
is "full"
,
* false
if it isn't. Setting this property to false
sets the billboardMode
to
* "none"
.
* Deprecated: This property is deprecated and will be removed.
@@ -1352,35 +1352,35 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
/**jsdoc
* The "Web"
{@link Entities.EntityType|EntityType} displays a browsable web page. Each user views their own copy
- * of the web page: if one user navigates to another page on the entity, other users do not see the change; if a video is being
- * played, users don't see it in sync. It has properties in addition to the common
+ * of the web page: if one user navigates to another page on the entity, other users do not see the change; if a video is being
+ * played, users don't see it in sync. It has properties in addition to the common
* {@link Entities.EntityProperties|EntityProperties}.
*
* @typedef {object} Entities.EntityProperties-Web
* @property {Vec3} dimensions=0.1,0.1,0.01 - The dimensions of the entity.
* @property {string} sourceUrl="" - The URL of the web page to display. This value does not change as you or others navigate
* on the Web entity.
- * @property {Color} color=255,255,255 - The color of the web surface. This color tints the web page displayed: the pixel
- * colors on the web page are multiplied by the property color. For example, a value of
+ * @property {Color} color=255,255,255 - The color of the web surface. This color tints the web page displayed: the pixel
+ * colors on the web page are multiplied by the property color. For example, a value of
* { red: 255, green: 0, blue: 0 }
lets only the red channel of pixels' colors through.
* @property {number} alpha=1 - The opacity of the web surface.
* @property {Entities.Pulse} pulse - Color and alpha pulse.
* Deprecated: This property is deprecated and will be removed.
* @property {BillboardMode} billboardMode="none" - Whether the entity is billboarded to face the camera.
- * @property {boolean} faceCamera - true
if billboardMode
is "yaw"
, false
+ * @property {boolean} faceCamera - true
if billboardMode
is "yaw"
, false
* if it isn't. Setting this property to false
sets the billboardMode
to "none"
.
* Deprecated: This property is deprecated and will be removed.
- * @property {boolean} isFacingAvatar - true
if billboardMode
is "full"
,
+ * @property {boolean} isFacingAvatar - true
if billboardMode
is "full"
,
* false
if it isn't. Setting this property to false
sets the billboardMode
to
* "none"
.
* Deprecated: This property is deprecated and will be removed.
- * @property {number} dpi=30 - The resolution to display the page at, in dots per inch. If you convert this to dots per meter
- * (multiply by 1 / 0.0254 = 39.3701) then multiply dimensions.x
and dimensions.y
by that value
+ * @property {number} dpi=30 - The resolution to display the page at, in dots per inch. If you convert this to dots per meter
+ * (multiply by 1 / 0.0254 = 39.3701) then multiply dimensions.x
and dimensions.y
by that value
* you get the resolution in pixels.
* @property {string} scriptURL="" - The URL of a JavaScript file to inject into the web page.
* @property {number} maxFPS=10 - The maximum update rate for the web content, in frames/second.
* @property {WebInputMode} inputMode="touch" - The user input mode to use.
- * @property {boolean} showKeyboardFocusHighlight=true - true
if the entity is highlighted when it has keyboard
+ * @property {boolean} showKeyboardFocusHighlight=true - true
if the entity is highlighted when it has keyboard
* focus, false
if it isn't.
* @example Create a Web entity displaying at 1920 x 1080 resolution.
* var METERS_TO_INCHES = 39.3701;
@@ -1401,17 +1401,17 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
/**jsdoc
* The "Zone"
{@link Entities.EntityType|EntityType} is a volume of lighting effects and avatar permissions.
- * Avatar interaction events such as {@link Entities.enterEntity} are also often used with a Zone entity. It has properties in
+ * Avatar interaction events such as {@link Entities.enterEntity} are also often used with a Zone entity. It has properties in
* addition to the common {@link Entities.EntityProperties|EntityProperties}.
*
* @typedef {object} Entities.EntityProperties-Zone
- * @property {Vec3} dimensions=0.1,0.1,0.1 - The dimensions of the volume in which the zone's lighting effects and avatar
+ * @property {Vec3} dimensions=0.1,0.1,0.1 - The dimensions of the volume in which the zone's lighting effects and avatar
* permissions have effect.
*
* @property {ShapeType} shapeType="box" - The shape of the volume in which the zone's lighting effects and avatar
- * permissions have effect. Reverts to the default value if set to "none"
, or set to "compound"
+ * permissions have effect. Reverts to the default value if set to "none"
, or set to "compound"
* and compoundShapeURL
is ""
.
- * @property {string} compoundShapeURL="" - The model file to use for the compound shape if shapeType
is
+ * @property {string} compoundShapeURL="" - The model file to use for the compound shape if shapeType
is
* "compound"
.
*
* @property {Entities.ComponentMode} keyLightMode="inherit" - Configures the key light in the zone.
@@ -1429,14 +1429,14 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* @property {Entities.ComponentMode} bloomMode="inherit" - Configures the bloom in the zone.
* @property {Entities.Bloom} bloom - The bloom properties of the zone.
*
- * @property {boolean} flyingAllowed=true - true
if visitors can fly in the zone; false
if they
+ * @property {boolean} flyingAllowed=true - true
if visitors can fly in the zone; false
if they
* cannot. Only works for domain entities.
- * @property {boolean} ghostingAllowed=true - true
if visitors with avatar collisions turned off will not
- * collide with content in the zone; false
if visitors will always collide with content in the zone. Only
+ * @property {boolean} ghostingAllowed=true - true
if visitors with avatar collisions turned off will not
+ * collide with content in the zone; false
if visitors will always collide with content in the zone. Only
* works for domain entities.
*
- * @property {string} filterURL="" - The URL of a JavaScript file that filters changes to properties of entities within the
- * zone. It is periodically executed for each entity in the zone. It can, for example, be used to not allow changes to
+ * @property {string} filterURL="" - The URL of a JavaScript file that filters changes to properties of entities within the
+ * zone. It is periodically executed for each entity in the zone. It can, for example, be used to not allow changes to
* certain properties:
*
* function filter(properties) {
@@ -1446,7 +1446,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* }
*
*
- * @property {Entities.AvatarPriorityMode} avatarPriority="inherit" - Configures the priority of updates from avatars in the
+ * @property {Entities.AvatarPriorityMode} avatarPriority="inherit" - Configures the priority of updates from avatars in the
* zone to other clients.
*
* @property {Entities.ScreenshareMode} screenshare="inherit" - Configures a zone for screen-sharing.
@@ -1472,21 +1472,21 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* @typedef {object} Entities.EntityProperties-Image
* @property {Vec3} dimensions=0.1,0.1,0.01 - The dimensions of the entity.
* @property {string} imageURL="" - The URL of the image to use.
- * @property {boolean} emissive=false - true
if the image should be emissive (unlit), false
if it
+ * @property {boolean} emissive=false - true
if the image should be emissive (unlit), false
if it
* shouldn't.
- * @property {boolean} keepAspectRatio=true - true
if the image should maintain its aspect ratio,
+ * @property {boolean} keepAspectRatio=true - true
if the image should maintain its aspect ratio,
* false
if it shouldn't.
- * @property {Rect} subImage=0,0,0,0 - The portion of the image to display. If width or height are 0
, it defaults
+ * @property {Rect} subImage=0,0,0,0 - The portion of the image to display. If width or height are 0
, it defaults
* to the full image in that dimension.
* @property {Color} color=255,255,255 - The color of the image.
* @property {number} alpha=1 - The opacity of the image.
* @property {Entities.Pulse} pulse - Color and alpha pulse.
* Deprecated: This property is deprecated and will be removed.
* @property {BillboardMode} billboardMode="none" - Whether the entity is billboarded to face the camera.
- * @property {boolean} faceCamera - true
if billboardMode
is "yaw"
, false
+ * @property {boolean} faceCamera - true
if billboardMode
is "yaw"
, false
* if it isn't. Setting this property to false
sets the billboardMode
to "none"
.
* Deprecated: This property is deprecated and will be removed.
- * @property {boolean} isFacingAvatar - true
if billboardMode
is "full"
,
+ * @property {boolean} isFacingAvatar - true
if billboardMode
is "full"
,
* false
if it isn't. Setting this property to false
sets the billboardMode
to
* "none"
.
* Deprecated: This property is deprecated and will be removed.
@@ -1947,13 +1947,13 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
QScriptValue renderInfo = engine->newObject();
/**jsdoc
- * Information on how an entity is rendered. Properties are only filled in for Model
entities; other
+ * Information on how an entity is rendered. Properties are only filled in for Model
entities; other
* entity types have an empty object, {}
.
* @typedef {object} Entities.RenderInfo
* @property {number} verticesCount - The number of vertices in the entity.
* @property {number} texturesCount - The number of textures in the entity.
* @property {number} texturesSize - The total size of the textures in the entity, in bytes.
- * @property {boolean} hasTransparent - true
if any of the textures has transparency, false
+ * @property {boolean} hasTransparent - true
if any of the textures has transparency, false
* if none of them do.
* @property {number} drawCalls - The number of draw calls required to render the entity.
*/
@@ -2604,7 +2604,7 @@ bool EntityItemProperties::getPropertyInfo(const QString& propertyName, EntityPr
ADD_PROPERTY_TO_MAP(PROP_POSITION, Position, position, vec3);
ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_DIMENSIONS, Dimensions, dimensions, vec3, ENTITY_ITEM_MIN_DIMENSION, FLT_MAX);
ADD_PROPERTY_TO_MAP(PROP_ROTATION, Rotation, rotation, quat);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_REGISTRATION_POINT, RegistrationPoint, registrationPoint, vec3,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_REGISTRATION_POINT, RegistrationPoint, registrationPoint, vec3,
ENTITY_ITEM_MIN_REGISTRATION_POINT, ENTITY_ITEM_MAX_REGISTRATION_POINT);
ADD_PROPERTY_TO_MAP(PROP_CREATED, Created, created, quint64);
ADD_PROPERTY_TO_MAP(PROP_LAST_EDITED_BY, LastEditedBy, lastEditedBy, QUuid);
@@ -2641,19 +2641,19 @@ bool EntityItemProperties::getPropertyInfo(const QString& propertyName, EntityPr
}
// Physics
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_DENSITY, Density, density, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_DENSITY, Density, density, float,
ENTITY_ITEM_MIN_DENSITY, ENTITY_ITEM_MAX_DENSITY);
ADD_PROPERTY_TO_MAP(PROP_VELOCITY, Velocity, velocity, vec3);
ADD_PROPERTY_TO_MAP(PROP_ANGULAR_VELOCITY, AngularVelocity, angularVelocity, vec3);
ADD_PROPERTY_TO_MAP(PROP_GRAVITY, Gravity, gravity, vec3);
ADD_PROPERTY_TO_MAP(PROP_ACCELERATION, Acceleration, acceleration, vec3);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_DAMPING, Damping, damping, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_DAMPING, Damping, damping, float,
ENTITY_ITEM_MIN_DAMPING, ENTITY_ITEM_MAX_DAMPING);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_ANGULAR_DAMPING, AngularDamping, angularDamping, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_ANGULAR_DAMPING, AngularDamping, angularDamping, float,
ENTITY_ITEM_MIN_DAMPING, ENTITY_ITEM_MAX_DAMPING);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_RESTITUTION, Restitution, restitution, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_RESTITUTION, Restitution, restitution, float,
ENTITY_ITEM_MIN_RESTITUTION, ENTITY_ITEM_MAX_RESTITUTION);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_FRICTION, Friction, friction, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_FRICTION, Friction, friction, float,
ENTITY_ITEM_MIN_FRICTION, ENTITY_ITEM_MAX_FRICTION);
ADD_PROPERTY_TO_MAP(PROP_LIFETIME, Lifetime, lifetime, float);
ADD_PROPERTY_TO_MAP(PROP_COLLISIONLESS, Collisionless, collisionless, bool);
@@ -2697,7 +2697,7 @@ bool EntityItemProperties::getPropertyInfo(const QString& propertyName, EntityPr
ADD_PROPERTY_TO_MAP(PROP_LOCAL_ROTATION, LocalRotation, localRotation, quat);
ADD_PROPERTY_TO_MAP(PROP_LOCAL_VELOCITY, LocalVelocity, localVelocity, vec3);
ADD_PROPERTY_TO_MAP(PROP_LOCAL_ANGULAR_VELOCITY, LocalAngularVelocity, localAngularVelocity, vec3);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_LOCAL_DIMENSIONS, LocalDimensions, localDimensions, vec3,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_LOCAL_DIMENSIONS, LocalDimensions, localDimensions, vec3,
ENTITY_ITEM_MIN_DIMENSION, FLT_MAX);
// Common
@@ -2716,59 +2716,59 @@ bool EntityItemProperties::getPropertyInfo(const QString& propertyName, EntityPr
ADD_PROPERTY_TO_MAP(PROP_BILLBOARD_MODE, BillboardMode, billboardMode, BillboardMode);
// Particles
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_MAX_PARTICLES, MaxParticles, maxParticles, quint32,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_MAX_PARTICLES, MaxParticles, maxParticles, quint32,
particle::MINIMUM_MAX_PARTICLES, particle::MAXIMUM_MAX_PARTICLES);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_LIFESPAN, Lifespan, lifespan, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_LIFESPAN, Lifespan, lifespan, float,
particle::MINIMUM_LIFESPAN, particle::MAXIMUM_LIFESPAN);
ADD_PROPERTY_TO_MAP(PROP_EMITTING_PARTICLES, IsEmitting, isEmitting, bool);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_EMIT_RATE, EmitRate, emitRate, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_EMIT_RATE, EmitRate, emitRate, float,
particle::MINIMUM_EMIT_RATE, particle::MAXIMUM_EMIT_RATE);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_EMIT_SPEED, EmitSpeed, emitSpeed, vec3,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_EMIT_SPEED, EmitSpeed, emitSpeed, vec3,
particle::MINIMUM_EMIT_SPEED, particle::MAXIMUM_EMIT_SPEED);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_SPEED_SPREAD, SpeedSpread, speedSpread, vec3,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_SPEED_SPREAD, SpeedSpread, speedSpread, vec3,
particle::MINIMUM_EMIT_SPEED, particle::MAXIMUM_EMIT_SPEED);
ADD_PROPERTY_TO_MAP(PROP_EMIT_ORIENTATION, EmitOrientation, emitOrientation, quat);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_EMIT_DIMENSIONS, EmitDimensions, emitDimensions, vec3,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_EMIT_DIMENSIONS, EmitDimensions, emitDimensions, vec3,
particle::MINIMUM_EMIT_DIMENSION, particle::MAXIMUM_EMIT_DIMENSION);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_EMIT_RADIUS_START, EmitRadiusStart, emitRadiusStart, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_EMIT_RADIUS_START, EmitRadiusStart, emitRadiusStart, float,
particle::MINIMUM_EMIT_RADIUS_START, particle::MAXIMUM_EMIT_RADIUS_START);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_POLAR_START, EmitPolarStart, polarStart, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_POLAR_START, EmitPolarStart, polarStart, float,
particle::MINIMUM_POLAR, particle::MAXIMUM_POLAR);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_POLAR_FINISH, EmitPolarFinish, polarFinish, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_POLAR_FINISH, EmitPolarFinish, polarFinish, float,
particle::MINIMUM_POLAR, particle::MAXIMUM_POLAR);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_AZIMUTH_START, EmitAzimuthStart, azimuthStart, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_AZIMUTH_START, EmitAzimuthStart, azimuthStart, float,
particle::MINIMUM_AZIMUTH, particle::MAXIMUM_AZIMUTH);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_AZIMUTH_FINISH, EmitAzimuthFinish, azimuthFinish, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_AZIMUTH_FINISH, EmitAzimuthFinish, azimuthFinish, float,
particle::MINIMUM_AZIMUTH, particle::MAXIMUM_AZIMUTH);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_EMIT_ACCELERATION, EmitAcceleration, emitAcceleration, vec3,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_EMIT_ACCELERATION, EmitAcceleration, emitAcceleration, vec3,
particle::MINIMUM_EMIT_ACCELERATION, particle::MAXIMUM_EMIT_ACCELERATION);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_ACCELERATION_SPREAD, AccelerationSpread, accelerationSpread, vec3,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_ACCELERATION_SPREAD, AccelerationSpread, accelerationSpread, vec3,
particle::MINIMUM_ACCELERATION_SPREAD, particle::MAXIMUM_ACCELERATION_SPREAD);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_PARTICLE_RADIUS, ParticleRadius, particleRadius, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_PARTICLE_RADIUS, ParticleRadius, particleRadius, float,
particle::MINIMUM_PARTICLE_RADIUS, particle::MAXIMUM_PARTICLE_RADIUS);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_RADIUS_SPREAD, RadiusSpread, radiusSpread, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_RADIUS_SPREAD, RadiusSpread, radiusSpread, float,
particle::MINIMUM_PARTICLE_RADIUS, particle::MAXIMUM_PARTICLE_RADIUS);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_RADIUS_START, RadiusStart, radiusStart, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_RADIUS_START, RadiusStart, radiusStart, float,
particle::MINIMUM_PARTICLE_RADIUS, particle::MAXIMUM_PARTICLE_RADIUS);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_RADIUS_FINISH, RadiusFinish, radiusFinish, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_RADIUS_FINISH, RadiusFinish, radiusFinish, float,
particle::MINIMUM_PARTICLE_RADIUS, particle::MAXIMUM_PARTICLE_RADIUS);
ADD_PROPERTY_TO_MAP(PROP_COLOR_SPREAD, ColorSpread, colorSpread, u8vec3Color);
ADD_PROPERTY_TO_MAP(PROP_COLOR_START, ColorStart, colorStart, vec3Color);
ADD_PROPERTY_TO_MAP(PROP_COLOR_FINISH, ColorFinish, colorFinish, vec3Color);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_ALPHA_SPREAD, AlphaSpread, alphaSpread, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_ALPHA_SPREAD, AlphaSpread, alphaSpread, float,
particle::MINIMUM_ALPHA, particle::MAXIMUM_ALPHA);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_ALPHA_START, AlphaStart, alphaStart, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_ALPHA_START, AlphaStart, alphaStart, float,
particle::MINIMUM_ALPHA, particle::MAXIMUM_ALPHA);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_ALPHA_FINISH, AlphaFinish, alphaFinish, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_ALPHA_FINISH, AlphaFinish, alphaFinish, float,
particle::MINIMUM_ALPHA, particle::MAXIMUM_ALPHA);
ADD_PROPERTY_TO_MAP(PROP_EMITTER_SHOULD_TRAIL, EmitterShouldTrail, emitterShouldTrail, bool);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_PARTICLE_SPIN, ParticleSpin, particleSpin, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_PARTICLE_SPIN, ParticleSpin, particleSpin, float,
particle::MINIMUM_PARTICLE_SPIN, particle::MAXIMUM_PARTICLE_SPIN);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_SPIN_SPREAD, SpinSpread, spinSpread, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_SPIN_SPREAD, SpinSpread, spinSpread, float,
particle::MINIMUM_PARTICLE_SPIN, particle::MAXIMUM_PARTICLE_SPIN);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_SPIN_START, SpinStart, spinStart, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_SPIN_START, SpinStart, spinStart, float,
particle::MINIMUM_PARTICLE_SPIN, particle::MAXIMUM_PARTICLE_SPIN);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_SPIN_FINISH, SpinFinish, spinFinish, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_SPIN_FINISH, SpinFinish, spinFinish, float,
particle::MINIMUM_PARTICLE_SPIN, particle::MAXIMUM_PARTICLE_SPIN);
ADD_PROPERTY_TO_MAP(PROP_PARTICLE_ROTATE_WITH_ENTITY, RotateWithEntity, rotateWithEntity, float);
@@ -2798,7 +2798,7 @@ bool EntityItemProperties::getPropertyInfo(const QString& propertyName, EntityPr
ADD_PROPERTY_TO_MAP(PROP_IS_SPOTLIGHT, IsSpotlight, isSpotlight, bool);
ADD_PROPERTY_TO_MAP(PROP_INTENSITY, Intensity, intensity, float);
ADD_PROPERTY_TO_MAP(PROP_EXPONENT, Exponent, exponent, float);
- ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_CUTOFF, Cutoff, cutoff, float,
+ ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_CUTOFF, Cutoff, cutoff, float,
LightEntityItem::MIN_CUTOFF, LightEntityItem::MAX_CUTOFF);
ADD_PROPERTY_TO_MAP(PROP_FALLOFF_RADIUS, FalloffRadius, falloffRadius, float);
@@ -5149,7 +5149,7 @@ bool EntityItemProperties::blobToProperties(QScriptEngine& scriptEngine, const Q
return true;
}
-void EntityItemProperties::propertiesToBlob(QScriptEngine& scriptEngine, const QUuid& myAvatarID,
+void EntityItemProperties::propertiesToBlob(QScriptEngine& scriptEngine, const QUuid& myAvatarID,
const EntityItemProperties& properties, QByteArray& blob, bool allProperties) {
// DANGER: this method is NOT efficient.
// begin recipe for extracting unfortunately-formatted-binary-blob from EntityItem
diff --git a/server-console/resources/console-beta.icns b/server-console/resources/console-beta.icns
index 1fe162f88e..9044dbfbf7 100644
Binary files a/server-console/resources/console-beta.icns and b/server-console/resources/console-beta.icns differ
diff --git a/server-console/resources/console-beta.ico b/server-console/resources/console-beta.ico
index 63a3eff482..22cd370d72 100644
Binary files a/server-console/resources/console-beta.ico and b/server-console/resources/console-beta.ico differ
diff --git a/server-console/resources/console-beta.png b/server-console/resources/console-beta.png
index 59fe03c8ee..b7c6ad4889 100644
Binary files a/server-console/resources/console-beta.png and b/server-console/resources/console-beta.png differ
diff --git a/server-console/resources/console-notification.png b/server-console/resources/console-notification.png
index e8991cd773..80fc9dd3a9 100644
Binary files a/server-console/resources/console-notification.png and b/server-console/resources/console-notification.png differ
diff --git a/server-console/resources/console-tray-osx-stopped.png b/server-console/resources/console-tray-osx-stopped.png
index 82fcf76d5c..e8df123f20 100644
Binary files a/server-console/resources/console-tray-osx-stopped.png and b/server-console/resources/console-tray-osx-stopped.png differ
diff --git a/server-console/resources/console-tray-osx-stopped@2x.png b/server-console/resources/console-tray-osx-stopped@2x.png
index 535e6b8135..3671365aa1 100644
Binary files a/server-console/resources/console-tray-osx-stopped@2x.png and b/server-console/resources/console-tray-osx-stopped@2x.png differ
diff --git a/server-console/resources/console-tray-osx-stopping.png b/server-console/resources/console-tray-osx-stopping.png
index c99313d00b..fe8a1932bd 100644
Binary files a/server-console/resources/console-tray-osx-stopping.png and b/server-console/resources/console-tray-osx-stopping.png differ
diff --git a/server-console/resources/console-tray-osx-stopping@2x.png b/server-console/resources/console-tray-osx-stopping@2x.png
index de09b722d3..1982102e5d 100644
Binary files a/server-console/resources/console-tray-osx-stopping@2x.png and b/server-console/resources/console-tray-osx-stopping@2x.png differ
diff --git a/server-console/resources/console-tray-osx.png b/server-console/resources/console-tray-osx.png
index 36756dd16f..13dd30430c 100644
Binary files a/server-console/resources/console-tray-osx.png and b/server-console/resources/console-tray-osx.png differ
diff --git a/server-console/resources/console-tray-osx@2x.png b/server-console/resources/console-tray-osx@2x.png
index 86d9eacea2..f8636fdd29 100644
Binary files a/server-console/resources/console-tray-osx@2x.png and b/server-console/resources/console-tray-osx@2x.png differ
diff --git a/server-console/resources/console-tray-stopped.ico b/server-console/resources/console-tray-stopped.ico
index 2f0251a185..d1f48a8862 100644
Binary files a/server-console/resources/console-tray-stopped.ico and b/server-console/resources/console-tray-stopped.ico differ
diff --git a/server-console/resources/console-tray-win-stopped.png b/server-console/resources/console-tray-win-stopped.png
index cedc6e02e1..07db771652 100644
Binary files a/server-console/resources/console-tray-win-stopped.png and b/server-console/resources/console-tray-win-stopped.png differ
diff --git a/server-console/resources/console-tray-win-stopped@2x.png b/server-console/resources/console-tray-win-stopped@2x.png
index b176209758..81f4fd4f10 100644
Binary files a/server-console/resources/console-tray-win-stopped@2x.png and b/server-console/resources/console-tray-win-stopped@2x.png differ
diff --git a/server-console/resources/console-tray-win-stopping.png b/server-console/resources/console-tray-win-stopping.png
index ddf60efc8e..30ab381158 100644
Binary files a/server-console/resources/console-tray-win-stopping.png and b/server-console/resources/console-tray-win-stopping.png differ
diff --git a/server-console/resources/console-tray-win-stopping@2x.png b/server-console/resources/console-tray-win-stopping@2x.png
index 50f9df457f..a72cdc1209 100644
Binary files a/server-console/resources/console-tray-win-stopping@2x.png and b/server-console/resources/console-tray-win-stopping@2x.png differ
diff --git a/server-console/resources/console-tray-win.png b/server-console/resources/console-tray-win.png
index cd8fa1d691..1ed710c880 100644
Binary files a/server-console/resources/console-tray-win.png and b/server-console/resources/console-tray-win.png differ
diff --git a/server-console/resources/console-tray-win@2x.png b/server-console/resources/console-tray-win@2x.png
index 142498f6a1..abe7bb0b93 100644
Binary files a/server-console/resources/console-tray-win@2x.png and b/server-console/resources/console-tray-win@2x.png differ
diff --git a/server-console/resources/console-tray.ico b/server-console/resources/console-tray.ico
index 6f06b43f73..cf25b69083 100644
Binary files a/server-console/resources/console-tray.ico and b/server-console/resources/console-tray.ico differ
diff --git a/server-console/resources/console.icns b/server-console/resources/console.icns
index 1fe162f88e..4e4df39d69 100644
Binary files a/server-console/resources/console.icns and b/server-console/resources/console.icns differ
diff --git a/server-console/resources/console.ico b/server-console/resources/console.ico
index 63a3eff482..34b48a029d 100644
Binary files a/server-console/resources/console.ico and b/server-console/resources/console.ico differ
diff --git a/server-console/resources/console.png b/server-console/resources/console.png
index e6e13081fd..677ce293c4 100644
Binary files a/server-console/resources/console.png and b/server-console/resources/console.png differ