Changeset 1364Tweet

Timestamp:

May 10, 2012, 10:02:12 PM (11 years ago)

Author:

sam

Message:

orbital: simplify starfield.

Location:

trunk/orbital

Files:

• orbital.cpp (modified) (3 diffs)
• orbital.h (modified) (1 diff)
• starfield.h (modified) (4 diffs)

trunk/orbital/orbital.cpp

@@ -90 +90 @@
     //Ticker::Ref(m_particlesystem);
 
-    m_starfield = new StarField(100, 100, 1.f, 2.f, 10.f, 20.f);
-    Ticker::Ref(m_starfield);
+    m_small_stars = new StarField(100, 1.f, 20.f);
+    Ticker::Ref(m_small_stars);
+    m_large_stars = new StarField(100, 2.f, 10.f);
+    Ticker::Ref(m_large_stars);
 
     /* Create a camera that matches the settings of XNA Orbital */
@@ -190 +192 @@
     }
 
-    Video::SetClearColor(vec4(0.0f, 0.0f, 0.0f, 1.0f));
+    Video::SetClearColor(vec4(0.0f, 0.0f, 0.12f, 1.0f));
 
     m.Render(m_model);
@@ -202 +204 @@
         Ticker::Unref(m_players[i]);
     //Ticker::Unref(m_particlesystem);
-    Ticker::Unref(m_starfield);
+    Ticker::Unref(m_small_stars);
+    Ticker::Unref(m_large_stars);
     Ticker::Unref(m_camera);
 }

trunk/orbital/orbital.h

@@ -33 +33 @@
 
     ParticleSystem *m_particlesystem;
-    StarField *m_starfield;
+    StarField *m_small_stars, *m_large_stars;
     Camera *m_camera;
     Array<Player *> m_players;

trunk/orbital/starfield.h

@@ -13 +13 @@
 {
 public:
-    StarField(int count3, int count4, float z3, float z4, float speed3, float speed4)
+    StarField(int count, float z, float speed)
       : m_ready(false)
     {
-        m_star3_mesh.SendCommand("sc1,1,1,1,scb1,1,1,0,ad4,1.8,1");
-        m_star4_mesh.SendCommand("sc1,1,1,1,scb1,1,1,0,ad3,0.8,1");
+        if (z == 1.f)
+            m_mesh.SendCommand("sc1,1,1,1,scb1,1,1,0,ad4,1.8,1");
+        else
+            m_mesh.SendCommand("sc1,1,1,1,scb1,1,1,0,ad3,0.8,1");
 
-        for (int i = 0; i < count3; i++)
-            m_star3.Push(vec3(RandF(800.f) - 400.f, z3, RandF(600.f) - 300.f),
-                         vec3(0.f, 0.f, speed3),
-                         RandF(0.f, 10.f));
-
-        for (int i = 0; i < count4; i++)
-            m_star4.Push(vec3(RandF(800.f) - 400.f, z4, RandF(600.f) - 300.f),
-                         vec3(0.f, 0.f, speed4),
+        for (int i = 0; i < count; i++)
+            m_stars.Push(vec3(RandF(440.f) - 220.f, z, RandF(600.f) - 300.f),
+                         vec3(0.f, 0.f, speed),
                          RandF(0.f, 10.f));
     }
@@ -34 +31 @@
     }
 
-    char const *GetName() { return "<particlesystem>"; }
+    char const *GetName() { return "<starfield>"; }
 
 protected:
@@ -41 +38 @@
         WorldEntity::TickGame(seconds);
 
-        for (int i = 0; i < m_star3.Count(); i++)
+        for (int i = 0; i < m_stars.Count(); i++)
         {
-            m_star3[i].m3 += 10.f * seconds;
-            m_star3[i].m1 += seconds * m_star3[i].m2;
-            if (m_star3[i].m1.z > 300.f)
-                m_star3[i].m1.z = -300.f;
-        }
-
-        for (int i = 0; i < m_star4.Count(); i++)
-        {
-            m_star4[i].m3 += 10.f * seconds;
-            m_star4[i].m1 += seconds * m_star4[i].m2;
-            if (m_star4[i].m1.z > 300.f)
-                m_star4[i].m1.z = -300.f;
+            m_stars[i].m3 += 10.f * seconds;
+            m_stars[i].m1 += seconds * m_stars[i].m2;
+            if (m_stars[i].m1.z > 300.f)
+            {
+                m_stars[i].m1.x = RandF(440.f) - 220.f;
+                m_stars[i].m1.z = -300.f;
+            }
         }
     }
@@ -64 +56 @@
         if (!m_ready)
         {
-            m_star3_mesh.SendCommand("irb");
-            m_star4_mesh.SendCommand("irb");
+            m_mesh.SendCommand("irb");
             m_ready = true;
         }
 
-        for (int i = 0; i < m_star3.Count(); i++)
+        for (int i = 0; i < m_stars.Count(); i++)
         {
-            mat4 model = mat4::translate(m_star3[i].m1)
-                       * mat4::rotate(m_star3[i].m3, 0.f, 1.f, 0.f);
+            mat4 model = mat4::translate(m_stars[i].m1)
+                       * mat4::rotate(m_stars[i].m3, 0.f, 1.f, 0.f);
 
-            m_star3_mesh.Render(model);
-        }
-
-        for (int i = 0; i < m_star4.Count(); i++)
-        {
-            mat4 model = mat4::translate(m_star4[i].m1)
-                       * mat4::rotate(m_star4[i].m3, 0.f, 1.f, 0.f);
-
-            m_star4_mesh.Render(model);
+            m_mesh.Render(model);
         }
     }
 
 private:
-    Mesh m_star3_mesh, m_star4_mesh;
-    Array<vec3, vec3, float> m_star3, m_star4;
+    Mesh m_mesh;
+    Array<vec3, vec3, float> m_stars;
     bool m_ready;
 };