projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.40.tar.gz
[xscreensaver]
/
hacks
/
glx
/
flurry.h
diff --git
a/hacks/glx/flurry.h
b/hacks/glx/flurry.h
index ba9cc9219d0569c9c7aac1a204a2c7f0dc7462ce..9bbe4b2580fb5cbb545d198357eaa42e84492160 100644
(file)
--- a/
hacks/glx/flurry.h
+++ b/
hacks/glx/flurry.h
@@
-35,9
+35,20
@@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef __GLCODE__
#define __GLCODE__
#ifndef __GLCODE__
#define __GLCODE__
-#include <GL/glu.h>
-#include <GL/gl.h>
-#include <GL/glx.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#ifndef HAVE_JWXYZ
+# include <GL/gl.h>
+# include <GL/glu.h>
+# include <GL/glx.h>
+#endif
+
+#ifdef HAVE_JWZGLES
+# include "jwzgles.h"
+#endif /* HAVE_JWZGLES */
+
#include <stdlib.h>
#include <math.h>
#include <stdlib.h>
#include <math.h>
@@
-274,12
+285,15
@@
struct _global_info_t {
float sys_glWidth;
float sys_glHeight;
float sys_glWidth;
float sys_glHeight;
+ double gTimeCounter;
+ int first;
+ double oldFrameTime;
+
flurry_info_t *flurry;
};
#define kNumSpectrumEntries 512
flurry_info_t *flurry;
};
#define kNumSpectrumEntries 512
-void OTSetup(void);
-double TimeInSecondsSinceStart(void);
+double TimeInSecondsSinceStart(const global_info_t *global);
#endif /* Include/Define */
#endif /* Include/Define */