From a20a1625022b77928e60250634b72bc0ccd31f09 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 22 Feb 2013 16:43:41 -0800 Subject: [PATCH] don't move user view with their gyro, temporarily hide hand --- interface/src/Head.cpp | 2 +- interface/src/main.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index 78ea7f950c..b933cae73d 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -361,7 +361,7 @@ void Head::parseData(void *data, int size) { &position.x, &position.y, &position.z, &loudness, &averageLoudness, &handPos.x, &handPos.y, &handPos.z); - if (glm::length(handPos) > 0.0) hand->setPos(handPos); +// if (glm::length(handPos) > 0.0) hand->setPos(handPos); } void Head::SetNewHeadTarget(float pitch, float yaw) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index de4da83491..44ed1b8ac9 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -393,8 +393,11 @@ void reset_sensors() void update_pos(float frametime) // Using serial data, update avatar/render position and angles { - float measured_pitch_rate = serialPort.getRelativeValue(PITCH_RATE); - float measured_yaw_rate = serialPort.getRelativeValue(YAW_RATE); +// float measured_pitch_rate = serialPort.getRelativeValue(PITCH_RATE); +// float measured_yaw_rate = serialPort.getRelativeValue(YAW_RATE); + + float measured_pitch_rate = 0; + float measured_yaw_rate = 0; //float measured_lateral_accel = serialPort.getRelativeValue(ACCEL_X); //float measured_fwd_accel = serialPort.getRelativeValue(ACCEL_Z);