Changeset 1344
- Timestamp:
- May 6, 2012, 2:23:24 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/orbital/Makefile.am
r1333 r1344 3 3 4 4 orbital_SOURCES = \ 5 orbital.cpp orbital.h mesh.h particlesystem.h tank.h 5 orbital.cpp orbital.h mesh.h particlesystem.h tank.h player.h 6 6 orbital_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@ 7 7 orbital_LDADD = -
trunk/orbital/orbital.cpp
r1340 r1344 60 60 m.SendCommand("rx20,ry30,t0,40,-20,fl"); 61 61 62 /* Orange player ship */63 m.SendCommand("sc1,.5,0,1");64 m.SendCommand("afcb5,1,3,0.6,fl,sc1,1,1,1,afcb1,5,3,0.6,tz-1,irb");65 m.SendCommand("sc1,.5,0,1");66 m.SendCommand("afcb3,6,7,.4,t0,0,7,sc1,1,1,1,afcb3,4,4,.4,t4,0,-4,mx,fl");67 m.SendCommand("sc1,.5,0,1");68 m.SendCommand("afcb3,6,5,.4,sc1,1,1,1,afcb2,3,9,.4,fl");69 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");70 71 62 /* Orange fire */ 72 63 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 */ 76 67 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"); 77 78 /* Thrusters */79 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");80 m.SendCommand("fl");81 68 82 69 //m_particlesystem = new ParticleSystem(); … … 88 75 Ticker::Ref(m_camera); 89 76 77 /* Add tanks */ 90 78 for (int j = 0; j < 10; j++) 91 79 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)); 96 84 Ticker::Ref(m_tanks.Last()); 85 } 86 87 /* Add player */ 88 for (int i = 0; i < 1; i++) 89 { 90 m_players << new Player(); 91 Ticker::Ref(m_players.Last()); 97 92 } 98 93 … … 177 172 for (int i = 0; i < m_tanks.Count(); i++) 178 173 Ticker::Unref(m_tanks[i]); 174 for (int i = 0; i < m_players.Count(); i++) 175 Ticker::Unref(m_players[i]); 179 176 //Ticker::Unref(m_particlesystem); 180 177 Ticker::Unref(m_camera); -
trunk/orbital/orbital.h
r1333 r1344 11 11 #include "particlesystem.h" 12 12 #include "tank.h" 13 #include "player.h" 13 14 14 15 class Orbital : public WorldEntity … … 32 33 ParticleSystem *m_particlesystem; 33 34 Camera *m_camera; 35 Array<Player *> m_players; 34 36 Array<Tank *> m_tanks; 35 37 -
trunk/win32/orbital.vcxproj
r1333 r1344 32 32 <ClInclude Include="..\orbital\orbital.h" /> 33 33 <ClInclude Include="..\orbital\particlesystem.h" /> 34 <ClInclude Include="..\orbital\player.h" /> 34 35 <ClInclude Include="..\orbital\tank.h" /> 35 36 </ItemGroup> -
trunk/win32/orbital.vcxproj.filters
r1333 r1344 4 4 <ClInclude Include="..\orbital\mesh.h" /> 5 5 <ClInclude Include="..\orbital\CommandParser.h" /> 6 <ClInclude Include="..\orbital\player.h" /> 6 7 <ClInclude Include="..\orbital\tank.h" /> 7 8 </ItemGroup>
Note: See TracChangeset
for help on using the changeset viewer.