Changeset 2255 for libcacaTweet

Timestamp:

Mar 2, 2008, 5:28:10 PM (15 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Improved ellipse rendering. Not perfect, but still much better than

old method. Closes #16 .

File:

• libcaca/trunk/cucul/conic.c (modified) (11 diffs)

libcaca/trunk/cucul/conic.c

@@ -28 +28 @@
 #include "cucul_internals.h"
 
-static void ellipsepoints(cucul_canvas_t *, int, int, int, int, uint32_t);
+static void ellipsepoints(cucul_canvas_t *, int, int, int, int, uint32_t, int);
 
 /** \brief Draw a circle on the canvas using the given character.
@@ -49 +49 @@
     for(test = 0, dx = 0, dy = r ; dx <= dy ; dx++)
     {
-        ellipsepoints(cv, x, y, dx, dy, ch);
-        ellipsepoints(cv, x, y, dy, dx, ch);
+        ellipsepoints(cv, x, y, dx, dy, ch, 1);
+        ellipsepoints(cv, x, y, dy, dx, ch, 1);
 
         test += test > 0 ? dx - dy-- : dx;
@@ -138 +138 @@
     int d1 = b*b - (a*a*b) + (a*a/4);
 
-    ellipsepoints(cv, xo, yo, x, y, ch);
+    ellipsepoints(cv, xo, yo, x, y, ch, 0);
 
     while(a*a*y - a*a/2 > b*b*(x+1))
@@ -152 +152 @@
         }
         x++;
-        ellipsepoints(cv, xo, yo, x, y, ch);
+        ellipsepoints(cv, xo, yo, x, y, ch, 0);
     }
 
@@ -169 +169 @@
 
         y--;
-        ellipsepoints(cv, xo, yo, x, y, ch);
+        ellipsepoints(cv, xo, yo, x, y, ch, 0);
     }
 
@@ -194 +194 @@
     int d1 = b*b - (a*a*b) + (a*a/4);
 
-    ellipsepoints(cv, xo, yo, x, y, '-');
+    ellipsepoints(cv, xo, yo, x, y, '-', 1);
 
     while(a*a*y - a*a/2 > b*b*(x+1))
@@ -201 +201 @@
         {
             d1 += b*b*(2*x+1); /* XXX: "Computer Graphics" has + 3 here. */
+            ellipsepoints(cv, xo, yo, x + 1, y, '0', 1);
         }
         else
@@ -206 +207 @@
             d1 += b*b*(2*x*1) + a*a*(-2*y+2);
             y--;
+            ellipsepoints(cv, xo, yo, x + 1, y, '1', 1);
         }
         x++;
-        ellipsepoints(cv, xo, yo, x, y, '-');
+       
+        
     }
 
@@ -218 +221 @@
             d2 += b*b*(2*x+2) + a*a*(-2*y+3);
             x++;
+            ellipsepoints(cv, xo, yo, x , y - 1, '2', 1);
         }
         else
         {
             d2 += a*a*(-2*y+3);
+            ellipsepoints(cv, xo, yo, x , y - 1, '3', 1);
         }
 
         y--;
-        ellipsepoints(cv, xo, yo, x, y, '|');
+        
+       
     }
 
@@ -232 +238 @@
 
 static void ellipsepoints(cucul_canvas_t *cv, int xo, int yo, int x, int y,
-                          uint32_t ch)
+                          uint32_t ch, int thin)
 {
     uint8_t b = 0;
@@ -245 +251 @@
         b |= 0x8;
 
-    if((b & (0x1|0x4)) == (0x1|0x4))
-        cucul_put_char(cv, xo + x, yo + y, ch);
-
-    if((b & (0x2|0x4)) == (0x2|0x4))
-        cucul_put_char(cv, xo - x, yo + y, ch);
-
-    if((b & (0x1|0x8)) == (0x1|0x8))
-        cucul_put_char(cv, xo + x, yo - y, ch);
-
-    if((b & (0x2|0x8)) == (0x2|0x8))
-        cucul_put_char(cv, xo - x, yo - y, ch);
-}
-
+    if((b & (0x1|0x4)) == (0x1|0x4)) {
+        char c = ch;
+        
+        if(thin) {
+            switch(c) {
+            case '0':
+                c = '-';
+                break;
+            case '1':
+                c = ',';
+                break;
+            case '2':
+                c = '/';
+                break;
+            case '3':
+                c = '|';
+                break;
+            }
+
+        }
+        cucul_put_char(cv, xo + x, yo + y, c);
+    }
+    if((b & (0x2|0x4)) == (0x2|0x4)) {
+        char c = ch;
+        
+        if(thin) {
+            switch(c) {
+            case '0':
+                c = '-';
+                break;
+            case '1':
+                c = '.';
+                break;
+            case '2':
+                c = '\\';
+                break;
+            case '3':
+                c = '|';
+                break;
+            }
+
+        }
+        cucul_put_char(cv, xo - x, yo + y, c);
+    }
+
+
+    if((b & (0x1|0x8)) == (0x1|0x8)) {
+        char c = ch;
+        
+        if(thin) {
+            switch(c) {
+            case '0':
+                c = '-';
+                break;
+            case '1':
+                c = '`';
+                break;
+            case '2':
+                c = '\\';
+                break;
+            case '3':
+                c = '|';
+                break;
+            }
+
+        }
+        cucul_put_char(cv, xo + x, yo - y, c);
+    }
+
+    if((b & (0x2|0x8)) == (0x2|0x8)) {
+        char c = ch;
+        
+        if(thin) {
+            switch(c) {
+            case '0':
+                c = '-';
+                break;
+            case '1':
+                c = '\'';
+                break;
+            case '2':
+                c = '/';
+                break;
+            case '3':
+                c = '|';
+                break;
+            }
+
+        }
+        cucul_put_char(cv, xo - x, yo - y, c);
+    }
+
+        
+}
+