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

Timestamp:

Jun 16, 2012, 5:16:54 PM (9 years ago)

Author:

sam

Message:

neercs: font blitting is now pixel perfect.

File:

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

trunk/neercs/video/render.cpp

@@ -41 +41 @@
 #define DEBUG 1            // debug flag //#if defined(_DEBUG)
 #define SHADER 1           // shader flag
-#define FUCK 1             // test flag
 #define PID M_PI/180.0f    // pi ratio
 #define CR 1.0f/256.0f     // color ratio
@@ -165 +164 @@
               shader_postfx_sync;
 
-FrameBuffer *fbo_back, *fbo_front, *fbo_blur_h, *fbo_blur_v;
-FrameBuffer *fbo_ping, *fbo_pong;
+FrameBuffer *fbo_text, *fbo_back, *fbo_front;
+FrameBuffer *fbo_blur_h, *fbo_blur_v, *fbo_ping, *fbo_pong;
 #endif
 
@@ -181 +180 @@
         for (int j = 0; j < m_height; j++)
         for (int i = 0; i < m_width; i++)
-            m_vertices << vec2(5.1 / 128.0 * i - 0.91, 0.75 - 0.0525 * j);
+            m_vertices << vec2(i, j);
     }
 
@@ -194 +193 @@
                                              VertexUsage::Color, 1);
         m_texture = m_shader->GetUniformLocation("in_Texture");
+        m_transform = m_shader->GetUniformLocation("in_Transform");
         m_vdecl
           = new VertexDeclaration(VertexStream<vec2>(VertexUsage::Position),
@@ -208 +208 @@
     }
 
-    void Blit()
-    {
+    void Blit(ivec2 screen_size, ivec2 font_size)
+    {
+        /* Transform matrix for the scene:
+         *  - translate to the centre of the glyph
+         *  - scale by 2.f * font_size / screen_size
+         *  - translate to the upper left corner */
+        mat4 xform = mat4::translate(-1.f, 1.f, 0.f)
+                   * mat4::scale(vec3(2.f * font_size / (screen_size), 1.f)
+                                  * vec3(1.f, -1.f, 1.f))
+                   * mat4::translate(0.5f, 0.5f, 0.f);
+
+        /* Upload libcaca canvas contents to the vertex buffers */
         uint32_t *colors = (uint32_t *)m_vbo2->Lock(0, 0);
         for (int j = 0; j < m_height; j++)
@@ -234 +244 @@
         //glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
         glDisable(GL_POINT_SMOOTH);
-        glPointSize(16.f);
+        glPointSize((float)max(font_size.x, font_size.y));
         m_shader->Bind();
         tex_map->Bind();
         m_shader->SetUniform(m_texture, 0);
+        m_shader->SetUniform(m_transform, xform);
         m_vdecl->SetStream(m_vbo1, m_coord);
         m_vdecl->SetStream(m_vbo2, m_color);
@@ -256 +267 @@
     Shader *m_shader;
     ShaderAttrib m_coord, m_color, m_char;
-    ShaderUniform m_texture;
+    ShaderUniform m_texture, m_transform;
     VertexDeclaration *m_vdecl;
     VertexBuffer *m_vbo1, *m_vbo2, *m_vbo3;
@@ -379 +390 @@
     if (shader_flag)
     {
+        fbo_text = new FrameBuffer(screen_size);
         fbo_back = new FrameBuffer(screen_size);
         fbo_front = new FrameBuffer(screen_size);
@@ -533 +545 @@
 {
 #if SHADER
+    /* Draw text in an offline buffer */
+    fbo_text->Bind();
+    text_render->Blit(screen_size, ivec2(8, 8));
+    fbo_text->Unbind();
+#endif
+
+    /* Clear the back buffer */
+#if SHADER
     if(shader_flag)
     {
@@ -546 +566 @@
 #endif
 
-    text_render->Blit();
+    /* FIXME: when SHADER is true, we should blit the offline
+     * buffer instead, but for some reason it doesn't work yet. */
+    text_render->Blit(screen_size, ivec2(8, 8));
 
     glEnableClientState(GL_VERTEX_ARRAY);
@@ -558 +580 @@
 
     init_viewport(1);
+
+#if 0
+    /* Render text buffer to the current buffer */
+    glEnable(GL_BLEND);
+    glEnable(GL_TEXTURE_2D);
+    glBlendFunc(GL_ONE, GL_ONE);
+    glVertexPointer(2, GL_INT, 0, shell_vtx);
+    glTexCoordPointer(2, GL_FLOAT, 0, shell_tex);
+    shader_simple->Bind();
+    shader_simple->SetTexture(shader_simple_texture, fbo_text->GetTexture(), 0);
+    fs_quad();
+    shader_simple->Unbind();
+#endif
 
     tex_map->Bind();