Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 13:28:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Changed velocity to be dvec3

Browse source
This commit is contained in:
Philip Rosedale 2013-04-25 10:18:30 -07:00
parent b9fb888073
commit 9e62728c33
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Avatar.cpp
View file

@ -442,10 +442,10 @@ void Avatar::simulate(float deltaTime) {
_bodyYawDelta *= (1.0 - TEST_YAW_DECAY * deltaTime); _bodyYawDelta *= (1.0 - TEST_YAW_DECAY * deltaTime);
// add thrust to velocity // add thrust to velocity
_velocity += glm::dvec3(_thrust * deltaTime); _velocity += _thrust * deltaTime;
// update position by velocity // update position by velocity
_position += (glm::vec3)_velocity * deltaTime; _position += _velocity * deltaTime;
// decay velocity // decay velocity
_velocity *= ( 1.0 - LIN_VEL_DECAY * deltaTime ); _velocity *= ( 1.0 - LIN_VEL_DECAY * deltaTime );

2
interface/src/Avatar.h
View file

@ -236,7 +236,7 @@ class Avatar : public AvatarData {
AvatarBone _bone[ NUM_AVATAR_BONES ]; AvatarBone _bone[ NUM_AVATAR_BONES ];
AvatarMode _mode; AvatarMode _mode;
AvatarHandHolding _handHolding; AvatarHandHolding _handHolding;
glm::dvec3 _velocity; glm::vec3 _velocity;
glm::vec3 _thrust; glm::vec3 _thrust;
float _maxArmLength; float _maxArmLength;
Orientation _orientation; Orientation _orientation;