Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 17:35:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Initialize entities' _locked and _script

Browse source
This commit is contained in:
Atlante45 2015-01-02 12:37:00 -08:00
parent 8fb0ed17b7
commit 022beff569
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/entities/src/EntityItem.cpp
View file

@ -63,8 +63,8 @@ void EntityItem::initFromEntityItemID(const EntityItemID& entityItemID) {
_changedOnServer = 0; _changedOnServer = 0;
_position = glm::vec3(0,0,0); _position = glm::vec3(0,0,0);
_rotation = DEFAULT_ROTATION;
_dimensions = DEFAULT_DIMENSIONS; _dimensions = DEFAULT_DIMENSIONS;
_rotation = DEFAULT_ROTATION;
_glowLevel = DEFAULT_GLOW_LEVEL; _glowLevel = DEFAULT_GLOW_LEVEL;
_localRenderAlpha = DEFAULT_LOCAL_RENDER_ALPHA; _localRenderAlpha = DEFAULT_LOCAL_RENDER_ALPHA;
_mass = DEFAULT_MASS; _mass = DEFAULT_MASS;
@ -72,13 +72,15 @@ void EntityItem::initFromEntityItemID(const EntityItemID& entityItemID) {
_gravity = DEFAULT_GRAVITY; _gravity = DEFAULT_GRAVITY;
_damping = DEFAULT_DAMPING; _damping = DEFAULT_DAMPING;
_lifetime = DEFAULT_LIFETIME; _lifetime = DEFAULT_LIFETIME;
_userData = DEFAULT_USER_DATA; _script = DEFAULT_SCRIPT;
_registrationPoint = DEFAULT_REGISTRATION_POINT; _registrationPoint = DEFAULT_REGISTRATION_POINT;
_angularVelocity = DEFAULT_ANGULAR_VELOCITY; _angularVelocity = DEFAULT_ANGULAR_VELOCITY;
_angularDamping = DEFAULT_ANGULAR_DAMPING; _angularDamping = DEFAULT_ANGULAR_DAMPING;
_visible = DEFAULT_VISIBLE; _visible = DEFAULT_VISIBLE;
_ignoreForCollisions = DEFAULT_IGNORE_FOR_COLLISIONS; _ignoreForCollisions = DEFAULT_IGNORE_FOR_COLLISIONS;
_collisionsWillMove = DEFAULT_COLLISIONS_WILL_MOVE; _collisionsWillMove = DEFAULT_COLLISIONS_WILL_MOVE;
_locked = DEFAULT_LOCKED;
_userData = DEFAULT_USER_DATA;
recalculateCollisionShape(); recalculateCollisionShape();
} }