Merge pull request #334 from PhilipRosedale/master

Mouse moves pitch, yaw when near screen edge, gravity bouncing fixed!

interface/src/Application.cpp

@@ -306,13 +306,13 @@ void Application::paintGL() {
             if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) {
                 _myCamera.setTargetPosition(_myAvatar.getSpringyHeadPosition());
                 _myCamera.setTargetRotation(_myAvatar.getAbsoluteHeadYaw(),
-                                            _myAvatar.getAbsoluteHeadPitch(),
+                                            -_myAvatar.getAbsoluteHeadPitch(),
                                             0.0f);
             
             } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
                 _myCamera.setTargetPosition(_myAvatar.getHeadPosition());
                 _myCamera.setTargetRotation(_myAvatar.getBodyYaw(),
-                                            0.0f,
+                                            -_myAvatar.getAbsoluteHeadPitch(),
                                             0.0f);
             }
         }
@@ -864,7 +864,11 @@ void Application::idle() {
         }
         
         //  Update from Mouse
-        _myAvatar.updateFromMouse(_mouseX, _mouseY, _glWidget->width(), _glWidget->height());
+        QPoint mouse = QCursor::pos();
+        _myAvatar.updateFromMouse(_glWidget->mapFromGlobal(mouse).x(),
+                                  _glWidget->mapFromGlobal(mouse).y(),
+                                  _glWidget->width(),
+                                  _glWidget->height());
        
         //  Read serial port interface devices
         if (_serialPort.active) {

interface/src/Avatar.cpp

@@ -101,7 +101,9 @@ Avatar::Avatar(bool isMine) {
     _sphere                     = NULL;
     _handHoldingPosition        = glm::vec3(0.0f, 0.0f, 0.0f);
     _distanceToNearestAvatar    = std::numeric_limits<float>::max();
-    _gravity                    = glm::vec3(0.0f, -1.0f, 0.0f); // default
+    _gravity                    = glm::vec3(0.0f, -1.0f, 0.0f);
+    _cumulativeMouseYaw         = 0.f;
+    _isMouseTurningRight        = false;
 
     initializeSkeleton();
     
@@ -212,7 +214,6 @@ void Avatar::reset() {
     _head.leanForward = _head.leanSideways = 0;
 }
 
-
 //  Update avatar head rotation with sensor data
 void Avatar::updateHeadFromGyros(float deltaTime, SerialInterface* serialInterface, glm::vec3* gravity) {
     float measuredPitchRate = 0.0f;
@@ -224,8 +225,6 @@ void Avatar::updateHeadFromGyros(float deltaTime, SerialInterface* serialInterfa
     measuredRollRate = serialInterface->getLastRollRate();
    
     //  Update avatar head position based on measured gyro rates
-    const float MAX_PITCH = 45;
-    const float MIN_PITCH = -45;
     const float MAX_YAW = 85;
     const float MIN_YAW = -85;
     const float MAX_ROLL = 50;
@@ -235,7 +234,6 @@ void Avatar::updateHeadFromGyros(float deltaTime, SerialInterface* serialInterfa
     addHeadYaw(measuredYawRate * deltaTime);
     addHeadRoll(measuredRollRate * deltaTime);
     
-    setHeadPitch(glm::clamp(getHeadPitch(), MIN_PITCH, MAX_PITCH));
     setHeadYaw(glm::clamp(getHeadYaw(), MIN_YAW, MAX_YAW));
     setHeadRoll(glm::clamp(getHeadRoll(), MIN_ROLL, MAX_ROLL));
     
@@ -292,14 +290,41 @@ bool Avatar::getIsNearInteractingOther() {
 }
 
 void  Avatar::updateFromMouse(int mouseX, int mouseY, int screenWidth, int screenHeight) {
-    //  Update pitch and yaw based on mouse behavior
+    //  Update yaw based on mouse behavior
     const float MOUSE_MOVE_RADIUS = 0.25f;
-    const float MOUSE_ROTATE_SPEED = 7.5f;
+    const float MOUSE_ROTATE_SPEED = 5.0f;
+    const float MOUSE_PITCH_SPEED = 3.0f;
+    const float MAX_YAW_TO_ADD = 180.f;
+    const int TITLE_BAR_HEIGHT = 46;
     float mouseLocationX = (float)mouseX / (float)screenWidth - 0.5f;
-    
+    float mouseLocationY = (float)mouseY / (float)screenHeight - 0.5f;
-    if (fabs(mouseLocationX) > MOUSE_MOVE_RADIUS) {
+
-        float mouseMag = (fabs(mouseLocationX) - MOUSE_MOVE_RADIUS) / (0.5f - MOUSE_MOVE_RADIUS) * MOUSE_ROTATE_SPEED;
+    if ((mouseX > 1) && (mouseX < screenWidth) && (mouseY > TITLE_BAR_HEIGHT) && (mouseY < screenHeight)) {
-        setBodyYaw(getBodyYaw() - ((mouseLocationX > 0.f) ? mouseMag : -mouseMag));
+        //
+        //  Mouse must be inside screen (not at edge) and not on title bar for movement to happen
+        //
+        if (fabs(mouseLocationX) > MOUSE_MOVE_RADIUS) {
+            //  Add Yaw
+            float mouseYawAdd = (fabs(mouseLocationX) - MOUSE_MOVE_RADIUS) / (0.5f - MOUSE_MOVE_RADIUS) * MOUSE_ROTATE_SPEED;
+            bool rightTurning = (mouseLocationX > 0.f);
+            if (_isMouseTurningRight == rightTurning) {
+                _cumulativeMouseYaw += mouseYawAdd;
+            } else {
+                _cumulativeMouseYaw = 0;
+                _isMouseTurningRight = rightTurning;
+            }
+            if (_cumulativeMouseYaw < MAX_YAW_TO_ADD) {
+                setBodyYaw(getBodyYaw() - (rightTurning ? mouseYawAdd : -mouseYawAdd));
+            }
+        } else {
+            _cumulativeMouseYaw = 0;
+        }
+        if (fabs(mouseLocationY) > MOUSE_MOVE_RADIUS) {
+            float mousePitchAdd = (fabs(mouseLocationY) - MOUSE_MOVE_RADIUS) / (0.5f - MOUSE_MOVE_RADIUS) * MOUSE_PITCH_SPEED;
+            bool downPitching = (mouseLocationY > 0.f);
+            setHeadPitch(getHeadPitch() + (downPitching ? mousePitchAdd : -mousePitchAdd));
+        }
+        
     }
     
     return;
@@ -329,7 +354,7 @@ void Avatar::simulate(float deltaTime) {
     _avatarTouch.simulate(deltaTime);        
     
     // apply gravity and collision with the ground/floor
-    if (USING_AVATAR_GRAVITY) {
+    if (_isMine && USING_AVATAR_GRAVITY) {
         if (_position.y > _pelvisStandingHeight + 0.01f) {
             _velocity += _gravity * (GRAVITY_SCALE * deltaTime);
         } else if (_position.y < _pelvisStandingHeight) {

interface/src/Avatar.h

@@ -200,6 +200,8 @@ private:
     glm::vec3   _mouseRayOrigin;
     glm::vec3   _mouseRayDirection;
     glm::vec3   _cameraPosition;
+    float       _cumulativeMouseYaw;
+    bool        _isMouseTurningRight;
     
     //AvatarJointID _jointTouched;
     

interface/src/Head.cpp

@@ -221,9 +221,6 @@ void Head::simulate(float deltaTime, bool isMine) {
                             (deltaTime / AUDIO_AVERAGING_SECS) * audioLoudness;
 }
 
-
-
-
 void Head::render(bool lookingInMirror, float bodyYaw) {
 
     int side = 0;

libraries/avatars/src/AvatarData.cpp

@@ -236,4 +236,13 @@ void AvatarData::setBodyRoll(float bodyRoll) {
     _bodyRoll = bodyRoll;
 }
 
+void AvatarData::setHeadPitch(float p) {
+    // Set head pitch and apply limits
+    const float MAX_PITCH = 60;
+    const float MIN_PITCH = -60;
+    _headPitch = glm::clamp(p, MIN_PITCH, MAX_PITCH);
+}
+
+
+
 

libraries/avatars/src/AvatarData.h

@@ -73,13 +73,13 @@ public:
     void  setBodyRoll(float bodyRoll);
 
     // Head Rotation
-    void setHeadPitch(float p) {_headPitch = p; }
+    void setHeadPitch(float p);
     void setHeadYaw(float y) {_headYaw = y; }
     void setHeadRoll(float r) {_headRoll = r; };
     float getHeadPitch() const { return _headPitch; };
     float getHeadYaw() const { return _headYaw; };
     float getHeadRoll() const { return _headRoll; };
-    void  addHeadPitch(float p) {_headPitch -= p; }
+    void  addHeadPitch(float p) { setHeadPitch(_headPitch - p); }
     void  addHeadYaw(float y){_headYaw -= y; }
     void  addHeadRoll(float r){_headRoll += r; }