Changeset 1348Tweet

Timestamp:

May 7, 2012, 1:39:15 AM (11 years ago)

Author:

sam

Message:

orbital: move ship with arrows.

Location:

trunk

Files:

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

trunk/orbital/player.h

@@ -30 +30 @@
         m_drone_mesh.SendCommand("sc0.2,0.7,0,1,afcb3,6,10,0.4,tx-8,afcb3,6,10,0.4,tx4,ty13,fl,sc1,1,1,1,afcb3,6,10,0.4,rx-30,ty13,fl");
 
-        m_position = vec3(0.f, 5.f, 0.f);
+        m_position = vec3(0.f, 3.5f, 0.f);
     }
 
@@ -46 +46 @@
         WorldEntity::TickGame(seconds);
 
-        float rightleft = 0.f, updown = 0.f;
+        float updown = Input::GetButtonState(273 /*SDLK_UP*/)
+                     - Input::GetButtonState(274 /*SDLK_DOWN*/);
+        float rightleft = Input::GetButtonState(275 /*SDLK_RIGHT*/)
+                        - Input::GetButtonState(276 /*SDLK_LEFT*/);
 
         if (!m_stick)

trunk/src/camera.cpp

@@ -59 +59 @@
 
     /* Hackish keyboard support */
-    float updown = Input::GetButtonState(273 /*SDLK_UP*/)
-                 - Input::GetButtonState(274 /*SDLK_DOWN*/);
-    float rightleft = Input::GetButtonState(275 /*SDLK_RIGHT*/)
-                    - Input::GetButtonState(276 /*SDLK_LEFT*/);
-    float pgupdown = Input::GetButtonState(280 /*SDLK_PAGEUP*/)
-                   - Input::GetButtonState(281 /*SDLK_PAGEDOWN*/);
+    float updown = 2.f * (Input::GetButtonState('w')
+                           + Input::GetButtonState('z')
+                           - Input::GetButtonState('s'));
+    float rightleft = 2.f * (Input::GetButtonState('d')
+                              - Input::GetButtonState('q')
+                              - Input::GetButtonState('a'));
+    float pgupdown = 2.f * (Input::GetButtonState('r')
+                             - Input::GetButtonState('f'));
 
     /* Hackish stick support */