X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fmoebius.c;h=feb1a488233c2be68ecf5b40925db43589119329;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=5ad9ccd5f34f1ee02994670fd09e04749954aced;hpb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;p=xscreensaver

diff --git a/hacks/glx/moebius.c b/hacks/glx/moebius.c
index 5ad9ccd5..feb1a488 100644
--- a/hacks/glx/moebius.c
+++ b/hacks/glx/moebius.c
@@ -82,14 +82,38 @@ static const char sccsid[] = "@(#)moebius.c	5.01 2001/03/01 xlockmore";
 # define refresh_moebius 0
 # define DEFAULTS			"*delay:		20000   \n"			\
 							"*showFPS:      False   \n"
+
 # include "xlockmore.h"		/* from the xscreensaver distribution */
 #else /* !STANDALONE */
 # include "xlock.h"		/* from the xlockmore distribution */
 #endif /* !STANDALONE */
 
+#ifdef HAVE_COCOA
+# include "jwxyz.h"
+#else
+# include <X11/Xlib.h>
+# include <GL/gl.h>
+# include <GL/glu.h>
+#endif
+
+#ifdef HAVE_JWZGLES
+# include "jwzgles.h"
+#endif /* HAVE_JWZGLES */
+
 #ifdef MODE_moebius
 
+#if 0 /* Hey, this never actually used the texture at all! */
+#if 0
 #include "e_textures.h"
+#else
+#include "xpm-ximage.h"
+#include "../images/wood.xpm"
+#endif
+#endif /* 0 */
+
+#include "sphere.h"
+#include "tube.h"
+
 #include "rotator.h"
 #include "gltrackball.h"
 
@@ -184,6 +208,7 @@ static moebiusstruct *moebius = (moebiusstruct *) NULL;
 static Bool
 mySphere(float radius)
 {
+#if 0
 	GLUquadricObj *quadObj;
 
 	if ((quadObj = gluNewQuadric()) == 0)
@@ -191,12 +216,19 @@ mySphere(float radius)
 	gluQuadricDrawStyle(quadObj, (GLenum) GLU_FILL);
 	gluSphere(quadObj, radius, 16, 16);
 	gluDeleteQuadric(quadObj);
+#else
+    glPushMatrix();
+    glScalef (radius, radius, radius);
+    unit_sphere (16, 16, False);
+    glPopMatrix();
+#endif
 	return True;
 }
 
 static Bool
 myCone(float radius)
 {
+#if 0
 	GLUquadricObj *quadObj;
 
 	if ((quadObj = gluNewQuadric()) == 0)
@@ -204,6 +236,12 @@ myCone(float radius)
 	gluQuadricDrawStyle(quadObj, (GLenum) GLU_FILL);
 	gluCylinder(quadObj, radius, 0, radius * 3, 8, 1);
 	gluDeleteQuadric(quadObj);
+#else
+    cone (0, 0, 0,
+          0, 0, radius * 3,
+          radius, 0,
+          8, True, True, False);
+#endif
 	return True;
 }
 
@@ -402,6 +440,10 @@ draw_moebius_strip(ModeInfo * mi)
 
 	float       Cx, Cy, Cz;
 
+#ifdef HAVE_JWZGLES /* #### glPolygonMode other than GL_FILL unimplemented */
+    solidmoebius = True;
+#endif
+
 	if (solidmoebius) {
 		glBegin(GL_QUAD_STRIP);
 		Phi = 0;
@@ -539,12 +581,10 @@ reshape_moebius (ModeInfo * mi, int width, int height)
 }
 
 static void
-pinit(void)
+pinit(ModeInfo *mi)
 {
-    int status;
+  /* int status; */
 	glClearDepth(1.0);
-	glClearColor(0.0, 0.0, 0.0, 1.0);
-
 	glLightfv(GL_LIGHT0, GL_AMBIENT, ambient);
 	glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse);
 	glLightfv(GL_LIGHT0, GL_POSITION, position0);
@@ -563,11 +603,13 @@ pinit(void)
 	/* moebius */
 	glShadeModel(GL_SMOOTH);
 	glEnable(GL_DEPTH_TEST);
-	glDisable(GL_TEXTURE_2D);
 	glDisable(GL_CULL_FACE);
 
+#if 0
+	glEnable(GL_TEXTURE_2D);
 	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 
+#if 0
     clear_gl_error();
 	status = gluBuild2DMipmaps(GL_TEXTURE_2D, 3,
                                WoodTextureWidth, WoodTextureHeight,
@@ -581,12 +623,29 @@ pinit(void)
         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);
 	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+#endif
 
 	glMaterialfv(GL_FRONT_AND_BACK, GL_SHININESS, front_shininess);
 	glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, front_specular);
@@ -609,39 +668,10 @@ moebius_handle_event (ModeInfo *mi, XEvent *event)
 {
   moebiusstruct *mp = &moebius[MI_SCREEN(mi)];
 
-  if (event->xany.type == ButtonPress &&
-      event->xbutton.button == Button1)
-    {
-      mp->button_down_p = True;
-      gltrackball_start (mp->trackball,
-                         event->xbutton.x, event->xbutton.y,
-                         MI_WIDTH (mi), MI_HEIGHT (mi));
-      return True;
-    }
-  else if (event->xany.type == ButtonRelease &&
-           event->xbutton.button == Button1)
-    {
-      mp->button_down_p = False;
-      return True;
-    }
-  else if (event->xany.type == ButtonPress &&
-           (event->xbutton.button == Button4 ||
-            event->xbutton.button == Button5 ||
-            event->xbutton.button == Button6 ||
-            event->xbutton.button == Button7))
-    {
-      gltrackball_mousewheel (mp->trackball, event->xbutton.button, 10,
-                              !!event->xbutton.state);
-      return True;
-    }
-  else if (event->xany.type == MotionNotify &&
-           mp->button_down_p)
-    {
-      gltrackball_track (mp->trackball,
-                         event->xmotion.x, event->xmotion.y,
-                         MI_WIDTH (mi), MI_HEIGHT (mi));
-      return True;
-    }
+  if (gltrackball_event_handler (event, mp->trackball,
+                                 MI_WIDTH (mi), MI_HEIGHT (mi),
+                                 &mp->button_down_p))
+    return True;
 
   return False;
 }
@@ -664,14 +694,14 @@ init_moebius (ModeInfo * mi)
     {
       double rot_speed = 0.3;
       mp->rot = make_rotator (rot_speed, rot_speed, rot_speed, 1, 0, True);
-      mp->trackball = gltrackball_init ();
+      mp->trackball = gltrackball_init (True);
     }
 
 	if ((mp->glx_context = init_GL(mi)) != NULL) {
 
 		reshape_moebius(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
 		glDrawBuffer(GL_BACK);
-		pinit();
+		pinit(mi);
 	} else {
 		MI_CLEARWINDOW(mi);
 	}