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

working with Eric to fix transmission of hand data

Browse source
This commit is contained in:
Jeffrey Ventrella 2013-08-05 17:00:50 -07:00
parent 2dbd0f7f31
commit 4ceba28632
2 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,6 +42,9 @@ void Hand::init() {
else { else {
_ballColor = glm::vec3(0.0, 0.0, 0.4); _ballColor = glm::vec3(0.0, 0.0, 0.4);
} }
_raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_NULL;
_raveGloveEffectsModeChanged = false;
} }
void Hand::reset() { void Hand::reset() {
@ -51,6 +54,14 @@ void Hand::reset() {
void Hand::simulate(float deltaTime, bool isMine) { void Hand::simulate(float deltaTime, bool isMine) {
if (_isRaveGloveActive) { if (_isRaveGloveActive) {
if (_raveGloveEffectsModeChanged) {
printf( "_raveGloveEffectsMode = %d\n", _raveGloveEffectsMode);
setRaveGloveMode(_raveGloveEffectsMode);
_raveGloveEffectsModeChanged = false;
}
updateRaveGloveParticles(deltaTime); updateRaveGloveParticles(deltaTime);
} }
} }
@ -106,18 +117,21 @@ void Hand::calculateGeometry() {
} }
void Hand::setRaveGloveEffectsMode(QKeyEvent* event) { void Hand::setRaveGloveEffectsMode(QKeyEvent* event) {
_raveGloveEffectsModeChanged = true;
switch (event->key()) { switch (event->key()) {
case Qt::Key_0: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_THROBBING_COLOR); break; case Qt::Key_0: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_THROBBING_COLOR; break;
case Qt::Key_1: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_TRAILS ); break; case Qt::Key_1: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_TRAILS; break;
case Qt::Key_2: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_FIRE ); break; case Qt::Key_2: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_FIRE; break;
case Qt::Key_3: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_WATER ); break; case Qt::Key_3: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_WATER; break;
case Qt::Key_4: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_FLASHY ); break; case Qt::Key_4: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_FLASHY; break;
case Qt::Key_5: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_BOZO_SPARKLER ); break; case Qt::Key_5: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_BOZO_SPARKLER; break;
case Qt::Key_6: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_LONG_SPARKLER ); break; case Qt::Key_6: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_LONG_SPARKLER; break;
case Qt::Key_7: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_SNAKE ); break; case Qt::Key_7: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_SNAKE; break;
case Qt::Key_8: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_PULSE ); break; case Qt::Key_8: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_PULSE; break;
case Qt::Key_9: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_THROB ); break; case Qt::Key_9: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_THROB; break;
}; };
} }

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

@ -60,6 +60,8 @@ private:
float _raveGloveClock; float _raveGloveClock;
bool _raveGloveInitialized; bool _raveGloveInitialized;
int _raveGloveEmitter[NUM_FINGERS]; int _raveGloveEmitter[NUM_FINGERS];
int _raveGloveEffectsMode;
bool _raveGloveEffectsModeChanged;
Avatar* _owningAvatar; Avatar* _owningAvatar;
float _renderAlpha; float _renderAlpha;
@ -72,8 +74,9 @@ private:
void setLeapHands(const std::vector<glm::vec3>& handPositions, void setLeapHands(const std::vector<glm::vec3>& handPositions,
const std::vector<glm::vec3>& handNormals); const std::vector<glm::vec3>& handNormals);
void renderRaveGloveStage();
virtual void setRaveGloveMode(int mode); virtual void setRaveGloveMode(int mode);
void renderRaveGloveStage();
void renderLeapHandSpheres(); void renderLeapHandSpheres();
void renderLeapHands(); void renderLeapHands();
void renderLeapHand(PalmData& hand); void renderLeapHand(PalmData& hand);