Changeset 1363
- Timestamp:
- May 10, 2012, 2:01:06 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/orbital/orbital.cpp
r1357 r1363 42 42 Orbital::Orbital() 43 43 { 44 #if 0 44 45 for (int j = 0; j < 20; j++) 45 46 { … … 54 55 } 55 56 } 56 57 #endif 58 59 /* Grey/red bonus */ 60 m.SendCommand("sc0.6,0.7,0.8,1,afcb7,4,7,0.6,sc1,0,0.3,1,afcb4,7,4,0.6"); 61 m.SendCommand("t-40,20,-30,fl"); 62 63 #if 0 57 64 /* Yellow sphere */ 58 65 m.SendCommand("sc1,1,0,1,asph10,30,20,24"); … … 66 73 m.SendCommand("sc0,0,0.3,1,afcb30,30,30,5,ry45,rx45,afcb30,30,30,5"); 67 74 m.SendCommand("t40,40,0,fl"); 68 69 /* Grey/red bonus */70 m.SendCommand("sc0.6,0.7,0.8,1,afcb7,4,7,0.6,sc1,0,0.3,1,afcb4,7,4,0.6");71 m.SendCommand("t-40,20,-30,fl");72 75 73 76 /* Orange/white alien */ … … 82 85 /* Lasers */ 83 86 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"); 87 #endif 84 88 85 89 //m_particlesystem = new ParticleSystem(); 86 90 //Ticker::Ref(m_particlesystem); 91 92 m_starfield = new StarField(100, 100, 1.f, 2.f, 10.f, 20.f); 93 Ticker::Ref(m_starfield); 87 94 88 95 /* Create a camera that matches the settings of XNA Orbital */ … … 195 202 Ticker::Unref(m_players[i]); 196 203 //Ticker::Unref(m_particlesystem); 204 Ticker::Unref(m_starfield); 197 205 Ticker::Unref(m_camera); 198 206 } -
trunk/orbital/orbital.h
r1344 r1363 10 10 #include "mesh.h" 11 11 #include "particlesystem.h" 12 #include "starfield.h" 12 13 #include "tank.h" 13 14 #include "player.h" … … 32 33 33 34 ParticleSystem *m_particlesystem; 35 StarField *m_starfield; 34 36 Camera *m_camera; 35 37 Array<Player *> m_players; -
trunk/win32/orbital.vcxproj
r1344 r1363 33 33 <ClInclude Include="..\orbital\particlesystem.h" /> 34 34 <ClInclude Include="..\orbital\player.h" /> 35 <ClInclude Include="..\orbital\starfield.h" /> 35 36 <ClInclude Include="..\orbital\tank.h" /> 36 37 </ItemGroup> -
trunk/win32/orbital.vcxproj.filters
r1344 r1363 6 6 <ClInclude Include="..\orbital\player.h" /> 7 7 <ClInclude Include="..\orbital\tank.h" /> 8 <ClInclude Include="..\orbital\starfield.h" /> 8 9 </ItemGroup> 9 10 <ItemGroup>
Note: See TracChangeset
for help on using the changeset viewer.