From f51db292a47f8c0d1a3395318dbccd651a6d4db6 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Mon, 5 Aug 2013 16:26:32 -0700 Subject: [PATCH 1/4] ya --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index f4b9b0999a..7f7e0f67ab 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2562,7 +2562,7 @@ void Application::update(float deltaTime) { if (_renderParticleSystemOn->isChecked()) { updateParticleSystem(deltaTime); - } + } } void Application::updateAvatar(float deltaTime) { From 4ceba28632f44d1759bcd4b9658c06f858300a62 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Mon, 5 Aug 2013 17:00:50 -0700 Subject: [PATCH 2/4] working with Eric to fix transmission of hand data --- interface/src/avatar/Hand.cpp | 34 ++++++++++++++++++++++++---------- interface/src/avatar/Hand.h | 5 ++++- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp index bf09096d7f..95128ec007 100755 --- a/interface/src/avatar/Hand.cpp +++ b/interface/src/avatar/Hand.cpp @@ -42,6 +42,9 @@ void Hand::init() { else { _ballColor = glm::vec3(0.0, 0.0, 0.4); } + + _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_NULL; + _raveGloveEffectsModeChanged = false; } void Hand::reset() { @@ -51,6 +54,14 @@ void Hand::reset() { void Hand::simulate(float deltaTime, bool isMine) { if (_isRaveGloveActive) { + if (_raveGloveEffectsModeChanged) { + + printf( "_raveGloveEffectsMode = %d\n", _raveGloveEffectsMode); + + setRaveGloveMode(_raveGloveEffectsMode); + _raveGloveEffectsModeChanged = false; + } + updateRaveGloveParticles(deltaTime); } } @@ -106,18 +117,21 @@ void Hand::calculateGeometry() { } void Hand::setRaveGloveEffectsMode(QKeyEvent* event) { + + _raveGloveEffectsModeChanged = true; + switch (event->key()) { - case Qt::Key_0: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_THROBBING_COLOR); break; - case Qt::Key_1: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_TRAILS ); break; - case Qt::Key_2: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_FIRE ); break; - case Qt::Key_3: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_WATER ); break; - case Qt::Key_4: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_FLASHY ); break; - case Qt::Key_5: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_BOZO_SPARKLER ); break; - case Qt::Key_6: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_LONG_SPARKLER ); break; - case Qt::Key_7: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_SNAKE ); break; - case Qt::Key_8: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_PULSE ); break; - case Qt::Key_9: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_THROB ); break; + case Qt::Key_0: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_THROBBING_COLOR; break; + case Qt::Key_1: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_TRAILS; break; + case Qt::Key_2: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_FIRE; break; + case Qt::Key_3: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_WATER; break; + case Qt::Key_4: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_FLASHY; break; + case Qt::Key_5: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_BOZO_SPARKLER; break; + case Qt::Key_6: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_LONG_SPARKLER; break; + case Qt::Key_7: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_SNAKE; break; + case Qt::Key_8: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_PULSE; break; + case Qt::Key_9: _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_THROB; break; }; } diff --git a/interface/src/avatar/Hand.h b/interface/src/avatar/Hand.h index 39845141aa..6df97ea106 100755 --- a/interface/src/avatar/Hand.h +++ b/interface/src/avatar/Hand.h @@ -60,6 +60,8 @@ private: float _raveGloveClock; bool _raveGloveInitialized; int _raveGloveEmitter[NUM_FINGERS]; + int _raveGloveEffectsMode; + bool _raveGloveEffectsModeChanged; Avatar* _owningAvatar; float _renderAlpha; @@ -72,8 +74,9 @@ private: void setLeapHands(const std::vector& handPositions, const std::vector& handNormals); - void renderRaveGloveStage(); virtual void setRaveGloveMode(int mode); + + void renderRaveGloveStage(); void renderLeapHandSpheres(); void renderLeapHands(); void renderLeapHand(PalmData& hand); From cba42808c135a3c9d389b74bf201c80fd640c59c Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Mon, 5 Aug 2013 17:24:31 -0700 Subject: [PATCH 3/4] fixed initial rave glove mode --- interface/src/avatar/Hand.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp index 95128ec007..c78b42fcea 100755 --- a/interface/src/avatar/Hand.cpp +++ b/interface/src/avatar/Hand.cpp @@ -43,7 +43,7 @@ void Hand::init() { _ballColor = glm::vec3(0.0, 0.0, 0.4); } - _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_NULL; + _raveGloveEffectsMode = RAVE_GLOVE_EFFECTS_MODE_FIRE; _raveGloveEffectsModeChanged = false; } @@ -362,7 +362,6 @@ void Hand::updateRaveGloveParticles(float deltaTime) { } - void Hand::setRaveGloveMode(int mode) { _raveGloveMode = mode; From f9f925b70b9e4021451f05ac0e6f3e28ec631142 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Mon, 5 Aug 2013 17:30:04 -0700 Subject: [PATCH 4/4] removed printf --- interface/src/avatar/Hand.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp index c78b42fcea..0e12b8c2b5 100755 --- a/interface/src/avatar/Hand.cpp +++ b/interface/src/avatar/Hand.cpp @@ -55,9 +55,6 @@ void Hand::simulate(float deltaTime, bool isMine) { if (_isRaveGloveActive) { if (_raveGloveEffectsModeChanged) { - - printf( "_raveGloveEffectsMode = %d\n", _raveGloveEffectsMode); - setRaveGloveMode(_raveGloveEffectsMode); _raveGloveEffectsModeChanged = false; }