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

removed _ballColor from Hand since it was never actually used

Browse source
This commit is contained in:
ZappoMan 2014-03-02 21:55:05 -08:00
parent 6ddc6132fd
commit 3479f72ec9
2 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/avatar/Hand.cpp
View file

@ -29,7 +29,6 @@ Hand::Hand(Avatar* owningAvatar) :
_owningAvatar(owningAvatar), _owningAvatar(owningAvatar),
_renderAlpha(1.0), _renderAlpha(1.0),
_ballColor(0.0, 0.0, 0.4),
_collisionCenter(0,0,0), _collisionCenter(0,0,0),
_collisionAge(0), _collisionAge(0),
_collisionDuration(0) _collisionDuration(0)
@ -37,13 +36,6 @@ Hand::Hand(Avatar* owningAvatar) :
} }
void Hand::init() { void Hand::init() {
// Different colors for my hand and others' hands
if (_owningAvatar && _owningAvatar->isMyAvatar()) {
_ballColor = glm::vec3(0.0, 0.4, 0.0);
}
else {
_ballColor = glm::vec3(0.0, 0.0, 0.4);
}
} }
void Hand::reset() { void Hand::reset() {
@ -351,7 +343,6 @@ void Hand::renderLeapHands(bool isMine) {
const float alpha = 1.0f; const float alpha = 1.0f;
//const glm::vec3 handColor = _ballColor;
const glm::vec3 handColor(1.0, 0.84, 0.66); // use the skin color const glm::vec3 handColor(1.0, 0.84, 0.66); // use the skin color
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);

2
interface/src/avatar/Hand.h
View file

@ -51,7 +51,6 @@ public:
void reset(); void reset();
void simulate(float deltaTime, bool isMine); void simulate(float deltaTime, bool isMine);
void render(bool isMine); void render(bool isMine);
void setBallColor (glm::vec3 ballColor ) { _ballColor = ballColor; }
// getters // getters
const glm::vec3& getLeapFingerTipBallPosition (int ball) const { return _leapFingerTipBalls [ball].position;} const glm::vec3& getLeapFingerTipBallPosition (int ball) const { return _leapFingerTipBalls [ball].position;}
@ -69,7 +68,6 @@ private:
Avatar* _owningAvatar; Avatar* _owningAvatar;
float _renderAlpha; float _renderAlpha;
glm::vec3 _ballColor;
std::vector<HandBall> _leapFingerTipBalls; std::vector<HandBall> _leapFingerTipBalls;
std::vector<HandBall> _leapFingerRootBalls; std::vector<HandBall> _leapFingerRootBalls;