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

Rave glove demo: network-glove fixes

Browse source 
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.
This commit is contained in:
Eric Johnston 2013-08-05 17:27:42 -07:00
parent 39f9729acb
commit d85ce81313
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -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) {

2
interface/src/avatar/Avatar.cpp
View file

@ -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());

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

@ -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