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

Merge pull request #787 from machinelevel/dev4

Browse source 
Rave glove demo: network-glove fixes
This commit is contained in:
Philip Rosedale 2013-08-05 18:58:04 -07:00
commit d7dc07502c
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

@ -2520,8 +2520,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

@ -748,6 +748,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