Changeset 1499Tweet

Timestamp:

Jun 19, 2012, 7:33:35 AM (11 years ago)

Author:

sam

Message:

neercs: move TextRender to its own file.

Location:

trunk/neercs

Files:

• Makefile.am (modified) (1 diff)
• neercs.vcxproj (modified) (1 diff)
• neercs.vcxproj.filters (modified) (1 diff)
• video/render.cpp (modified) (3 diffs)
• video/text-render.cpp (added)
• video/text-render.h (added)

trunk/neercs/Makefile.am

@@ -8 +8 @@
     \
     video/render.cpp video/render.h \
+    video/text-render.cpp video/text-render.h \
     video/blurh.lolfx video/blurv.lolfx video/glow.lolfx \
     video/postfx.lolfx video/radial.lolfx video/simple.lolfx \

trunk/neercs/neercs.vcxproj

@@ -30 +30 @@
     <ClInclude Include="neercs.h" />
     <ClInclude Include="video\render.h" />
+    <ClInclude Include="video\text-render.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="neercs.cpp" />
     <ClCompile Include="video\render.cpp" />
+    <ClCompile Include="video\text-render.cpp" />
   </ItemGroup>
   <ItemGroup>

trunk/neercs/neercs.vcxproj.filters

@@ -6 +6 @@
       <Filter>video</Filter>
     </ClCompile>
+    <ClCompile Include="video\text-render.cpp">
+      <Filter>video</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="neercs.h" />
     <ClInclude Include="video\render.h">
+      <Filter>video</Filter>
+    </ClInclude>
+    <ClInclude Include="video\text-render.h">
       <Filter>video</Filter>
     </ClInclude>

trunk/neercs/video/render.cpp

@@ -30 +30 @@
 #include "../neercs.h"
 #include "render.h"
+#include "text-render.h"
 
 extern char const *lolfx_blurh;
@@ -37 +38 @@
 extern char const *lolfx_radial;
 extern char const *lolfx_simple;
-extern char const *lolfx_text;
 
 #define DEBUG 1            // debug flag //#if defined(_DEBUG)
@@ -164 +164 @@
 FrameBuffer *fbo_blur_h, *fbo_blur_v, *fbo_ping, *fbo_pong;
 
-/*
- * Text rendering interface
- */
-struct TextRender
-{
-    TextRender(caca_canvas_t *caca, ivec2 font_size)
-      : m_caca(caca),
-        m_font_size(font_size),
-        m_canvas_size(caca_get_canvas_width(m_caca),
-                      caca_get_canvas_height(m_caca)),
-        m_cells(m_canvas_size.x * m_canvas_size.y)
-    {
-        for (int j = 0; j < m_canvas_size.y; j++)
-        for (int i = 0; i < m_canvas_size.x; i++)
-            m_vertices << vec2(i, j);
-    }
-
-    void Init(ivec2 screen_size)
-    {
-        m_font = new TileSet("neercs/video/resource/map.png",
-                             ivec2(256, 256), ivec2(1));
-
-        m_shader = Shader::Create(lolfx_text);
-        m_coord = m_shader->GetAttribLocation("in_Position",
-                                              VertexUsage::Position, 0);
-        m_color = m_shader->GetAttribLocation("in_Attr",
-                                              VertexUsage::Color, 0);
-        m_char = m_shader->GetAttribLocation("in_Char",
-                                             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),
-                                  VertexStream<uint32_t>(VertexUsage::Color),
-                                  VertexStream<uint32_t>(VertexUsage::Color));
-
-        m_vbo1 = new VertexBuffer(m_vertices.Bytes());
-        void *vertices = m_vbo1->Lock(0, 0);
-        memcpy(vertices, &m_vertices[0], m_vertices.Bytes());
-        m_vbo1->Unlock();
-
-        m_vbo2 = new VertexBuffer(m_cells * sizeof(int32_t));
-        m_vbo3 = new VertexBuffer(m_cells * sizeof(int32_t));
-
-        m_fbo = new FrameBuffer(screen_size);
-    }
-
-    void Render(ivec2 fbo_size)
-    {
-        /* 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)
-                                  * 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_canvas_size.y; j++)
-        for (int i = 0; i < m_canvas_size.x; 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_cells * sizeof(uint32_t));
-        m_vbo2->Unlock();
-
-        uint32_t *chars = (uint32_t *)m_vbo3->Lock(0, 0);
-        memcpy(chars, caca_get_canvas_chars(m_caca),
-               m_cells * sizeof(uint32_t));
-        m_vbo3->Unlock();
-
-        m_fbo->Bind();
-        glDisable(GL_DEPTH_TEST);
-        glEnable(GL_POINT_SPRITE);
-        //glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
-        glDisable(GL_POINT_SMOOTH);
-        glPointSize((float)max(m_font_size.x, m_font_size.y));
-        m_shader->Bind();
-        m_font->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);
-        m_vdecl->SetStream(m_vbo3, m_char);
-        m_vdecl->Bind();
-        m_vdecl->DrawElements(MeshPrimitive::Points, 0, m_cells);
-        m_vdecl->Unbind();
-        m_font->Unbind();
-        m_shader->Unbind();
-        glDisable(GL_POINT_SPRITE);
-        m_fbo->Unbind();
-    }
-
-    void Blit(ivec2 fbo_size, ivec2 pos, ivec2 size)
-    {
-        glDisable(GL_BLEND);
-        glEnable(GL_TEXTURE_2D);
-        glBindTexture(GL_TEXTURE_2D, m_fbo->GetTexture());
-        glColor3f(1.0f, 1.0f, 1.0f);
-
-        vec2 tc = (vec2)m_canvas_size * m_font_size / fbo_size;
-
-        glLoadIdentity();
-        glBegin(GL_QUADS);
-            glTexCoord2f(tc.x, 1.0f);
-            glVertex2i(pos.x + size.x, pos.y);
-            glTexCoord2f(0.0f, 1.0f);
-            glVertex2i(pos.x, pos.y);
-            glTexCoord2f(0.0f, 1.0f - tc.y);
-            glVertex2i(pos.x, pos.y + size.y);
-            glTexCoord2f(tc.x, 1.0f - tc.y);
-            glVertex2i(pos.x + size.x, pos.y + size.y);
-        glEnd();
-    }
-
-private:
-    caca_canvas_t *m_caca;
-    ivec2 m_font_size, m_canvas_size;
-    int m_cells;
-
-    Array<vec2> m_vertices;
-    TileSet *m_font;
-    Shader *m_shader;
-    ShaderAttrib m_coord, m_color, m_char;
-    ShaderUniform m_texture, m_transform;
-    VertexDeclaration *m_vdecl;
-    VertexBuffer *m_vbo1, *m_vbo2, *m_vbo3;
-    FrameBuffer *m_fbo;
-};
-
 TextRender *text_render;