summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Wallin <nibbler.v1@gmail.com>2010-09-03 12:55:31 (GMT)
committer Felix Wallin <nibbler.v1@gmail.com>2010-09-03 12:55:31 (GMT)
commit49ba3f196f706472344a9a10105dad349bf1a0e0 (patch)
tree5d5fd230bd2d2be57819eeee71e1c11b39cfdea2
parent62b3d7842493a07947b3f5c0a0e31453ebdea8a6 (diff)
downloadpowder-49ba3f196f706472344a9a10105dad349bf1a0e0.zip
powder-49ba3f196f706472344a9a10105dad349bf1a0e0.tar.gz
added various things
-rw-r--r--graphics.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/graphics.c b/graphics.c
index a6f83f3..ce5e893 100644
--- a/graphics.c
+++ b/graphics.c
@@ -884,7 +884,7 @@ void fillrect(pixel *vid, int x, int y, int w, int h, int r, int g, int b, int a
for(j=1; j<h; j++)
for(i=1; i<w; i++)
drawpixel(vid, x+i, y+j, r, g, b, a);
-#endif
+#endif // OpenGL
}
void clearrect(pixel *vid, int x, int y, int w, int h)
@@ -893,12 +893,19 @@ void clearrect(pixel *vid, int x, int y, int w, int h)
for(i=1; i<h; i++)
memset(vid+(x+1+(XRES+BARSIZE)*(y+i)), 0, PIXELSIZE*(w-1));
}
-
void drawdots(pixel *vid, int x, int y, int h, int r, int g, int b, int a)
{
+#ifdef OpenGL
+ glBegin(GL_QUADS);
+ glColor4ub(r, g, b, a);
+ for(int i = 0; i <= h; i +=2)
+ glVertex2i(x, y+i);
+ glEnd();
+#else
int i;
for(i=0; i<=h; i+=2)
drawpixel(vid, x, y+i, r, g, b, a);
+#endif //OpenGL
}
int textwidth(char *s)
@@ -958,6 +965,9 @@ _inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
#endif
{
+#ifdef OpenGL
+ gl_
+#else
pixel t;
if(x<0 || y<0 || x>=XRES || y>=YRES)
return;
@@ -969,6 +979,7 @@ inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
b = (a*b + (255-a)*PIXB(t)) >> 8;
}
vid[y*(XRES+BARSIZE)+x] = PIXRGB(r,g,b);
+#endif //OpenGL
}
void draw_icon(pixel *vid_buf, int x, int y, char ch, int flag)
@@ -2352,4 +2363,4 @@ void ClearScreen()
{
glClear(GL_COLOR_BUFFER_BIT);
}
-#endif \ No newline at end of file
+#endif