Changeset 1362Tweet

Timestamp:

May 10, 2012, 1:37:00 PM (11 years ago)

Author:

sam

Message:

orbital: use both thumb sticks to pilot ships.

Location:

trunk

Files:

• orbital/player.h (modified) (3 diffs)
• src/camera.cpp (modified) (2 diffs)

trunk/orbital/player.h

@@ -14 +14 @@
 public:
     Player(int type)
-      : m_stick(0),
+      : m_type(type),
+        m_stick(0),
         m_ready(false)
     {
@@ -72 +73 @@
         if (m_stick && m_stick->GetAxisCount() >= 4)
         {
-            rightleft += 1.f * m_stick->GetAxis(2);
-            updown += -1.f * m_stick->GetAxis(3);
+            rightleft += 1.f * m_stick->GetAxis(m_type * 2 + 0);
+            updown += -1.f * m_stick->GetAxis(m_type * 2 + 1);
         }
 
@@ -130 +131 @@
 
 private:
+    int m_type;
     Mesh m_ship_mesh, m_option_mesh, m_exhaust_mesh;
     Stick *m_stick;

trunk/src/camera.cpp

@@ -86 +86 @@
                              - Input::GetButtonState('f'));
 
+#if 0
     /* Hackish stick support */
     static Stick *stick = NULL;
@@ -95 +96 @@
         updown += -2.f * stick->GetAxis(1) * std::abs(stick->GetAxis(1));
     }
+#endif
 
     m_position += vec3(rightleft, pgupdown, -updown) * 200.f * seconds;