From d85ce813135f6f9b28f856dc711026d73ca5e600 Mon Sep 17 00:00:00 2001 From: Eric Johnston Date: Mon, 5 Aug 2013 17:27:42 -0700 Subject: [PATCH] Rave glove demo: network-glove fixes After this change, people can see each other's rave glove performances. 1. Moved hand->simulate call into avatar->simulate so that it gets called on all avatars, not just mine. 2. Hide the rave stage, so it's out of the way while we figure out the best way to darken the world, if that's still desired. --- interface/src/Application.cpp | 2 -- interface/src/avatar/Avatar.cpp | 2 ++ interface/src/avatar/Hand.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 6087a4493e..8cfeaf3327 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2446,8 +2446,6 @@ void Application::update(float deltaTime) { _myAvatar.simulate(deltaTime, NULL); } - _myAvatar.getHand().simulate(deltaTime, true); - if (!OculusManager::isConnected()) { if (_lookingInMirror->isChecked()) { if (_myCamera.getMode() != CAMERA_MODE_MIRROR) { diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 346d5ff7d5..065501f39a 100755 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -741,6 +741,8 @@ void Avatar::simulate(float deltaTime, Transmitter* transmitter) { _head.setScale(_scale); _head.setSkinColor(glm::vec3(SKIN_COLOR[0], SKIN_COLOR[1], SKIN_COLOR[2])); _head.simulate(deltaTime, isMyAvatar()); + _hand.simulate(deltaTime, isMyAvatar()); + diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp index 7b74a1b7d8..bb941c9beb 100755 --- a/interface/src/avatar/Hand.cpp +++ b/interface/src/avatar/Hand.cpp @@ -129,7 +129,8 @@ void Hand::render(bool lookingInMirror) { calculateGeometry(); if (_isRaveGloveActive) { - renderRaveGloveStage(); + // Disable raveGloveStage while we work on the network glove features + // renderRaveGloveStage(); if (_raveGloveInitialized) { updateRaveGloveEmitters(); // do this after calculateGeometry