From be8a587d49028d4942220b0009b44e7e7ace3cbc Mon Sep 17 00:00:00 2001
From: Jeffrey Ventrella <jeffreyventrella@gmail.com>
Date: Wed, 31 Jul 2013 16:07:21 -0700
Subject: [PATCH 1/2] named rave glove effects
---
interface/src/ParticleSystem.cpp | 2 +-
interface/src/avatar/Hand.cpp | 53 ++++++++++++++++----------------
interface/src/avatar/Hand.h | 20 ++++++------
3 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/interface/src/ParticleSystem.cpp b/interface/src/ParticleSystem.cpp
index fb5ecca9f4..5e2b92bb64 100644
--- a/interface/src/ParticleSystem.cpp
+++ b/interface/src/ParticleSystem.cpp
@@ -41,7 +41,7 @@ ParticleSystem::ParticleSystem() {
e->particleRenderStyle = PARTICLE_RENDER_STYLE_SPHERE;
e->numParticlesEmittedThisTime = 0;
- for (int lifeStage = 0; lifeStage<NUM_PARTICLE_LIFE_STAGES; lifeStage++) {
+ for (int lifeStage = 0; lifeStage < NUM_PARTICLE_LIFE_STAGES; lifeStage++) {
setParticleAttributesToDefault(&_emitter[emitterIndex].particleAttributes[lifeStage]);
}
};
diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp
index d51c65891c..28b1af0603 100755
--- a/interface/src/avatar/Hand.cpp
+++ b/interface/src/avatar/Hand.cpp
@@ -14,7 +14,7 @@
#include "Util.h"
#include "renderer/ProgramObject.h"
-const bool SHOW_LEAP_HAND = true;
+const bool SHOW_LEAP_HAND = false;
using namespace std;
@@ -22,7 +22,7 @@ Hand::Hand(Avatar* owningAvatar) :
HandData((AvatarData*)owningAvatar),
_raveGloveClock(0.0f),
- _raveGloveMode(RAVE_GLOVE_EFFECTS_MODE_0),
+ _raveGloveMode(RAVE_GLOVE_EFFECTS_MODE_THROBBING_COLOR),
_raveGloveInitialized(false),
_isRaveGloveActive(false),
_owningAvatar(owningAvatar),
@@ -86,17 +86,18 @@ void Hand::calculateGeometry() {
void Hand::setRaveGloveEffectsMode(QKeyEvent* event) {
switch (event->key()) {
- case Qt::Key_0: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_0); break;
- case Qt::Key_1: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_1); break;
- case Qt::Key_2: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_2); break;
- case Qt::Key_3: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_3); break;
- case Qt::Key_4: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_4); break;
- case Qt::Key_5: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_5); break;
- case Qt::Key_6: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_6); break;
- case Qt::Key_7: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_7); break;
- case Qt::Key_8: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_8); break;
- case Qt::Key_9: setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_9); break;
- };
+
+ 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;
+ };
}
void Hand::render(bool lookingInMirror) {
@@ -327,8 +328,8 @@ void Hand::updateRaveGloveParticles(float deltaTime) {
//printf( "%d\n", _raveGloveEmitter[f] );
}
-
- setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_2);
+
+ setRaveGloveMode(RAVE_GLOVE_EFFECTS_MODE_FIRE);
_raveGloveParticleSystem.setUpDirection(glm::vec3(0.0f, 1.0f, 0.0f));
_raveGloveInitialized = true;
} else {
@@ -336,7 +337,7 @@ void Hand::updateRaveGloveParticles(float deltaTime) {
_raveGloveClock += deltaTime;
// this rave glove effect oscillates though various colors and radii that are meant to show off some effects
- if (_raveGloveMode == RAVE_GLOVE_EFFECTS_MODE_0) {
+ if (_raveGloveMode == RAVE_GLOVE_EFFECTS_MODE_THROBBING_COLOR) {
ParticleSystem::ParticleAttributes attributes;
float red = 0.5f + 0.5f * sinf(_raveGloveClock * 1.4f);
float green = 0.5f + 0.5f * cosf(_raveGloveClock * 1.7f);
@@ -372,7 +373,7 @@ void Hand::setRaveGloveMode(int mode) {
//-----------------------------------------
// throbbing color cycle
//-----------------------------------------
- if (mode == RAVE_GLOVE_EFFECTS_MODE_0) {
+ if (mode == RAVE_GLOVE_EFFECTS_MODE_THROBBING_COLOR) {
_raveGloveParticleSystem.setParticleRenderStyle (_raveGloveEmitter[f], PARTICLE_RENDER_STYLE_SPHERE );
_raveGloveParticleSystem.setShowingEmitterBaseParticle(_raveGloveEmitter[f], true );
_raveGloveParticleSystem.setEmitterParticleLifespan (_raveGloveEmitter[f], 0.0f );
@@ -395,7 +396,7 @@ void Hand::setRaveGloveMode(int mode) {
//-----------------------------------------
// trails
//-----------------------------------------
- } else if (mode == RAVE_GLOVE_EFFECTS_MODE_1) {
+ } else if (mode == RAVE_GLOVE_EFFECTS_MODE_TRAILS) {
_raveGloveParticleSystem.setParticleRenderStyle (_raveGloveEmitter[f], PARTICLE_RENDER_STYLE_RIBBON );
_raveGloveParticleSystem.setShowingEmitterBaseParticle(_raveGloveEmitter[f], false );
_raveGloveParticleSystem.setEmitterParticleLifespan (_raveGloveEmitter[f], 1.0f );
@@ -426,7 +427,7 @@ void Hand::setRaveGloveMode(int mode) {
//-----------------------------------------
// Fire!
//-----------------------------------------
- if (mode == RAVE_GLOVE_EFFECTS_MODE_2) {
+ if (mode == RAVE_GLOVE_EFFECTS_MODE_FIRE) {
_raveGloveParticleSystem.setParticleRenderStyle (_raveGloveEmitter[f], PARTICLE_RENDER_STYLE_SPHERE );
_raveGloveParticleSystem.setShowingEmitterBaseParticle(_raveGloveEmitter[f], false );
@@ -461,7 +462,7 @@ void Hand::setRaveGloveMode(int mode) {
//-----------------------------------------
// water
//-----------------------------------------
- } else if (mode == RAVE_GLOVE_EFFECTS_MODE_3) {
+ } else if (mode == RAVE_GLOVE_EFFECTS_MODE_WATER) {
_raveGloveParticleSystem.setParticleRenderStyle (_raveGloveEmitter[f], PARTICLE_RENDER_STYLE_SPHERE );
_raveGloveParticleSystem.setShowingEmitterBaseParticle(_raveGloveEmitter[f], true );
@@ -493,7 +494,7 @@ void Hand::setRaveGloveMode(int mode) {
//-----------------------------------------
// flashy
//-----------------------------------------
- } else if (mode == RAVE_GLOVE_EFFECTS_MODE_4) {
+ } else if (mode == RAVE_GLOVE_EFFECTS_MODE_FLASHY) {
_raveGloveParticleSystem.setParticleRenderStyle (_raveGloveEmitter[f], PARTICLE_RENDER_STYLE_SPHERE );
_raveGloveParticleSystem.setShowingEmitterBaseParticle(_raveGloveEmitter[f], true );
@@ -525,7 +526,7 @@ void Hand::setRaveGloveMode(int mode) {
//-----------------------------------------
// Bozo sparkler
//-----------------------------------------
- } else if (mode == RAVE_GLOVE_EFFECTS_MODE_5) {
+ } else if (mode == RAVE_GLOVE_EFFECTS_MODE_BOZO_SPARKLER) {
_raveGloveParticleSystem.setParticleRenderStyle (_raveGloveEmitter[f], PARTICLE_RENDER_STYLE_RIBBON );
_raveGloveParticleSystem.setShowingEmitterBaseParticle(_raveGloveEmitter[f], false );
@@ -557,7 +558,7 @@ void Hand::setRaveGloveMode(int mode) {
//-----------------------------------------
// long sparkler
//-----------------------------------------
- } else if (mode == RAVE_GLOVE_EFFECTS_MODE_6) {
+ } else if (mode == RAVE_GLOVE_EFFECTS_MODE_LONG_SPARKLER) {
_raveGloveParticleSystem.setParticleRenderStyle (_raveGloveEmitter[f], PARTICLE_RENDER_STYLE_RIBBON );
_raveGloveParticleSystem.setShowingEmitterBaseParticle(_raveGloveEmitter[f], false );
@@ -590,7 +591,7 @@ void Hand::setRaveGloveMode(int mode) {
//-----------------------------------------
// bubble snake
//-----------------------------------------
- } else if (mode == RAVE_GLOVE_EFFECTS_MODE_7) {
+ } else if (mode == RAVE_GLOVE_EFFECTS_MODE_SNAKE) {
_raveGloveParticleSystem.setParticleRenderStyle (_raveGloveEmitter[f], PARTICLE_RENDER_STYLE_SPHERE );
_raveGloveParticleSystem.setShowingEmitterBaseParticle(_raveGloveEmitter[f], true );
@@ -627,7 +628,7 @@ void Hand::setRaveGloveMode(int mode) {
//-----------------------------------------
// pulse
//-----------------------------------------
- } else if (mode == RAVE_GLOVE_EFFECTS_MODE_8) {
+ } else if (mode == RAVE_GLOVE_EFFECTS_MODE_PULSE) {
_raveGloveParticleSystem.setParticleRenderStyle (_raveGloveEmitter[f], PARTICLE_RENDER_STYLE_SPHERE );
_raveGloveParticleSystem.setShowingEmitterBaseParticle(_raveGloveEmitter[f], true );
@@ -651,7 +652,7 @@ void Hand::setRaveGloveMode(int mode) {
//-----------------------------------------
// throb
//-----------------------------------------
- } else if (mode == RAVE_GLOVE_EFFECTS_MODE_9) {
+ } else if (mode == RAVE_GLOVE_EFFECTS_MODE_LONG_SPARKLER) {
_raveGloveParticleSystem.setParticleRenderStyle (_raveGloveEmitter[f], PARTICLE_RENDER_STYLE_SPHERE );
_raveGloveParticleSystem.setShowingEmitterBaseParticle(_raveGloveEmitter[f], true );
diff --git a/interface/src/avatar/Hand.h b/interface/src/avatar/Hand.h
index bfddf9811d..a3a00beb96 100755
--- a/interface/src/avatar/Hand.h
+++ b/interface/src/avatar/Hand.h
@@ -26,16 +26,16 @@ class ProgramObject;
enum RaveGloveEffectsMode
{
RAVE_GLOVE_EFFECTS_MODE_NULL = -1,
- RAVE_GLOVE_EFFECTS_MODE_0,
- RAVE_GLOVE_EFFECTS_MODE_1,
- RAVE_GLOVE_EFFECTS_MODE_2,
- RAVE_GLOVE_EFFECTS_MODE_3,
- RAVE_GLOVE_EFFECTS_MODE_4,
- RAVE_GLOVE_EFFECTS_MODE_5,
- RAVE_GLOVE_EFFECTS_MODE_6,
- RAVE_GLOVE_EFFECTS_MODE_7,
- RAVE_GLOVE_EFFECTS_MODE_8,
- RAVE_GLOVE_EFFECTS_MODE_9,
+ RAVE_GLOVE_EFFECTS_MODE_THROBBING_COLOR,
+ RAVE_GLOVE_EFFECTS_MODE_TRAILS,
+ RAVE_GLOVE_EFFECTS_MODE_FIRE,
+ RAVE_GLOVE_EFFECTS_MODE_WATER,
+ RAVE_GLOVE_EFFECTS_MODE_FLASHY,
+ RAVE_GLOVE_EFFECTS_MODE_BOZO_SPARKLER,
+ RAVE_GLOVE_EFFECTS_MODE_LONG_SPARKLER,
+ RAVE_GLOVE_EFFECTS_MODE_SNAKE,
+ RAVE_GLOVE_EFFECTS_MODE_PULSE,
+ RAVE_GLOVE_EFFECTS_MODE_THROB,
NUM_RAVE_GLOVE_EFFECTS_MODES
};
From 5c040ad84d43cc0e15271d902cd3e94f5091c706 Mon Sep 17 00:00:00 2001
From: Jeffrey Ventrella <jeffreyventrella@gmail.com>
Date: Wed, 31 Jul 2013 16:08:46 -0700
Subject: [PATCH 2/2] test
---
interface/CMakeLists.txt | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 interface/CMakeLists.txt
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
old mode 100755
new mode 100644