clean up scroll callback, rotate camera

Author: jasonlmfong

Model-Modifier/src/main.cpp

@@ -275,11 +275,12 @@ int main()
         }
 
         // adjust FOV using vertical scroll
-        camera.m_FOV -= Input::GetScrollY() * 2.0f;
-        camera.m_FOV < 20.0f ? camera.m_FOV = 20.0f : NULL;
-        camera.m_FOV > 110.0f ? camera.m_FOV = 110.0f : NULL;
-        projMatrix = glm::perspective(glm::radians(camera.m_FOV), aspectRatio, 0.1f, 1000.0f);
-        Input::ResetScroll();
+        if (Input::GetScrollY() != 0)
+        {
+            camera.changeFOV(Input::GetScrollY());
+            projMatrix = glm::perspective(glm::radians(camera.m_FOV), aspectRatio, 0.1f, 1000.0f);
+            Input::ResetScroll();
+        }
 
         ////////// clearing per frame //////////
         glClearColor(0.80f, 0.90f, 0.96f, 1.00f);

Model-Modifier/src/renderer/Camera.cpp

@@ -20,7 +20,14 @@ void Camera::MoveCamera(glm::vec3 direction, float speed)
 void Camera::RotateCamera(float deltaPitch, float deltaYaw, float deltaDist)
 {
     GetYawPitchDist(); // set these properly first
-    m_Pitch += deltaPitch;
+    { // makes sure the pitch doesn't flip
+        if (m_Pitch + deltaPitch > 1.5f)
+            m_Pitch = 1.5f;
+        else if (m_Pitch + deltaPitch < -1.5f)
+            m_Pitch = -1.5f;
+        else
+            m_Pitch += deltaPitch;
+    }
     m_Yaw += deltaYaw;
     m_Dist += deltaDist;
 
@@ -31,6 +38,13 @@ void Camera::RotateCamera(float deltaPitch, float deltaYaw, float deltaDist)
     SetViewMatrix();
 }
 
+void Camera::changeFOV(float scrollY)
+{
+    m_FOV -= scrollY * 2.0f;
+    m_FOV < 20.0f ? m_FOV = 20.0f : NULL;
+    m_FOV > 110.0f ? m_FOV = 110.0f : NULL;
+}
+
 glm::vec3 Camera::GetPosOnSphere()
 {
     return m_Dist * glm::vec3 

Model-Modifier/src/renderer/Camera.h

@@ -21,12 +21,12 @@ class Camera
 	float m_FOV;
 
 public:
-	Camera();
 	Camera(float pitch, float yaw, float distance);
 	~Camera();
 
 	void MoveCamera(glm::vec3 direction, float speed); 
 	void RotateCamera(float deltaPitch, float deltaYaw, float deltaDist);
+	void changeFOV(float scrollY);
 
 	glm::vec3 GetPosOnSphere();
 	void GetYawPitchDist();