Changeset 1332Tweet

Timestamp:

May 2, 2012, 1:47:32 PM (11 years ago)

Author:

sam

Message:

orbital: do not let the world objects know anything about the projection
or view matrix unless strictly necessary.

Location:

trunk/orbital

Files:

• mesh.h (modified) (1 diff)
• orbital.cpp (modified) (2 diffs)
• orbital.h (modified) (1 diff)
• particlesystem.h (modified) (1 diff)

trunk/orbital/mesh.h

@@ -224 +224 @@
     }
 
-    void Render(mat4 const &modelview, mat4 const &proj)
-    {
+    void Render(mat4 const &model)
+    {
+        mat4 modelview = Scene::GetDefault()->GetViewMatrix() * model;
         mat3 normalmat = transpose(inverse(mat3(modelview)));
 
         m_gpu.shader->Bind();
         m_gpu.shader->SetUniform(m_gpu.modelview, modelview);
-        m_gpu.shader->SetUniform(m_gpu.proj, proj);
+        m_gpu.shader->SetUniform(m_gpu.proj, Scene::GetDefault()->GetProjMatrix());
         m_gpu.shader->SetUniform(m_gpu.normalmat, normalmat);
         m_gpu.vdecl->SetStream(m_gpu.vbo, m_gpu.coord, m_gpu.norm, m_gpu.color);

trunk/orbital/orbital.cpp

@@ -149 +149 @@
     mat4 model = mat4::translate(vec3(0));
 
-    m_modelview = m_camera->GetViewMatrix() * model * anim;
-    m_proj = m_camera->GetProjMatrix();
+    m_model = model * anim;
 }
 
@@ -167 +166 @@
     Video::SetClearColor(vec4(0.0f, 0.0f, 0.0f, 1.0f));
 
-    m.Render(m_modelview, m_proj);
+    m.Render(m_model);
 }
 

trunk/orbital/orbital.h

@@ -28 +28 @@
     float m_auto_cam_timer;
     vec3 m_angle, m_angular_velocity;
-
-    mat4 m_modelview, m_proj;
+    mat4 m_model;
 
     ParticleSystem *m_particlesystem;

trunk/orbital/particlesystem.h

@@ -60 +60 @@
             m_ready = true;
         }
-        mat4 anim = mat4::rotate(m_angle, vec3(0, 1, 0));
-        mat4 view = mat4::lookat(vec3(0, 2, 0), vec3(0, 0, -4), vec3(0, 1, 0));
-        mat4 proj = mat4::perspective(45.0f, 640.0f, 480.0f, 0.1f, 10.0f);
 
         for (int i = 0; i < m_particles.Count(); i++)
         {
-            mat4 model = mat4::translate(vec3(0, 0, -4.5))
-                       * mat4::scale(vec3(0.025))
-                       * mat4::translate(m_particles[i].m1);
-            mat4 modelview = view * model * anim;
+            mat4 model = mat4::translate(vec3(0, 0, -100))
+                       * mat4::translate(m_particles[i].m1);;
 
-            m_mesh.Render(modelview, proj);
+            m_mesh.Render(model);
         }
     }