Changeset 1304Tweet

Timestamp:

Apr 28, 2012, 3:38:35 PM (9 years ago)

Author:

sam

Message:

orbital: add more comments to the various meshes we have.

Location:

trunk/orbital

Files:

• camera.h (modified) (1 diff)
• mesh.h (modified) (7 diffs)
• orbital.cpp (modified) (3 diffs)

trunk/orbital/camera.h

@@ -40 +40 @@
         m_view_matrix = mat4::lookat(m_position, m_target, m_up);
         m_proj_matrix = mat4::perspective(45.0f, 640.0f, 480.0f, 1.f, 1000.0f);
-        //m_proj_matrix = mat4::ortho(0, 640, 0, -480, .1f, 2000.0f);
+        //m_proj_matrix = mat4::ortho(-160, 160, -120, 120, .1f, 2000.0f);
     }
 

trunk/orbital/mesh.h

@@ -56 +56 @@
             else CASE("ascb") { p = GetArg(p, v3, f1); AppendSmoothChamfBox(v3, f1); }
             else CASE("afcb") { p = GetArg(p, v3, f1); AppendFlatChamfBox(v3, f1); }
-            else CASE("asph") { p = GetArg(p, v3, f1); AppendSphere(v3, (int)f1); }
+            else CASE("asph") { p = GetArg(p, f1); p = GetArg(p, v3); AppendSphere((int)f1, v3); }
             else CASE("as")  { p = GetArg(p, f1, f2, f3, f4, f5); AppendStar((int)f1, f2, f3, (int)f4, (int)f5); }
             else CASE("aes") { p = GetArg(p, f1, f2, f3, f4); AppendExpandedStar((int)f1, f2, f3, f4); }
@@ -156 +156 @@
             "void main(void)"
             "{"
-                 /* Diffuse information -- the level decides this */
-
                  /* Global shit */
             "    float alpha_mul = 1.0f;"
@@ -175 +173 @@
 
                  /* Specular: global settings */
-            "    vec4 spec_col = vec4(0.8, 0.85, 0.4, 1.0);"
-            "    vec3 spec_dir = normalize(vec3(-0.7, -0.7, 0.4));"
-            "    float spec_exp = 60.0f;"
+            "    vec4 spec_col = vec4(0.8, 0.75, 0.4, 1.0);"
+            "    vec3 spec_dir = normalize(vec3(-0.3, -0.3, -1.8));"
+            "    float spec_exp = 60.f;"
 
             "    float spec_mul = max(-dot(world_normal, spec_dir), 0.0);"
@@ -183 +181 @@
 
 
-            "    vec4 TmpColor = frontColor * in_Color;"
-                 /* NOTE: use saturate() in HLSL */
-            "    pass_Color = clamp(diffuse_mul[0] * TmpColor"
+            "    vec4 tmpColor = frontColor * in_Color;"
+            "    pass_Color = clamp(diffuse_mul[0] * tmpColor"
             "                        + diffuse_mul[1] * backColor"
             "                        + spec_mul * spec_col, 0.0, 1.0);"
@@ -224 +221 @@
             "    float spec_mul = max(-dot(world_normal, spec_dir), 0.0);"
             "    spec_mul = saturate(pow(spec_mul, spec_exp));"
-            "    float4 TmpColor = frontColor * in_Color;"
-            "    pass_Color = saturate(diffuse_mul[0] * TmpColor"
+            "    float4 tmpColor = frontColor * in_Color;"
+            "    pass_Color = saturate(diffuse_mul[0] * tmpColor"
             "                           + diffuse_mul[1] * backColor"
             "                           + spec_mul * spec_col);"
@@ -543 +540 @@
     }
 
-    void AppendSphere(vec3 const &size, int divisions)
-    {
+    void AppendSphere(int ndivisions, vec3 const &size)
+    {
+        ndivisions *= 2;
+
         int ibase = m_quadidx.Count();
         int vbase = m_vert.Count();
@@ -552 +551 @@
 
         Array<vec2> table;
-        for (int i = 0; i <= divisions; i++)
-            table.Append(vec2(std::sin(pi * 2 / divisions * i) + 1e-5f,
-                              std::cos(pi * 2 / divisions * i) + 1e-5f));
-
-        for (int j = 0; j <= divisions / 2; j++)
-            for (int i = 0; i < divisions; i++)
+        for (int i = 0; i <= ndivisions; i++)
+            table.Append(vec2(std::sin(pi * 2 / ndivisions * i) + 1e-5f,
+                              std::cos(pi * 2 / ndivisions * i) + 1e-5f));
+
+        for (int j = 0; j <= ndivisions / 2; j++)
+            for (int i = 0; i < ndivisions; i++)
             {
                 int j2 = j + 1;
-                int i2 = (i + 1) % divisions;
+                int i2 = (i + 1) % ndivisions;
 
                 AppendQuadVert(d * vec3(table[i], 1.0f) * table[j].xxy);

trunk/orbital/orbital.cpp

@@ -30 +30 @@
 Orbital::Orbital()
 {
-    m.SendCommand("sc1,1,0,1,asph10,16,20,24");
+    for (int j = 0; j < 20; j++)
+    {
+        for (int i = 0; i < 20; i++)
+        {
+            m.SendCommand(((i + j) % 2) ? "sc.3,.7,.9,1,scb.3,.7,.9,1"
+                                        : "sc.3,.3,.7,1,scb.3,.3,.7,1");
+            m.SendCommand("ac4,2,44,40,0,0,ty-1,ad4,40,0,ry45");
+            m.Scale(vec3(std::sqrt(0.5f)));
+            m.Translate(vec3(i * 44 - 440, -50, j * 44 - 440));
+            m.Flush();
+        }
+    }
+
+    /* Yellow sphere */
+    m.SendCommand("sc1,1,0,1,asph10,30,20,24");
     m.SendCommand("t0,0,-60,fl");
 
+    /* Pink box */
     m.SendCommand("sc1,0,1,1,afcb10,10,10,1,rx45,rz45");
     m.SendCommand("t-20,-20,0,fl");
 
+    /* Large meteor */
     m.SendCommand("sc0,0,0.3,1,afcb30,30,30,5,ry45,rx45,afcb30,30,30,5");
     m.SendCommand("t40,40,0,fl");
 
-    m.SendCommand("sc1,1,0,1,scb1,0,0,0,at4,1,s1.5,1,4,tz-13,ad6,5.8,1");
-    m.SendCommand("t-40,-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 */
     m.SendCommand("sc1,0.7,0,1,afcb12,3,10,0.4,tz3,sc1,1,1,1,afcb2,10,10,0.4");
     m.SendCommand("rx20,ry30,t0,40,-20,fl");
 
+    /* Tank body + tank head */
     m.SendCommand("sc0.1,0.1,0,1,ab6,6,15,ty-2,sc1,1,1,1,afcb4,5,16,0.4,tx4,tx60,mx,tx120,fl,sc0.2,0.7,0,1,afcb8,7,10,0.4,tz-4,tx60,fl");
     m.SendCommand("sc0.2,0.7,0,1,afcb3,6,10,0.4,tx-8,afcb3,6,10,0.4,tx4,ty10,tx60,fl,sc1,1,1,1,afcb3,6,10,0.4,rx-30,ty10,tx60,fl");
 
-    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");
-
+    /* 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");
@@ -61 +76 @@
     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");
+    m.SendCommand("t-40,-40,0,fl");
+
+    /* 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();
-    m_camera = new Camera(vec3(0, 150, 200),
+    m_camera = new Camera(vec3(0, 200, 300),
                           vec3(0, 0, 0),
                           vec3(0, 1, 0));
@@ -80 +104 @@
     WorldEntity::TickGame(deltams);
 
-    m_angle += deltams / 1000.0f * 90.0f;
+    m_angle += deltams / 50.0f;
 
-    mat4 anim = mat4::rotate(m_angle, vec3(0, 1, 0))
-              * mat4::rotate(m_angle * 0.25f, vec3(0, 0, 1));
+    mat4 anim = mat4::rotate(m_angle, vec3(0, 1, 0));
     mat4 model = mat4::translate(vec3(0));