mirror of
https://github.com/overte-org/overte.git
synced 2025-04-06 08:12:49 +02:00
cleanup entity properties more and start polyline work, remove lines
This commit is contained in:
SamGondelman
parent
b261665072
commit
770da220d7
15 changed files with 1665 additions and 2199 deletions
|
|
@ -1,90 +0,0 @@
|
|||
//
|
||||
// RenderableLineEntityItem.cpp
|
||||
// libraries/entities-renderer/src/
|
||||
//
|
||||
// Created by Seth Alves on 5/11/15.
|
||||
// Copyright 2015 High Fidelity, Inc.
|
||||
//
|
||||
// Distributed under the Apache License, Version 2.0.
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
#include "RenderableLineEntityItem.h"
|
||||
|
||||
#include <gpu/Batch.h>
|
||||
#include <PerfStat.h>
|
||||
|
||||
using namespace render;
|
||||
using namespace render::entities;
|
||||
|
||||
LineEntityRenderer::LineEntityRenderer(const EntityItemPointer& entity) :
|
||||
Parent(entity) {
|
||||
_lineVerticesID = DependencyManager::get<GeometryCache>()->allocateID();
|
||||
}
|
||||
|
||||
LineEntityRenderer::~LineEntityRenderer() {
|
||||
auto geometryCache = DependencyManager::get<GeometryCache>();
|
||||
if (geometryCache) {
|
||||
geometryCache->releaseID(_lineVerticesID);
|
||||
for (auto id : _glowGeometryIDs) {
|
||||
geometryCache->releaseID(id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool LineEntityRenderer::isTransparent() const {
|
||||
return Parent::isTransparent() || _glow > 0.0f || _alpha < 1.0f;
|
||||
}
|
||||
|
||||
bool LineEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const {
|
||||
if (entity->pointsChanged()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (_color != entity->getColor()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (_alpha != entity->getAlpha()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (_lineWidth != entity->getLineWidth()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (_glow != entity->getGlow()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
void LineEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
|
||||
entity->resetPointsChanged();
|
||||
_linePoints = entity->getLinePoints();
|
||||
_color = entity->getColor();
|
||||
_alpha = entity->getAlpha();
|
||||
_lineWidth = entity->getLineWidth();
|
||||
_glow = entity->getGlow();
|
||||
|
||||
// TODO: take into account _lineWidth
|
||||
geometryCache->updateVertices(_lineVerticesID, _linePoints, lineColor);
|
||||
}
|
||||
|
||||
void LineEntityRenderer::doRender(RenderArgs* args) {
|
||||
PerformanceTimer perfTimer("RenderableLineEntityItem::render");
|
||||
|
||||
Q_ASSERT(args->_batch);
|
||||
gpu::Batch& batch = *args->_batch;
|
||||
|
||||
const auto& modelTransform = getModelTransform();
|
||||
Transform transform = Transform();
|
||||
transform.setTranslation(modelTransform.getTranslation());
|
||||
transform.setRotation(modelTransform.getRotation());
|
||||
batch.setModelTransform(transform);
|
||||
if (_linePoints.size() > 1) {
|
||||
DependencyManager::get<GeometryCache>()->bindSimpleProgram(batch);
|
||||
DependencyManager::get<GeometryCache>()->renderVertices(batch, gpu::LINE_STRIP, _lineVerticesID);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
//
|
||||
// RenderableLineEntityItem.h
|
||||
// libraries/entities-renderer/src/
|
||||
//
|
||||
// Created by Seth Alves on 5/11/15.
|
||||
// Copyright 2015 High Fidelity, Inc.
|
||||
//
|
||||
// Distributed under the Apache License, Version 2.0.
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
#ifndef hifi_RenderableLineEntityItem_h
|
||||
#define hifi_RenderableLineEntityItem_h
|
||||
|
||||
#include "RenderableEntityItem.h"
|
||||
#include <LineEntityItem.h>
|
||||
#include <GeometryCache.h>
|
||||
|
||||
|
||||
namespace render { namespace entities {
|
||||
|
||||
class LineEntityRenderer : public TypedEntityRenderer<LineEntityItem> {
|
||||
using Parent = TypedEntityRenderer<LineEntityItem>;
|
||||
friend class EntityRenderer;
|
||||
|
||||
public:
|
||||
LineEntityRenderer(const EntityItemPointer& entity);
|
||||
~LineEntityRenderer();
|
||||
|
||||
bool isTransparent() const override;
|
||||
|
||||
protected:
|
||||
virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
|
||||
virtual void doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) override;
|
||||
virtual void doRender(RenderArgs* args) override;
|
||||
|
||||
private:
|
||||
int _lineVerticesID { GeometryCache::UNKNOWN_ID };
|
||||
std::vector<int> _glowGeometryIDs;
|
||||
|
||||
QVector<glm::vec3> _linePoints;
|
||||
glm::u8vec3 _color;
|
||||
float _alpha;
|
||||
float _lineWidth;
|
||||
float _glow;
|
||||
};
|
||||
|
||||
} } // namespace
|
||||
|
||||
#endif // hifi_RenderableLineEntityItem_h
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -37,7 +37,6 @@
|
|||
#include "EntityPropertyFlags.h"
|
||||
#include "EntityPsuedoPropertyFlags.h"
|
||||
#include "LightEntityItem.h"
|
||||
#include "LineEntityItem.h"
|
||||
#include "ParticleEffectEntityItem.h"
|
||||
#include "PolyVoxEntityItem.h"
|
||||
#include "SimulationOwner.h"
|
||||
|
|
@ -78,7 +77,6 @@ class EntityItemProperties {
|
|||
friend class ImageEntityItem;
|
||||
friend class WebEntityItem;
|
||||
friend class ParticleEffectEntityItem;
|
||||
friend class LineEntityItem;
|
||||
friend class PolyLineEntityItem;
|
||||
friend class PolyVoxEntityItem;
|
||||
friend class GridEntityItem;
|
||||
|
|
@ -181,8 +179,14 @@ public:
|
|||
DEFINE_PROPERTY(PROP_SCRIPT_TIMESTAMP, ScriptTimestamp, scriptTimestamp, quint64, ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP);
|
||||
DEFINE_PROPERTY_REF(PROP_SERVER_SCRIPTS, ServerScripts, serverScripts, QString, ENTITY_ITEM_DEFAULT_SERVER_SCRIPTS);
|
||||
|
||||
// Particles
|
||||
// Common
|
||||
DEFINE_PROPERTY_REF_ENUM(PROP_SHAPE_TYPE, ShapeType, shapeType, ShapeType, SHAPE_TYPE_NONE);
|
||||
DEFINE_PROPERTY_REF(PROP_COMPOUND_SHAPE_URL, CompoundShapeURL, compoundShapeURL, QString, "");
|
||||
DEFINE_PROPERTY_REF(PROP_COLOR, Color, color, u8vec3Color, particle::DEFAULT_COLOR);
|
||||
DEFINE_PROPERTY(PROP_ALPHA, Alpha, alpha, float, particle::DEFAULT_ALPHA);
|
||||
DEFINE_PROPERTY_REF(PROP_TEXTURES, Textures, textures, QString, "");
|
||||
|
||||
// Particles
|
||||
DEFINE_PROPERTY(PROP_MAX_PARTICLES, MaxParticles, maxParticles, quint32, particle::DEFAULT_MAX_PARTICLES);
|
||||
DEFINE_PROPERTY(PROP_LIFESPAN, Lifespan, lifespan, float, particle::DEFAULT_LIFESPAN);
|
||||
DEFINE_PROPERTY(PROP_EMITTING_PARTICLES, IsEmitting, isEmitting, bool, true);
|
||||
|
|
@ -202,15 +206,12 @@ public:
|
|||
DEFINE_PROPERTY(PROP_RADIUS_SPREAD, RadiusSpread, radiusSpread, float, particle::DEFAULT_RADIUS_SPREAD);
|
||||
DEFINE_PROPERTY(PROP_RADIUS_START, RadiusStart, radiusStart, float, particle::DEFAULT_RADIUS_START);
|
||||
DEFINE_PROPERTY(PROP_RADIUS_FINISH, RadiusFinish, radiusFinish, float, particle::DEFAULT_RADIUS_FINISH);
|
||||
DEFINE_PROPERTY_REF(PROP_COLOR, Color, color, u8vec3Color, particle::DEFAULT_COLOR);
|
||||
DEFINE_PROPERTY_REF(PROP_COLOR_SPREAD, ColorSpread, colorSpread, u8vec3Color, particle::DEFAULT_COLOR_SPREAD);
|
||||
DEFINE_PROPERTY_REF(PROP_COLOR_START, ColorStart, colorStart, glm::vec3, particle::DEFAULT_COLOR_UNINITIALIZED);
|
||||
DEFINE_PROPERTY_REF(PROP_COLOR_FINISH, ColorFinish, colorFinish, glm::vec3, particle::DEFAULT_COLOR_UNINITIALIZED);
|
||||
DEFINE_PROPERTY(PROP_ALPHA, Alpha, alpha, float, particle::DEFAULT_ALPHA);
|
||||
DEFINE_PROPERTY(PROP_ALPHA_SPREAD, AlphaSpread, alphaSpread, float, particle::DEFAULT_ALPHA_SPREAD);
|
||||
DEFINE_PROPERTY(PROP_ALPHA_START, AlphaStart, alphaStart, float, particle::DEFAULT_ALPHA_START);
|
||||
DEFINE_PROPERTY(PROP_ALPHA_FINISH, AlphaFinish, alphaFinish, float, particle::DEFAULT_ALPHA_FINISH);
|
||||
DEFINE_PROPERTY_REF(PROP_TEXTURES, Textures, textures, QString, "");
|
||||
DEFINE_PROPERTY(PROP_EMITTER_SHOULD_TRAIL, EmitterShouldTrail, emitterShouldTrail, bool, particle::DEFAULT_EMITTER_SHOULD_TRAIL);
|
||||
DEFINE_PROPERTY(PROP_PARTICLE_SPIN, ParticleSpin, particleSpin, float, particle::DEFAULT_PARTICLE_SPIN);
|
||||
DEFINE_PROPERTY(PROP_SPIN_SPREAD, SpinSpread, spinSpread, float, particle::DEFAULT_SPIN_SPREAD);
|
||||
|
|
@ -220,7 +221,6 @@ public:
|
|||
|
||||
// Model
|
||||
DEFINE_PROPERTY_REF(PROP_MODEL_URL, ModelURL, modelURL, QString, "");
|
||||
DEFINE_PROPERTY_REF(PROP_COMPOUND_SHAPE_URL, CompoundShapeURL, compoundShapeURL, QString, "");
|
||||
DEFINE_PROPERTY_REF(PROP_JOINT_ROTATIONS_SET, JointRotationsSet, jointRotationsSet, QVector<bool>, QVector<bool>());
|
||||
DEFINE_PROPERTY_REF(PROP_JOINT_ROTATIONS, JointRotations, jointRotations, QVector<glm::quat>, QVector<glm::quat>());
|
||||
DEFINE_PROPERTY_REF(PROP_JOINT_TRANSLATIONS_SET, JointTranslationsSet, jointTranslationsSet, QVector<bool>, QVector<bool>());
|
||||
|
|
@ -281,15 +281,14 @@ public:
|
|||
DEFINE_PROPERTY_REF(PROP_SOURCE_URL, SourceUrl, sourceUrl, QString, "");
|
||||
DEFINE_PROPERTY_REF(PROP_DPI, DPI, dpi, uint16_t, ENTITY_ITEM_DEFAULT_DPI);
|
||||
|
||||
// Line
|
||||
DEFINE_PROPERTY(PROP_LINE_WIDTH, LineWidth, lineWidth, float, LineEntityItem::DEFAULT_LINE_WIDTH);
|
||||
DEFINE_PROPERTY_REF(LINE_POINTS, LinePoints, linePoints, QVector<glm::vec3>, ENTITY_ITEM_DEFAULT_EMPTY_VEC3_QVEC);
|
||||
|
||||
// Polyline
|
||||
DEFINE_PROPERTY(PROP_NORMALS, Normals, normals, QVector<glm::vec3>, ENTITY_ITEM_DEFAULT_EMPTY_VEC3_QVEC);
|
||||
DEFINE_PROPERTY(PROP_STROKE_COLORS, StrokeColors, strokeColors, QVector<glm::vec3>, ENTITY_ITEM_DEFAULT_EMPTY_VEC3_QVEC);
|
||||
DEFINE_PROPERTY_REF(PROP_LINE_POINTS, LinePoints, linePoints, QVector<glm::vec3>, ENTITY_ITEM_DEFAULT_EMPTY_VEC3_QVEC);
|
||||
DEFINE_PROPERTY(PROP_STROKE_WIDTHS, StrokeWidths, strokeWidths, QVector<float>, QVector<float>());
|
||||
DEFINE_PROPERTY(PROP_STROKE_NORMALS, Normals, normals, QVector<glm::vec3>, ENTITY_ITEM_DEFAULT_EMPTY_VEC3_QVEC);
|
||||
DEFINE_PROPERTY(PROP_STROKE_COLORS, StrokeColors, strokeColors, QVector<glm::vec3>, ENTITY_ITEM_DEFAULT_EMPTY_VEC3_QVEC);
|
||||
DEFINE_PROPERTY(PROP_IS_UV_MODE_STRETCH, IsUVModeStretch, isUVModeStretch, bool, true);
|
||||
DEFINE_PROPERTY(PROP_LINE_GLOW, Glow, glow, bool, false);
|
||||
DEFINE_PROPERTY(PROP_LINE_FACE_CAMERA, FaceCamera, faceCamera, bool, false);
|
||||
|
||||
// Shape
|
||||
DEFINE_PROPERTY_REF(PROP_SHAPE, Shape, shape, QString, "Sphere");
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@ QDebug& operator<<(QDebug& dbg, const EntityPropertyFlags& f) {
|
|||
result = f.getHasProperty(PROP_LIFESPAN) ? result + "lifespan " : result;
|
||||
result = f.getHasProperty(PROP_EMIT_RATE) ? result + "emitRate " : result;
|
||||
result = f.getHasProperty(PROP_EMIT_SPEED) ? result + "emitSpeed " : result;
|
||||
result = f.getHasProperty(PROP_EMIT_STRENGTH) ? result + "emitStrength " : result;
|
||||
result = f.getHasProperty(PROP_EMIT_ACCELERATION) ? result + "emitAcceleration " : result;
|
||||
result = f.getHasProperty(PROP_PARTICLE_RADIUS) ? result + "particleRadius " : result;
|
||||
result = f.getHasProperty(PROP_COMPOUND_SHAPE_URL) ? result + "compoundShapeUrl " : result;
|
||||
|
|
@ -63,7 +62,6 @@ QDebug& operator<<(QDebug& dbg, const EntityPropertyFlags& f) {
|
|||
result = f.getHasProperty(PROP_VOXEL_VOLUME_SIZE) ? result + "voxelVolumeSize " : result;
|
||||
result = f.getHasProperty(PROP_VOXEL_DATA) ? result + "voxelData " : result;
|
||||
result = f.getHasProperty(PROP_VOXEL_SURFACE_STYLE) ? result + "voxelSurfaceStyle " : result;
|
||||
result = f.getHasProperty(PROP_LINE_WIDTH) ? result + "lineWidth " : result;
|
||||
result = f.getHasProperty(PROP_LINE_POINTS) ? result + "linePoints " : result;
|
||||
result = f.getHasProperty(PROP_HREF) ? result + "href " : result;
|
||||
result = f.getHasProperty(PROP_DESCRIPTION) ? result + "description " : result;
|
||||
|
|
|
|||
|
|
@ -18,250 +18,27 @@ enum EntityPropertyList {
|
|||
PROP_PAGED_PROPERTY,
|
||||
PROP_CUSTOM_PROPERTIES_INCLUDED,
|
||||
|
||||
// these properties are supported by the EntityItem base class
|
||||
// Core properties
|
||||
PROP_VISIBLE,
|
||||
PROP_CAN_CAST_SHADOW,
|
||||
PROP_NAME,
|
||||
PROP_LOCKED,
|
||||
PROP_USER_DATA,
|
||||
PROP_HREF,
|
||||
PROP_DESCRIPTION,
|
||||
PROP_POSITION,
|
||||
PROP_DIMENSIONS,
|
||||
PROP_ROTATION,
|
||||
PROP_DENSITY,
|
||||
PROP_VELOCITY,
|
||||
PROP_GRAVITY,
|
||||
PROP_DAMPING,
|
||||
PROP_LIFETIME,
|
||||
PROP_SCRIPT,
|
||||
|
||||
// these properties are supported by some derived classes
|
||||
PROP_COLOR,
|
||||
|
||||
// these are used by models only
|
||||
PROP_MODEL_URL,
|
||||
PROP_ANIMATION_URL,
|
||||
PROP_ANIMATION_FPS,
|
||||
PROP_ANIMATION_FRAME_INDEX,
|
||||
PROP_ANIMATION_PLAYING,
|
||||
PROP_ANIMATION_ALLOW_TRANSLATION,
|
||||
PROP_RELAY_PARENT_JOINTS,
|
||||
|
||||
// these properties are supported by the EntityItem base class
|
||||
PROP_REGISTRATION_POINT,
|
||||
PROP_ANGULAR_VELOCITY,
|
||||
PROP_ANGULAR_DAMPING,
|
||||
PROP_COLLISIONLESS,
|
||||
PROP_DYNAMIC, // 24
|
||||
|
||||
// property used by Light entity
|
||||
PROP_IS_SPOTLIGHT,
|
||||
PROP_DIFFUSE_COLOR,
|
||||
PROP_AMBIENT_COLOR_UNUSED, // FIXME - No longer used, can remove and bump protocol
|
||||
PROP_SPECULAR_COLOR_UNUSED, // FIXME - No longer used, can remove and bump protocol
|
||||
PROP_INTENSITY, // Previously PROP_CONSTANT_ATTENUATION
|
||||
PROP_LINEAR_ATTENUATION_UNUSED,
|
||||
PROP_QUADRATIC_ATTENUATION_UNUSED,
|
||||
PROP_EXPONENT,
|
||||
PROP_CUTOFF,
|
||||
|
||||
// available to all entities
|
||||
PROP_LOCKED, // 34
|
||||
|
||||
PROP_TEXTURES, // used by Model entities
|
||||
PROP_ANIMATION_SETTINGS_UNUSED, // FIXME - No longer used, can remove and bump protocol
|
||||
PROP_USER_DATA, // all entities -- 37
|
||||
PROP_SHAPE_TYPE, // used by Model + zones entities
|
||||
|
||||
// used by ParticleEffect entities
|
||||
PROP_MAX_PARTICLES, // 39
|
||||
PROP_LIFESPAN, // 40 -- used by all entities
|
||||
PROP_EMIT_RATE,
|
||||
PROP_EMIT_SPEED,
|
||||
PROP_EMIT_STRENGTH,
|
||||
PROP_EMIT_ACCELERATION, // FIXME - doesn't seem to get set in mark all changed????
|
||||
PROP_PARTICLE_RADIUS, // 45!!
|
||||
|
||||
PROP_COMPOUND_SHAPE_URL, // used by Model + zones entities
|
||||
PROP_MARKETPLACE_ID, // all entities
|
||||
PROP_ACCELERATION, // all entities
|
||||
PROP_SIMULATION_OWNER, // formerly known as PROP_SIMULATOR_ID
|
||||
PROP_NAME, // all entities -- 50
|
||||
PROP_COLLISION_SOUND_URL,
|
||||
PROP_RESTITUTION,
|
||||
PROP_FRICTION, // 53
|
||||
|
||||
PROP_VOXEL_VOLUME_SIZE,
|
||||
PROP_VOXEL_DATA,
|
||||
PROP_VOXEL_SURFACE_STYLE,
|
||||
|
||||
//for lines
|
||||
PROP_LINE_WIDTH,
|
||||
PROP_LINE_POINTS,
|
||||
|
||||
// used by hyperlinks
|
||||
PROP_HREF,
|
||||
PROP_DESCRIPTION, // 61
|
||||
|
||||
PROP_BILLBOARD_MODE,
|
||||
PROP_SCRIPT_TIMESTAMP,
|
||||
|
||||
PROP_ACTION_DATA,
|
||||
|
||||
PROP_X_TEXTURE_URL, // used by PolyVox
|
||||
PROP_Y_TEXTURE_URL, // used by PolyVox
|
||||
PROP_Z_TEXTURE_URL, // used by PolyVox
|
||||
|
||||
// Used by PolyLine entity
|
||||
PROP_NORMALS,
|
||||
PROP_STROKE_COLORS,
|
||||
PROP_STROKE_WIDTHS,
|
||||
PROP_IS_UV_MODE_STRETCH,
|
||||
|
||||
// used by particles
|
||||
PROP_SPEED_SPREAD,
|
||||
PROP_ACCELERATION_SPREAD,
|
||||
|
||||
PROP_X_N_NEIGHBOR_ID, // used by PolyVox
|
||||
PROP_Y_N_NEIGHBOR_ID, // used by PolyVox
|
||||
PROP_Z_N_NEIGHBOR_ID, // used by PolyVox
|
||||
PROP_X_P_NEIGHBOR_ID, // used by PolyVox
|
||||
PROP_Y_P_NEIGHBOR_ID, // used by PolyVox
|
||||
PROP_Z_P_NEIGHBOR_ID, // used by PolyVox
|
||||
|
||||
// Used by particles
|
||||
PROP_RADIUS_SPREAD,
|
||||
PROP_RADIUS_START,
|
||||
PROP_RADIUS_FINISH,
|
||||
|
||||
PROP_ALPHA, // Supported by some derived classes
|
||||
|
||||
//Used by particles
|
||||
PROP_COLOR_SPREAD,
|
||||
PROP_COLOR_START,
|
||||
PROP_COLOR_FINISH,
|
||||
PROP_ALPHA_SPREAD,
|
||||
PROP_ALPHA_START,
|
||||
PROP_ALPHA_FINISH,
|
||||
PROP_EMIT_ORIENTATION,
|
||||
PROP_EMIT_DIMENSIONS,
|
||||
PROP_EMIT_RADIUS_START,
|
||||
PROP_POLAR_START,
|
||||
PROP_POLAR_FINISH,
|
||||
PROP_AZIMUTH_START,
|
||||
PROP_AZIMUTH_FINISH,
|
||||
|
||||
PROP_ANIMATION_LOOP,
|
||||
PROP_ANIMATION_FIRST_FRAME,
|
||||
PROP_ANIMATION_LAST_FRAME,
|
||||
PROP_ANIMATION_HOLD,
|
||||
PROP_ANIMATION_START_AUTOMATICALLY,
|
||||
|
||||
PROP_EMITTER_SHOULD_TRAIL,
|
||||
|
||||
PROP_CREATED,
|
||||
PROP_LAST_EDITED_BY,
|
||||
PROP_ENTITY_HOST_TYPE, // not sent over wire
|
||||
PROP_OWNING_AVATAR_ID, // not sent over wire
|
||||
PROP_PARENT_ID,
|
||||
PROP_PARENT_JOINT_INDEX,
|
||||
|
||||
PROP_LOCAL_POSITION, // only used to convert values to and from scripts
|
||||
PROP_LOCAL_ROTATION, // only used to convert values to and from scripts
|
||||
|
||||
PROP_QUERY_AA_CUBE, // how the EntityTree considers the size and position on an entity
|
||||
|
||||
// ModelEntity joint state
|
||||
PROP_JOINT_ROTATIONS_SET,
|
||||
PROP_JOINT_ROTATIONS,
|
||||
PROP_JOINT_TRANSLATIONS_SET,
|
||||
PROP_JOINT_TRANSLATIONS,
|
||||
|
||||
PROP_COLLISION_MASK, // one byte of collision group flags
|
||||
|
||||
PROP_FALLOFF_RADIUS, // for Light entity
|
||||
|
||||
PROP_FLYING_ALLOWED, // can avatars in a zone fly?
|
||||
PROP_GHOSTING_ALLOWED, // can avatars in a zone turn off physics?
|
||||
|
||||
PROP_ENTITY_HOST_TYPE, // doesn't go over wire
|
||||
PROP_OWNING_AVATAR_ID, // doesn't go over wire
|
||||
|
||||
PROP_SHAPE,
|
||||
PROP_DPI,
|
||||
|
||||
PROP_LOCAL_VELOCITY, // only used to convert values to and from scripts
|
||||
PROP_LOCAL_ANGULAR_VELOCITY, // only used to convert values to and from scripts
|
||||
|
||||
PROP_LAST_EDITED_BY,
|
||||
|
||||
PROP_SERVER_SCRIPTS,
|
||||
|
||||
PROP_FILTER_URL,
|
||||
|
||||
// Certificable Properties
|
||||
PROP_ITEM_NAME,
|
||||
PROP_ITEM_DESCRIPTION,
|
||||
PROP_ITEM_CATEGORIES,
|
||||
PROP_ITEM_ARTIST,
|
||||
PROP_ITEM_LICENSE,
|
||||
PROP_LIMITED_RUN,
|
||||
// PROP_MARKETPLACE_ID is above
|
||||
PROP_EDITION_NUMBER,
|
||||
PROP_ENTITY_INSTANCE_NUMBER,
|
||||
PROP_CERTIFICATE_ID,
|
||||
PROP_STATIC_CERTIFICATE_VERSION,
|
||||
|
||||
PROP_CLONEABLE,
|
||||
PROP_CLONE_LIFETIME,
|
||||
PROP_CLONE_LIMIT,
|
||||
PROP_CLONE_DYNAMIC,
|
||||
PROP_CLONE_AVATAR_ENTITY,
|
||||
PROP_CLONE_ORIGIN_ID,
|
||||
|
||||
PROP_HAZE_MODE,
|
||||
|
||||
PROP_KEYLIGHT_COLOR,
|
||||
PROP_KEYLIGHT_INTENSITY,
|
||||
PROP_KEYLIGHT_DIRECTION,
|
||||
PROP_KEYLIGHT_CAST_SHADOW,
|
||||
|
||||
PROP_HAZE_RANGE,
|
||||
PROP_HAZE_COLOR,
|
||||
PROP_HAZE_GLARE_COLOR,
|
||||
PROP_HAZE_ENABLE_GLARE,
|
||||
PROP_HAZE_GLARE_ANGLE,
|
||||
|
||||
PROP_HAZE_ALTITUDE_EFFECT,
|
||||
PROP_HAZE_CEILING,
|
||||
PROP_HAZE_BASE_REF,
|
||||
|
||||
PROP_HAZE_BACKGROUND_BLEND,
|
||||
|
||||
PROP_HAZE_ATTENUATE_KEYLIGHT,
|
||||
PROP_HAZE_KEYLIGHT_RANGE,
|
||||
PROP_HAZE_KEYLIGHT_ALTITUDE,
|
||||
|
||||
PROP_KEY_LIGHT_MODE,
|
||||
PROP_AMBIENT_LIGHT_MODE,
|
||||
PROP_SKYBOX_MODE,
|
||||
|
||||
PROP_LOCAL_DIMENSIONS, // only used to convert values to and from scripts
|
||||
|
||||
PROP_MATERIAL_URL,
|
||||
PROP_MATERIAL_MAPPING_MODE,
|
||||
PROP_MATERIAL_PRIORITY,
|
||||
PROP_PARENT_MATERIAL_NAME,
|
||||
PROP_MATERIAL_MAPPING_POS,
|
||||
PROP_MATERIAL_MAPPING_SCALE,
|
||||
PROP_MATERIAL_MAPPING_ROT,
|
||||
PROP_MATERIAL_DATA,
|
||||
|
||||
PROP_VISIBLE_IN_SECONDARY_CAMERA, // not sent over the wire, only used locally
|
||||
|
||||
PROP_PARTICLE_SPIN,
|
||||
PROP_SPIN_START,
|
||||
PROP_SPIN_FINISH,
|
||||
PROP_SPIN_SPREAD,
|
||||
PROP_PARTICLE_ROTATE_WITH_ENTITY,
|
||||
|
||||
PROP_BLOOM_MODE,
|
||||
PROP_BLOOM_INTENSITY,
|
||||
PROP_BLOOM_THRESHOLD,
|
||||
PROP_BLOOM_SIZE,
|
||||
|
||||
PROP_QUERY_AA_CUBE,
|
||||
PROP_CAN_CAST_SHADOW,
|
||||
PROP_VISIBLE_IN_SECONDARY_CAMERA, // not sent over wire
|
||||
// Grab
|
||||
PROP_GRAB_GRABBABLE,
|
||||
PROP_GRAB_KINEMATIC,
|
||||
PROP_GRAB_FOLLOWS_CONTROLLER,
|
||||
|
|
@ -275,60 +52,271 @@ enum EntityPropertyList {
|
|||
PROP_GRAB_EQUIPPABLE_INDICATOR_SCALE,
|
||||
PROP_GRAB_EQUIPPABLE_INDICATOR_OFFSET,
|
||||
|
||||
PROP_MATERIAL_REPEAT,
|
||||
// Physics
|
||||
PROP_DENSITY,
|
||||
PROP_VELOCITY,
|
||||
PROP_ANGULAR_VELOCITY,
|
||||
PROP_GRAVITY,
|
||||
PROP_ACCELERATION,
|
||||
PROP_DAMPING,
|
||||
PROP_ANGULAR_DAMPING,
|
||||
PROP_RESTITUTION,
|
||||
PROP_FRICTION,
|
||||
PROP_LIFETIME,
|
||||
PROP_COLLISIONLESS,
|
||||
PROP_COLLISION_MASK,
|
||||
PROP_DYNAMIC,
|
||||
PROP_SIMULATION_OWNER,
|
||||
PROP_COLLISION_SOUND_URL,
|
||||
PROP_ACTION_DATA,
|
||||
|
||||
PROP_EMISSIVE,
|
||||
PROP_SUB_IMAGE,
|
||||
// Cloning
|
||||
PROP_CLONEABLE,
|
||||
PROP_CLONE_LIFETIME,
|
||||
PROP_CLONE_LIMIT,
|
||||
PROP_CLONE_DYNAMIC,
|
||||
PROP_CLONE_AVATAR_ENTITY,
|
||||
PROP_CLONE_ORIGIN_ID,
|
||||
|
||||
PROP_LEFT_MARGIN,
|
||||
PROP_RIGHT_MARGIN,
|
||||
PROP_TOP_MARGIN,
|
||||
PROP_BOTTOM_MARGIN,
|
||||
// Scripts
|
||||
PROP_SCRIPT,
|
||||
PROP_SCRIPT_TIMESTAMP,
|
||||
PROP_SERVER_SCRIPTS,
|
||||
|
||||
// Certifiable Properties
|
||||
PROP_ITEM_NAME,
|
||||
PROP_ITEM_DESCRIPTION,
|
||||
PROP_ITEM_CATEGORIES,
|
||||
PROP_ITEM_ARTIST,
|
||||
PROP_ITEM_LICENSE,
|
||||
PROP_LIMITED_RUN,
|
||||
PROP_MARKETPLACE_ID,
|
||||
PROP_EDITION_NUMBER,
|
||||
PROP_ENTITY_INSTANCE_NUMBER,
|
||||
PROP_CERTIFICATE_ID,
|
||||
PROP_STATIC_CERTIFICATE_VERSION,
|
||||
|
||||
// Used to convert values to and from scripts
|
||||
PROP_LOCAL_POSITION,
|
||||
PROP_LOCAL_ROTATION,
|
||||
PROP_LOCAL_VELOCITY,
|
||||
PROP_LOCAL_ANGULAR_VELOCITY,
|
||||
PROP_LOCAL_DIMENSIONS,
|
||||
|
||||
// These properties are used by multiple subtypes but aren't in the base EntityItem
|
||||
PROP_SHAPE_TYPE,
|
||||
PROP_COMPOUND_SHAPE_URL,
|
||||
PROP_COLOR,
|
||||
PROP_ALPHA,
|
||||
PROP_TEXTURES,
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// ATTENTION: add new properties to end of list just ABOVE this line
|
||||
// ATTENTION: add new shared EntityItem properties to the list ABOVE this line
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// We need as many of these as the number of unique properties of a derived EntityItem class
|
||||
PROP_DERIVED_0,
|
||||
PROP_DERIVED_1,
|
||||
PROP_DERIVED_2,
|
||||
PROP_DERIVED_3,
|
||||
PROP_DERIVED_4,
|
||||
PROP_DERIVED_5,
|
||||
PROP_DERIVED_6,
|
||||
PROP_DERIVED_7,
|
||||
PROP_DERIVED_8,
|
||||
PROP_DERIVED_9,
|
||||
PROP_DERIVED_10,
|
||||
PROP_DERIVED_11,
|
||||
PROP_DERIVED_12,
|
||||
PROP_DERIVED_13,
|
||||
PROP_DERIVED_14,
|
||||
PROP_DERIVED_15,
|
||||
PROP_DERIVED_16,
|
||||
PROP_DERIVED_17,
|
||||
PROP_DERIVED_18,
|
||||
PROP_DERIVED_19,
|
||||
PROP_DERIVED_20,
|
||||
PROP_DERIVED_21,
|
||||
PROP_DERIVED_22,
|
||||
PROP_DERIVED_23,
|
||||
PROP_DERIVED_24,
|
||||
PROP_DERIVED_25,
|
||||
PROP_DERIVED_26,
|
||||
PROP_DERIVED_27,
|
||||
PROP_DERIVED_28,
|
||||
PROP_DERIVED_29,
|
||||
PROP_DERIVED_30,
|
||||
|
||||
PROP_AFTER_LAST_ITEM,
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// WARNING! Do not add props here unless you intentionally mean to reuse PROP_ indexes
|
||||
// WARNING! Do not add props here unless you intentionally mean to reuse PROP_DERIVED_X indexes
|
||||
//
|
||||
// These properties of TextEntity piggy back off of properties of ModelEntities, the type doesn't matter
|
||||
// since the derived class knows how to interpret it's own properties and knows the types it expects
|
||||
PROP_TEXT_COLOR = PROP_COLOR,
|
||||
PROP_TEXT_ALPHA = PROP_ALPHA,
|
||||
PROP_TEXT = PROP_MODEL_URL,
|
||||
PROP_LINE_HEIGHT = PROP_ANIMATION_URL,
|
||||
PROP_BACKGROUND_COLOR = PROP_ANIMATION_FPS,
|
||||
PROP_BACKGROUND_ALPHA = PROP_ALPHA_START,
|
||||
|
||||
// Aliases/Piggyback properties for Zones. These properties intentionally reuse the enum values for
|
||||
// other properties which will never overlap with each other. We do this so that we don't have to expand
|
||||
// These properties intentionally reuse the enum values for other properties which will never overlap with each other. We do this so that we don't have to expand
|
||||
// the size of the properties bitflags mask
|
||||
PROP_SKYBOX_COLOR = PROP_ANIMATION_URL,
|
||||
PROP_SKYBOX_URL = PROP_ANIMATION_FPS,
|
||||
//
|
||||
// Only add properties here that are only used by one subclass. Otherwise, they should go above to prevent collisions
|
||||
|
||||
PROP_AMBIENT_LIGHT_INTENSITY = PROP_CUTOFF,
|
||||
PROP_AMBIENT_LIGHT_URL = PROP_ANIMATION_PLAYING,
|
||||
// Particles
|
||||
PROP_MAX_PARTICLES = PROP_DERIVED_0,
|
||||
PROP_LIFESPAN = PROP_DERIVED_1,
|
||||
PROP_EMITTING_PARTICLES = PROP_DERIVED_2,
|
||||
PROP_EMIT_RATE = PROP_DERIVED_3,
|
||||
PROP_EMIT_SPEED = PROP_DERIVED_4,
|
||||
PROP_SPEED_SPREAD = PROP_DERIVED_5,
|
||||
PROP_EMIT_ORIENTATION = PROP_DERIVED_6,
|
||||
PROP_EMIT_DIMENSIONS = PROP_DERIVED_7,
|
||||
PROP_EMIT_RADIUS_START = PROP_DERIVED_8,
|
||||
PROP_EMIT_ACCELERATION = PROP_DERIVED_9,
|
||||
PROP_ACCELERATION_SPREAD = PROP_DERIVED_10,
|
||||
PROP_POLAR_START = PROP_DERIVED_11,
|
||||
PROP_POLAR_FINISH = PROP_DERIVED_12,
|
||||
PROP_AZIMUTH_START = PROP_DERIVED_13,
|
||||
PROP_AZIMUTH_FINISH = PROP_DERIVED_14,
|
||||
PROP_PARTICLE_RADIUS = PROP_DERIVED_15,
|
||||
PROP_RADIUS_SPREAD = PROP_DERIVED_16,
|
||||
PROP_RADIUS_START = PROP_DERIVED_17,
|
||||
PROP_RADIUS_FINISH = PROP_DERIVED_18,
|
||||
PROP_COLOR_SPREAD = PROP_DERIVED_19,
|
||||
PROP_COLOR_START = PROP_DERIVED_20,
|
||||
PROP_COLOR_FINISH = PROP_DERIVED_21,
|
||||
PROP_ALPHA_SPREAD = PROP_DERIVED_22,
|
||||
PROP_ALPHA_START = PROP_DERIVED_23,
|
||||
PROP_ALPHA_FINISH = PROP_DERIVED_24,
|
||||
PROP_EMITTER_SHOULD_TRAIL = PROP_DERIVED_25,
|
||||
PROP_PARTICLE_SPIN = PROP_DERIVED_26,
|
||||
PROP_SPIN_START = PROP_DERIVED_27,
|
||||
PROP_SPIN_FINISH = PROP_DERIVED_28,
|
||||
PROP_SPIN_SPREAD = PROP_DERIVED_29,
|
||||
PROP_PARTICLE_ROTATE_WITH_ENTITY = PROP_DERIVED_30,
|
||||
|
||||
// Aliases/Piggyback properties for Web. These properties intentionally reuse the enum values for
|
||||
// other properties which will never overlap with each other.
|
||||
PROP_SOURCE_URL = PROP_MODEL_URL,
|
||||
// Model
|
||||
PROP_MODEL_URL = PROP_DERIVED_0,
|
||||
PROP_JOINT_ROTATIONS_SET = PROP_DERIVED_1,
|
||||
PROP_JOINT_ROTATIONS = PROP_DERIVED_2,
|
||||
PROP_JOINT_TRANSLATIONS_SET = PROP_DERIVED_3,
|
||||
PROP_JOINT_TRANSLATIONS = PROP_DERIVED_4,
|
||||
PROP_RELAY_PARENT_JOINTS = PROP_DERIVED_5,
|
||||
// Animation
|
||||
PROP_ANIMATION_URL = PROP_DERIVED_6,
|
||||
PROP_ANIMATION_ALLOW_TRANSLATION = PROP_DERIVED_7,
|
||||
PROP_ANIMATION_FPS = PROP_DERIVED_8,
|
||||
PROP_ANIMATION_FRAME_INDEX = PROP_DERIVED_9,
|
||||
PROP_ANIMATION_PLAYING = PROP_DERIVED_10,
|
||||
PROP_ANIMATION_LOOP = PROP_DERIVED_11,
|
||||
PROP_ANIMATION_FIRST_FRAME = PROP_DERIVED_12,
|
||||
PROP_ANIMATION_LAST_FRAME = PROP_DERIVED_13,
|
||||
PROP_ANIMATION_HOLD = PROP_DERIVED_14,
|
||||
|
||||
// Aliases/Piggyback properties for Particle Emmitter. These properties intentionally reuse the enum values for
|
||||
// other properties which will never overlap with each other.
|
||||
PROP_EMITTING_PARTICLES = PROP_ANIMATION_PLAYING,
|
||||
// Light
|
||||
PROP_IS_SPOTLIGHT = PROP_DERIVED_0,
|
||||
PROP_INTENSITY = PROP_DERIVED_1,
|
||||
PROP_EXPONENT = PROP_DERIVED_2,
|
||||
PROP_CUTOFF = PROP_DERIVED_3,
|
||||
PROP_FALLOFF_RADIUS = PROP_DERIVED_4,
|
||||
|
||||
// Aliases/Piggyback properties for Image. These properties intentionally reuse the enum values for
|
||||
// other properties which will never overlap with each other.
|
||||
PROP_IMAGE_URL = PROP_MODEL_URL,
|
||||
PROP_KEEP_ASPECT_RATIO = PROP_ANIMATION_PLAYING,
|
||||
// Text
|
||||
PROP_TEXT = PROP_DERIVED_0,
|
||||
PROP_LINE_HEIGHT = PROP_DERIVED_1,
|
||||
PROP_TEXT_COLOR = PROP_DERIVED_2,
|
||||
PROP_TEXT_ALPHA = PROP_DERIVED_3,
|
||||
PROP_BACKGROUND_COLOR = PROP_DERIVED_4,
|
||||
PROP_BACKGROUND_ALPHA = PROP_DERIVED_5,
|
||||
PROP_BILLBOARD_MODE = PROP_DERIVED_6,
|
||||
PROP_LEFT_MARGIN = PROP_DERIVED_7,
|
||||
PROP_RIGHT_MARGIN = PROP_DERIVED_8,
|
||||
PROP_TOP_MARGIN = PROP_DERIVED_9,
|
||||
PROP_BOTTOM_MARGIN = PROP_DERIVED_10,
|
||||
|
||||
// Aliases/Piggyback properties for Grid. These properties intentionally reuse the enum values for
|
||||
// other properties which will never overlap with each other.
|
||||
PROP_GRID_FOLLOW_CAMERA = PROP_ANIMATION_PLAYING,
|
||||
PROP_MAJOR_GRID_EVERY = PROP_ANIMATION_URL,
|
||||
PROP_MINOR_GRID_EVERY = PROP_ANIMATION_FPS,
|
||||
// Zone
|
||||
// Keylight
|
||||
PROP_KEYLIGHT_COLOR = PROP_DERIVED_0,
|
||||
PROP_KEYLIGHT_INTENSITY = PROP_DERIVED_1,
|
||||
PROP_KEYLIGHT_DIRECTION = PROP_DERIVED_2,
|
||||
PROP_KEYLIGHT_CAST_SHADOW = PROP_DERIVED_3,
|
||||
// Ambient light
|
||||
PROP_AMBIENT_LIGHT_INTENSITY = PROP_DERIVED_4,
|
||||
PROP_AMBIENT_LIGHT_URL = PROP_DERIVED_5,
|
||||
// Skybox
|
||||
PROP_SKYBOX_COLOR = PROP_DERIVED_6,
|
||||
PROP_SKYBOX_URL = PROP_DERIVED_7,
|
||||
// Haze
|
||||
PROP_HAZE_RANGE = PROP_DERIVED_8,
|
||||
PROP_HAZE_COLOR = PROP_DERIVED_9,
|
||||
PROP_HAZE_GLARE_COLOR = PROP_DERIVED_10,
|
||||
PROP_HAZE_ENABLE_GLARE = PROP_DERIVED_11,
|
||||
PROP_HAZE_GLARE_ANGLE = PROP_DERIVED_12,
|
||||
PROP_HAZE_ALTITUDE_EFFECT = PROP_DERIVED_13,
|
||||
PROP_HAZE_CEILING = PROP_DERIVED_14,
|
||||
PROP_HAZE_BASE_REF = PROP_DERIVED_15,
|
||||
PROP_HAZE_BACKGROUND_BLEND = PROP_DERIVED_16,
|
||||
PROP_HAZE_ATTENUATE_KEYLIGHT = PROP_DERIVED_17,
|
||||
PROP_HAZE_KEYLIGHT_RANGE = PROP_DERIVED_18,
|
||||
PROP_HAZE_KEYLIGHT_ALTITUDE = PROP_DERIVED_19,
|
||||
// Bloom
|
||||
PROP_BLOOM_INTENSITY = PROP_DERIVED_20,
|
||||
PROP_BLOOM_THRESHOLD = PROP_DERIVED_21,
|
||||
PROP_BLOOM_SIZE = PROP_DERIVED_22,
|
||||
PROP_FLYING_ALLOWED = PROP_DERIVED_23,
|
||||
PROP_GHOSTING_ALLOWED = PROP_DERIVED_24,
|
||||
PROP_FILTER_URL = PROP_DERIVED_25,
|
||||
PROP_KEY_LIGHT_MODE = PROP_DERIVED_26,
|
||||
PROP_AMBIENT_LIGHT_MODE = PROP_DERIVED_27,
|
||||
PROP_SKYBOX_MODE = PROP_DERIVED_28,
|
||||
PROP_HAZE_MODE = PROP_DERIVED_29,
|
||||
PROP_BLOOM_MODE = PROP_DERIVED_30,
|
||||
|
||||
// Polyvox
|
||||
PROP_VOXEL_VOLUME_SIZE = PROP_DERIVED_0,
|
||||
PROP_VOXEL_DATA = PROP_DERIVED_1,
|
||||
PROP_VOXEL_SURFACE_STYLE = PROP_DERIVED_2,
|
||||
PROP_X_TEXTURE_URL = PROP_DERIVED_3,
|
||||
PROP_Y_TEXTURE_URL = PROP_DERIVED_4,
|
||||
PROP_Z_TEXTURE_URL = PROP_DERIVED_5,
|
||||
PROP_X_N_NEIGHBOR_ID = PROP_DERIVED_6,
|
||||
PROP_Y_N_NEIGHBOR_ID = PROP_DERIVED_7,
|
||||
PROP_Z_N_NEIGHBOR_ID = PROP_DERIVED_8,
|
||||
PROP_X_P_NEIGHBOR_ID = PROP_DERIVED_9,
|
||||
PROP_Y_P_NEIGHBOR_ID = PROP_DERIVED_10,
|
||||
PROP_Z_P_NEIGHBOR_ID = PROP_DERIVED_11,
|
||||
|
||||
// Web
|
||||
PROP_SOURCE_URL = PROP_DERIVED_0,
|
||||
PROP_DPI = PROP_DERIVED_1,
|
||||
|
||||
// Polyline
|
||||
PROP_LINE_POINTS = PROP_DERIVED_0,
|
||||
PROP_STROKE_WIDTHS = PROP_DERIVED_1,
|
||||
PROP_STROKE_NORMALS = PROP_DERIVED_2,
|
||||
PROP_STROKE_COLORS = PROP_DERIVED_3,
|
||||
PROP_IS_UV_MODE_STRETCH = PROP_DERIVED_4,
|
||||
PROP_LINE_GLOW = PROP_DERIVED_5,
|
||||
PROP_LINE_FACE_CAMERA = PROP_DERIVED_6,
|
||||
|
||||
// Shape
|
||||
PROP_SHAPE = PROP_DERIVED_0,
|
||||
|
||||
// Material
|
||||
PROP_MATERIAL_URL = PROP_DERIVED_0,
|
||||
PROP_MATERIAL_MAPPING_MODE = PROP_DERIVED_1,
|
||||
PROP_MATERIAL_PRIORITY = PROP_DERIVED_2,
|
||||
PROP_PARENT_MATERIAL_NAME = PROP_DERIVED_3,
|
||||
PROP_MATERIAL_MAPPING_POS = PROP_DERIVED_4,
|
||||
PROP_MATERIAL_MAPPING_SCALE = PROP_DERIVED_5,
|
||||
PROP_MATERIAL_MAPPING_ROT = PROP_DERIVED_6,
|
||||
PROP_MATERIAL_DATA = PROP_DERIVED_7,
|
||||
PROP_MATERIAL_REPEAT = PROP_DERIVED_8,
|
||||
|
||||
// Image
|
||||
PROP_IMAGE_URL = PROP_DERIVED_0,
|
||||
PROP_EMISSIVE = PROP_DERIVED_1,
|
||||
PROP_KEEP_ASPECT_RATIO = PROP_DERIVED_2,
|
||||
PROP_SUB_IMAGE = PROP_DERIVED_3,
|
||||
|
||||
// Grid
|
||||
PROP_GRID_FOLLOW_CAMERA = PROP_DERIVED_0,
|
||||
PROP_MAJOR_GRID_EVERY = PROP_DERIVED_1,
|
||||
PROP_MINOR_GRID_EVERY = PROP_DERIVED_2,
|
||||
|
||||
// WARNING!!! DO NOT ADD PROPS_xxx here unless you really really meant to.... Add them UP above
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1519,46 +1519,6 @@ bool EntityScriptingInterface::polyVoxWorker(QUuid entityID, std::function<bool(
|
|||
return result;
|
||||
}
|
||||
|
||||
bool EntityScriptingInterface::setPoints(QUuid entityID, std::function<bool(LineEntityItem&)> actor) {
|
||||
PROFILE_RANGE(script_entities, __FUNCTION__);
|
||||
|
||||
if (!_entityTree) {
|
||||
return false;
|
||||
}
|
||||
|
||||
EntityItemPointer entity = static_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID));
|
||||
if (!entity) {
|
||||
qCDebug(entities) << "EntityScriptingInterface::setPoints no entity with ID" << entityID;
|
||||
}
|
||||
|
||||
EntityTypes::EntityType entityType = entity->getType();
|
||||
|
||||
if (entityType != EntityTypes::Line) {
|
||||
return false;
|
||||
}
|
||||
|
||||
auto now = usecTimestampNow();
|
||||
|
||||
auto lineEntity = std::static_pointer_cast<LineEntityItem>(entity);
|
||||
bool success;
|
||||
_entityTree->withWriteLock([&] {
|
||||
success = actor(*lineEntity);
|
||||
entity->setLastEdited(now);
|
||||
entity->setLastBroadcast(now);
|
||||
});
|
||||
|
||||
EntityItemProperties properties;
|
||||
_entityTree->withReadLock([&] {
|
||||
properties = entity->getProperties();
|
||||
});
|
||||
|
||||
properties.setLinePointsDirty();
|
||||
properties.setLastEdited(now);
|
||||
|
||||
queueEntityMessage(PacketType::EntityEdit, entityID, properties);
|
||||
return success;
|
||||
}
|
||||
|
||||
bool EntityScriptingInterface::setVoxelSphere(QUuid entityID, const glm::vec3& center, float radius, int value) {
|
||||
PROFILE_RANGE(script_entities, __FUNCTION__);
|
||||
return polyVoxWorker(entityID, [center, radius, value](PolyVoxEntityItem& polyVoxEntity) {
|
||||
|
|
@ -1601,49 +1561,6 @@ bool EntityScriptingInterface::setVoxelsInCuboid(QUuid entityID, const glm::vec3
|
|||
});
|
||||
}
|
||||
|
||||
bool EntityScriptingInterface::setAllPoints(QUuid entityID, const QVector<glm::vec3>& points) {
|
||||
PROFILE_RANGE(script_entities, __FUNCTION__);
|
||||
|
||||
EntityItemPointer entity = static_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID));
|
||||
if (!entity) {
|
||||
qCDebug(entities) << "EntityScriptingInterface::setPoints no entity with ID" << entityID;
|
||||
}
|
||||
|
||||
EntityTypes::EntityType entityType = entity->getType();
|
||||
|
||||
if (entityType == EntityTypes::Line) {
|
||||
return setPoints(entityID, [points](LineEntityItem& lineEntity) -> bool
|
||||
{
|
||||
return (LineEntityItem*)lineEntity.setLinePoints(points);
|
||||
});
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool EntityScriptingInterface::appendPoint(QUuid entityID, const glm::vec3& point) {
|
||||
PROFILE_RANGE(script_entities, __FUNCTION__);
|
||||
|
||||
EntityItemPointer entity = static_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID));
|
||||
if (!entity) {
|
||||
qCDebug(entities) << "EntityScriptingInterface::setPoints no entity with ID" << entityID;
|
||||
// There is no entity
|
||||
return false;
|
||||
}
|
||||
|
||||
EntityTypes::EntityType entityType = entity->getType();
|
||||
|
||||
if (entityType == EntityTypes::Line) {
|
||||
return setPoints(entityID, [point](LineEntityItem& lineEntity) -> bool
|
||||
{
|
||||
return (LineEntityItem*)lineEntity.appendPoint(point);
|
||||
});
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
bool EntityScriptingInterface::actionWorker(const QUuid& entityID,
|
||||
std::function<bool(EntitySimulationPointer, EntityItemPointer)> actor) {
|
||||
if (!_entityTree) {
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
#include <PointerEvent.h>
|
||||
|
||||
#include "PolyVoxEntityItem.h"
|
||||
#include "LineEntityItem.h"
|
||||
#include "PolyLineEntityItem.h"
|
||||
#include "EntityTree.h"
|
||||
|
||||
|
|
@ -861,75 +860,12 @@ public slots:
|
|||
// FIXME move to a renderable entity interface
|
||||
Q_INVOKABLE glm::vec3 localCoordsToVoxelCoords(const QUuid& entityID, glm::vec3 localCoords);
|
||||
|
||||
/**jsdoc
|
||||
* Set the <code>linePoints</code> property of a {@link Entities.EntityType|Line} entity.
|
||||
* @function Entities.setAllPoints
|
||||
* @param {Uuid} entityID - The ID of the {@link Entities.EntityType|Line} entity.
|
||||
* @param {Vec3[]} points - The array of points to set the entity's <code>linePoints</code> property to.
|
||||
* @returns {boolean} <code>true</code> if the entity's property was updated, otherwise <code>false</code>. The property
|
||||
* may fail to be updated if the entity does not exist, the entity is not a {@link Entities.EntityType|Line} entity,
|
||||
* one of the points is outside the entity's dimensions, or the number of points is greater than the maximum allowed.
|
||||
* @example <caption>Change the shape of a Line entity.</caption>
|
||||
* // Draw a horizontal line between two points.
|
||||
* var entity = Entities.addEntity({
|
||||
* type: "Line",
|
||||
* position: Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, y: 0.75, z: -5 })),
|
||||
* rotation: MyAvatar.orientation,
|
||||
* dimensions: { x: 2, y: 2, z: 1 },
|
||||
* linePoints: [
|
||||
* { x: -1, y: 0, z: 0 },
|
||||
* { x:1, y: -0, z: 0 }
|
||||
* ],
|
||||
* color: { red: 255, green: 0, blue: 0 },
|
||||
* lifetime: 300 // Delete after 5 minutes.
|
||||
* });
|
||||
*
|
||||
* // Change the line to be a "V".
|
||||
* Script.setTimeout(function () {
|
||||
* Entities.setAllPoints(entity, [
|
||||
* { x: -1, y: 1, z: 0 },
|
||||
* { x: 0, y: -1, z: 0 },
|
||||
* { x: 1, y: 1, z: 0 },
|
||||
* ]);
|
||||
* }, 2000);
|
||||
*/
|
||||
Q_INVOKABLE bool setAllPoints(QUuid entityID, const QVector<glm::vec3>& points);
|
||||
|
||||
/**jsdoc
|
||||
* Append a point to a {@link Entities.EntityType|Line} entity.
|
||||
* @function Entities.appendPoint
|
||||
* @param {Uuid} entityID - The ID of the {@link Entities.EntityType|Line} entity.
|
||||
* @param {Vec3} point - The point to add to the line. The coordinates are relative to the entity's position.
|
||||
* @returns {boolean} <code>true</code> if the point was added to the line, otherwise <code>false</code>. The point may
|
||||
* fail to be added if the entity does not exist, the entity is not a {@link Entities.EntityType|Line} entity, the
|
||||
* point is outside the entity's dimensions, or the maximum number of points has been reached.
|
||||
* @example <caption>Append a point to a Line entity.</caption>
|
||||
* // Draw a line between two points.
|
||||
* var entity = Entities.addEntity({
|
||||
* type: "Line",
|
||||
* position: Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, y: 0.75, z: -5 })),
|
||||
* rotation: MyAvatar.orientation,
|
||||
* dimensions: { x: 2, y: 2, z: 1 },
|
||||
* linePoints: [
|
||||
* { x: -1, y: 1, z: 0 },
|
||||
* { x: 0, y: -1, z: 0 }
|
||||
* ],
|
||||
* color: { red: 255, green: 0, blue: 0 },
|
||||
* lifetime: 300 // Delete after 5 minutes.
|
||||
* });
|
||||
*
|
||||
* // Add a third point to create a "V".
|
||||
* Entities.appendPoint(entity, { x: 1, y: 1, z: 0 });
|
||||
*/
|
||||
Q_INVOKABLE bool appendPoint(QUuid entityID, const glm::vec3& point);
|
||||
|
||||
/**jsdoc
|
||||
* Dumps debug information about all entities in Interface's local in-memory tree of entities it knows about to the program log.
|
||||
* @function Entities.dumpTree
|
||||
*/
|
||||
Q_INVOKABLE void dumpTree() const;
|
||||
|
||||
|
||||
/**jsdoc
|
||||
* Add an action to an entity. An action is registered with the physics engine and is applied every physics simulation
|
||||
* step. Any entity may have more than one action associated with it, but only as many as will fit in an entity's
|
||||
|
|
@ -1978,7 +1914,6 @@ private slots:
|
|||
private:
|
||||
bool actionWorker(const QUuid& entityID, std::function<bool(EntitySimulationPointer, EntityItemPointer)> actor);
|
||||
bool polyVoxWorker(QUuid entityID, std::function<bool(PolyVoxEntityItem&)> actor);
|
||||
bool setPoints(QUuid entityID, std::function<bool(LineEntityItem&)> actor);
|
||||
void queueEntityMessage(PacketType packetType, EntityItemID entityID, const EntityItemProperties& properties);
|
||||
bool addLocalEntityCopy(EntityItemProperties& propertiesWithSimID, EntityItemID& id, bool isClone = false);
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
#include "TextEntityItem.h"
|
||||
#include "ImageEntityItem.h"
|
||||
#include "WebEntityItem.h"
|
||||
#include "LineEntityItem.h"
|
||||
#include "PolyLineEntityItem.h"
|
||||
#include "PolyVoxEntityItem.h"
|
||||
#include "GridEntityItem.h"
|
||||
|
|
@ -50,7 +49,6 @@ REGISTER_ENTITY_TYPE(Text)
|
|||
REGISTER_ENTITY_TYPE(Image)
|
||||
REGISTER_ENTITY_TYPE(Web)
|
||||
REGISTER_ENTITY_TYPE(ParticleEffect)
|
||||
REGISTER_ENTITY_TYPE(Line)
|
||||
REGISTER_ENTITY_TYPE(PolyLine)
|
||||
REGISTER_ENTITY_TYPE(PolyVox)
|
||||
REGISTER_ENTITY_TYPE(Grid)
|
||||
|
|
|
|||
|
|
@ -70,8 +70,6 @@ public:
|
|||
* <tr><td><code>"ParticleEffect"</code></td><td>A particle system that can be used to simulate things such as fire,
|
||||
* smoke, snow, magic spells, etc.</td>
|
||||
* <td>{@link Entities.EntityProperties-ParticleEffect|EntityProperties-ParticleEffect}</td></tr>
|
||||
* <tr><td><code>"Line"</code></td><td>A sequence of one or more simple straight lines.</td>
|
||||
* <td>{@link Entities.EntityProperties-Line|EntityProperties-Line}</td></tr>
|
||||
* <tr><td><code>"PolyLine"</code></td><td>A sequence of one or more textured straight lines.</td>
|
||||
* <td>{@link Entities.EntityProperties-PolyLine|EntityProperties-PolyLine}</td></tr>
|
||||
* <tr><td><code>"PolyVox"</code></td><td>A set of textured voxels.</td>
|
||||
|
|
@ -99,7 +97,6 @@ public:
|
|||
Image,
|
||||
Web,
|
||||
ParticleEffect,
|
||||
Line,
|
||||
PolyLine,
|
||||
PolyVox,
|
||||
Grid,
|
||||
|
|
|
|||
|
|
@ -1,191 +0,0 @@
|
|||
//
|
||||
// LineEntityItem.cpp
|
||||
// libraries/entities/src
|
||||
//
|
||||
// Created by Seth Alves on 5/11/15.
|
||||
// Copyright 2015 High Fidelity, Inc.
|
||||
//
|
||||
// Distributed under the Apache License, Version 2.0.
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
#include "LineEntityItem.h"
|
||||
|
||||
#include <QDebug>
|
||||
|
||||
#include <ByteCountCoding.h>
|
||||
|
||||
#include "EntitiesLogging.h"
|
||||
#include "EntityItemProperties.h"
|
||||
#include "EntityTree.h"
|
||||
#include "EntityTreeElement.h"
|
||||
#include "OctreeConstants.h"
|
||||
|
||||
const float LineEntityItem::DEFAULT_LINE_WIDTH = 2.0f;
|
||||
const int LineEntityItem::MAX_POINTS_PER_LINE = 70;
|
||||
|
||||
|
||||
EntityItemPointer LineEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
|
||||
EntityItemPointer entity(new LineEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
|
||||
entity->setProperties(properties);
|
||||
return entity;
|
||||
}
|
||||
|
||||
LineEntityItem::LineEntityItem(const EntityItemID& entityItemID) :
|
||||
EntityItem(entityItemID)
|
||||
{
|
||||
_type = EntityTypes::Line;
|
||||
}
|
||||
|
||||
EntityItemProperties LineEntityItem::getProperties(const EntityPropertyFlags& desiredProperties, bool allowEmptyDesiredProperties) const {
|
||||
|
||||
EntityItemProperties properties = EntityItem::getProperties(desiredProperties, allowEmptyDesiredProperties); // get the properties from our base class
|
||||
|
||||
COPY_ENTITY_PROPERTY_TO_PROPERTIES(color, getColor);
|
||||
COPY_ENTITY_PROPERTY_TO_PROPERTIES(lineWidth, getLineWidth);
|
||||
COPY_ENTITY_PROPERTY_TO_PROPERTIES(linePoints, getLinePoints);
|
||||
|
||||
return properties;
|
||||
}
|
||||
|
||||
bool LineEntityItem::setProperties(const EntityItemProperties& properties) {
|
||||
bool somethingChanged = false;
|
||||
somethingChanged = EntityItem::setProperties(properties); // set the properties in our base class
|
||||
|
||||
SET_ENTITY_PROPERTY_FROM_PROPERTIES(color, setColor);
|
||||
SET_ENTITY_PROPERTY_FROM_PROPERTIES(lineWidth, setLineWidth);
|
||||
SET_ENTITY_PROPERTY_FROM_PROPERTIES(linePoints, setLinePoints);
|
||||
|
||||
if (somethingChanged) {
|
||||
bool wantDebug = false;
|
||||
if (wantDebug) {
|
||||
uint64_t now = usecTimestampNow();
|
||||
int elapsed = now - getLastEdited();
|
||||
qCDebug(entities) << "LineEntityItem::setProperties() AFTER update... edited AGO=" << elapsed <<
|
||||
"now=" << now << " getLastEdited()=" << getLastEdited();
|
||||
}
|
||||
setLastEdited(properties._lastEdited);
|
||||
}
|
||||
return somethingChanged;
|
||||
}
|
||||
|
||||
bool LineEntityItem::appendPoint(const glm::vec3& point) {
|
||||
if (_points.size() > MAX_POINTS_PER_LINE - 1) {
|
||||
qCDebug(entities) << "MAX POINTS REACHED!";
|
||||
return false;
|
||||
}
|
||||
glm::vec3 halfBox = getScaledDimensions() * 0.5f;
|
||||
if ( (point.x < - halfBox.x || point.x > halfBox.x) || (point.y < -halfBox.y || point.y > halfBox.y) || (point.z < - halfBox.z || point.z > halfBox.z) ) {
|
||||
qCDebug(entities) << "Point is outside entity's bounding box";
|
||||
return false;
|
||||
}
|
||||
withWriteLock([&] {
|
||||
_points << point;
|
||||
_pointsChanged = true;
|
||||
});
|
||||
return true;
|
||||
}
|
||||
|
||||
bool LineEntityItem::setLinePoints(const QVector<glm::vec3>& points) {
|
||||
if (points.size() > MAX_POINTS_PER_LINE) {
|
||||
return false;
|
||||
}
|
||||
glm::vec3 halfBox = getScaledDimensions() * 0.5f;
|
||||
for (int i = 0; i < points.size(); i++) {
|
||||
glm::vec3 point = points.at(i);
|
||||
if ( (point.x < - halfBox.x || point.x > halfBox.x) || (point.y < -halfBox.y || point.y > halfBox.y) || (point.z < - halfBox.z || point.z > halfBox.z) ) {
|
||||
qCDebug(entities) << "Point is outside entity's bounding box";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
withWriteLock([&] {
|
||||
_points = points;
|
||||
_pointsChanged = true;
|
||||
});
|
||||
return true;
|
||||
}
|
||||
|
||||
int LineEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
|
||||
ReadBitstreamToTreeParams& args,
|
||||
EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
|
||||
bool& somethingChanged) {
|
||||
|
||||
int bytesRead = 0;
|
||||
const unsigned char* dataAt = data;
|
||||
|
||||
READ_ENTITY_PROPERTY(PROP_COLOR, glm::u8vec3, setColor);
|
||||
READ_ENTITY_PROPERTY(PROP_LINE_WIDTH, float, setLineWidth);
|
||||
READ_ENTITY_PROPERTY(PROP_LINE_POINTS, QVector<glm::vec3>, setLinePoints);
|
||||
|
||||
return bytesRead;
|
||||
}
|
||||
|
||||
|
||||
EntityPropertyFlags LineEntityItem::getEntityProperties(EncodeBitstreamParams& params) const {
|
||||
EntityPropertyFlags requestedProperties = EntityItem::getEntityProperties(params);
|
||||
requestedProperties += PROP_COLOR;
|
||||
requestedProperties += PROP_LINE_WIDTH;
|
||||
requestedProperties += PROP_LINE_POINTS;
|
||||
return requestedProperties;
|
||||
}
|
||||
|
||||
void LineEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
|
||||
EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
|
||||
EntityPropertyFlags& requestedProperties,
|
||||
EntityPropertyFlags& propertyFlags,
|
||||
EntityPropertyFlags& propertiesDidntFit,
|
||||
int& propertyCount,
|
||||
OctreeElement::AppendState& appendState) const {
|
||||
|
||||
bool successPropertyFits = true;
|
||||
|
||||
APPEND_ENTITY_PROPERTY(PROP_COLOR, getColor());
|
||||
APPEND_ENTITY_PROPERTY(PROP_LINE_WIDTH, getLineWidth());
|
||||
APPEND_ENTITY_PROPERTY(PROP_LINE_POINTS, getLinePoints());
|
||||
}
|
||||
|
||||
void LineEntityItem::debugDump() const {
|
||||
quint64 now = usecTimestampNow();
|
||||
qCDebug(entities) << " LINE EntityItem id:" << getEntityItemID() << "---------------------------------------------";
|
||||
qCDebug(entities) << " color:" << _color;
|
||||
qCDebug(entities) << " position:" << debugTreeVector(getWorldPosition());
|
||||
qCDebug(entities) << " dimensions:" << debugTreeVector(getScaledDimensions());
|
||||
qCDebug(entities) << " getLastEdited:" << debugTime(getLastEdited(), now);
|
||||
}
|
||||
|
||||
glm::u8vec3 LineEntityItem::getColor() const {
|
||||
return resultWithReadLock<glm::u8vec3>([&] {
|
||||
return _color;
|
||||
});
|
||||
}
|
||||
|
||||
void LineEntityItem::setColor(const glm::u8vec3& value) {
|
||||
withWriteLock([&] {
|
||||
_color = value;
|
||||
});
|
||||
}
|
||||
|
||||
void LineEntityItem::setLineWidth(float lineWidth) {
|
||||
withWriteLock([&] {
|
||||
_lineWidth = lineWidth;
|
||||
});
|
||||
}
|
||||
|
||||
float LineEntityItem::getLineWidth() const {
|
||||
return resultWithReadLock<bool>([&] {
|
||||
return _lineWidth;
|
||||
});
|
||||
}
|
||||
|
||||
QVector<glm::vec3> LineEntityItem::getLinePoints() const {
|
||||
return resultWithReadLock<QVector<glm::vec3>>([&] {
|
||||
return _points;
|
||||
});
|
||||
}
|
||||
|
||||
void LineEntityItem::resetPointsChanged() {
|
||||
withWriteLock([&] {
|
||||
_pointsChanged = false;
|
||||
});
|
||||
}
|
||||
|
|
@ -1,82 +0,0 @@
|
|||
//
|
||||
// LineEntityItem.h
|
||||
// libraries/entities/src
|
||||
//
|
||||
// Created by Seth Alves on 5/11/15.
|
||||
// Copyright 2015 High Fidelity, Inc.
|
||||
//
|
||||
// Distributed under the Apache License, Version 2.0.
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
#ifndef hifi_LineEntityItem_h
|
||||
#define hifi_LineEntityItem_h
|
||||
|
||||
#include "EntityItem.h"
|
||||
|
||||
class LineEntityItem : public EntityItem {
|
||||
public:
|
||||
static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
|
||||
|
||||
LineEntityItem(const EntityItemID& entityItemID);
|
||||
|
||||
ALLOW_INSTANTIATION // This class can be instantiated
|
||||
|
||||
// methods for getting/setting all properties of an entity
|
||||
virtual EntityItemProperties getProperties(const EntityPropertyFlags& desiredProperties, bool allowEmptyDesiredProperties) const override;
|
||||
virtual bool setProperties(const EntityItemProperties& properties) override;
|
||||
|
||||
virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
|
||||
|
||||
virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
|
||||
EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
|
||||
EntityPropertyFlags& requestedProperties,
|
||||
EntityPropertyFlags& propertyFlags,
|
||||
EntityPropertyFlags& propertiesDidntFit,
|
||||
int& propertyCount,
|
||||
OctreeElement::AppendState& appendState) const override;
|
||||
|
||||
virtual int readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
|
||||
ReadBitstreamToTreeParams& args,
|
||||
EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
|
||||
bool& somethingChanged) override;
|
||||
|
||||
glm::u8vec3 getColor() const;
|
||||
void setColor(const glm::u8vec3& value);
|
||||
|
||||
void setLineWidth(float lineWidth);
|
||||
float getLineWidth() const;
|
||||
|
||||
bool setLinePoints(const QVector<glm::vec3>& points);
|
||||
bool appendPoint(const glm::vec3& point);
|
||||
|
||||
QVector<glm::vec3> getLinePoints() const;
|
||||
|
||||
virtual ShapeType getShapeType() const override { return SHAPE_TYPE_NONE; }
|
||||
|
||||
// never have a ray intersection pick a LineEntityItem.
|
||||
virtual bool supportsDetailedIntersection() const override { return true; }
|
||||
virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
|
||||
OctreeElementPointer& element, float& distance,
|
||||
BoxFace& face, glm::vec3& surfaceNormal,
|
||||
QVariantMap& extraInfo,
|
||||
bool precisionPicking) const override { return false; }
|
||||
virtual bool findDetailedParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity,
|
||||
const glm::vec3& acceleration, OctreeElementPointer& element, float& parabolicDistance,
|
||||
BoxFace& face, glm::vec3& surfaceNormal,
|
||||
QVariantMap& extraInfo,
|
||||
bool precisionPicking) const override { return false; }
|
||||
bool pointsChanged() const { return _pointsChanged; }
|
||||
void resetPointsChanged();
|
||||
virtual void debugDump() const override;
|
||||
static const float DEFAULT_LINE_WIDTH;
|
||||
static const int MAX_POINTS_PER_LINE;
|
||||
|
||||
private:
|
||||
glm::u8vec3 _color;
|
||||
float _lineWidth { DEFAULT_LINE_WIDTH };
|
||||
QVector<glm::vec3> _points;
|
||||
bool _pointsChanged { true };
|
||||
};
|
||||
|
||||
#endif // hifi_LineEntityItem_h
|
||||
|
|
@ -41,14 +41,15 @@ EntityItemProperties PolyLineEntityItem::getProperties(const EntityPropertyFlags
|
|||
EntityItemProperties properties = EntityItem::getProperties(desiredProperties, allowEmptyDesiredProperties); // get the properties from our base class
|
||||
|
||||
COPY_ENTITY_PROPERTY_TO_PROPERTIES(color, getColor);
|
||||
COPY_ENTITY_PROPERTY_TO_PROPERTIES(lineWidth, getLineWidth);
|
||||
COPY_ENTITY_PROPERTY_TO_PROPERTIES(linePoints, getLinePoints);
|
||||
|
||||
COPY_ENTITY_PROPERTY_TO_PROPERTIES(strokeWidths, getStrokeWidths);
|
||||
COPY_ENTITY_PROPERTY_TO_PROPERTIES(normals, getNormals);
|
||||
COPY_ENTITY_PROPERTY_TO_PROPERTIES(strokeColors, getStrokeColors);
|
||||
COPY_ENTITY_PROPERTY_TO_PROPERTIES(strokeWidths, getStrokeWidths);
|
||||
COPY_ENTITY_PROPERTY_TO_PROPERTIES(textures, getTextures);
|
||||
COPY_ENTITY_PROPERTY_TO_PROPERTIES(isUVModeStretch, getIsUVModeStretch);
|
||||
COPY_ENTITY_PROPERTY_TO_PROPERTIES(glow, getGlow);
|
||||
COPY_ENTITY_PROPERTY_TO_PROPERTIES(faceCamera, getFaceCamera);
|
||||
|
||||
return properties;
|
||||
}
|
||||
|
||||
|
|
@ -58,14 +59,14 @@ bool PolyLineEntityItem::setProperties(const EntityItemProperties& properties) {
|
|||
somethingChanged = EntityItem::setProperties(properties); // set the properties in our base class
|
||||
|
||||
SET_ENTITY_PROPERTY_FROM_PROPERTIES(color, setColor);
|
||||
SET_ENTITY_PROPERTY_FROM_PROPERTIES(lineWidth, setLineWidth);
|
||||
SET_ENTITY_PROPERTY_FROM_PROPERTIES(linePoints, setLinePoints);
|
||||
|
||||
SET_ENTITY_PROPERTY_FROM_PROPERTIES(strokeWidths, setStrokeWidths);
|
||||
SET_ENTITY_PROPERTY_FROM_PROPERTIES(normals, setNormals);
|
||||
SET_ENTITY_PROPERTY_FROM_PROPERTIES(strokeColors, setStrokeColors);
|
||||
SET_ENTITY_PROPERTY_FROM_PROPERTIES(strokeWidths, setStrokeWidths);
|
||||
SET_ENTITY_PROPERTY_FROM_PROPERTIES(textures, setTextures);
|
||||
SET_ENTITY_PROPERTY_FROM_PROPERTIES(isUVModeStretch, setIsUVModeStretch);
|
||||
SET_ENTITY_PROPERTY_FROM_PROPERTIES(glow, setGlow);
|
||||
SET_ENTITY_PROPERTY_FROM_PROPERTIES(faceCamera, setFaceCamera);
|
||||
|
||||
if (somethingChanged) {
|
||||
bool wantDebug = false;
|
||||
|
|
|
|||
|
|
@ -42,52 +42,6 @@ function jointToWorldPointTest_update(deltaTime) {
|
|||
Entities.editEntity(jointToWorldPointTest_sphereEntity, newProperties);
|
||||
}
|
||||
|
||||
//jointToWorldDirection
|
||||
// create line in world space
|
||||
// each frame calculate world space direction of players head z axis
|
||||
// update line to match
|
||||
var jointToWorldDirectionTest_lineEntity;
|
||||
function jointToWorldDirectionTest() {
|
||||
var jointIndex = MyAvatar.getJointIndex("Head");
|
||||
var avatarPos = MyAvatar.getJointPosition(jointIndex);
|
||||
|
||||
var jointDir = { x: 1, y: 0, z: 1 };
|
||||
var worldDir = MyAvatar.jointToWorldDirection(jointDir, jointIndex);
|
||||
print(worldDir.x);
|
||||
print(worldDir.y);
|
||||
print(worldDir.z);
|
||||
jointToWorldDirectionTest_lineEntity = Entities.addEntity({
|
||||
type: "Line",
|
||||
color: {red: 250, green: 0, blue: 0},
|
||||
dimensions: {x: 5, y: 5, z: 5},
|
||||
lifetime: 10.0,
|
||||
linePoints: [{
|
||||
x: 0,
|
||||
y: 0,
|
||||
z: 0
|
||||
}, worldDir
|
||||
],
|
||||
position : avatarPos,
|
||||
});
|
||||
}
|
||||
function jointToWorldDirection_update(deltaTime) {
|
||||
var jointIndex = MyAvatar.getJointIndex("Head");
|
||||
var avatarPos = MyAvatar.getJointPosition(jointIndex);
|
||||
var jointDir = { x: 1, y: 0, z: 0 };
|
||||
var worldDir = MyAvatar.jointToWorldDirection(jointDir, jointIndex);
|
||||
var newProperties = {
|
||||
linePoints: [{
|
||||
x: 0,
|
||||
y: 0,
|
||||
z: 0
|
||||
}, worldDir
|
||||
],
|
||||
position : avatarPos
|
||||
};
|
||||
|
||||
Entities.editEntity(jointToWorldDirectionTest_lineEntity, newProperties);
|
||||
}
|
||||
|
||||
//jointToWorldRotation
|
||||
// create box in world space
|
||||
// each frame calculate world space rotation of players head
|
||||
|
|
|
|||
|
|
@ -49,53 +49,6 @@ function worldToJointPointTest() {
|
|||
Entities.addEntity(worldSphereProps);
|
||||
}
|
||||
|
||||
//worldToJointDirection
|
||||
// create line and attach to avatars head
|
||||
// each frame calculate direction of world x axis in joint space of players head
|
||||
// update arrow orientation to match
|
||||
var worldToJointDirectionTest_lineEntity;
|
||||
function worldToJointDirectionTest() {
|
||||
var jointIndex = MyAvatar.getJointIndex("Head");
|
||||
|
||||
var jointPosition_WorldSpace = MyAvatar.getJointPosition(jointIndex);
|
||||
var jointOffset_WorldSpace = { x: 0, y: 0, z: 0 };
|
||||
var jointPosition_WorldSpaceOffset = Vec3.sum(jointPosition_WorldSpace, jointOffset_WorldSpace);
|
||||
var jointPosition_JointSpaceOffset = MyAvatar.worldToJointPoint(jointPosition_WorldSpaceOffset, jointIndex);
|
||||
|
||||
var worldDir = { x: 1, y: 0, z: 0 };
|
||||
var avatarDir = MyAvatar.worldToJointDirection(worldDir, jointIndex);
|
||||
|
||||
worldToJointDirectionTest_lineEntity = Entities.addEntity({
|
||||
type: "Line",
|
||||
color: {red: 200, green: 250, blue: 0},
|
||||
dimensions: {x: 5, y: 5, z: 5},
|
||||
lifetime: 10.0,
|
||||
linePoints: [{
|
||||
x: 0,
|
||||
y: 0,
|
||||
z: 0
|
||||
}, avatarDir
|
||||
],
|
||||
localPosition : jointOffset_WorldSpace,
|
||||
parentID : AVATAR_SELF_ID,
|
||||
parentJointIndex : jointIndex
|
||||
});
|
||||
}
|
||||
|
||||
function worldToJointDirectionTest_update(deltaTime) {
|
||||
var jointIndex = MyAvatar.getJointIndex("Head");
|
||||
var worldDir = { x: 1, y: 0, z: 0 };
|
||||
var avatarDir = MyAvatar.worldToJointDirection(worldDir, jointIndex);
|
||||
var newProperties = { linePoints: [{
|
||||
x: 0,
|
||||
y: 0,
|
||||
z: 0
|
||||
}, avatarDir
|
||||
]};
|
||||
|
||||
Entities.editEntity(worldToJointDirectionTest_lineEntity, newProperties);
|
||||
}
|
||||
|
||||
//worldToJointRotation
|
||||
// create box and parent to some player joint
|
||||
// convert world identity rotation to joint space rotation
|
||||
|
|
|
|||
Loading…
Reference in a new issue