X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fcage.c;h=bcd382b64449197f9fc2651198b2a4f9056a6644;hb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;hp=9b781c90ebcc0c4a7437918ea912adb81e656de3;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/glx/cage.c b/hacks/glx/cage.c
index 9b781c90..bcd382b6 100644
--- a/hacks/glx/cage.c
+++ b/hacks/glx/cage.c
@@ -80,6 +80,7 @@ static const char sccsid[] = "@(#)cage.c	5.01 2001/03/01 xlockmore";
 # define DEFAULTS			"*delay:		25000   \n"			\
 							"*showFPS:      False   \n"			\
 							"*wireframe:	False	\n"
+
 # define refresh_cage 0
 # define reshape_cage 0
 # define cage_handle_event 0
@@ -90,7 +91,12 @@ static const char sccsid[] = "@(#)cage.c	5.01 2001/03/01 xlockmore";
 
 #ifdef MODE_cage
 
+#if 0
 #include "e_textures.h"
+#else
+#include "xpm-ximage.h"
+#include "../images/wood.xpm"
+#endif
 
 ENTRYPOINT ModeSpecOpt cage_opts =
 {0, (XrmOptionDescRec *) NULL, 0, (argtype *) NULL, (OptionStruct *) NULL};
@@ -142,7 +148,7 @@ static cagestruct *cage = (cagestruct *) NULL;
 #define PlankThickness  0.15
 
 static Bool 
-draw_woodplank(cagestruct * cp, int wire)
+draw_woodplank(ModeInfo *mi, cagestruct * cp, int wire)
 {
 	glBegin(wire ? GL_LINES : GL_QUADS);
 	glNormal3f(0, 0, 1);
@@ -154,6 +160,7 @@ draw_woodplank(cagestruct * cp, int wire)
 	glVertex3f(PlankWidth, PlankHeight, PlankThickness);
 	glTexCoord2f(0, 1);
 	glVertex3f(-PlankWidth, PlankHeight, PlankThickness);
+    mi->polygon_count++;
 	glNormal3f(0, 0, -1);
 	glTexCoord2f(0, 0);
 	glVertex3f(-PlankWidth, PlankHeight, -PlankThickness);
@@ -163,6 +170,7 @@ draw_woodplank(cagestruct * cp, int wire)
 	glVertex3f(PlankWidth, -PlankHeight, -PlankThickness);
 	glTexCoord2f(0, 1);
 	glVertex3f(-PlankWidth, -PlankHeight, -PlankThickness);
+    mi->polygon_count++;
 	glNormal3f(0, 1, 0);
 	glTexCoord2f(0, 0);
 	glVertex3f(-PlankWidth, PlankHeight, PlankThickness);
@@ -172,6 +180,7 @@ draw_woodplank(cagestruct * cp, int wire)
 	glVertex3f(PlankWidth, PlankHeight, -PlankThickness);
 	glTexCoord2f(0, 1);
 	glVertex3f(-PlankWidth, PlankHeight, -PlankThickness);
+    mi->polygon_count++;
 	glNormal3f(0, -1, 0);
 	glTexCoord2f(0, 0);
 	glVertex3f(-PlankWidth, -PlankHeight, -PlankThickness);
@@ -181,6 +190,7 @@ draw_woodplank(cagestruct * cp, int wire)
 	glVertex3f(PlankWidth, -PlankHeight, PlankThickness);
 	glTexCoord2f(0, 1);
 	glVertex3f(-PlankWidth, -PlankHeight, PlankThickness);
+    mi->polygon_count++;
 	glNormal3f(1, 0, 0);
 	glTexCoord2f(0, 0);
 	glVertex3f(PlankWidth, -PlankHeight, PlankThickness);
@@ -190,6 +200,7 @@ draw_woodplank(cagestruct * cp, int wire)
 	glVertex3f(PlankWidth, PlankHeight, -PlankThickness);
 	glTexCoord2f(0, 1);
 	glVertex3f(PlankWidth, PlankHeight, PlankThickness);
+    mi->polygon_count++;
 	glNormal3f(-1, 0, 0);
 	glTexCoord2f(0, 0);
 	glVertex3f(-PlankWidth, PlankHeight, PlankThickness);
@@ -199,80 +210,81 @@ draw_woodplank(cagestruct * cp, int wire)
 	glVertex3f(-PlankWidth, -PlankHeight, -PlankThickness);
 	glTexCoord2f(0, 1);
 	glVertex3f(-PlankWidth, -PlankHeight, PlankThickness);
+    mi->polygon_count++;
 	glEnd();
 
 	return True;
 }
 
 static Bool
-draw_impossiblecage(cagestruct * cp, int wire)
+draw_impossiblecage(ModeInfo *mi, cagestruct * cp, int wire)
 {
 	glPushMatrix();
 	glRotatef(90, 0, 1, 0);
 	glTranslatef(0.0, PlankHeight - PlankWidth, -PlankThickness - PlankWidth);
-	if (!draw_woodplank(cp, wire))
+	if (!draw_woodplank(mi, cp, wire))
 		return False;
 	glPopMatrix();
 	glPushMatrix();
 	glRotatef(90, 0, 0, 1);
 	glTranslatef(0.0, PlankHeight - PlankWidth, PlankWidth - PlankThickness);
-	if (!draw_woodplank(cp, wire))
+	if (!draw_woodplank(mi, cp, wire))
 		return False;
 	glPopMatrix();
 	glPushMatrix();
 	glRotatef(90, 0, 1, 0);
 	glTranslatef(0.0, PlankWidth - PlankHeight, -PlankThickness - PlankWidth);
-	if (!draw_woodplank(cp, wire))
+	if (!draw_woodplank(mi, cp, wire))
 		return False;
 	glPopMatrix();
 	glPushMatrix();
 	glTranslatef(0.0, PlankWidth - PlankHeight, 3 * PlankThickness - PlankWidth);
-	if (!draw_woodplank(cp, wire))
+	if (!draw_woodplank(mi, cp, wire))
 		return False;
 	glPopMatrix();
 	glPushMatrix();
 	glRotatef(90, 0, 0, 1);
 	glTranslatef(0.0, PlankWidth - PlankHeight, PlankWidth - PlankThickness);
-	if (!draw_woodplank(cp, wire))
+	if (!draw_woodplank(mi, cp, wire))
 		return False;
 	glPopMatrix();
 	glPushMatrix();
 	glTranslatef(0.0, PlankWidth - PlankHeight, PlankWidth - 3 * PlankThickness);
-	if (!draw_woodplank(cp, wire))
+	if (!draw_woodplank(mi, cp, wire))
 		return False;
 	glPopMatrix();
 	glPushMatrix();
 	glTranslatef(0.0, PlankHeight - PlankWidth, 3 * PlankThickness - PlankWidth);
-	if (!draw_woodplank(cp, wire))
+	if (!draw_woodplank(mi, cp, wire))
 		return False;
 	glPopMatrix();
 	glPushMatrix();
 	glRotatef(90, 0, 0, 1);
 	glTranslatef(0.0, PlankHeight - PlankWidth, PlankThickness - PlankWidth);
-	if (!draw_woodplank(cp, wire))
+	if (!draw_woodplank(mi, cp, wire))
 		return False;
 	glPopMatrix();
 	glPushMatrix();
 	glTranslatef(0.0, PlankHeight - PlankWidth, PlankWidth - 3 * PlankThickness);
-	if (!draw_woodplank(cp, wire))
+	if (!draw_woodplank(mi, cp, wire))
 		return False;
 	glPopMatrix();
 	glPushMatrix();
 	glRotatef(90, 0, 1, 0);
 	glTranslatef(0.0, PlankHeight - PlankWidth, PlankWidth + PlankThickness);
-	if (!draw_woodplank(cp, wire))
+	if (!draw_woodplank(mi, cp, wire))
 		return False;
 	glPopMatrix();
 	glPushMatrix();
 	glRotatef(90, 0, 0, 1);
 	glTranslatef(0.0, PlankWidth - PlankHeight, PlankThickness - PlankWidth);
-	if (!draw_woodplank(cp, wire))
+	if (!draw_woodplank(mi, cp, wire))
 		return False;
 	glPopMatrix();
 	glPushMatrix();
 	glRotatef(90, 0, 1, 0);
 	glTranslatef(0.0, PlankWidth - PlankHeight, PlankWidth + PlankThickness);
-	if (!draw_woodplank(cp, wire))
+	if (!draw_woodplank(mi, cp, wire))
 		return False;
 	glPopMatrix();
 	return True;
@@ -297,10 +309,7 @@ reshape(ModeInfo * mi, int width, int height)
 static void
 pinit(ModeInfo *mi)
 {
-	int status;
-
-	glClearDepth(1.0);
-	glClearColor(0.0, 0.0, 0.0, 1.0);
+  /* int status; */
 
     if (MI_IS_WIREFRAME(mi))
       return;
@@ -329,6 +338,7 @@ pinit(ModeInfo *mi)
 
 	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 
+#if 0
 	clear_gl_error();
 	if (MI_IS_MONO(mi))
       status = 0;
@@ -344,6 +354,22 @@ pinit(ModeInfo *mi)
 		exit (1);
 	  }
 	check_gl_error("mipmapping");
+#else
+    {
+      XImage *img = xpm_to_ximage (mi->dpy,
+                                   mi->xgwa.visual,
+                                   mi->xgwa.colormap,
+                                   wood_texture);
+	  glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA,
+                    img->width, img->height, 0,
+                    GL_RGBA,
+                    /* GL_UNSIGNED_BYTE, */
+                    GL_UNSIGNED_INT_8_8_8_8_REV,
+                    img->data);
+      check_gl_error("texture");
+      XDestroyImage (img);
+    }
+#endif
 
 	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
@@ -412,12 +438,12 @@ draw_cage (ModeInfo * mi)
 	if (!cp->glx_context)
 		return;
 
+    mi->polygon_count = 0;
 	glXMakeCurrent(display, window, *(cp->glx_context));
 
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 	glPushMatrix();
-
 	glTranslatef(0.0, 0.0, -10.0);
 
 	if (!MI_IS_ICONIC(mi)) {
@@ -430,7 +456,7 @@ draw_cage (ModeInfo * mi)
 	glRotatef(cp->step * 100, 0, 0, 1);
 	glRotatef(25 + cos(cp->step * 5) * 6, 1, 0, 0);
 	glRotatef(204.5 - sin(cp->step * 5) * 8, 0, 1, 0);
-	if (!draw_impossiblecage(cp, MI_IS_WIREFRAME(mi))) {
+	if (!draw_impossiblecage(mi, cp, MI_IS_WIREFRAME(mi))) {
 		release_cage(mi);
 		return;
 	}