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

Timestamp:

Jun 15, 2012, 2:40:55 PM (11 years ago)

Author:

sam

Message:

neercs: get rid of the fixed pipeline calls for the text rendering.

File:

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

trunk/neercs/video/render.cpp

@@ -41 +41 @@
 #define DEBUG 1            // debug flag //#if defined(_DEBUG)
 #define SHADER 1           // shader flag
-#define FUCK 0             // test flag
 #define PI 3.1415926535f   // pi
 #define PID PI/180.0f      // pi ratio
@@ -170 +169 @@
 #endif
 
-#if FUCK
 /*
  * Text rendering interface
@@ -183 +181 @@
         for (int j = 0; j < m_height; j++)
         for (int i = 0; i < m_width; i++)
-            m_vertices << vec2(5.0 / 128.0 * i - 0.75, 0.5 - 0.0525 * j);
+            m_vertices << vec2(5.1 / 128.0 * i - 0.91, 0.75 - 0.0525 * j);
     }
 
@@ -264 +262 @@
 
 TextRender *text_render;
-#endif
 
 void init_viewport(int type)
@@ -465 +462 @@
   : m_caca(caca)
 {
-#if FUCK
     text_render = new TextRender(m_caca);
-#endif
 }
 
@@ -484 +479 @@
         CreateGLWindow("LOL");
         todo = 0;
-#if FUCK
         text_render->Init();
-#endif
     }
 
@@ -535 +528 @@
     Draw2D();
     Draw3D();
-
-#if FUCK
-    text_render->Blit();
-#endif
 }
 
@@ -556 +545 @@
     glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
 #endif
+
+    text_render->Blit();
 
     glEnableClientState(GL_VERTEX_ARRAY);
@@ -611 +602 @@
         glTexCoordPointer(2, GL_FLOAT, 0, shell_tex);
         glDrawArrays(GL_QUADS, 0, 4);
-#if !FUCK
-        // draw dos text
-        glVertexPointer(2, GL_INT, 0, dos_vtx);
-        float x = dos_m + font_size.x;
-        float y = dos_m + (font_size.y*1.5f+3)*ratio_2d.y;
-
-        /* background colors */
-        glDisable(GL_TEXTURE_2D);
-        for (int j = 0; j < caca_get_canvas_height(m_caca); j++)
-        for (int i = 0; i < caca_get_canvas_width(m_caca); i++)
-        {
-            uint32_t att = caca_get_attr(m_caca, i, j);
-
-            glLoadIdentity();
-            glTranslated(x+i*font_size.x*ratio_2d.x, y+j*font_size.y*ratio_2d.y, 0);
-
-            uint16_t bg = caca_attr_to_rgb12_bg(att);
-            glColor3f((float)(bg >> 8) / 16.f,
-                      (float)((bg & 0xf0) >> 4) / 16.f,
-                      (float)(bg & 0xf) / 16.f);
-            glDrawArrays(GL_QUADS, 0, 4);
-        }
-        glEnable(GL_TEXTURE_2D);
-
-        /* Foreground characters */
-        for (int j = 0; j < caca_get_canvas_height(m_caca); j++)
-        for (int i = 0; i < caca_get_canvas_width(m_caca); i++)
-        {
-            uint32_t car = caca_get_char(m_caca, i, j);
-            uint32_t att = caca_get_attr(m_caca, i, j);
-
-            if (car <= 32 || car >= 127)
-                continue;
-
-            glLoadIdentity();
-            glTranslated(x+i*font_size.x*ratio_2d.x, y+j*font_size.y*ratio_2d.y, 0);
-            vec2 uv((car%16)*car_size.x, (car-car%16)*1.0f/map_size.y/16*font_size.y);
-            float dos_tex[]={uv.x+car_size.x, uv.y+0.5f+car_size.y, uv.x+car_size.x, uv.y+0.5f, uv.x, uv.y+0.5f, uv.x, uv.y+0.5f+car_size.y};
-
-            glTexCoordPointer(2, GL_FLOAT, 0, dos_tex);
-            uint16_t fg = caca_attr_to_rgb12_fg(att);
-            glColor3f((float)(fg >> 8) / 16.f,
-                      (float)((fg & 0xf0) >> 4) / 16.f,
-                      (float)(fg & 0xf) / 16.f);
-            // FIXME: draw cursor!
-            //if(car==car_cursor) glColor3f(CR*(dos_color.r+64), CR*(dos_color.g+48), CR*(dos_color.b+48));
-            glDrawArrays(GL_QUADS, 0, 4);
-            //if(car==car_cursor) glColor3f(1.0f, 1.0f, 1.0f);
-        }
-#endif
     }
     // draw corner