projects
/
dana
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
34cc24b
)
textures? not happening.
author
Derek Foreman
<manmower@gmail.com>
Sun, 8 Jun 2003 23:31:26 +0000
(23:31 +0000)
committer
Derek Foreman
<manmower@gmail.com>
Sun, 8 Jun 2003 23:31:26 +0000
(23:31 +0000)
render2/texture.c
patch
|
blob
|
history
diff --git
a/render2/texture.c
b/render2/texture.c
index 01b224ad9f1d5af6d2ecb8634f7db2b299ba9a54..a1a119ed9fc707ecab0b83c9e2d443ad6f3c92df 100644
(file)
--- a/
render2/texture.c
+++ b/
render2/texture.c
@@
-32,7
+32,6
@@
void RrTextureSetRGBA(struct RrSurface *sur,
{
unsigned int num;
struct RrTexture *tex = RrSurfaceTexture(sur, texnum);
-
if (!tex) return;
RrTextureFreeContents(tex);
tex->type = RR_TEXTURE_RGBA;
@@
-97,6
+96,19
@@
void RrTexturePaint(struct RrSurface *sur, struct RrTexture *tex,
tex->data.text.layout, tex->data.text.string,
x, y, w, h);
break;
+ case RR_TEXTURE_RGBA:
+ glColor3f(1.0, 1.0, 1.0);
+ glBegin(GL_TRIANGLES);
+ glVertex2i(x, y);
+ glVertex2i(x+w, y);
+ glVertex2i(x+w, y+h);
+
+ glVertex2i(x+w, y+h);
+ glVertex2i(x, y+h);
+ glVertex2i(x, y);
+ glEnd();
+
+ break;
}
glDisable(GL_TEXTURE_2D);
}