/* -*- Mode: C; tab-width: 4 -*- */
/* sproingiewrap.c - sproingies wrapper */
-#if !defined( lint ) && !defined( SABER )
+#if 0
static const char sccsid[] = "@(#)sproingiewrap.c 4.07 97/11/24 xlockmore";
-
#endif
/*-
* other special, indirect and consequential damages.
*
* Programming: Ed Mackey, http://www.netaxs.com/~emackey/
+ * Gordon Wrigley, gdw33@student.canterbury.ac.nz
* Sproingie 3D objects modeled by: Al Mackey, al@iam.com
* (using MetaNURBS in NewTek's Lightwave 3D v5).
*
* Revision History:
+ * 13-Dec-02: Changed triangle normals into vertex normals to give a smooth
+ apperance and moved the sproingies from Display Lists to
+ Vertex Arrays, still need to do this for the TopsSides.
+ (gordon)
* 26-Apr-97: Added glPointSize() calls around explosions, plus other fixes.
* 28-Mar-97: Added size support.
* 22-Mar-97: Updated to use glX interface instead of xmesa one.
*/
#ifdef STANDALONE
-# define PROGCLASS "Sproingies"
-# define HACK_INIT init_sproingies
-# define HACK_DRAW draw_sproingies
-# define sproingies_opts xlockmore_opts
-# define DEFAULTS "*delay: 100 \n" \
+# define DEFAULTS "*delay: 25000 \n" \
"*count: 5 \n" \
"*cycles: 0 \n" \
"*size: 0 \n" \
+ "*showFPS: False \n" \
+ "*fpsTop: True \n" \
"*wireframe: False \n"
+# define refresh_sproingies 0
+# define sproingies_handle_event 0
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
# include "xlock.h" /* from the xlockmore distribution */
#ifdef USE_GL
-ModeSpecOpt sproingies_opts = {
- 0, NULL, 0, NULL, NULL };
+#include "sproingies.h"
+
+ENTRYPOINT ModeSpecOpt sproingies_opts =
+{0, NULL, 0, NULL, NULL};
#ifdef USE_MODULES
ModStruct sproingies_description =
{"sproingies", "init_sproingies", "draw_sproingies", "release_sproingies",
"refresh_sproingies", "init_sproingies", NULL, &sproingies_opts,
- 1000, 5, 0, 400, 1.0, "",
+ 1000, 5, 0, 400, 4, 1.0, "",
"Shows Sproingies! Nontoxic. Safe for pets and small children", 0, NULL};
#endif
#define MINSIZE 32
-#include <GL/glu.h>
#include <time.h>
void NextSproingie(int screen);
-void NextSproingieDisplay(int screen);
-void DisplaySproingies(int screen);
-
-#if 0
+void NextSproingieDisplay(int screen,int pause);
+void DisplaySproingies(int screen,int pause);
void ReshapeSproingies(int w, int h);
-
-#endif
void CleanupSproingies(int screen);
void InitSproingies(int wfmode, int grnd, int mspr, int screen, int numscreens, int mono);
static sproingiesstruct *sproingies = NULL;
-static Display *swap_display;
-static Window swap_window;
-
-void
-SproingieSwap(void)
-{
- glFinish();
- glXSwapBuffers(swap_display, swap_window);
-}
-
-
-void
-init_sproingies(ModeInfo * mi)
+ENTRYPOINT void
+init_sproingies (ModeInfo * mi)
{
- Display *display = MI_DISPLAY(mi);
Window window = MI_WINDOW(mi);
int screen = MI_SCREEN(mi);
int cycles = MI_CYCLES(mi);
- int batchcount = MI_BATCHCOUNT(mi);
+ int count = MI_COUNT(mi);
int size = MI_SIZE(mi);
sproingiesstruct *sp;
}
sp = &sproingies[screen];
- sp->mono = (MI_WIN_IS_MONO(mi) ? 1 : 0);
+ sp->mono = (MI_IS_MONO(mi) ? 1 : 0);
sp->window = window;
if ((sp->glx_context = init_GL(mi)) != NULL) {
- if ((cycles & 1) || MI_WIN_IS_WIREFRAME(mi))
+ if ((cycles & 1) || MI_IS_WIREFRAME(mi))
wfmode = 1;
grnd = (cycles >> 1);
if (grnd > 2)
grnd = 2;
- mspr = batchcount;
+ mspr = count;
if (mspr > 100)
mspr = 100;
/* Viewport is specified size if size >= MINSIZE && size < screensize */
if (size == 0) {
- w = MI_WIN_WIDTH(mi);
- h = MI_WIN_HEIGHT(mi);
+ w = MI_WIDTH(mi);
+ h = MI_HEIGHT(mi);
} else if (size < MINSIZE) {
w = MINSIZE;
h = MINSIZE;
} else {
- w = (size > MI_WIN_WIDTH(mi)) ? MI_WIN_WIDTH(mi) : size;
- h = (size > MI_WIN_HEIGHT(mi)) ? MI_WIN_HEIGHT(mi) : size;
+ w = (size > MI_WIDTH(mi)) ? MI_WIDTH(mi) : size;
+ h = (size > MI_HEIGHT(mi)) ? MI_HEIGHT(mi) : size;
}
- glViewport((MI_WIN_WIDTH(mi) - w) / 2, (MI_WIN_HEIGHT(mi) - h) / 2, w, h);
+ glViewport((MI_WIDTH(mi) - w) / 2, (MI_HEIGHT(mi) - h) / 2, w, h);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
gluPerspective(65.0, (GLfloat) w / (GLfloat) h, 0.1, 2000.0); /* was 200000.0 */
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
- swap_display = display;
- swap_window = window;
- DisplaySproingies(MI_SCREEN(mi));
+ DisplaySproingies(MI_SCREEN(mi),mi->pause);
+
} else {
MI_CLEARWINDOW(mi);
}
}
/* ARGSUSED */
-void
-draw_sproingies(ModeInfo * mi)
+ENTRYPOINT void
+draw_sproingies (ModeInfo * mi)
{
sproingiesstruct *sp = &sproingies[MI_SCREEN(mi)];
Display *display = MI_DISPLAY(mi);
glDrawBuffer(GL_BACK);
glXMakeCurrent(display, window, *(sp->glx_context));
- swap_display = display;
- swap_window = window;
+ NextSproingieDisplay(MI_SCREEN(mi),mi->pause); /* It will swap. */
- NextSproingieDisplay(MI_SCREEN(mi)); /* It will swap. */
+ if (mi->fps_p) do_fps (mi);
+ glFinish();
+ glXSwapBuffers(MI_DISPLAY(mi), MI_WINDOW(mi));
}
-void
+#ifndef STANDALONE
+ENTRYPOINT void
refresh_sproingies(ModeInfo * mi)
{
/* No need to do anything here... The whole screen is updated
* with DisplaySproingies(...).
*/
}
+#endif /* !STANDALONE */
+
+ENTRYPOINT void
+reshape_sproingies (ModeInfo *mi, int w, int h)
+{
+ ReshapeSproingies(w, h);
+}
-void
-release_sproingies(ModeInfo * mi)
+
+ENTRYPOINT void
+release_sproingies (ModeInfo * mi)
{
if (sproingies != NULL) {
int screen;
FreeAllGL(mi);
}
+XSCREENSAVER_MODULE ("Sproingies", sproingies)
+
#endif
/* End of sproingiewrap.c */
projects / xscreensaver / blobdiff