Changeset 1477 for trunk/neercs/video/render.cppTweet

Timestamp:

Jun 14, 2012, 9:43:44 PM (11 years ago)

Author:

sam

Message:

neercs: improve the point sprite rendering routine.

File:

• trunk/neercs/video/render.cpp (modified) (11 diffs)

trunk/neercs/video/render.cpp

@@ -40 +40 @@
 
 #define DEBUG 1            // debug flag //#if defined(_DEBUG)
-#define SHADER 0           // shader flag
+#define SHADER 1           // shader flag
 #define FUCK 0             // test flag
 #define PI 3.1415926535f   // pi
@@ -183 +183 @@
         for (int j = 0; j < m_height; j++)
         for (int i = 0; i < m_width; i++)
-            m_vertices << vec2(0.05 * i - 1.0, 0.5 - 0.09 * j);
+            m_vertices << vec2(5.0 / 128.0 * i - 0.75, 0.5 - 0.0525 * j);
     }
 
@@ -191 +191 @@
         m_coord = m_shader->GetAttribLocation("in_Position",
                                               VertexUsage::Position, 0);
-        m_color = m_shader->GetAttribLocation("in_Color",
+        m_color = m_shader->GetAttribLocation("in_Attr",
                                               VertexUsage::Color, 0);
         m_char = m_shader->GetAttribLocation("in_Char",
@@ -212 +212 @@
     void Blit()
     {
-        void *colors = m_vbo2->Lock(0, 0);
-for (int j = 0; j < m_height; j++)
-for (int i = 0; i < m_width; i++)
-{
-    uint32_t attr = caca_get_attr(m_caca, i, j);
-//printf("%i %i: %08x -> ", i, j, attr);
-    uint16_t fg = caca_attr_to_rgb12_fg(attr);
-    uint16_t bg = caca_attr_to_rgb12_bg(attr);
-//printf("%04x %04x -> ", fg, bg);
-    caca_set_color_argb(m_caca, fg, bg);
-    attr = caca_get_attr(m_caca, -1, -1);
-//printf("%08x\n", attr);
-    caca_put_attr(m_caca, i, j, attr);
-}
+        uint32_t *colors = (uint32_t *)m_vbo2->Lock(0, 0);
+        for (int j = 0; j < m_height; j++)
+        for (int i = 0; i < m_width; i++)
+        {
+            uint32_t attr = caca_get_attr(m_caca, i, j);
+            uint16_t fg = caca_attr_to_rgb12_fg(attr);
+            uint16_t bg = caca_attr_to_rgb12_bg(attr);
+            caca_set_color_argb(m_caca, fg, bg);
+            attr = caca_get_attr(m_caca, -1, -1);
+            caca_put_attr(m_caca, i, j, attr);
+            uint32_t a2 = caca_get_attr(m_caca, i, j);
+        }
         memcpy(colors, caca_get_canvas_attrs(m_caca),
                m_width * m_height * sizeof(uint32_t));
         m_vbo2->Unlock();
 
-        void *chars = m_vbo3->Lock(0, 0);
+        uint32_t *chars = (uint32_t *)m_vbo3->Lock(0, 0);
         memcpy(chars, caca_get_canvas_chars(m_caca),
                m_width * m_height * sizeof(uint32_t));
@@ -250 +248 @@
         tex_map->Unbind();
         m_shader->Unbind();
+        glDisable(GL_POINT_SPRITE);
     }
 
@@ -534 +533 @@
     }
 
+    Draw2D();
+    Draw3D();
+
+#if FUCK
+    text_render->Blit();
+#endif
+}
+
+void Render::Draw2D()
+{
+#if SHADER
+    if(shader_flag)
+    {
+        fbo_back->Bind();
+        fbo_back->Clear(vec4(screen_color, 0.0f), 1.0f);
+    }
+    else
+    {
+        glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+    }
+#else
+    glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+#endif
+
     glEnableClientState(GL_VERTEX_ARRAY);
     glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-    Draw2D();
-    Draw3D();
-    glDisableClientState(GL_VERTEX_ARRAY);
-    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-#if FUCK
-    text_render->Blit();
-#endif
-}
-
-void Render::Draw2D()
-{
-#if SHADER
-    if(shader_flag)
-    {
-        fbo_back->Bind();
-        fbo_back->Clear(vec4(screen_color, 0.0f), 1.0f);
-    }
-    else
-    {
-        glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-    }
-#else
-    glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-#endif
 
     glEnable(GL_BLEND);
@@ -612 +611 @@
         glTexCoordPointer(2, GL_FLOAT, 0, shell_tex);
         glDrawArrays(GL_QUADS, 0, 4);
+#if !FUCK
         // draw dos text
         glVertexPointer(2, GL_INT, 0, dos_vtx);
@@ -660 +660 @@
             //if(car==car_cursor) glColor3f(1.0f, 1.0f, 1.0f);
         }
+#endif
     }
     // draw corner
@@ -679 +680 @@
     glEnable(GL_BLEND);
     tex_map->Unbind();
+
+    glDisableClientState(GL_VERTEX_ARRAY);
+    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 }
 
@@ -689 +693 @@
     if (!shader_flag)
         return;
+
+    glEnableClientState(GL_VERTEX_ARRAY);
+    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 
     init_shader();
@@ -804 +811 @@
         draw_shader_simple(fbo_pong, 0);
     }
+
+    glDisableClientState(GL_VERTEX_ARRAY);
+    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 #endif
 }