summaryrefslogtreecommitdiff
path: root/src/demos
diff options
context:
space:
mode:
Diffstat (limited to 'src/demos')
-rw-r--r--src/demos/fire.c11
-rw-r--r--src/demos/ipers.c12
-rw-r--r--src/demos/rain.cxx14
-rw-r--r--src/demos/ray.c14
-rw-r--r--src/demos/teapot.c11
-rw-r--r--src/demos/terrain.c16
-rw-r--r--src/demos/tunnel.c12
-rw-r--r--src/demos/tunnel2.c36
8 files changed, 0 insertions, 126 deletions
diff --git a/src/demos/fire.c b/src/demos/fire.c
index 25b2fa29..05371986 100644
--- a/src/demos/fire.c
+++ b/src/demos/fire.c
@@ -21,11 +21,6 @@
#include "glut_wrap.h"
#include "readtex.h"
-#ifdef XMESA
-#include "GL/xmesa.h"
-static int fullscreen = 1;
-#endif
-
#ifndef M_PI
#define M_PI 3.1415926535
#endif
@@ -604,12 +599,6 @@ key(unsigned char key, int x, int y)
case 'T':
ridtri -= 0.005;
break;
-#ifdef XMESA
- case ' ':
- XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
- fullscreen = (!fullscreen);
- break;
-#endif
case 'n':
NiceFog = !NiceFog;
printf("NiceFog %d\n", NiceFog);
diff --git a/src/demos/ipers.c b/src/demos/ipers.c
index c939d9be..d7cd9e75 100644
--- a/src/demos/ipers.c
+++ b/src/demos/ipers.c
@@ -21,11 +21,6 @@
#include "readtex.h"
-#ifdef XMESA
-#include "GL/xmesa.h"
-static int fullscreen = 1;
-#endif
-
static int WIDTH = 640;
static int HEIGHT = 480;
@@ -273,13 +268,6 @@ key(unsigned char k, int x, int y)
v -= 0.01;
break;
-#ifdef XMESA
- case ' ':
- fullscreen = (!fullscreen);
- XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
- break;
-#endif
-
case '+':
LODbias--;
break;
diff --git a/src/demos/rain.cxx b/src/demos/rain.cxx
index 138da3c7..f87df891 100644
--- a/src/demos/rain.cxx
+++ b/src/demos/rain.cxx
@@ -26,11 +26,6 @@ extern "C" {
#include <mmsystem.h>
#endif
-#ifdef XMESA
-#include "GL/xmesa.h"
-static int fullscreen=1;
-#endif
-
static int WIDTH=640;
static int HEIGHT=480;
static int NUMPART=7500;
@@ -290,12 +285,6 @@ static void key(unsigned char key, int x, int y)
case 'f':
fog=(!fog);
break;
-#ifdef XMESA
- case ' ':
- XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
- fullscreen=(!fullscreen);
- break;
-#endif
}
}
@@ -377,9 +366,6 @@ int main(int ac,char **av)
glFogi(GL_FOG_MODE,GL_EXP);
glFogfv(GL_FOG_COLOR,fogcolor);
glFogf(GL_FOG_DENSITY,0.1);
-#ifdef FX
- glHint(GL_FOG_HINT,GL_NICEST);
-#endif
initparticle();
diff --git a/src/demos/ray.c b/src/demos/ray.c
index 8611b53b..7b70603d 100644
--- a/src/demos/ray.c
+++ b/src/demos/ray.c
@@ -17,11 +17,6 @@
#include "glut_wrap.h"
-#ifdef XMESA
-#include "GL/xmesa.h"
-static int fullscreen = 1;
-#endif
-
static int WIDTH = 640;
static int HEIGHT = 480;
@@ -226,12 +221,6 @@ key(unsigned char k, int x, int y)
poutline = 1;
}
break;
-#ifdef XMESA
- case ' ':
- XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
- fullscreen = (!fullscreen);
- break;
-#endif
}
}
@@ -881,9 +870,6 @@ main(int ac, char **av)
glFogfv(GL_FOG_COLOR, fogcolor);
glFogf(GL_FOG_DENSITY, 0.01);
-#ifdef FX
- glHint(GL_FOG_HINT, GL_NICEST);
-#endif
calcposobs();
diff --git a/src/demos/teapot.c b/src/demos/teapot.c
index e7bd8ac9..ab78c713 100644
--- a/src/demos/teapot.c
+++ b/src/demos/teapot.c
@@ -19,11 +19,6 @@
#include "glut_wrap.h"
#include "readtex.h"
-#ifdef XMESA
-#include "GL/xmesa.h"
-static int fullscreen=1;
-#endif
-
static int WIDTH=640;
static int HEIGHT=480;
@@ -218,12 +213,6 @@ static void key(unsigned char k, int x, int y)
bfcull=1;
}
break;
-#ifdef XMESA
- case ' ':
- XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
- fullscreen=(!fullscreen);
- break;
-#endif
}
}
diff --git a/src/demos/terrain.c b/src/demos/terrain.c
index 2362505e..03f80d6c 100644
--- a/src/demos/terrain.c
+++ b/src/demos/terrain.c
@@ -21,11 +21,6 @@
#include "glut_wrap.h"
-#ifdef XMESA
-#include "GL/xmesa.h"
-static int fullscreen = 1;
-#endif
-
#ifndef M_PI
#define M_PI 3.14159265
#endif
@@ -478,12 +473,6 @@ key(unsigned char k, int x, int y)
bfcull = 1;
}
break;
-#ifdef XMESA
- case ' ':
- XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
- fullscreen = (!fullscreen);
- break;
-#endif
}
}
@@ -617,9 +606,6 @@ init(void)
glFogi(GL_FOG_MODE, GL_EXP2);
glFogfv(GL_FOG_COLOR, fogcolor);
glFogf(GL_FOG_DENSITY, 0.0007);
-#ifdef FX
- glHint(GL_FOG_HINT, GL_NICEST);
-#endif
reshape(scrwidth, scrheight);
}
@@ -643,10 +629,8 @@ main(int ac, char **av)
init();
-#ifndef FX
glDisable(GL_TEXTURE_2D);
usetex = 0;
-#endif
glutReshapeFunc(reshape);
glutDisplayFunc(drawscene);
diff --git a/src/demos/tunnel.c b/src/demos/tunnel.c
index 91fe67e1..d36b74d9 100644
--- a/src/demos/tunnel.c
+++ b/src/demos/tunnel.c
@@ -19,11 +19,6 @@
#include "readtex.h"
#include "tunneldat.h"
-#ifdef XMESA
-#include "GL/xmesa.h"
-static int fullscreen = 1;
-#endif
-
static int WIDTH = 640;
static int HEIGHT = 480;
@@ -224,13 +219,6 @@ key(unsigned char k, int x, int y)
case 'z':
v -= 5.;
break;
-
-#ifdef XMESA
- case ' ':
- fullscreen = (!fullscreen);
- XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
- break;
-#endif
case 'j':
joyactive = (!joyactive);
break;
diff --git a/src/demos/tunnel2.c b/src/demos/tunnel2.c
index 0c7b1a64..dd064a2b 100644
--- a/src/demos/tunnel2.c
+++ b/src/demos/tunnel2.c
@@ -22,18 +22,6 @@
#include "readtex.h"
#include "tunneldat.h"
-#ifdef FX
-#endif
-
-#ifdef XMESA
-#include "GL/xmesa.h"
-static int fullscreen = 1;
-#endif
-
-#ifdef FX
-GLint fxMesaSelectCurrentBoard(int);
-#endif
-
static int WIDTHC0 = 640;
static int HEIGHTC0 = 480;
@@ -225,18 +213,6 @@ key(unsigned char k, int x, int y)
v -= 5.;
break;
-#ifdef XMESA
- case ' ':
- fullscreen = (!fullscreen);
-
- glutSetWindow(channel[0]);
- XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
-
- glutSetWindow(channel[1]);
- XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
- break;
-#endif
-
case 'j':
joyactive = (!joyactive);
break;
@@ -566,12 +542,6 @@ main(int ac, char **av)
glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
-#ifdef FX
- if (fxMesaSelectCurrentBoard(0) < 0) {
- fprintf(stderr, "The first Voodoo Graphics board is missing !?!?\n");
- return -1;
- }
-#endif
if (!(channel[0] = glutCreateWindow("Channel 0"))) {
fprintf(stderr, "Error, couldn't open window\n");
return -1;
@@ -585,12 +555,6 @@ main(int ac, char **av)
glutKeyboardFunc(key);
glutSpecialFunc(special);
-#ifdef FX
- if (fxMesaSelectCurrentBoard(1) < 0) {
- fprintf(stderr, "The second Voodoo Graphics board is missing !\n");
- exit(-1);
- }
-#endif
glutInitWindowPosition(WIDTHC0, 0);
glutInitWindowSize(WIDTHC1, HEIGHTC1);
if (!(channel[1] = glutCreateWindow("Channel 1"))) {
View Lorry Controller Status