Changeset 1344Tweet

Timestamp:

May 6, 2012, 2:23:24 PM (9 years ago)

Author:

sam

Message:

orbital: create a Player class with joystick support.

Location:

trunk

Files:

• orbital/Makefile.am (modified) (1 diff)
• orbital/orbital.cpp (modified) (5 diffs)
• orbital/orbital.h (modified) (2 diffs)
• orbital/player.h (added)
• win32/orbital.vcxproj (modified) (1 diff)
• win32/orbital.vcxproj.filters (modified) (1 diff)

trunk/orbital/Makefile.am

@@ -3 +3 @@
 
 orbital_SOURCES = \
-    orbital.cpp orbital.h mesh.h particlesystem.h tank.h
+    orbital.cpp orbital.h mesh.h particlesystem.h tank.h player.h
 orbital_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
 orbital_LDADD =

trunk/orbital/orbital.cpp

@@ -60 +60 @@
     m.SendCommand("rx20,ry30,t0,40,-20,fl");
 
-    /* Orange player ship */
-    m.SendCommand("sc1,.5,0,1");
-    m.SendCommand("afcb5,1,3,0.6,fl,sc1,1,1,1,afcb1,5,3,0.6,tz-1,irb");
-    m.SendCommand("sc1,.5,0,1");
-    m.SendCommand("afcb3,6,7,.4,t0,0,7,sc1,1,1,1,afcb3,4,4,.4,t4,0,-4,mx,fl");
-    m.SendCommand("sc1,.5,0,1");
-    m.SendCommand("afcb3,6,5,.4,sc1,1,1,1,afcb2,3,9,.4,fl");
-    m.SendCommand("scb1,1,1,1,ac4,15,.2,.6,1,1,tz-2,ac4,15,.2,.6,1,1,rx90,t0,-2,-7,fl");
-
     /* Orange fire */
     m.SendCommand("sc1,1,0,1,scb1,0,0,0,at4,1,s1.5,1,4,tz-13,ad6,5.8,1");
@@ -75 +66 @@
     /* Lasers */
     m.SendCommand("sc1,1,1,1,scb0,0,0,1,aq8,1,sx0.25,tx-3,sc1,0,0,1,scb0,0,0,1,aq8,1,tx4,sz50,sx0.3,tz-200,mx,as10,12,8,1,1,ty60,fl");
-
-    /* Thrusters */
-    m.SendCommand("sc0,1,1,scb0,0,0,1,ac5,15,0,1.5,0,1,ac7,35,1.1,4,0,1,rx90,t-3,0,27,mx");
-    m.SendCommand("fl");
 
     //m_particlesystem = new ParticleSystem();
@@ -88 +75 @@
     Ticker::Ref(m_camera);
 
+    /* Add tanks */
     for (int j = 0; j < 10; j++)
     for (int i = 0; i < 10; i++)
@@ -95 +83 @@
         m_tanks.Last()->SetTarget(vec3(i * 80.f - 200.f, 0, j * 80.f - 130.f));
         Ticker::Ref(m_tanks.Last());
+    }
+
+    /* Add player */
+    for (int i = 0; i < 1; i++)
+    {
+        m_players << new Player();
+        Ticker::Ref(m_players.Last());
     }
 
@@ -177 +172 @@
     for (int i = 0; i < m_tanks.Count(); i++)
         Ticker::Unref(m_tanks[i]);
+    for (int i = 0; i < m_players.Count(); i++)
+        Ticker::Unref(m_players[i]);
     //Ticker::Unref(m_particlesystem);
     Ticker::Unref(m_camera);

trunk/orbital/orbital.h

@@ -11 +11 @@
 #include "particlesystem.h"
 #include "tank.h"
+#include "player.h"
 
 class Orbital : public WorldEntity
@@ -32 +33 @@
     ParticleSystem *m_particlesystem;
     Camera *m_camera;
+    Array<Player *> m_players;
     Array<Tank *> m_tanks;
 

trunk/win32/orbital.vcxproj

@@ -32 +32 @@
     <ClInclude Include="..\orbital\orbital.h" />
     <ClInclude Include="..\orbital\particlesystem.h" />
+    <ClInclude Include="..\orbital\player.h" />
     <ClInclude Include="..\orbital\tank.h" />
   </ItemGroup>

trunk/win32/orbital.vcxproj.filters

@@ -4 +4 @@
     <ClInclude Include="..\orbital\mesh.h" />
     <ClInclude Include="..\orbital\CommandParser.h" />
+    <ClInclude Include="..\orbital\player.h" />
     <ClInclude Include="..\orbital\tank.h" />
   </ItemGroup>