Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 18:01:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved members to MyAvatar

Browse source
This commit is contained in:
Atlante45 2014-08-18 16:25:38 -07:00
parent 698699dea8
commit c113dd350e
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/avatar/Avatar.cpp
View file

@ -64,7 +64,6 @@ Avatar::Avatar() :
_mouseRayDirection(0.0f, 0.0f, 0.0f), _mouseRayDirection(0.0f, 0.0f, 0.0f),
_moving(false), _moving(false),
_collisionGroups(0), _collisionGroups(0),
_player(NULL),
_initialized(false), _initialized(false),
_shouldRenderBillboard(true) _shouldRenderBillboard(true)
{ {

3
interface/src/avatar/Avatar.h
View file

@ -188,9 +188,6 @@ protected:
bool _moving; ///< set when position is changing bool _moving; ///< set when position is changing
quint32 _collisionGroups; quint32 _collisionGroups;
RecorderPointer _recorder;
PlayerPointer _player;
// protected methods... // protected methods...
glm::vec3 getBodyRightDirection() const { return getOrientation() * IDENTITY_RIGHT; } glm::vec3 getBodyRightDirection() const { return getOrientation() * IDENTITY_RIGHT; }

3
interface/src/avatar/MyAvatar.h
View file

@ -205,6 +205,9 @@ private:
QList<AnimationHandlePointer> _animationHandles; QList<AnimationHandlePointer> _animationHandles;
PhysicsSimulation _physicsSimulation; PhysicsSimulation _physicsSimulation;
RecorderPointer _recorder;
PlayerPointer _player;
// private methods // private methods
float computeDistanceToFloor(const glm::vec3& startPoint); float computeDistanceToFloor(const glm::vec3& startPoint);
void updateOrientation(float deltaTime); void updateOrientation(float deltaTime);