Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 04:58:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed renderPitch(), and renderYaw() from code/classes - we will use bodyPitch(), headPitch() only.

Browse source
This commit is contained in:
Philip Rosedale 2013-05-15 09:52:12 -07:00
parent 73c793c0a1
commit 124f04820e
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -306,7 +306,7 @@ void Application::paintGL() {
if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) { if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) {
_myCamera.setTargetPosition(_myAvatar.getSpringyHeadPosition()); _myCamera.setTargetPosition(_myAvatar.getSpringyHeadPosition());
_myCamera.setTargetRotation(_myAvatar.getAbsoluteHeadYaw(), _myCamera.setTargetRotation(_myAvatar.getAbsoluteHeadYaw(),
_myAvatar.getRenderPitch(), 0.0f); _myAvatar.getAbsoluteHeadPitch(), 0.0f);
} else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) { } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
_myCamera.setTargetPosition(_myAvatar.getHeadPosition()); _myCamera.setTargetPosition(_myAvatar.getHeadPosition());
@ -1225,6 +1225,7 @@ void Application::updateAvatar(float deltaTime) {
// Update head and body pitch and yaw based on measured gyro rates // Update head and body pitch and yaw based on measured gyro rates
if (_gyroLook->isChecked()) { if (_gyroLook->isChecked()) {
// Render Yaw // Render Yaw
/* NOTE: PER - Leave here until I get back and can modify to couple gyros to head pitch, yaw
float renderYawSpring = fabs(_headMouseX - _glWidget->width() / 2.f) / (_glWidget->width() / 2.f); float renderYawSpring = fabs(_headMouseX - _glWidget->width() / 2.f) / (_glWidget->width() / 2.f);
const float RENDER_YAW_MULTIPLY = 4.f; const float RENDER_YAW_MULTIPLY = 4.f;
_myAvatar.setRenderYaw((1.f - renderYawSpring * deltaTime) * _myAvatar.getRenderYaw() + _myAvatar.setRenderYaw((1.f - renderYawSpring * deltaTime) * _myAvatar.getRenderYaw() +
@ -1234,6 +1235,7 @@ void Application::updateAvatar(float deltaTime) {
const float RENDER_PITCH_MULTIPLY = 4.f; const float RENDER_PITCH_MULTIPLY = 4.f;
_myAvatar.setRenderPitch((1.f - renderPitchSpring * deltaTime) * _myAvatar.getRenderPitch() + _myAvatar.setRenderPitch((1.f - renderPitchSpring * deltaTime) * _myAvatar.getRenderPitch() +
renderPitchSpring * deltaTime * -_myAvatar.getHeadPitch() * RENDER_PITCH_MULTIPLY); renderPitchSpring * deltaTime * -_myAvatar.getHeadPitch() * RENDER_PITCH_MULTIPLY);
*/
} }
if (OculusManager::isConnected()) { if (OculusManager::isConnected()) {

5
interface/src/Avatar.cpp
View file

@ -96,8 +96,6 @@ Avatar::Avatar(bool isMine) {
_head.initialize(); _head.initialize();
_movedHandOffset = glm::vec3(0.0f, 0.0f, 0.0f); _movedHandOffset = glm::vec3(0.0f, 0.0f, 0.0f);
_renderYaw = 0.0;
_renderPitch = 0.0;
_sphere = NULL; _sphere = NULL;
_handHoldingPosition = glm::vec3(0.0f, 0.0f, 0.0f); _handHoldingPosition = glm::vec3(0.0f, 0.0f, 0.0f);
_distanceToNearestAvatar = std::numeric_limits<float>::max(); _distanceToNearestAvatar = std::numeric_limits<float>::max();
@ -126,7 +124,6 @@ Avatar::Avatar(const Avatar &otherAvatar) {
_mode = otherAvatar._mode; _mode = otherAvatar._mode;
_isMine = otherAvatar._isMine; _isMine = otherAvatar._isMine;
_renderYaw = otherAvatar._renderYaw; _renderYaw = otherAvatar._renderYaw;
_renderPitch = otherAvatar._renderPitch;
_maxArmLength = otherAvatar._maxArmLength; _maxArmLength = otherAvatar._maxArmLength;
_transmitterTimer = otherAvatar._transmitterTimer; _transmitterTimer = otherAvatar._transmitterTimer;
_transmitterIsFirstData = otherAvatar._transmitterIsFirstData; _transmitterIsFirstData = otherAvatar._transmitterIsFirstData;
@ -303,7 +300,7 @@ void Avatar::updateFromMouse(int mouseX, int mouseY, int screenWidth, int scree
((mouseLocationX > 0.f) ? ((mouseLocationX > 0.f) ?
mouseMag : mouseMag :
-mouseMag) ); -mouseMag) );
printLog("yaw = %f\n", getBodyYaw()); //printLog("yaw = %f\n", getBodyYaw());
} }
return; return;

4
interface/src/Avatar.h
View file

@ -84,10 +84,6 @@ public:
void updateHeadFromGyros(float frametime, SerialInterface * serialInterface, glm::vec3 * gravity); void updateHeadFromGyros(float frametime, SerialInterface * serialInterface, glm::vec3 * gravity);
void updateFromMouse(int mouseX, int mouseY, int screenWidth, int screenHeight); void updateFromMouse(int mouseX, int mouseY, int screenWidth, int screenHeight);
void setNoise (float mag) {_head.noise = mag;} void setNoise (float mag) {_head.noise = mag;}
void setRenderYaw(float y) {_renderYaw = y;}
void setRenderPitch(float p) {_renderPitch = p;}
float getRenderYaw() {return _renderYaw;}
float getRenderPitch() {return _renderPitch;}
float getLastMeasuredHeadYaw() const {return _head.yawRate;} float getLastMeasuredHeadYaw() const {return _head.yawRate;}
float getBodyYaw() {return _bodyYaw;}; float getBodyYaw() {return _bodyYaw;};
void addBodyYaw(float y) {_bodyYaw += y;}; void addBodyYaw(float y) {_bodyYaw += y;};