Changeset 3987Tweet

Timestamp:

11/21/09 11:28:58 (4 years ago)

Author:

jylam

Message:

• Indentation fixes

Location:

libcaca/trunk

Files:

• caca/triangle.c (modified) (15 diffs)
• examples/trifiller.c (modified) (5 diffs)

libcaca/trunk/caca/triangle.c

@@ -1 @@
-/*
+/* 
  *  libcaca       Colour ASCII-Art library
  *  Copyright (c) 2002-2006 Sam Hocevar <sam@zoy.org>
@@ -13 +13 @@
  */
 
-/*
+/* 
  *  This file contains triangle drawing functions, both filled and outline.
  */
@@ -40 +40 @@
  *  \return This function always returns 0.
  */
-int caca_draw_triangle(caca_canvas_t *cv, int x1, int y1, int x2, int y2,
-                        int x3, int y3, uint32_t ch)
+int caca_draw_triangle(caca_canvas_t * cv, int x1, int y1, int x2, int y2,
+                       int x3, int y3, uint32_t ch)
 {
     caca_draw_line(cv, x1, y1, x2, y2, ch);
@@ -63 +63 @@
  *  \return This function always returns 0.
  */
-int caca_draw_thin_triangle(caca_canvas_t *cv, int x1, int y1,
-                             int x2, int y2, int x3, int y3)
+int caca_draw_thin_triangle(caca_canvas_t * cv, int x1, int y1,
+                            int x2, int y2, int x3, int y3)
 {
     caca_draw_thin_line(cv, x1, y1, x2, y2);
@@ -87 +87 @@
  *  \return This function always returns 0.
  */
-int caca_fill_triangle(caca_canvas_t *cv, int x1, int y1, int x2, int y2,
-                        int x3, int y3, uint32_t ch)
+int caca_fill_triangle(caca_canvas_t * cv, int x1, int y1, int x2, int y2,
+                       int x3, int y3, uint32_t ch)
 {
     int x, y, xmin, xmax, ymin, ymax;
@@ -94 +94 @@
 
     /* Bubble-sort y1 <= y2 <= y3 */
-    if(y1 > y2)
+    if (y1 > y2)
         return caca_fill_triangle(cv, x2, y2, x1, y1, x3, y3, ch);
 
-    if(y2 > y3)
+    if (y2 > y3)
         return caca_fill_triangle(cv, x1, y1, x3, y3, x2, y2, ch);
 
@@ -112 +112 @@
     ymax = y3 + 1 < cv->height ? y3 + 1 : cv->height;
 
-    if(ymin < y2)
+    if (ymin < y2)
     {
         xa = x1 + sl21 * (ymin - y1);
         xb = x1 + sl31 * (ymin - y1);
     }
-    else if(ymin == y2)
+    else if (ymin == y2)
     {
         xa = x2;
         xb = (y1 == y3) ? x3 : x1 + sl31 * (ymin - y1);
     }
-    else /* (ymin > y2) */
+    else                        /* (ymin > y2) */
     {
         xa = x3 + sl32 * (ymin - y3);
@@ -129 +129 @@
 
     /* Rasterize our triangle */
-    for(y = ymin; y < ymax; y++)
+    for (y = ymin; y < ymax; y++)
     {
         /* Rescale xa and xb, recentering the division */
-        if(xa < xb)
+        if (xa < xb)
         {
             xx1 = (xa + 0x800) / 0x10000;
@@ -146 +146 @@
         xmax = xx2 + 1 < cv->width ? xx2 + 1 : cv->width;
 
-        for(x = xmin; x < xmax; x++)
+        for (x = xmin; x < xmax; x++)
             caca_put_char(cv, x, y, ch);
 
@@ -156 +156 @@
 }
 
-/* This function actually renders the triangle, 
- * but is not exported due to sam's pedantic will. */
-static int caca_fill_triangle_textured_l(caca_canvas_t *cv,
-                                int x1, int y1,
-                                int x2, int y2,
-                                        int x3, int y3,
-                                caca_canvas_t *tex,
-                                float u1, float v1,
-                                float u2, float v2,
-                                        float u3, float v3)
-                                
+/* This function actually renders the triangle, but is not exported due to
+   sam's pedantic will. */
+static int caca_fill_triangle_textured_l(caca_canvas_t * cv,
+                                         int x1, int y1,
+                                         int x2, int y2,
+                                         int x3, int y3,
+                                         caca_canvas_t * tex,
+                                         float u1, float v1,
+                                         float u2, float v2,
+                                         float u3, float v3)
 {
     uint32_t savedattr;
 
-    #define SWAP_F(a, b) {float c = a; a = b; b = c; }
-    
-    /* (very) Naive and 
-     * (very) float-based affine and
-     * (very) non-clipped and
-     * (very) non-corrected triangle mapper 
-     *
-     * Accepts arbitrary texture sizes
-     * Coordinates clamped to [0.0 - 1.0] (no repeat)
-     */
-    if(!cv || !tex) return -1;
+#define SWAP_F(a, b) {float c = a; a = b; b = c; }
+
+    /* (very) Naive and (very) float-based affine and (very) non-clipped and
+       (very) non-corrected triangle mapper Accepts arbitrary texture sizes
+       Coordinates clamped to [0.0 - 1.0] (no repeat) */
+    if (!cv || !tex)
+        return -1;
 
     /* Bubble-sort y1 <= y2 <= y3 */
-    if(y1 > y2)
-        return caca_fill_triangle_textured_l(cv, 
+    if (y1 > y2)
+        return caca_fill_triangle_textured_l(cv,
                                              x2, y2, x1, y1, x3, y3,
-                                             tex,
-                                             u2, v2, u1, v1, u3, v3);
-    if(y2 > y3) 
-        return caca_fill_triangle_textured_l(cv, 
+                                             tex, u2, v2, u1, v1, u3, v3);
+    if (y2 > y3)
+        return caca_fill_triangle_textured_l(cv,
                                              x1, y1, x3, y3, x2, y2,
-                                             tex,
-                                             u1, v1, u3, v3, u2, v2);
+                                             tex, u1, v1, u3, v3, u2, v2);
 
     savedattr = caca_get_attr(cv, -1, -1);
 
     /* Clip texture coordinates */
-    if(u1<0.0f) u1 = 0.0f; if(v1<0.0f) v1 = 0.0f;
-    if(u2<0.0f) u2 = 0.0f; if(v2<0.0f) v2 = 0.0f;
-    if(u3<0.0f) u3 = 0.0f; if(v3<0.0f) v3 = 0.0f;
-    if(u1>1.0f) u1 = 1.0f; if(v1>1.0f) v1 = 1.0f;
-    if(u2>1.0f) u2 = 1.0f; if(v2>1.0f) v2 = 1.0f;
-    if(u3>1.0f) u3 = 1.0f; if(v3>1.0f) v3 = 1.0f;
-    
+    if (u1 < 0.0f)
+        u1 = 0.0f;
+    if (v1 < 0.0f)
+        v1 = 0.0f;
+    if (u2 < 0.0f)
+        u2 = 0.0f;
+    if (v2 < 0.0f)
+        v2 = 0.0f;
+    if (u3 < 0.0f)
+        u3 = 0.0f;
+    if (v3 < 0.0f)
+        v3 = 0.0f;
+    if (u1 > 1.0f)
+        u1 = 1.0f;
+    if (v1 > 1.0f)
+        v1 = 1.0f;
+    if (u2 > 1.0f)
+        u2 = 1.0f;
+    if (v2 > 1.0f)
+        v2 = 1.0f;
+    if (u3 > 1.0f)
+        u3 = 1.0f;
+    if (v3 > 1.0f)
+        v3 = 1.0f;
+
     /* Convert relative tex coordinates to absolute */
     int tw = caca_get_canvas_width(tex);
     int th = caca_get_canvas_height(tex);
-    
-    u1*=(float)tw; u2*=(float)tw; u3*=(float)tw;
-    v1*=(float)th; v2*=(float)th; v3*=(float)th;
-    
+
+    u1 *= (float)tw;
+    u2 *= (float)tw;
+    u3 *= (float)tw;
+    v1 *= (float)th;
+    v2 *= (float)th;
+    v3 *= (float)th;
+
     int x, y;
-    float y2y1 = y2-y1;
-    float y3y1 = y3-y1;
-    float y3y2 = y3-y2;
-    
+    float y2y1 = y2 - y1;
+    float y3y1 = y3 - y1;
+    float y3y2 = y3 - y2;
+
     /* Compute slopes, making sure we don't divide by zero */
     /* (in this case, we don't need the value anyway) */
     /* FIXME : only compute needed slopes */
-    float sl12 = ((float)x2 - x1) / (y2y1==0?1:y2y1);
-    float sl13 = ((float)x3 - x1) / (y3y1==0?1:y3y1);
-    float sl23 = ((float)x3 - x2) / (y3y2==0?1:y3y2);
-    
-    float usl12 = (u2 - u1) / (y2y1==0?1:y2y1);
-    float usl13 = (u3 - u1) / (y3y1==0?1:y3y1);
-    float usl23 = (u3 - u2) / (y3y2==0?1:y3y2);
-    float vsl12 = (v2 - v1) / (y2y1==0?1:y2y1);
-    float vsl13 = (v3 - v1) / (y3y1==0?1:y3y1);
-    float vsl23 = (v3 - v2) / (y3y2==0?1:y3y2);
-    
-    float xa = (float) x1, xb = (float) x1;
+    float sl12 = ((float)x2 - x1) / (y2y1 == 0 ? 1 : y2y1);
+    float sl13 = ((float)x3 - x1) / (y3y1 == 0 ? 1 : y3y1);
+    float sl23 = ((float)x3 - x2) / (y3y2 == 0 ? 1 : y3y2);
+
+    float usl12 = (u2 - u1) / (y2y1 == 0 ? 1 : y2y1);
+    float usl13 = (u3 - u1) / (y3y1 == 0 ? 1 : y3y1);
+    float usl23 = (u3 - u2) / (y3y2 == 0 ? 1 : y3y2);
+    float vsl12 = (v2 - v1) / (y2y1 == 0 ? 1 : y2y1);
+    float vsl13 = (v3 - v1) / (y3y1 == 0 ? 1 : y3y1);
+    float vsl23 = (v3 - v2) / (y3y2 == 0 ? 1 : y3y2);
+
+    float xa = (float)x1, xb = (float)x1;
     float ua = u1, ub = u1;
     float va = v1, vb = v1;
     float u, v;
-    
+
     int s = 0;
-    
+
     /* Top */
-    for(y = y1 ; y < y2; y++)
-    {
-        
-        if(xb < xa) {
-            SWAP_F(xb, xa);   
+    for (y = y1; y < y2; y++)
+    {
+
+        if (xb < xa)
+        {
+            SWAP_F(xb, xa);
             SWAP_F(sl13, sl12);
             SWAP_F(ua, ub);
-            SWAP_F(va, vb);            
+            SWAP_F(va, vb);
             SWAP_F(usl13, usl12);
             SWAP_F(vsl13, vsl12);
-            s=1;
-        }
-        
+            s = 1;
+        }
+
         float tus = (ub - ua) / (xb - xa);
         float tvs = (vb - va) / (xb - xa);
-        v = va; u = ua;
-        
+        v = va;
+        u = ua;
+
         /* scanline */
-        for(x = xa ; x < xb; x++)
-        {
-            u+=tus;
-            v+=tvs;
-            /* FIXME: use caca_get_canvas_attrs / caca_get_canvas_chars  */
+        for (x = xa; x < xb; x++)
+        {
+            u += tus;
+            v += tvs;
+            /* FIXME: use caca_get_canvas_attrs / caca_get_canvas_chars */
             uint32_t attr = caca_get_attr(tex, u, v);
-            uint32_t c    = caca_get_char(tex, u, v);
+            uint32_t c = caca_get_char(tex, u, v);
             caca_set_attr(cv, attr);
             caca_put_char(cv, x, y, c);
         }
-        
-        xa+=sl13;
-        xb+=sl12;
-        
-        ua+=usl13; va+=vsl13;
-        ub+=usl12; vb+=vsl12;
-    }
-    
-    if(s)
+
+        xa += sl13;
+        xb += sl12;
+
+        ua += usl13;
+        va += vsl13;
+        ub += usl12;
+        vb += vsl12;
+    }
+
+    if (s)
     {
         SWAP_F(xb, xa);
@@ -283 +302 @@
         SWAP_F(vsl13, vsl12);
     }
-    
-    
+
+
     /* Bottom */
-    xb = (float) x2;
-
-    /* These variables are set by 'top' routine 
-     * and are in an incorrect state if we only draw the bottom part
-     */
-        if(y1 == y2) {
+    xb = (float)x2;
+
+    /* These variables are set by 'top' routine and are in an incorrect state 
+       if we only draw the bottom part */
+    if (y1 == y2)
+    {
         ua = u1;
         ub = u2;
@@ -297 +316 @@
         vb = v2;
     }
-    
-    for(y = y2 ; y < y3; y++)
-    {
-        if(xb <= xa)
+
+    for (y = y2; y < y3; y++)
+    {
+        if (xb <= xa)
         {
             SWAP_F(xb, xa);
@@ -308 +327 @@
             SWAP_F(usl13, usl23);
             SWAP_F(vsl13, vsl23);
-        } 
-        
+        }
+
         float tus = (ub - ua) / ((float)xb - xa);
         float tvs = (vb - va) / ((float)xb - xa);
-        u = ua; v = va;
-        
+        u = ua;
+        v = va;
+
         /* scanline */
-        for(x = xa ; x < xb; x++)
-        {    
-            u+=tus;
-            v+=tvs;
-            /* FIXME, can be heavily optimised  */
+        for (x = xa; x < xb; x++)
+        {
+            u += tus;
+            v += tvs;
+            /* FIXME, can be heavily optimised */
             uint32_t attr = caca_get_attr(tex, u, v);
-            uint32_t c    = caca_get_char(tex, u, v);
+            uint32_t c = caca_get_char(tex, u, v);
             caca_set_attr(cv, attr);
             caca_put_char(cv, x, y, c);
         }
 
-        xa+=sl13;
-        xb+=sl23;
-        
-        ua+=usl13; va+=vsl13;
-        ub+=usl23; vb+=vsl23;
+        xa += sl13;
+        xb += sl23;
+
+        ua += usl13;
+        va += vsl13;
+        ub += usl23;
+        vb += vsl23;
     }
 
@@ -348 +370 @@
  *  \return This function return 0 if ok, -1 if canvas or texture are missing.
  */
-int caca_fill_triangle_textured(caca_canvas_t *cv,
+int caca_fill_triangle_textured(caca_canvas_t * cv,
                                 int coords[6],
-                                caca_canvas_t *tex,
-                                float uv[6]) {
-    
+                                caca_canvas_t * tex, float uv[6])
+{
+
     return caca_fill_triangle_textured_l(cv,
                                          coords[0], coords[1],
@@ -358 +380 @@
                                          coords[4], coords[5],
                                          tex,
-                                         uv[0],     uv[1],
-                                         uv[2],     uv[3],
-                                         uv[4],     uv[5]);
-}
-
-
-
-/*
+                                         uv[0], uv[1],
+                                         uv[2], uv[3], uv[4], uv[5]);
+}
+
+
+
+/* 
  * XXX: The following functions are aliases.
  */
 
 int cucul_draw_triangle(cucul_canvas_t *, int, int, int, int, int,
-                      int, uint32_t) CACA_ALIAS(caca_draw_triangle);
-int cucul_draw_thin_triangle(cucul_canvas_t *, int, int, int, int,
-                             int, int) CACA_ALIAS(caca_draw_thin_triangle);
-int cucul_fill_triangle(cucul_canvas_t *, int, int, int, int, int,
-                        int, uint32_t) CACA_ALIAS(caca_fill_triangle);
-
+                        int, uint32_t) CACA_ALIAS(caca_draw_triangle);
+     int cucul_draw_thin_triangle(cucul_canvas_t *, int, int, int, int,
+                                  int,
+                                  int) CACA_ALIAS(caca_draw_thin_triangle);
+     int cucul_fill_triangle(cucul_canvas_t *, int, int, int, int, int, int,
+                             uint32_t) CACA_ALIAS(caca_fill_triangle);

libcaca/trunk/examples/trifiller.c

@@ -1 @@
-/*
+/* 
  *  trifiller     texture mapping features
  *  Copyright (c) 2009 Jean-Yves Lamoureux <jylam@lnxscene.org>
@@ -28 +28 @@
 
 /* M_PI / cos / sin */
-#include <math.h> 
+#include <math.h>
 
 
@@ -35 +35 @@
 int main(int argc, char *argv[])
 {
-    
+
     /* libcaca/libcaca contexts */
-    caca_canvas_t *cv; caca_display_t *dp;
+    caca_canvas_t *cv;
+    caca_display_t *dp;
     caca_canvas_t *tex;
-    
+
     /* cached canvas size */
     int ww, wh, tw, th;
-    
+
     /* logic */
-    int quit  = 0;
+    int quit = 0;
     int update = 1;
     int px, py;
     float angle = 0;
-    
-    
+
+
     float square[6][2] = {
         {-SQUARE_SIZE, -SQUARE_SIZE},
-        { SQUARE_SIZE, -SQUARE_SIZE},
-        { SQUARE_SIZE,  SQUARE_SIZE},
-        {-SQUARE_SIZE,  SQUARE_SIZE},
+        {SQUARE_SIZE, -SQUARE_SIZE},
+        {SQUARE_SIZE, SQUARE_SIZE},
+        {-SQUARE_SIZE, SQUARE_SIZE},
     };
     float uv1[6] = {
-        0, 0, 
+        0, 0,
         1, 0,
         1, 1
     };
     float uv2[6] = {
-        0, 0, 
+        0, 0,
         1, 1,
         0, 1
     };
-    
-    
+
+
     float rotated[4][2];
     int coords1[6], coords2[6];
-    
+
     /* Create displayed canvas */
     cv = caca_create_canvas(0, 0);
-    if(!cv)
+    if (!cv)
     {
         fprintf(stderr, "%s: unable to initialise libcaca\n", argv[0]);
         return 1;
     }
-    
+
     /* Create texture holding canvas */
     tex = caca_create_canvas(16, 16);
-    if(!tex)
+    if (!tex)
     {
         fprintf(stderr, "%s: unable to initialise libcaca\n", argv[0]);
         return 1;
     }
-    
+
     /* Open window */
     dp = caca_create_display(cv);
-    if(!dp)
+    if (!dp)
     {
         fprintf(stderr, "%s: unable to initialise libcaca\n", argv[0]);
         return 1;
     }
-    
-    
-    
+
+
+
     /* Set the window title */
     caca_set_display_title(dp, "trifiller");
-    
+
     /* Frame duration */
     caca_set_display_time(dp, 10000);
-    
+
     /* Get displayed canvas size */
     ww = caca_get_canvas_width(cv);
     wh = caca_get_canvas_height(cv);
-    
+
     /* Texture size */
     tw = caca_get_canvas_width(tex);
     th = caca_get_canvas_height(tex);
-    
+
     /* Load texture if any */
-    if(argc == 2)
+    if (argc == 2)
     {
         struct image *im = load_image(argv[1]);
-        if(!im)
-        {
-            fprintf(stderr, "%s: unable to load image '%s'\n", argv[0], argv[1]);
+        if (!im)
+        {
+            fprintf(stderr, "%s: unable to load image '%s'\n", argv[0],
+                    argv[1]);
             return 1;
         }
-        
+
         caca_set_dither_algorithm(im->dither,
                                   caca_get_dither_algorithm_list(NULL)[4]);
-        caca_dither_bitmap(tex, 
-                           0, 0, 
-                           tw, th,  
-                           im->dither, im->pixels);
+        caca_dither_bitmap(tex, 0, 0, tw, th, im->dither, im->pixels);
         unload_image(im);
-    } 
+    }
     /* or generate one */
-    else 
-    {
-        
+    else
+    {
+
         int i;
-        for(i = 0; i < 16; i ++) 
-        {
-            caca_set_color_ansi(tex, (i+1)%0xF, i%0xF);
+        for (i = 0; i < 16; i++)
+        {
+            caca_set_color_ansi(tex, (i + 1) % 0xF, i % 0xF);
             caca_put_str(tex, 0, i, "0123456789ABCDEF");
         }
     }
-    
+
 
     px = 0;
     py = 0;
-    
-    while(!quit)
+
+    while (!quit)
     {
         caca_event_t ev;
         unsigned int const event_mask = CACA_EVENT_KEY_PRESS
-        | CACA_EVENT_RESIZE
-        | CACA_EVENT_QUIT;
+            | CACA_EVENT_RESIZE | CACA_EVENT_QUIT;
         int event;
-        
-        if(update)
+
+        if (update)
             event = caca_get_event(dp, event_mask, &ev, 0);
         else
             event = caca_get_event(dp, event_mask, &ev, -1);
-        
-        while(event)
-        {
-            if(caca_get_event_type(&ev) & CACA_EVENT_KEY_PRESS)
-                switch(caca_get_event_key_ch(&ev)) 
-            {
+
+        while (event)
+        {
+            if (caca_get_event_type(&ev) & CACA_EVENT_KEY_PRESS)
+                switch (caca_get_event_key_ch(&ev))
+                {
                 case 'q':
                 case 'Q':
@@ -181 +179 @@
                     break;
                 case 'a':
-                    angle+=1.0f;
+                    angle += 1.0f;
                     break;
                 case 's':
-                    angle-=1.0f;
-                    break;                    
-            }
-            else if(caca_get_event_type(&ev) == CACA_EVENT_RESIZE)
+                    angle -= 1.0f;
+                    break;
+                }
+            else if (caca_get_event_type(&ev) == CACA_EVENT_RESIZE)
             {
                 caca_refresh_display(dp);
@@ -193 +191 @@
                 wh = caca_get_event_resize_height(&ev);
                 update = 1;
-            } 
-            else if(caca_get_event_type(&ev) & CACA_EVENT_QUIT)
+            }
+            else if (caca_get_event_type(&ev) & CACA_EVENT_QUIT)
                 quit = 1;
-            
+
             event = caca_get_event(dp, CACA_EVENT_KEY_PRESS, &ev, 0);
         }
-        
-        
-        
+
+
+
         /* 2D Rotation around screen center */
         int p;
-        for(p=0; p<4; p++) 
-        {
-            rotated[p][0] = square[p][0] * cos(angle*M_PI/180.0f) - square[p][1] * sin(angle*M_PI/180.0f);
-            rotated[p][1] = square[p][0] * sin(angle*M_PI/180.0f) + square[p][1] * cos(angle*M_PI/180.0f);
-            
-            rotated[p][0] += ww/2 + px;
-            rotated[p][1] += wh/2 + py;
-        }
-        
-        angle+=1.0f;
-        
-        
+        for (p = 0; p < 4; p++)
+        {
+            rotated[p][0] =
+                square[p][0] * cos(angle * M_PI / 180.0f) -
+                square[p][1] * sin(angle * M_PI / 180.0f);
+            rotated[p][1] =
+                square[p][0] * sin(angle * M_PI / 180.0f) +
+                square[p][1] * cos(angle * M_PI / 180.0f);
+
+            rotated[p][0] += ww / 2 + px;
+            rotated[p][1] += wh / 2 + py;
+        }
+
+        angle += 1.0f;
+
+
         /* Reaarange coordinates to fit libcaca's format */
-        coords1[0] = rotated[0][0]; coords1[1] = rotated[0][1];
-        coords1[2] = rotated[1][0]; coords1[3] = rotated[1][1];
-        coords1[4] = rotated[2][0]; coords1[5] = rotated[2][1];
-       
-        coords2[0] = rotated[0][0]; coords2[1] = rotated[0][1];
-        coords2[2] = rotated[2][0]; coords2[3] = rotated[2][1];
-        coords2[4] = rotated[3][0]; coords2[5] = rotated[3][1];
-        
+        coords1[0] = rotated[0][0];
+        coords1[1] = rotated[0][1];
+        coords1[2] = rotated[1][0];
+        coords1[3] = rotated[1][1];
+        coords1[4] = rotated[2][0];
+        coords1[5] = rotated[2][1];
+
+        coords2[0] = rotated[0][0];
+        coords2[1] = rotated[0][1];
+        coords2[2] = rotated[2][0];
+        coords2[3] = rotated[2][1];
+        coords2[4] = rotated[3][0];
+        coords2[5] = rotated[3][1];
+
         /* Display two triangles */
-        caca_fill_triangle_textured(cv,      /* canvas */
-                                    coords1, /* triangle coordinates */
-                                    tex,     /* texture canvas */
-                                    uv1);    /* texture coordinates */
-        caca_fill_triangle_textured(cv,
-                                    coords2,
-                                    tex,
-                                    uv2);
-        
+        caca_fill_triangle_textured(cv, /* canvas */
+                                    coords1,    /* triangle coordinates */
+                                    tex,        /* texture canvas */
+                                    uv1);       /* texture coordinates */
+        caca_fill_triangle_textured(cv, coords2, tex, uv2);
+
         /* Refresh display and clear for next frame */
         caca_refresh_display(dp);
         caca_clear_canvas(cv);
-        
-    }
-    
+
+    }
+
     caca_free_display(dp);
     caca_free_canvas(cv);
     caca_free_canvas(tex);
-    
+
     return 0;
 }