Changeset 1396Tweet

Timestamp:

May 15, 2012, 2:24:22 PM (9 years ago)

Author:

sam

Message:

orbital: start working on the gun system.

Location:

trunk

Files:

• orbital/Makefile.am (modified) (1 diff)
• orbital/gun.h (added)
• orbital/orbital.cpp (modified) (1 diff)
• orbital/orbital.h (modified) (1 diff)
• orbital/snake.h (modified) (4 diffs)
• win32/orbital.vcxproj (modified) (1 diff)
• win32/orbital.vcxproj.filters (modified) (1 diff)

trunk/orbital/Makefile.am

@@ -4 +4 @@
 orbital_SOURCES = \
     orbital.cpp orbital.h mesh.h particlesystem.h tank.h player.h \
-    snake.h starfield.h
+    gun.h snake.h starfield.h
 nodist_orbital_SOURCES = \
     shiny.lolfx.cpp

trunk/orbital/orbital.cpp

@@ -239 +239 @@
 int main(int argc, char **argv)
 {
-    Application app("Orbital", ivec2(800, 600), 60.0f);
+    Application app("Orbital", ivec2(1280, 720), 60.0f);
+    //Application app("Orbital", ivec2(800, 600), 60.0f);
 
 #if defined _MSC_VER && !defined _XBOX

trunk/orbital/orbital.h

@@ -10 +10 @@
 #include "mesh.h"
 #include "particlesystem.h"
+#include "gun.h"
 #include "starfield.h"
 #include "tank.h"

trunk/orbital/snake.h

@@ -15 +15 @@
     Snake(int nodes)
       : m_steer(0.f),
+        m_stick(0),
         m_ready(false)
     {
@@ -46 +47 @@
     ~Snake()
     {
+        if (m_stick)
+            Input::UntrackStick(m_stick);
     }
 
@@ -68 +71 @@
 
         /* Destruction test */
-        if (m_nodes.Count() >= 3 && m_steer > 30
-             && (int)m_steer / 6 != (int)(m_steer - 2.f * seconds) / 6)
+        if (!m_stick)
+            m_stick = Input::TrackStick();
+        if (m_stick && m_stick->GetButtonCount() >= 4
+             && m_stick->GetButton(12)
+             && (int)m_steer != (int)(m_steer - 2.f * seconds))
         {
             int tohit = (int)RandF(m_nodes.Count() - 2);
@@ -167 +173 @@
     /* List of nodes (position, self-rotation angle, life, damage) */
     Array<vec3, float, float, float> m_nodes;
+    /* Test */
+    Stick *m_stick;
     bool m_ready;
 };

trunk/win32/orbital.vcxproj

@@ -29 +29 @@
   <ItemGroup>
     <ClInclude Include="..\orbital\CommandParser.h" />
+    <ClInclude Include="..\orbital\gun.h" />
     <ClInclude Include="..\orbital\mesh.h" />
     <ClInclude Include="..\orbital\orbital.h" />

trunk/win32/orbital.vcxproj.filters

@@ -2 +2 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
+    <ClInclude Include="..\orbital\gun.h" />
     <ClInclude Include="..\orbital\mesh.h" />
     <ClInclude Include="..\orbital\CommandParser.h" />