Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 13:18:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #793 from machinelevel/dev4

Browse source 
Rave glove: Fix initialization issues and activate mode switch.
This commit is contained in:
Philip Rosedale 2013-08-06 12:15:01 -07:00
commit bb15eb664c
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,7 @@ void Hand::reset() {
void Hand::simulate(float deltaTime, bool isMine) { void Hand::simulate(float deltaTime, bool isMine) {
if (_isRaveGloveActive) { if (_isRaveGloveActive) {
if (_raveGloveEffectsModeChanged) { if (_raveGloveEffectsModeChanged && _raveGloveInitialized) {
activateNewRaveGloveMode(); activateNewRaveGloveMode();
_raveGloveEffectsModeChanged = false; _raveGloveEffectsModeChanged = false;
} }
@ -363,6 +363,10 @@ void Hand::updateRaveGloveParticles(float deltaTime) {
// The rave glove mode has changed, so activate the effects. // The rave glove mode has changed, so activate the effects.
void Hand::activateNewRaveGloveMode() { void Hand::activateNewRaveGloveMode() {
if (!_raveGloveInitialized) {
return;
}
int mode = _raveGloveEffectsMode; int mode = _raveGloveEffectsMode;
_raveGloveParticleSystem.killAllParticles(); _raveGloveParticleSystem.killAllParticles();

5
libraries/avatars/src/HandData.cpp
View file

@ -161,8 +161,9 @@ int HandData::decodeRemoteData(unsigned char* sourceBuffer) {
} }
setRaveGloveActive((gloveFlags & GLOVE_FLAG_RAVE) != 0); setRaveGloveActive((gloveFlags & GLOVE_FLAG_RAVE) != 0);
// Jeffrey: uncomment this to test locally, before unrolling it to the team. if (numHands > 0) {
// setRaveGloveMode(effectsMode); setRaveGloveMode(effectsMode);
}
// One byte for error checking safety. // One byte for error checking safety.
unsigned char requiredLength = (unsigned char)(sourceBuffer - startPosition); unsigned char requiredLength = (unsigned char)(sourceBuffer - startPosition);