X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fantinspect.c;h=bb6927d1902cd1b0433ba2cd512c0044d0019178;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=21bb1be90f4ee5bf3384caa4162176cfa7dbe602;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver

diff --git a/hacks/glx/antinspect.c b/hacks/glx/antinspect.c
index 21bb1be9..bb6927d1 100644
--- a/hacks/glx/antinspect.c
+++ b/hacks/glx/antinspect.c
@@ -20,11 +20,25 @@
 			    "*showFPS: False   \n"
 
 # define refresh_antinspect 0
+# define release_antinspect 0
 #include "xlockmore.h"
 #else
 #include "xlock.h"
 #endif
 
+#ifdef HAVE_JWXYZ
+# 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 */
+
+#include "sphere.h"
 #include "gltrackball.h"
 
 #define DEF_SHADOWS  "True"
@@ -52,7 +66,7 @@ ENTRYPOINT ModeSpecOpt antinspect_opts = {sizeof opts / sizeof opts[0],
 
 #ifdef USE_MODULES
 ModStruct   antinspect_description =
-  {"antinspect", "init_antinspect", "draw_antinspect", "release_antinspect",
+  {"antinspect", "init_antinspect", "draw_antinspect", (char *) NULL,
    "draw_antinspect", "change_antinspect", (char *) NULL, &antinspect_opts,
    1000, 1, 1, 1, 4, 1.0, "",
    "draws some ants", 0, NULL};
@@ -148,6 +162,7 @@ static const GLfloat ground[4] = {0.0, 1.0, 0.0, -0.00001};
 /* simple filled sphere */
 static Bool mySphere(float radius) 
 {
+#if 0
   GLUquadricObj *quadObj;
 
   if((quadObj = gluNewQuadric()) == 0)
@@ -155,13 +170,20 @@ static Bool mySphere(float radius)
   gluQuadricDrawStyle(quadObj, (GLenum) GLU_FILL);
   gluSphere(quadObj, radius, 16, 16);
   gluDeleteQuadric(quadObj);
-
+#else
+    glPushMatrix();
+    glScalef (radius, radius, radius);
+    glRotatef (90, 1, 0, 0);
+    unit_sphere (16, 16, False);
+    glPopMatrix();
+#endif
   return True;
 }
 
 /* caged sphere */
 static Bool mySphere2(float radius) 
 {
+#if 0
   GLUquadricObj *quadObj;
 
   if((quadObj = gluNewQuadric()) == 0)
@@ -169,6 +191,13 @@ static Bool mySphere2(float radius)
   gluQuadricDrawStyle(quadObj, (GLenum) GLU_LINE);/*GLU_SILHOUETTE);*/
   gluSphere(quadObj, radius, 16, 8);
   gluDeleteQuadric(quadObj);
+#else
+    glPushMatrix();
+    glScalef (radius, radius, radius);
+    glRotatef (90, 1, 0, 0);
+    unit_sphere (16, 8, True);
+    glPopMatrix();
+#endif
 
   return True;
 }
@@ -537,8 +566,6 @@ ENTRYPOINT void reshape_antinspect(ModeInfo * mi, int width, int height)
 static void pinit(void) 
 {
   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);
@@ -562,47 +589,14 @@ static void pinit(void)
   glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, front_specular);
 }
 
-ENTRYPOINT void release_antinspect(ModeInfo * mi) 
-{
-  if(antinspect) {
-	free((void *) antinspect);
-	antinspect = (antinspectstruct *) NULL;
-  }
-  FreeAllGL(mi);
-}
-
 ENTRYPOINT Bool antinspect_handle_event (ModeInfo *mi, XEvent *event) 
 {
   antinspectstruct *mp = &antinspect[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, 5,
-                              !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;
 }
@@ -611,15 +605,11 @@ ENTRYPOINT void init_antinspect(ModeInfo * mi)
 {
   antinspectstruct *mp;
   
-  if(antinspect == NULL) {
-    if((antinspect = (antinspectstruct *) calloc(MI_NUM_SCREENS(mi),
-						 sizeof (antinspectstruct))) == NULL)
-      return;
-  }
+  MI_INIT(mi, antinspect, NULL);
   mp = &antinspect[MI_SCREEN(mi)];
   mp->step = NRAND(90);
   mp->ant_position = NRAND(90);
-  mp->trackball = gltrackball_init ();
+  mp->trackball = gltrackball_init (False);
   
   if ((mp->glx_context = init_GL(mi)) != NULL) {
     reshape_antinspect(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
@@ -659,13 +649,24 @@ ENTRYPOINT void draw_antinspect(ModeInfo * mi)
   /* position camera --- this works well, we can peer inside 
      the antbubble */
   glTranslatef(0.0, 0.0, -10.0);
+
+# ifdef HAVE_MOBILE	/* Keep it the same relative size when rotated. */
+  {
+    GLfloat h = MI_HEIGHT(mi) / (GLfloat) MI_WIDTH(mi);
+    int o = (int) current_device_rotation();
+    if (o != 0 && o != 180 && o != -180)
+      glScalef (1/h, 1/h, 1/h);
+    glRotatef(o, 0, 0, 1);
+  }
+# endif
+
   gltrackball_rotate(mp->trackball);
   glRotatef((15.0/2.0 + 15.0*sin(mp->ant_step/100.0)), 1.0, 0.0, 0.0);
   glRotatef(30.0, 1.0, 0.0, 0.0);
   glRotatef(180.0, 0.0, 1.0, 0.0);
   
   if (!draw_antinspect_strip(mi)) {
-	release_antinspect(mi);
+	MI_ABORT(mi);
 	return;
   }