SF.net SVN: alleg:[11524] allegro/branches/4.9/addons/primitives

[<Sie...@us...>]

Revision: 11524
          http://alleg.svn.sourceforge.net/alleg/?rev=11524&view=rev
Author:   SiegeLord
Date:     2009-01-29 22:16:21 +0000 (Thu, 29 Jan 2009)

Log Message:
-----------
Made the primitives addon a little less dependent on internal functions

Modified Paths:
--------------
    allegro/branches/4.9/addons/primitives/line_soft.c
    allegro/branches/4.9/addons/primitives/tri_soft.c

Modified: allegro/branches/4.9/addons/primitives/line_soft.c
===================================================================
--- allegro/branches/4.9/addons/primitives/line_soft.c	2009-01-29 21:12:01 UTC (rev 11523)
+++ allegro/branches/4.9/addons/primitives/line_soft.c	2009-01-29 22:16:21 UTC (rev 11524)
@@ -53,15 +53,15 @@
    */
    
    state_grad_any_2d* s = (state_grad_any_2d*)state;
-   ALLEGRO_COLOR res;
-   _al_blend(&s->cur_color, dest, x, y, &res);
-   _al_put_pixel(dest, x, y, res);
+   (void)dest;
+   al_draw_pixel(x, y, s->cur_color);
 }
 
 static void shader_grad_any_2d_draw_opaque(ALLEGRO_BITMAP* dest, uintptr_t state, int x, int y)
 {
    state_grad_any_2d* s = (state_grad_any_2d*)state;
-   _al_put_pixel(dest, x, y, s->cur_color);
+   (void)dest;
+   al_put_pixel(x, y, s->cur_color);
 }
 
 static void shader_grad_any_2d_first(uintptr_t state, int start_x, int start_y, ALLEGRO_VERTEX* v1, ALLEGRO_VERTEX* v2)
@@ -138,15 +138,15 @@
 static void shader_solid_any_2d_draw_shade(ALLEGRO_BITMAP* dest, uintptr_t state, int x, int y)
 {
    state_solid_any_2d* s = (state_solid_any_2d*)state;
-   ALLEGRO_COLOR res;
-   _al_blend(&s->color, dest, x, y, &res);
-   _al_put_pixel(dest, x, y, res);
+   (void)dest;
+   al_draw_pixel(x, y, s->color);
 }
 
 static void shader_solid_any_2d_draw_opaque(ALLEGRO_BITMAP* dest, uintptr_t state, int x, int y)
 {
    state_solid_any_2d* s = (state_solid_any_2d*)state;
-   _al_put_pixel(dest, x, y, s->color);
+   (void)dest;
+   al_put_pixel(x, y, s->color);
 }
 
 static void shader_solid_any_2d_first(uintptr_t state, int start_x, int start_y, ALLEGRO_VERTEX* v1, ALLEGRO_VERTEX* v2)

Modified: allegro/branches/4.9/addons/primitives/tri_soft.c
===================================================================
--- allegro/branches/4.9/addons/primitives/tri_soft.c	2009-01-29 21:12:01 UTC (rev 11523)
+++ allegro/branches/4.9/addons/primitives/tri_soft.c	2009-01-29 22:16:21 UTC (rev 11524)
@@ -21,7 +21,6 @@
 #include "allegro5/internal/aintern_prim.h"
 #include "allegro5/internal/aintern_prim_soft.h"
 #include "allegro5/internal/aintern_bitmap.h"
-#include "allegro5/internal/aintern_display.h"
 #include <math.h>
 
 typedef void (*shader_draw)(ALLEGRO_BITMAP*, uintptr_t, int, int, int);
@@ -66,20 +65,16 @@
 {
    state_grad_any_2d* s = (state_grad_any_2d*)state;
    int x;
+   (void)dest;
    
    ALLEGRO_COLOR color = s->cur_color;
    for (x = x1; x <= x2; x++) {
-      ALLEGRO_COLOR res;
-      
-      _al_blend(&color, dest, x, y - 1, &res);
-      
       /*
       TODO: This y - 1 bit bothers me, why would I need this?
       Either _al_put_pixel, or al_draw_bitmap are shifted by 1 relative to OpenGL
       */
+      al_draw_pixel(x, y - 1, color);
       
-      _al_put_pixel(dest, x, y - 1, res);
-      
       color.r += s->color_dx.r;
       color.g += s->color_dx.g;
       color.b += s->color_dx.b;
@@ -91,10 +86,11 @@
 {
    state_grad_any_2d* s = (state_grad_any_2d*)state;
    int x;
-   
+   (void)dest;
+
    ALLEGRO_COLOR color = s->cur_color;
    for (x = x1; x <= x2; x++) {
-      _al_put_pixel(dest, x, y - 1, color);
+      al_put_pixel(x, y - 1, color);
       
       color.r += s->color_dx.r;
       color.g += s->color_dx.g;
@@ -203,11 +199,10 @@
 {
    state_solid_any_2d* s = (state_solid_any_2d*)state;
    int x;
-   
+   (void)dest;
+
    for (x = x1; x <= x2; x++) {
-      ALLEGRO_COLOR res;
-      _al_blend(&s->cur_color, dest, x, y - 1, &res);
-      _al_put_pixel(dest, x, y - 1, res);
+      al_draw_pixel(x, y - 1, s->cur_color);
    }
 }
 
@@ -215,9 +210,10 @@
 {
    state_solid_any_2d* s = (state_solid_any_2d*)state;
    int x;
-   
+   (void)dest;
+
    for (x = x1; x <= x2; x++) {
-      _al_put_pixel(dest, x, y - 1, s->cur_color);
+      al_put_pixel(x, y - 1, s->cur_color);
    }
 }
 
@@ -590,7 +586,6 @@
       grad = 0;
    }
    
-   
    if (texture) {
    
    } else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.