Enlightenment CVS committal

Author  : turran
Project : e17
Module  : proto/enesim

Dir     : e17/proto/enesim/src/lib/raster/rasterizer


Modified Files:
        rasterizer.c Makefile.am rasterizer.h cpsc.c kiia.c 
Added Files:
        kiia.h kiia16.c kiia8.c kiia32.c 


Log Message:
+ Anti Alias Polygon rasterizer (kiia8, 16 and 32)
+ Move scanline definitions to the API (first step for a new scanline approach)
+ Blending with a relative alpha
+ New data types (extender, etc)

===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/rasterizer/rasterizer.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- rasterizer.c        13 Nov 2007 00:23:45 -0000      1.2
+++ rasterizer.c        2 Dec 2007 23:28:43 -0000       1.3
@@ -12,8 +12,8 @@
  * To be documented
  * FIXME: To be fixed
  */
-Enesim_Rasterizer * enesim_rasterizer_new(void *data, Enesim_Rasterizer_Func 
*funcs,
-               Enesim_Rectangle boundaries)
+Enesim_Rasterizer * enesim_rasterizer_new(void *data, Enesim_Rasterizer_Func
+               *funcs, Enesim_Rectangle boundaries, int types)
 {
        Enesim_Rasterizer *r;
 
@@ -21,6 +21,7 @@
        r->funcs = funcs;
        r->data = data;
        r->boundaries = boundaries;
+       r->types = types;
        return r;
 }
 /*============================================================================*
@@ -43,13 +44,22 @@
  * To be documented
  * FIXME: To be fixed
  */
-EAPI void enesim_rasterizer_generate(Enesim_Rasterizer *r, Enesim_Scanline *s)
+EAPI int enesim_rasterizer_generate(Enesim_Rasterizer *r, int sl, 
Enesim_Scanline_Callback cb, void *data)
 {
        assert(r);
        assert(r->funcs);
        assert(r->funcs->generate);
-       
-       r->funcs->generate(r->data, s);
+       assert(cb);
+
+       if (!(r->types & sl))
+       {
+               ENESIM_WARNING("Scanline not supported");
+               return -ENESIM_ERROR_SCANLINE_NOT_SUPPORTED;
+       }
+       r->user_data = data;
+       r->scanline_callback = cb;
+       r->funcs->generate(r->data, sl);
+       return ENESIM_OK;
 }
 
 /**
@@ -64,4 +74,4 @@
        
        r->funcs->delete(r->data);
        free(r);
-}
\ No newline at end of file
+}
===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/rasterizer/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 13 Nov 2007 00:23:45 -0000      1.4
+++ Makefile.am 2 Dec 2007 23:28:43 -0000       1.5
@@ -13,7 +13,9 @@
 libenesim_rasterizer_la_SOURCES = \
 rasterizer.c \
 cpsc.c \
-kiia.c
+kiia.c \
+kiia8.c \
+kiia16.c
 
 libenesim_rasterizer_la_LIBADD = 
 
===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/rasterizer/rasterizer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- rasterizer.h        13 Nov 2007 00:23:45 -0000      1.2
+++ rasterizer.h        2 Dec 2007 23:28:43 -0000       1.3
@@ -13,7 +13,7 @@
  */
 
 typedef void (*Enesim_Rasterizer_Vertex_Add)(void *r, float x, float y);
-typedef void (*Enesim_Rasterizer_Generate)(void *r, Enesim_Scanline *sl);
+typedef void (*Enesim_Rasterizer_Generate)(void *r, int sl);
 typedef void (*Enesim_Rasterizer_Delete)(void *r);
 typedef struct _Enesim_Rasterizer_Func
 {
@@ -29,12 +29,17 @@
 
 struct _Enesim_Rasterizer
 {
-       Enesim_Rectangle        boundaries;
-       Enesim_Rasterizer_Func  *funcs;
-       void                    *data;
+       int                      types;
+       Enesim_Rectangle         boundaries;
+       Enesim_Scanline_Callback scanline_callback;
+       Enesim_Rasterizer_Func   *funcs;
+       void                     *data;
+       void                     *user_data;
 };
 
-Enesim_Rasterizer * enesim_rasterizer_new(void *data, Enesim_Rasterizer_Func 
*func,
-               Enesim_Rectangle boundaries);
+Enesim_Rasterizer * enesim_rasterizer_new(void *data, Enesim_Rasterizer_Func
+       *func, Enesim_Rectangle boundaries, int types);
+Enesim_Rasterizer * enesim_rasterizer_kiia8_new(Enesim_Rectangle boundaries);
+Enesim_Rasterizer * enesim_rasterizer_kiia16_new(Enesim_Rectangle boundaries);
 
 #endif
===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/rasterizer/cpsc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- cpsc.c      13 Nov 2007 00:23:45 -0000      1.3
+++ cpsc.c      2 Dec 2007 23:28:43 -0000       1.4
@@ -7,6 +7,7 @@
 #include "enesim_private.h"
 #include "rasterizer.h"
 #include "scanline.h"
+//#include "alias.h" // This header should be fixed
 
 /* Code based on the algorithm "Concave Polygon Scan Conversion" by 
  * Paul Heckbert from "Graphics Gems". 
@@ -129,8 +130,9 @@
        r->num_vertices++;
 }
 
-static void _generate(Cpsc *r, Enesim_Scanline *sl)
+static void _generate(Cpsc *r, int sl)
 {
+       Enesim_Scanline_Alias alias;
        Cpsc_Vertex     *vertices;
        Cpsc_Edge       *aet;
        int             *sindex;
@@ -209,8 +211,11 @@
                        if (xl <= xr)
                        {
                                /* append a new scanline from xl to xr at y */
-                               //printf("span from [%d] %d to %d, %d\n", y, 
xl, xr, j);
-                               sl->funcs->add(sl->data, y, xl, xr, 255);
+                               alias.y = y;
+                               alias.x = xl;
+                               alias.w = xr - xl + 1;
+                               r->r->scanline_callback(&alias, 
r->r->user_data);
+                               //sl->funcs->add(sl->data, y, xl, xr, 255);
                        }
                        aet[j].x += aet[j].dx;
                        aet[j + 1].x += aet[j + 1].dx;
@@ -246,7 +251,7 @@
        c = calloc(1, sizeof(Cpsc));
        c->a = edata_array_new(c, EDATA_ARRAY_ALLOC(_a_alloc),
                EDATA_ARRAY_FREE(_a_free));
-       r = enesim_rasterizer_new(c, &cpsc_func, boundaries);
+       r = enesim_rasterizer_new(c, &cpsc_func, boundaries, 
ENESIM_SCANLINE_ALIAS);
        c->r = r;
        return r;
 }
===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/rasterizer/kiia.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- kiia.c      13 Nov 2007 00:23:45 -0000      1.1
+++ kiia.c      2 Dec 2007 23:28:43 -0000       1.2
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
@@ -8,171 +9,6 @@
 #include "rasterizer.h"
 #include "scanline.h"
 #include "extender.h"
-/*
- * Kiia Kallio Scanline edge-flag algorithm, check it out at:
- * http://mlab.uiah.fi/~kkallio/antialiasing/
- */
-
-/* 
- * 8x8 n-queens pattern
- * [][][][][]##[][] 5
- * ##[][][][][][][] 0
- * [][][]##[][][][] 3
- * [][][][][][]##[] 6
- * []##[][][][][][] 1
- * [][][][]##[][][] 4
- * [][][][][][][]## 7
- * [][]##[][][][][] 2
- */
-
-static const float offsets_8[8] = {
-       (5.0f/8.0f),
-       (0.0f/8.0f),
-       (3.0f/8.0f),
-       (6.0f/8.0f),
-       (1.0f/8.0f),
-       (4.0f/8.0f),
-       (7.0f/8.0f)
-};
-
-static const float *offsets[ENESIM_RASTERIZER_KIIA_COUNTS] = {
-       offsets_8,
-       NULL,
-       NULL,
-};
-
-enum
-{
-       KIIA_EDGE_DIRECTION_DOWN = -1,
-       KIIA_EDGE_DIRECTION_UP = 1,
-};
-
-typedef struct _Kiia_Edge Kiia_Edge;
-struct _Kiia_Edge
-{
-       int yfirst;
-       int ylast;
-       int direction;
-       Kiia_Edge *next;
-};
-
-typedef struct _Kiia_Vertex
-{
-       float x;
-       float y;
-} Kiia_Vertex;
-
-typedef struct _Kiia
-{
-       Enesim_Rasterizer *r;
-       
-       Kiia_Edge **table;
-       Kiia_Vertex vertex_last;
-       int vertex_pos;
-
-       Enesim_Extender extender;
-       
-       float *subpixel_offsets;
-       int subpixel_count;
-       int subpixel_shift;
-} Kiia;
-
-
-/*============================================================================*
- *                                  Local                                     
* 
- 
*============================================================================*/
-static const unsigned char coverages[256] = {
-       0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
-       1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-       1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-       2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-       1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-       2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-       2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-       3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-       1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-       2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-       2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-       3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-       2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-       3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-       3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-       4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8
-};
-
-static void _edge_add(Kiia *k, Kiia_Vertex *v)
-{
-       Kiia_Edge *e, *tmp;
-
-       e = calloc(1, sizeof(Kiia_Edge));
-       /* TODO clip to the rasterizer boundaries */
-       /* insert the edge to the edge table */
-       /* accumulate the maxy and miny */
-       if (v->y > k->vertex_last.y)
-       {
-               e->yfirst = v->y;
-               e->ylast = k->vertex_last.y;
-               e->direction = KIIA_EDGE_DIRECTION_UP;
-       }
-       else
-       {
-               e->yfirst = k->vertex_last.y;
-               e->ylast = v->y;
-               e->direction = KIIA_EDGE_DIRECTION_DOWN;
-       }
-       tmp = k->table[e->yfirst];
-       e->next = tmp;
-       k->table[e->yfirst] = e;
-       
-       enesim_extender_add(&k->extender, e->yfirst, e->ylast);
-}
-
-static void _vertex_add(Kiia *k, float x, float y)
-{
-       Kiia_Vertex v;
-       /* scale the vertices on y by subpixel count */
-       /* translate the sampling point to pixel center */
-       v.x = x + 0.5;
-       v.y = (y * k->subpixel_count) - 0.5;
-       /* in case this is the second vertex, add an edge */
-       if (k->vertex_pos)
-       {
-               _edge_add(k, &v);
-       }
-       k->vertex_pos = (k->vertex_pos + 1) % 2;
-       k->vertex_last = v;
-}
-
-static void _generate(Kiia *k, Enesim_Scanline *sl)
-{
-       /* TODO */
-}
-
-static void _delete(Kiia *k)
-{
-       int i;
-       
-       /* free all edges on the edge table */
-       for (i = 0; i < k->r->boundaries.w; i++)
-       {
-                       Kiia_Edge *e, *next;
-                       
-                       e = k->table[i];
-                       while (e)
-                       {
-                               next = e->next;
-                               free(e);
-                               e = next;
-                       }
-       }
-       free(k);
-}
-
-static Enesim_Rasterizer_Func kiia_func = {
-       .vertex_add = ENESIM_RASTERIZER_VERTEX_ADD(_vertex_add),
-       .generate   = ENESIM_RASTERIZER_GENERATE(_generate),
-       .delete     = ENESIM_RASTERIZER_DELETE(_delete)
-};
 
 /*============================================================================*
  *                                   API                                      
* 
@@ -184,16 +20,17 @@
 EAPI Enesim_Rasterizer * 
enesim_rasterizer_kiia_new(Enesim_Rasterizer_Kiia_Count
                count, Enesim_Rectangle boundaries)
 {
-       Enesim_Rasterizer *r;
-       Kiia *k;
-
-       k = calloc(1, sizeof(Kiia));
-       k->subpixel_offsets = offsets[count];
-       k->subpixel_shift = count + 3; // 0 => 3, 1 => 4, 2 => 5
-       k->subpixel_count = 1 << k->subpixel_shift;
-       r = enesim_rasterizer_new(k, &kiia_func, boundaries);
-       k->r = r;
-       k->table = calloc(boundaries.w, sizeof(Kiia_Edge *));
-       
+       Enesim_Rasterizer *r = NULL;
+       switch (count)
+       {
+       case ENESIM_RASTERIZER_KIIA_COUNT_8:
+               r = enesim_rasterizer_kiia8_new(boundaries);
+               break;
+       case ENESIM_RASTERIZER_KIIA_COUNT_16:
+               r = enesim_rasterizer_kiia16_new(boundaries);
+               break;
+       case ENESIM_RASTERIZER_KIIA_COUNT_32:
+               break;
+       }
        return r;
 }



-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell.  From the desktop to the data center, Linux is going
mainstream.  Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to