X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fatlantis.h;h=3b24bfab32526b702a8dc01b0ff54f4a4f910447;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=413b48b853448a4ee4518baaec420f07b7c10e80;hpb=ce3185de9d9705e259f2b60dd4b5509007fa17d4;p=xscreensaver

diff --git a/hacks/glx/atlantis.h b/hacks/glx/atlantis.h
index 413b48b8..3b24bfab 100644
--- a/hacks/glx/atlantis.h
+++ b/hacks/glx/atlantis.h
@@ -25,7 +25,7 @@
  * Thanks goes also to Brian Paul for making it possible and inexpensive
  * to use OpenGL at home.
  *
- * My e-mail address is lassauge@sagem.fr
+ * My e-mail address is lassauge@users.sourceforge.net
  *
  * Eric Lassauge  (May-13-1998)
  *
@@ -67,8 +67,29 @@
  *
  * OpenGL(TM) is a trademark of Silicon Graphics, Inc.
  */
-#include <GL/gl.h>
-#include <GL/glx.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#ifdef STANDALONE
+# include <math.h>
+# include "screenhackI.h"
+# ifndef HAVE_JWXYZ
+#  include <GL/gl.h>
+#  include <GL/glx.h>
+# endif
+#else
+# include "xlock.h"
+#endif
+#ifdef HAVE_ANDROID
+#include <GLES/gl.h>
+#endif
+
+
+#ifdef HAVE_JWZGLES
+# include "jwzgles.h"
+#endif /* HAVE_JWZGLES */
 
 #define RAD 57.295
 #define RRAD 0.01745
@@ -84,6 +105,7 @@ typedef struct _fishRec {
 	float       htail, vtail;
 	float       dtheta;
 	int         spurt, attack;
+        int         sign;
 } fishRec;
 
 typedef struct {
@@ -98,6 +120,8 @@ typedef struct {
 	fishRec     momWhale;
 	fishRec     babyWhale;
 	fishRec     dolph;
+
+        XImage     *texture;	   /* water distortion overlay bits */
 } atlantisstruct;
 
 extern void FishTransform(fishRec *);