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

remove unused GLUQuadric sphere from Avatar class

Browse source
This commit is contained in:
Stephen Birarda 2013-05-17 10:45:26 -07:00
parent 0e7c0776f2
commit a1ea7b58dd
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/Avatar.cpp
View file

@ -60,7 +60,6 @@ float chatMessageHeight = 0.45;
Avatar::Avatar(bool isMine) { Avatar::Avatar(bool isMine) {
_orientation.setToIdentity(); _orientation.setToIdentity();
_velocity = glm::vec3(0.0f, 0.0f, 0.0f); _velocity = glm::vec3(0.0f, 0.0f, 0.0f);
@ -94,7 +93,6 @@ Avatar::Avatar(bool isMine) {
for (int i = 0; i < MAX_DRIVE_KEYS; i++) _driveKeys[i] = false; for (int i = 0; i < MAX_DRIVE_KEYS; i++) _driveKeys[i] = false;
_movedHandOffset = glm::vec3(0.0f, 0.0f, 0.0f); _movedHandOffset = glm::vec3(0.0f, 0.0f, 0.0f);
_sphere = NULL;
_handHoldingPosition = glm::vec3(0.0f, 0.0f, 0.0f); _handHoldingPosition = glm::vec3(0.0f, 0.0f, 0.0f);
_distanceToNearestAvatar = std::numeric_limits<float>::max(); _distanceToNearestAvatar = std::numeric_limits<float>::max();
_gravity = glm::vec3(0.0f, -1.0f, 0.0f); _gravity = glm::vec3(0.0f, -1.0f, 0.0f);
@ -109,7 +107,7 @@ Avatar::Avatar(bool isMine) {
else { _balls = NULL; } else { _balls = NULL; }
} }
Avatar::Avatar(const Avatar &otherAvatar) :_head(otherAvatar._head) { //include the copy constructor for head Avatar::Avatar(const Avatar &otherAvatar) : _head(otherAvatar._head) { //include the copy constructor for head
_velocity = otherAvatar._velocity; _velocity = otherAvatar._velocity;
_thrust = otherAvatar._thrust; _thrust = otherAvatar._thrust;
@ -138,8 +136,6 @@ Avatar::Avatar(const Avatar &otherAvatar) :_head(otherAvatar._head) { //include
_orientation.set(otherAvatar._orientation); _orientation.set(otherAvatar._orientation);
_sphere = NULL;
initializeSkeleton(); initializeSkeleton();
for (int i = 0; i < MAX_DRIVE_KEYS; i++) _driveKeys[i] = otherAvatar._driveKeys[i]; for (int i = 0; i < MAX_DRIVE_KEYS; i++) _driveKeys[i] = otherAvatar._driveKeys[i];
@ -150,12 +146,6 @@ Avatar::Avatar(const Avatar &otherAvatar) :_head(otherAvatar._head) { //include
} }
Avatar::~Avatar() {
if (_sphere != NULL) {
gluDeleteQuadric(_sphere);
}
}
Avatar* Avatar::clone() const { Avatar* Avatar::clone() const {
return new Avatar(*this); return new Avatar(*this);
} }

1
interface/src/Avatar.h
View file

@ -179,7 +179,6 @@ private:
float _maxArmLength; float _maxArmLength;
Orientation _orientation; Orientation _orientation;
int _driveKeys[MAX_DRIVE_KEYS]; int _driveKeys[MAX_DRIVE_KEYS];
GLUquadric* _sphere;
float _renderYaw; float _renderYaw;
float _renderPitch; // Pitch from view frustum when this is own head float _renderPitch; // Pitch from view frustum when this is own head
bool _transmitterIsFirstData; bool _transmitterIsFirstData;