Changeset 1363Tweet

Timestamp:

May 10, 2012, 2:01:06 PM (9 years ago)

Author:

sam

Message:

orbital: add the two parallax starfields.

Location:

trunk

Files:

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

trunk/orbital/orbital.cpp

@@ -42 +42 @@
 Orbital::Orbital()
 {
+#if 0
     for (int j = 0; j < 20; j++)
     {
@@ -54 +55 @@
         }
     }
-
+#endif
+
+    /* Grey/red bonus */
+    m.SendCommand("sc0.6,0.7,0.8,1,afcb7,4,7,0.6,sc1,0,0.3,1,afcb4,7,4,0.6");
+    m.SendCommand("t-40,20,-30,fl");
+
+#if 0
     /* Yellow sphere */
     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");
     m.SendCommand("t40,40,0,fl");
-
-    /* Grey/red bonus */
-    m.SendCommand("sc0.6,0.7,0.8,1,afcb7,4,7,0.6,sc1,0,0.3,1,afcb4,7,4,0.6");
-    m.SendCommand("t-40,20,-30,fl");
 
     /* Orange/white alien */
@@ -82 +85 @@
     /* 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");
+#endif
 
     //m_particlesystem = new ParticleSystem();
     //Ticker::Ref(m_particlesystem);
+
+    m_starfield = new StarField(100, 100, 1.f, 2.f, 10.f, 20.f);
+    Ticker::Ref(m_starfield);
 
     /* Create a camera that matches the settings of XNA Orbital */
@@ -195 +202 @@
         Ticker::Unref(m_players[i]);
     //Ticker::Unref(m_particlesystem);
+    Ticker::Unref(m_starfield);
     Ticker::Unref(m_camera);
 }

trunk/orbital/orbital.h

@@ -10 +10 @@
 #include "mesh.h"
 #include "particlesystem.h"
+#include "starfield.h"
 #include "tank.h"
 #include "player.h"
@@ -32 +33 @@
 
     ParticleSystem *m_particlesystem;
+    StarField *m_starfield;
     Camera *m_camera;
     Array<Player *> m_players;

trunk/win32/orbital.vcxproj

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

trunk/win32/orbital.vcxproj.filters

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