Changeset 1484Tweet

Timestamp:

Jun 16, 2012, 7:19:17 PM (11 years ago)

Author:

sam

Message:

neercs: the text rendering object now owns its rendering buffer.

Location:

trunk/neercs/video

Files:

• render.cpp (modified) (12 diffs)
• render.h (modified) (1 diff)

trunk/neercs/video/render.cpp

@@ -164 +164 @@
               shader_postfx_sync;
 
-FrameBuffer *fbo_text, *fbo_back, *fbo_front;
+FrameBuffer *fbo_back, *fbo_front;
 FrameBuffer *fbo_blur_h, *fbo_blur_v, *fbo_ping, *fbo_pong;
 #endif
@@ -183 +183 @@
     }
 
-    void Init()
+    void Init(ivec2 screen_size, ivec2 font_size)
     {
         m_shader = Shader::Create(lolfx_text);
@@ -206 +206 @@
         m_vbo2 = new VertexBuffer(m_width * m_height * sizeof(int32_t));
         m_vbo3 = new VertexBuffer(m_width * m_height * sizeof(int32_t));
-    }
-
-    void Blit(ivec2 screen_size, ivec2 font_size)
+
+        m_fbo = new FrameBuffer(screen_size);
+    }
+
+    void Render(ivec2 screen_size, ivec2 font_size)
     {
         /* Transform matrix for the scene:
@@ -241 +243 @@
         m_vbo3->Unlock();
 
+        m_fbo->Bind();
         glEnable(GL_POINT_SPRITE);
         //glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
@@ -258 +261 @@
         m_shader->Unbind();
         glDisable(GL_POINT_SPRITE);
+        m_fbo->Unbind();
+    }
+
+    void Blit()
+    {
+        /* FIXME: scaling is wrong */
+        glDisable(GL_BLEND);
+        glEnable(GL_TEXTURE_2D);
+        glBindTexture(GL_TEXTURE_2D, m_fbo->GetTexture());
+        glColor3f(1.0f,1.0f,1.0f);
+
+        int x = dos_m;
+        int y = dos_m + (font_size.y + 2) * ratio_2d.y;
+        int w = screen_size.x - dos_m * 2;
+        int h = screen_size.y - dos_m * 2 - (font_size.y + 2) * ratio_2d.y;
+
+        glLoadIdentity();
+        glBegin(GL_QUADS);
+            glTexCoord2f(1.0f, 1.0f);
+            glVertex2i(x+w, y  );
+            glTexCoord2f(0.0f, 1.0f);
+            glVertex2i(x  , y  );
+            glTexCoord2f(0.0f, 0.0f);
+            glVertex2i(x  , y+h);
+            glTexCoord2f(1.0f, 0.0f);
+            glVertex2i(x+w, y+h);
+        glEnd();
     }
 
@@ -270 +300 @@
     VertexDeclaration *m_vdecl;
     VertexBuffer *m_vbo1, *m_vbo2, *m_vbo3;
+    FrameBuffer *m_fbo;
 };
 
@@ -387 +418 @@
     // initialize some variable
     screen();
+
 #if SHADER
     if (shader_flag)
     {
-        fbo_text = new FrameBuffer(screen_size);
+        /* Initialise framebuffer objects */
         fbo_back = new FrameBuffer(screen_size);
         fbo_front = new FrameBuffer(screen_size);
@@ -472 +504 @@
 
 Render::Render(caca_canvas_t *caca)
-  : m_caca(caca)
+  : m_caca(caca),
+    m_ready(false)
 {
     text_render = new TextRender(m_caca);
@@ -486 +519 @@
     Entity::TickDraw(seconds);
 
-    static int todo = 1;
-    if (todo)
+    if (!m_ready)
     {
         CreateGLWindow("LOL");
-        todo = 0;
-        text_render->Init();
+        text_render->Init(screen_size, ivec2(8, 8));
+
+        m_ready = true;
     }
 
@@ -544 +577 @@
 void Render::Draw2D()
 {
-#if SHADER
     /* Draw text in an offline buffer */
-    fbo_text->Bind();
-    text_render->Blit(screen_size, ivec2(8, 8));
-    fbo_text->Unbind();
-#endif
+    text_render->Render(screen_size, ivec2(8, 8));
 
     /* Clear the back buffer */
@@ -566 +595 @@
 #endif
 
-    /* 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));
+    text_render->Blit();
 
     glEnableClientState(GL_VERTEX_ARRAY);
@@ -580 +607 @@
 
     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();

trunk/neercs/video/render.h

@@ -22 +22 @@
 private:
     caca_canvas_t *m_caca;
+    bool m_ready;
 };