Changeset 1462Tweet

Timestamp:

Jun 12, 2012, 11:47:33 PM (11 years ago)

Author:

sam

Message:

neercs: use a libcaca canvas instead of a character string.

Location:

trunk/neercs

Files:

• Makefile.am (modified) (2 diffs)
• neercs.cpp (modified) (5 diffs)
• neercs.h (modified) (2 diffs)
• video/render.cpp (modified) (9 diffs)
• video/render.h (modified) (2 diffs)

trunk/neercs/Makefile.am

@@ -1 +1 @@
 
+if USE_CACA
 noinst_PROGRAMS = neercs
+endif
 
 neercs_SOURCES = \
@@ -11 +13 @@
 neercs_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
 neercs_LDADD =
-neercs_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+neercs_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@ @CACA_LIBS@
 neercs_DEPENDENCIES = $(top_builddir)/src/liblol.a
 

trunk/neercs/neercs.cpp

@@ -32 +32 @@
 #endif
 
+#include <caca.h>
+
 #include "core.h"
 #include "loldebug.h"
@@ -42 +44 @@
 
 Neercs::Neercs()
-  : m_ready(false)
+  : m_ready(false),
+    m_caca(caca_create_canvas(43, 14)),
+    m_render(new Render(m_caca)),
+    m_time(0.f)
 {
+    Ticker::Ref(m_render);
 }
 
@@ -49 +55 @@
 {
     WorldEntity::TickGame(seconds);
+
+    m_time += seconds;
+
+    caca_set_color_ansi(m_caca, CACA_DEFAULT, CACA_DEFAULT);
+    caca_clear_canvas(m_caca);
+
+    caca_fill_ellipse(m_caca, 0, 0, 30, 10, '+');
+
+    caca_set_color_ansi(m_caca, 2, CACA_DEFAULT);
+    int x1 = 12 + 10 * cos(m_time * 5.f);
+    int y1 = 6 + 5 * sin(m_time * 5.f);
+    int x2 = 30 + 5 * cos(m_time * 8.f);
+    int y2 = 8 + 5 * sin(m_time * 8.f);
+    int y3 = 8 + 5 * cos(m_time * 5.f);
+    caca_draw_thin_line(m_caca, x1, y1, x2, y2);
+    caca_draw_thin_line(m_caca, 40, y3, x2, y2);
+    caca_draw_thin_line(m_caca, x1, y1, 40, y3);
+
+    int x3 = 13 + 7 * cos(m_time * 3.f);
+    caca_set_color_ansi(m_caca, CACA_CYAN, CACA_BLUE);
+    caca_printf(m_caca, x3, 3, " LOL WUT ");
+
+    int x4 = 6 + 5 * cos(m_time * 2.f);
+    caca_set_color_ansi(m_caca, CACA_YELLOW, CACA_RED);
+    caca_printf(m_caca, x4, 12, "Le Caca C'Est Surpuissant");
 }
 
@@ -58 +89 @@
 Neercs::~Neercs()
 {
+    Ticker::Unref(m_render);
 }
 
@@ -71 +103 @@
 
     new Neercs();
-    new Render();
     new DebugFps(5, 5);
     app.ShowPointer(false);

trunk/neercs/neercs.h

@@ -7 +7 @@
 #if !defined __NEERCS_H__
 #define __NEERCS_H__
+
+#include <caca.h>
 
 #include "video/render.h"
@@ -24 +26 @@
 private:
     bool m_ready;
+    caca_canvas_t *m_caca;
+    Render *m_render;
+    float m_time;
 };
 

trunk/neercs/video/render.cpp

@@ -52 +52 @@
 int active = true;         // window active flag
 bool fullscreen = DEBUG?false:true;    // fullscreen flag
-bool pause = false;        // pause flag
+bool paused = false;       // pause flag
 float nearplane = 0.1f;    // nearplane
 float farplane = 1000.0f;  // farplane
@@ -70 +70 @@
 float part_angle;          // part angle
 float fx_angle;            // current angle
-/* liner variable */
-int car;                   // ascii code
-int car_cursor = 126;      // cursor ascii code
-int liner_length;          // text length
-int liner_line_n;          // line number
-int liner_line;            // line increment
-int liner_max;             // line max length
-int liner_i;               // char increment
-int liner_count;           // counter
 /* text variable */
 char const *name = "cacaShell";
-std::string txt("");
 /* fs_quad variable */
 float fs_quad_vtx[] = {-1.0f, 1.0f, 0, 1.0f, -1.0f, -1.0f, 0, 1.0f, 1.0f, -1.0f, 0, 1.0f, 1.0f, 1.0f, 0, 1.0f};
@@ -128 +118 @@
 int key_code = 0;          // keyboard code
 /* common variable */
-int i, j, k, l;
-float x, y, z, w, h;
-float r, g, b, c;
 float value, angle, radius, scale, speed;
 TileSet *tex_map;
@@ -228 +215 @@
 #endif
 
-void calc_txt()
-{
-    liner_length = txt.length();
-    liner_count = 0;
-    liner_line_n = 0;
-    liner_max = 0;
-    liner_i = 0;
-    for(i = 0;i<liner_length;i++)
-    {
-        if((unsigned char)txt[i] != 13)
-        {
-            liner_i++;
-        }
-        else
-        {
-            if(liner_i>liner_max) liner_max = liner_i;
-            liner_line_n++;
-            liner_i = 0;
-        }
-    }
-    if(liner_i>liner_max) liner_max = liner_i;
-}
-
 void rectangle(int x, int y, int w, int h)
 {
@@ -267 +231 @@
     vertex[0] = 0;
     vertex[1] = 0;
-    for(i = 1;i<corner_n+1;i++)
-    {
-        j = i*2;
+    for (int i = 1; i < corner_n + 1; i++)
+    {
+        int j = i*2;
         float a = PID*90.0f/(corner_n-1)*(i-1);
         vertex[j  ] = corner_w-corner_w*cosf(a);
         vertex[j+1] = corner_w-corner_w*sinf(a);
     }
-    for(i = 0;i<corner_n;i++)
-    {
-        j = i*6;
-        k = i*2;
+    for (int i = 0; i < corner_n; i++)
+    {
+        int j = i*6;
+        int k = i*2;
         corner_vtx[j  ] = (int)vertex[0];
         corner_vtx[j+1] = (int)vertex[1];
@@ -293 +257 @@
     dos_color = CR * vec3(48, 56, 64);
     screen_color = dos_color;
-    txt = "\rCopyright \x05e 2012 cacaShell v0.1\r ";
-    calc_txt();
     /*-------------------------*/
     shader_effect_flag = true;
@@ -430 +392 @@
 }
 
-Render::Render()
+Render::Render(caca_canvas_t *caca)
+  : m_caca(caca)
 {
 }
@@ -451 +414 @@
 
     // timer
-    if(!pause)
+    if(!paused)
         main_angle += seconds * 100.0f * PID;
     if(sync_flag)
@@ -569 +532 @@
         // draw dos text
         glVertexPointer(2, GL_INT, 0, dos_vtx);
-        j=0;
-        liner_line=-1;
-        for(i=1;i<liner_length+1;i++)
+        float x = dos_m + (float)(dos_w + 2 * ratio_2d);
+        float y = dos_m + (float)(15 * ratio_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++)
         {
-            j++;
-            car=(unsigned char)txt[i-1];
-            if(i==liner_length) car=car_cursor;
-            if(car>32)
+            uint32_t car = caca_get_char(m_caca, i, j);
+            uint32_t att = caca_get_attr(m_caca, i, j);
+
+            glLoadIdentity();
+            glTranslated(x+i*(dos_w+2*ratio_2d), y+j*(dos_h+4*ratio_2d), 0);
+
+            glDisable(GL_TEXTURE_2D);
+            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);
+
+            if (car > 32 && car < 127)
             {
-                glLoadIdentity();
-                glTranslated(x+j*(dos_w+2*ratio_2d), y, 0);
                 float l_w=(car%16)*0.03125f;
                 float l_h=(car-car%16)*0.001953125f;
                 float dos_tex[]={l_w+0.03125f, 0.5f+l_h+0.03125f, l_w+0.03125f, 0.5f+l_h, l_w, 0.5f+l_h, l_w, 0.5f+l_h+0.03125f};
                 glTexCoordPointer(2, GL_FLOAT, 0, dos_tex);
-                if(car==car_cursor) glColor3f(CR*(dos_color.r+64), CR*(dos_color.g+48), CR*(dos_color.b+48));
+                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);
-            }
-            if(car==13)
-            {
-                j=0;
-                liner_line++;
-                x=dos_m;
-                y=dos_m+(float)(15*ratio_2d+liner_line*(dos_h+4*ratio_2d));
-                if(y+dos_h>screen_size.y-dos_m) break;
+                //if(car==car_cursor) glColor3f(1.0f, 1.0f, 1.0f);
             }
         }
     }
-    // draw debug
-    //#if DEBUG
-    if(debug_flag)
-    {
-        char debug[512];
-        sprintf(debug, "width=%d\rheight=%d\rratio=%dx\rbeat=%-02.1f\rsync=%-02.1f\rkey code=%03d\r", screen_size.x, screen_size.y, ratio_2d, beat_value, sync_value, key_code);
-        float l_v=0.0390625f;
-        float l_j=0.001953125f;
-        glVertexPointer(2, GL_INT, 0, debug_vtx);
-        glLoadIdentity();
-        glBlendFunc(GL_ONE, GL_ONE);
-        glColor3f(0.625f, 0.25f, 0.0f);
-        glTranslated(debug_x, debug_y, 0);
-        j=0;
-        for(i=0;i<(int)strlen(debug);i++)
-        {
-            j++;
-            car=(unsigned char)debug[i];
-            if(car==13)
-            {
-                glTranslated(-j*(debug_w-ratio_2d)*2, (debug_h-ratio_2d)*2, 0);
-                j=0;
-            }
-            glTranslated((debug_w-ratio_2d)*2, 0, 0);
-            if(car>32)
-            {
-                float l_w=(car%16)*0.03515625f;
-                float l_h=(car-car%16)*0.00244140625f;
-                float debug_tex[]={l_w+l_v-l_j, 1.0f-l_h-l_v, l_w+l_v-l_j, 1.0f-l_h, l_w-l_j, 1.0f-l_h, l_w-l_j, 1.0f-l_h-l_v};
-                glTexCoordPointer(2, GL_FLOAT, 0, debug_tex);
-                glDrawArrays(GL_QUADS, 0, 4);
-            }
-        }
-    }
-    //#endif
     // draw corner
     glDisable(GL_TEXTURE_2D);

trunk/neercs/video/render.h

@@ -8 +8 @@
 {
 public:
-    Render();
+    Render(caca_canvas_t *caca);
     virtual ~Render();
 
@@ -21 +21 @@
 
 private:
+    caca_canvas_t *m_caca;
 };