Changeset 1308Tweet

Timestamp:

Apr 29, 2012, 8:41:43 PM (10 years ago)

Author:

touky

Message:

Added GetButtonState() in Input class.
Added Escape button in to quit Orbital.
Added Camera control with some little damping sweetness in Camera logic in main Tick.
First Commit \o/

Location:

trunk

Files:

• orbital/orbital.cpp (modified) (2 diffs)
• orbital/orbital.h (modified) (1 diff)
• src/input.cpp (modified) (1 diff)
• src/input.h (modified) (1 diff)

trunk/orbital/orbital.cpp

@@ -92 +92 @@
                           vec3(0, 1, 0));
 
-    m_angle = 0;
+        m_auto_cam_timer = 0.0f;
+
+        m_horizontal_angle = 0;
+        m_vertical_angle = 0;
+        m_roll_angle = 0;
+
+    m_horizontal_angle_speed = 0.0f;
+    m_vertical_angle_speed = 0.0f;
+    m_roll_angle_speed = 0.0f;
 
     m_ready = false;
@@ -104 +112 @@
     WorldEntity::TickGame(deltams);
 
-    m_angle += deltams / 50.0f;
-
-    mat4 anim = mat4::rotate(m_angle, vec3(0, 1, 0));
+        //TEMP : Convert DT to seconds
+        deltams /= 1000.0f;
+
+        if (Input::GetButtonState(27 /*SDLK_ESCAPE*/))
+        Ticker::Shutdown();
+
+        if (m_auto_cam_timer > 0.0f)
+                m_auto_cam_timer -= deltams;
+
+        //Doing the query with actual values, cause I want to stay SDL-free for now.
+        int HMovement = Input::GetButtonState(276 /*SDLK_LEFT*/) - Input::GetButtonState(275 /*SDLK_RIGHT*/);
+        int VMovement = Input::GetButtonState(273 /*SDLK_UP*/) - Input::GetButtonState(274 /*SDLK_DOWN*/);
+        int RMovement = Input::GetButtonState(256 /*SDLK_KP0*/) - Input::GetButtonState(305 /*SDLK_RCTRL*/);
+
+    float new_horizontal_angle_speed = 0.0f;
+    float new_vertical_angle_speed = 0.0f;
+    float new_roll_angle_speed = 0.0f;
+
+        if (HMovement != 0 || VMovement != 0 || RMovement != 0)
+        {
+                new_horizontal_angle_speed = ((float)HMovement) * 50.0f;
+                new_vertical_angle_speed = ((float)VMovement) * 50.0f;
+                new_roll_angle_speed = ((float)RMovement) * 50.0f;
+                m_auto_cam_timer = 2.0f;
+        }
+        else if (m_auto_cam_timer <= 0.0f)
+        {
+                new_horizontal_angle_speed = 40.0f;
+                new_vertical_angle_speed = max<float>(min<float>(-m_vertical_angle, 20.0f), -20.0f);
+                new_roll_angle_speed = max<float>(min<float>(-m_roll_angle, 40.0f), -40.0f);
+        }
+
+        m_horizontal_angle_speed += (new_horizontal_angle_speed - m_horizontal_angle_speed) * (deltams / (deltams + 0.3f));
+        m_vertical_angle_speed += (new_vertical_angle_speed - m_vertical_angle_speed) * (deltams / (deltams + 0.3f));
+        m_roll_angle_speed += (new_roll_angle_speed - m_roll_angle_speed) * (deltams / (deltams + 0.3f));
+
+        m_horizontal_angle += m_horizontal_angle_speed * deltams;
+    m_vertical_angle += new_vertical_angle_speed * deltams;
+    m_roll_angle += new_roll_angle_speed * deltams;
+
+        if (m_horizontal_angle > 180.0f)
+                m_horizontal_angle -= 360.0f;
+        else if (m_horizontal_angle < -180.0f)
+                m_horizontal_angle += 360.0f;
+        if (m_vertical_angle > 180.0f)
+                m_vertical_angle -= 360.0f;
+        else if (m_vertical_angle < -180.0f)
+                m_vertical_angle += 360.0f;
+        if (m_roll_angle > 180.0f)
+                m_roll_angle -= 360.0f;
+        else if (m_roll_angle < -180.0f)
+                m_roll_angle += 360.0f;
+
+    mat4 animH = mat4::rotate(m_horizontal_angle, vec3(0, 1, 0));
+    mat4 animV = mat4::rotate(m_vertical_angle, vec3(1, 0, 0));
+    mat4 animR = mat4::rotate(m_roll_angle, vec3(0, 0, 1));
     mat4 model = mat4::translate(vec3(0));
 
-    m_modelview = m_camera->GetViewMatrix() * model * anim;
+    m_modelview = m_camera->GetViewMatrix() * model * animV * animR * animH;
     m_proj = m_camera->GetProjMatrix();
     m_normalmat = transpose(inverse(mat3(m_modelview)));

trunk/orbital/orbital.h

@@ -20 +20 @@
 private:
     Mesh m;
-    float m_angle;
-    mat4 m_modelview, m_proj;
+    float m_auto_cam_timer;
+    float m_horizontal_angle_speed;
+    float m_vertical_angle_speed;
+    float m_roll_angle_speed;
+
+        float m_horizontal_angle;
+    float m_vertical_angle;
+    float m_roll_angle;
+
+        mat4 m_modelview, m_proj;
     mat3 m_normalmat;
 

trunk/src/input.cpp

@@ -92 +92 @@
 }
 
+//BH : Added this, is a v0.1 Alpha version.
+int Input::GetButtonState(int button)
+{
+#if defined USE_SDL
+#if SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION >= 3
+    Uint8 *keystate = SDL_GetKeyboardState(NULL);
+#else
+    Uint8 *keystate = SDL_GetKeyState(NULL);
+#endif
+    return keystate[button];
+#else
+    return 0;
+#endif
+}
+
 void Input::TrackMouse(WorldEntity *e)
 {

trunk/src/input.h

@@ -31 +31 @@
     static ivec2 GetMousePos();
     static ivec3 GetMouseButtons();
+        //BH : Added this, is a v0.1 Alpha version.
+    static int GetButtonState(int button);
 
     /* Entities can subscribe to events */