Changeset 1357Tweet

Timestamp:

May 9, 2012, 6:40:49 PM (11 years ago)

Author:

sam

Message:

orbital: clamp ship heading to full 45-degree orientations.

Location:

trunk/orbital

Files:

• orbital.cpp (modified) (1 diff)
• player.h (modified) (2 diffs)

trunk/orbital/orbital.cpp

@@ -11 +11 @@
 #if defined _WIN32
 #   include <direct.h>
+#endif
+
+#if defined _XBOX
+#   define _USE_MATH_DEFINES /* for M_PI */
+#   include <xtl.h>
+#   undef near /* Fuck Microsoft */
+#   undef far /* Fuck Microsoft again */
+#elif defined _WIN32
+#   define _USE_MATH_DEFINES /* for M_PI */
+#   define WIN32_LEAN_AND_MEAN
+#   include <windows.h>
+#   undef near /* Fuck Microsoft */
+#   undef far /* Fuck Microsoft again */
+#else
+#   include <cmath>
 #endif
 

trunk/orbital/player.h

@@ -53 +53 @@
     {
         if (m_stick)
-            Ticker::Unref(m_stick);
+            Input::UntrackStick();
     }
 
@@ -74 +74 @@
             rightleft += 1.f * m_stick->GetAxis(2);
             updown += -1.f * m_stick->GetAxis(3);
+        }
+
+        /* Clamp direction at 45-degree multiples */
+        if (rightleft * rightleft + updown * updown > 0.2f)
+        {
+            float norm = sqrt(rightleft * rightleft + updown * updown);
+            float angle = atan2(updown, rightleft);
+            angle = (int)(angle / (M_PI / 4.f) + 8.5f) * (M_PI / 4.f);
+            rightleft = cos(angle);
+            updown = sin(angle);
+        }
+        else
+        {
+            rightleft = updown = 0.f;
         }