Changeset 1503Tweet

Timestamp:

Jun 20, 2012, 7:13:35 PM (11 years ago)

Author:

sam

Message:

neercs: the text rendering FBO is now exactly the required size.

Location:

trunk/neercs/video

Files:

• render.cpp (modified) (4 diffs)
• text-render.cpp (modified) (6 diffs)
• text-render.h (modified) (1 diff)

trunk/neercs/video/render.cpp

@@ -324 +324 @@
     {
         CreateGLWindow("LOL");
-        text_render->Init(screen_size);
+        text_render->Init();
 
         m_ready = true;
@@ -380 +380 @@
 {
     /* Draw text in an offline buffer */
-    text_render->Render(screen_size);
+    text_render->Render();
 
     if(shader_flag)
         fbo_back->Bind();
+
+    glViewport(0, 0, screen_size.x, screen_size.y);
 
     /* Clear the back buffer */
@@ -394 +396 @@
     ivec2 border_bottom = ivec2(dos_m * 2, dos_m * 2 + font_size.y * ratio_2d.y)
                         + ratio_2d * 2;
-    text_render->Blit(screen_size, border_top, screen_size - border_bottom);
+    text_render->Blit(border_top, screen_size - border_bottom);
 
     glEnable(GL_BLEND);
@@ -402 +404 @@
     if(polygon) glEnable(GL_TEXTURE_2D);
 
-    glViewport(0, 0, screen_size.x, screen_size.y);
     glMatrixMode(GL_PROJECTION);
     mat4 m = mat4::ortho(0, screen_size.x, screen_size.y, 0, -1.f, 1.f);

trunk/neercs/video/text-render.cpp

@@ -34 +34 @@
     m_canvas_size(caca_get_canvas_width(m_caca),
                   caca_get_canvas_height(m_caca)),
+    m_fbo_size(m_font_size * m_canvas_size),
     m_cells(m_canvas_size.x * m_canvas_size.y)
 {
@@ -41 +42 @@
 }
 
-void TextRender::Init(ivec2 screen_size)
+void TextRender::Init()
 {
     m_font = new TileSet("neercs/video/resource/map.png",
@@ -68 +69 @@
     m_vbo3 = new VertexBuffer(m_cells * sizeof(int32_t));
 
-    m_fbo = new FrameBuffer(screen_size);
+    m_fbo = new FrameBuffer(m_fbo_size);
 }
 
-void TextRender::Render(ivec2 fbo_size)
+void TextRender::Render()
 {
     /* Transform matrix for the scene:
      *  - translate to the centre of the glyph
      *  - scale by 2.f * font_size / fbo_size
-     *  - translate to the upper left corner */
-    mat4 xform = mat4::translate(-1.f, 1.f, 0.f)
-               * mat4::scale(vec3(2.f * m_font_size / (fbo_size), 1.f)
+     *  - translate to the lower left corner */
+    mat4 xform = mat4::translate(-1.f, -1.f + 2.0f * m_font_size.y
+                                        * m_canvas_size.y / m_fbo_size.y, 0.f)
+               * mat4::scale(vec3(2.f * m_font_size / m_fbo_size, 1.f)
                               * vec3(1.f, -1.f, 1.f))
                * mat4::translate(0.5f, 0.5f, 0.f);
@@ -104 +106 @@
 
     m_fbo->Bind();
+    glViewport(0, 0, m_fbo_size.x, m_fbo_size.y);
     glDisable(GL_DEPTH_TEST);
     glEnable(GL_POINT_SPRITE);
@@ -125 +128 @@
 }
 
-void TextRender::Blit(ivec2 fbo_size, ivec2 pos, ivec2 size)
+void TextRender::Blit(ivec2 pos, ivec2 size)
 {
     glDisable(GL_BLEND);
@@ -132 +135 @@
     glColor3f(1.0f, 1.0f, 1.0f);
 
-    vec2 tc = (vec2)m_canvas_size * m_font_size / fbo_size;
+    vec2 tc = (vec2)m_canvas_size * m_font_size / m_fbo_size;
 
     glLoadIdentity();
     glBegin(GL_QUADS);
-        glTexCoord2f(tc.x, 1.0f);
+        glTexCoord2f(tc.x, tc.y);
         glVertex2i(pos.x + size.x, pos.y);
-        glTexCoord2f(0.0f, 1.0f);
+        glTexCoord2f(0.0f, tc.y);
         glVertex2i(pos.x, pos.y);
-        glTexCoord2f(0.0f, 1.0f - tc.y);
+        glTexCoord2f(0.0f, 0.0f);
         glVertex2i(pos.x, pos.y + size.y);
-        glTexCoord2f(tc.x, 1.0f - tc.y);
+        glTexCoord2f(tc.x, 0.0f);
         glVertex2i(pos.x + size.x, pos.y + size.y);
     glEnd();

trunk/neercs/video/text-render.h

@@ -9 +9 @@
 {
     TextRender(caca_canvas_t *caca, ivec2 font_size);
-    void Init(ivec2 screen_size);
-    void Render(ivec2 fbo_size);
-    void Blit(ivec2 fbo_size, ivec2 pos, ivec2 size);
+    void Init();
+    void Render();
+    void Blit(ivec2 pos, ivec2 size);
 
 private:
     caca_canvas_t *m_caca;
-    ivec2 m_font_size, m_canvas_size;
+    ivec2 m_font_size, m_canvas_size, m_fbo_size;
     int m_cells;