X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fflurry.h;h=9bbe4b2580fb5cbb545d198357eaa42e84492160;hb=HEAD;hp=ba9cc9219d0569c9c7aac1a204a2c7f0dc7462ce;hpb=f0261d8acab611f3433160e4f07367b870439739;p=xscreensaver

diff --git a/hacks/glx/flurry.h b/hacks/glx/flurry.h
index ba9cc921..dd66a12a 100644
--- a/hacks/glx/flurry.h
+++ b/hacks/glx/flurry.h
@@ -35,22 +35,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __GLCODE__
 #define __GLCODE__
 
-#include <GL/glu.h>
-#include <GL/gl.h>
-#include <GL/glx.h>
-
-#include <stdlib.h>
-#include <math.h>
-
+#include "xlockmoreI.h"
 #include "yarandom.h"
 #include "rotator.h"
 #include "gltrackball.h"
 
+#include <stdlib.h>
+#include <math.h>
+
 typedef struct _global_info_t global_info_t;
 typedef struct _flurry_info_t flurry_info_t;
 
 #define sqr(X)     ((X) * (X))
-#define PI         3.14159265358979323846f
+#define PI         M_PI
 #define DEG2RAD(X) (PI*(X)/180.0)
 #define RAD2DEG(X) ((X)*180.0/PI)
 #define rnd()      (frand(1.0))
@@ -200,7 +197,7 @@ static vector float FastDistance2DV(vector float x, vector float y) {
 
 extern GLuint theTexture;
 
-void MakeTexture(void);
+GLuint MakeTexture(void);
 
 #define OPT_MODE_SCALAR_BASE		0x0
 
@@ -274,12 +271,16 @@ struct _global_info_t {
 	float sys_glWidth;
 	float sys_glHeight;
 
+	double gTimeCounter;
+	int first;
+	double oldFrameTime;
+
 	flurry_info_t *flurry;
+        GLuint texid;
 };
 
 #define kNumSpectrumEntries 512
 
-void OTSetup(void);
-double TimeInSecondsSinceStart(void);
+double TimeInSecondsSinceStart(const global_info_t *global);
 
 #endif /* Include/Define */