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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Philip Rosedale 2013-04-24 13:12:40 -07:00
commit 179bdc9fa2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Head.cpp
View file

@ -1272,7 +1272,7 @@ void Head::renderBody() {
//--------------------------------------------------------- //---------------------------------------------------------
// if the hand is grasping, show it... // if the hand is grasping, show it...
//--------------------------------------------------------- //---------------------------------------------------------
if (( _usingBodySprings ) && ( getHandState() == 1 )) { if (( _usingBodySprings ) && ( _handState == 1 )) {
glPushMatrix(); glPushMatrix();
glTranslatef glTranslatef
( (

2
libraries/avatars/src/AvatarData.h
View file

@ -48,7 +48,7 @@ public:
// Hand State // Hand State
void setHandState(char s) { _handState = s; }; void setHandState(char s) { _handState = s; };
const float getHandState() const {return _handState; }; //@Philip - shouldn't this be an int or a char? const char getHandState() const {return _handState; };
// Instantaneous audio loudness to drive mouth/facial animation // Instantaneous audio loudness to drive mouth/facial animation
void setLoudness(float l) { _audioLoudness = l; }; void setLoudness(float l) { _audioLoudness = l; };