Changeset 1325Tweet

Timestamp:

May 1, 2012, 3:40:56 PM (9 years ago)

Author:

sam

Message:

core: move some of the camera view logic from the Video class to the
Scene and Camera classes.

Location:

trunk/src

Files:

• camera.cpp (modified) (2 diffs)
• entity.h (modified) (1 diff)
• gradient.cpp (modified) (1 diff)
• scene.cpp (modified) (8 diffs)
• scene.h (modified) (1 diff)
• ticker.cpp (modified) (3 diffs)
• video.cpp (modified) (4 diffs)
• video.h (modified) (1 diff)

trunk/src/camera.cpp

@@ -30 +30 @@
 {
     m_gamegroup = GAMEGROUP_BEFORE;
+    m_drawgroup = DRAWGROUP_CAMERA;
 
     SetPosition(position);
@@ -65 +66 @@
 {
     WorldEntity::TickDraw(seconds);
+
+    Scene::GetDefault()->SetViewMatrix(m_view_matrix);
+    Scene::GetDefault()->SetProjMatrix(m_proj_matrix);
 }
 

trunk/src/entity.h

@@ -55 +55 @@
     {
         DRAWGROUP_BEFORE = GAMEGROUP_END,
+        DRAWGROUP_CAMERA,
         DRAWGROUP_DEFAULT,
         DRAWGROUP_HUD,

trunk/src/gradient.cpp

@@ -187 +187 @@
 
     uni_mat = data->shader->GetUniformLocation("proj_matrix");
-    data->shader->SetUniform(uni_mat, Video::GetProjMatrix());
+    data->shader->SetUniform(uni_mat, Scene::GetDefault()->GetProjMatrix());
     uni_mat = data->shader->GetUniformLocation("view_matrix");
-    data->shader->SetUniform(uni_mat, Video::GetViewMatrix());
+    data->shader->SetUniform(uni_mat, Scene::GetDefault()->GetViewMatrix());
     uni_mat = data->shader->GetUniformLocation("model_matrix");
     data->shader->SetUniform(uni_mat, model_matrix);

trunk/src/scene.cpp

@@ -36 +36 @@
 };
 
-static Shader *stdshader = NULL;
-
 /*
  * Scene implementation class
@@ -55 +53 @@
     }
 
-    mat4 model_matrix;
+    mat4 m_model_matrix;
+    mat4 m_view_matrix;
+    mat4 m_proj_matrix;
 
     Tile *tiles;
     int ntiles;
-    float angle;
-
+
+    Shader *m_shader;
     VertexDeclaration *m_vdecl;
     VertexBuffer **bufs;
@@ -74 +74 @@
  */
 
-Scene::Scene(float angle)
+Scene::Scene()
   : data(new SceneData())
 {
+    data->m_model_matrix = mat4(1.f);
+    data->m_view_matrix = mat4(1.f);
+    data->m_proj_matrix = mat4::ortho(0, Video::GetSize().x,
+                                      0, Video::GetSize().y, -1000.f, 1000.f);
+
     data->tiles = 0;
     data->ntiles = 0;
-    data->angle = angle;
-
+
+    data->m_shader = 0;
     data->bufs = 0;
     data->nbufs = 0;
@@ -92 +97 @@
     /* FIXME: this must be done while the GL context is still active.
      * Change the code architecture to make sure of that. */
-    /* XXX: The test is necessary because of a crash with PSGL. */
+    /* FIXME: also, make sure we do not add code to Reset() that will
+     * reallocate stuff */
+    Reset();
+
+    delete data->m_vdecl;
+    delete data;
+}
+
+Scene *Scene::GetDefault()
+{
+    if (!SceneData::scene)
+        SceneData::scene = new Scene();
+    return SceneData::scene;
+}
+
+void Scene::Reset()
+{
     for (int i = 0; i < data->nbufs; i++)
         delete data->bufs[i];
     free(data->bufs);
-
-    delete data->m_vdecl;
-    delete data;
-}
-
-Scene *Scene::GetDefault()
-{
-    if (!SceneData::scene)
-        SceneData::scene = new Scene(0.0f);
-    return SceneData::scene;
-}
-
-void Scene::Reset()
-{
-    if (SceneData::scene)
-        delete SceneData::scene;
-    SceneData::scene = NULL;
+    data->bufs = 0;
+    data->nbufs = 0;
+}
+
+void Scene::SetViewMatrix(mat4 const &m)
+{
+    data->m_view_matrix = m;
+}
+
+void Scene::SetProjMatrix(mat4 const &m)
+{
+    data->m_proj_matrix = m;
+}
+
+mat4 const &Scene::GetViewMatrix(void)
+{
+    return data->m_view_matrix;
+}
+
+mat4 const &Scene::GetProjMatrix(void)
+{
+    return data->m_proj_matrix;
 }
 
@@ -132 +158 @@
 void Scene::Render() // XXX: rename to Blit()
 {
-    if (!stdshader)
+    if (!data->m_shader)
     {
 #if !defined _XBOX && !defined __CELLOS_LV2__ && !defined USE_D3D9
-        stdshader = Shader::Create(
+        data->m_shader = Shader::Create(
 #   if !defined HAVE_GLES_2X
             "#version 130\n"
@@ -217 +243 @@
             "}\n");
 #else
-        stdshader = Shader::Create(
+        data->m_shader = Shader::Create(
             "void main(float4 in_Position : POSITION,"
             "          float2 in_TexCoord : TEXCOORD0,"
@@ -289 +315 @@
 
     // XXX: debug stuff
-    data->model_matrix = mat4::translate(320.0f, 240.0f, 0.0f);
-    data->model_matrix *= mat4::rotate(-data->angle, 1.0f, 0.0f, 0.0f);
+    data->m_model_matrix = mat4::translate(320.0f, 240.0f, 0.0f);
 #if 0
     static float f = 0.0f;
     f += 0.01f;
-    data->model_matrix *= mat4::rotate(6.0f * sinf(f), 1.0f, 0.0f, 0.0f);
-    data->model_matrix *= mat4::rotate(17.0f * cosf(f), 0.0f, 0.0f, 1.0f);
-#endif
-    data->model_matrix *= mat4::translate(-320.0f, -240.0f, 0.0f);
+    data->m_model_matrix *= mat4::rotate(6.0f * sinf(f), 1.0f, 0.0f, 0.0f);
+    data->m_model_matrix *= mat4::rotate(17.0f * cosf(f), 0.0f, 0.0f, 1.0f);
+#endif
+    data->m_model_matrix *= mat4::translate(-320.0f, -240.0f, 0.0f);
     // XXX: end of debug stuff
 
     ShaderUniform uni_mat, uni_tex;
     ShaderAttrib attr_pos, attr_tex;
-    attr_pos = stdshader->GetAttribLocation("in_Position", VertexUsage::Position, 0);
-    attr_tex = stdshader->GetAttribLocation("in_TexCoord", VertexUsage::TexCoord, 0);
-
-    stdshader->Bind();
-
-    uni_mat = stdshader->GetUniformLocation("proj_matrix");
-    stdshader->SetUniform(uni_mat, Video::GetProjMatrix());
-    uni_mat = stdshader->GetUniformLocation("view_matrix");
-    stdshader->SetUniform(uni_mat, Video::GetViewMatrix());
-    uni_mat = stdshader->GetUniformLocation("model_matrix");
-    stdshader->SetUniform(uni_mat, data->model_matrix);
+    attr_pos = data->m_shader->GetAttribLocation("in_Position", VertexUsage::Position, 0);
+    attr_tex = data->m_shader->GetAttribLocation("in_TexCoord", VertexUsage::TexCoord, 0);
+
+    data->m_shader->Bind();
+
+    uni_mat = data->m_shader->GetUniformLocation("proj_matrix");
+    data->m_shader->SetUniform(uni_mat, data->m_proj_matrix);
+    uni_mat = data->m_shader->GetUniformLocation("view_matrix");
+    data->m_shader->SetUniform(uni_mat, data->m_view_matrix);
+    uni_mat = data->m_shader->GetUniformLocation("model_matrix");
+    data->m_shader->SetUniform(uni_mat, data->m_model_matrix);
 
 #if defined USE_D3D9 || defined _XBOX
 #else
-    uni_tex = stdshader->GetUniformLocation("in_Texture");
-    stdshader->SetUniform(uni_tex, 0);
+    uni_tex = data->m_shader->GetUniformLocation("in_Texture");
+    data->m_shader->SetUniform(uni_tex, 0);
 
 #if !defined HAVE_GLES_2X
@@ -386 +411 @@
     data->ntiles = 0;
 
-    stdshader->Unbind();
+    data->m_shader->Unbind();
 
 #if defined USE_D3D9 || defined _XBOX

trunk/src/scene.h

@@ -29 +29 @@
 {
 public:
-    Scene(float angle);
+    Scene();
     ~Scene();
 
     static Scene *GetDefault();
-    static void Reset();
 
+    void SetViewMatrix(mat4 const &m);
+    void SetProjMatrix(mat4 const &m);
+    mat4 const &GetViewMatrix(void);
+    mat4 const &GetProjMatrix(void);
+
+    void Reset();
+    void Render();
+
+    /* FIXME: this should be deprecated -- it doesn't really match
+     * the architecture we want to build */
     void AddTile(TileSet *tileset, int id, vec3 pos, int o, vec2 scale);
-    void Render();
 
 private:

trunk/src/ticker.cpp

@@ -343 +343 @@
     Profiler::Start(Profiler::STAT_TICK_DRAW);
 
-    Video::Clear();
-
-    Scene::GetDefault();
-
     /* Tick objects for the draw loop */
     for (int i = Entity::DRAWGROUP_BEGIN; i < Entity::DRAWGROUP_END; i++)
@@ -352 +348 @@
         switch (i)
         {
+        case Entity::DRAWGROUP_BEGIN:
+            Scene::GetDefault()->Reset();
+            Video::Clear();
+            break;
         case Entity::DRAWGROUP_HUD:
-            Scene::GetDefault()->Render();
             Video::SetDepth(false);
             break;
@@ -376 +375 @@
 #endif
             }
-    }
-
-    Scene::GetDefault()->Render();
-    Scene::Reset();
+
+        /* Do this render step */
+        Scene::GetDefault()->Render();
+    }
 
     Profiler::Stop(Profiler::STAT_TICK_DRAW);

trunk/src/video.cpp

@@ -52 +52 @@
 
 private:
-    static mat4 proj_matrix, view_matrix;
+    static mat4 proj_matrix;
     static ivec2 saved_viewport;
 #if defined USE_D3D9
@@ -66 +66 @@
 
 mat4 VideoData::proj_matrix;
-mat4 VideoData::view_matrix;
 ivec2 VideoData::saved_viewport(0, 0);
 
@@ -195 +194 @@
         VideoData::proj_matrix = proj * trans;
     }
-
-    VideoData::view_matrix = mat4(1.0f);
 }
 
@@ -298 +295 @@
 }
 
-mat4 const & Video::GetProjMatrix()
-{
-    return VideoData::proj_matrix;
-}
-
-mat4 const & Video::GetViewMatrix()
-{
-    return VideoData::view_matrix;
-}
-
 } /* namespace lol */
 

trunk/src/video.h

@@ -34 +34 @@
     static void Capture(uint32_t *buffer);
     static ivec2 GetSize();
-    static mat4 const & GetProjMatrix();
-    static mat4 const & GetViewMatrix();
 };