* Changed OpenGL clearning to use a depth buffer trick

* Updates to key-handling code

macsrc/GLDraw.c

@@ -20,12 +20,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <math.h>
 
 #include <GL/gl.h>
 #include <GL/glext.h>
 
 #include "wolfdef.h"
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+int UseSharedTexturePalette = 0;
+
+void xgluPerspective(GLdouble fovx, GLdouble aspect, GLdouble zNear, GLdouble zFar)
+{
+	GLdouble xmin, xmax, ymin, ymax;
+	
+	xmax = zNear * tan(fovx * M_PI / 360.0);
+	xmin = -xmax;
+	
+	ymin = xmin / aspect;
+	ymax = xmax / aspect;
+	
+	glFrustum(xmin, xmax, ymin, ymax, zNear, zFar);
+}
+
 void DisplayScreen(Word res)
 {
 }
@@ -44,7 +64,7 @@ void SetAPalettePtr(unsigned char *PalPtr)
 
 void ClearTheScreen(Word c)
 {
-	glClearColor((double)Pal[c*3+0]/256.0, (double)Pal[c*3+1]/256.0, (double)Pal[c*3+2]/256.0, 0.0);
+	glClearColor((double)Pal[c*3+0]/255.0, (double)Pal[c*3+1]/255.0, (double)Pal[c*3+2]/255.0, 0.0);
 	glClear(GL_COLOR_BUFFER_BIT);
 }
 
@@ -285,12 +305,7 @@ void IO_ClearViewBuffer()
 {
 	LastTexture = 0;
 	glBindTexture(GL_TEXTURE_2D, 0);
-	
-	/* glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); */
-	glClear(GL_DEPTH_BUFFER_BIT);
-	
-	glDisable(GL_DEPTH_TEST);
-	
+
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();
 		
@@ -298,6 +313,12 @@ void IO_ClearViewBuffer()
 	glPushMatrix();
 	glLoadIdentity();
 	
+#if 0	
+	/* glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); */
+	glClear(GL_DEPTH_BUFFER_BIT);
+	
+	glDisable(GL_DEPTH_TEST);
+	
 	glColor3ub(Pal[0x2F*3+0], Pal[0x2F*3+1], Pal[0x2F*3+2]);
 	glRectf(-1, 0, 1, 1);
 	
@@ -307,7 +328,23 @@ void IO_ClearViewBuffer()
 	glColor3f(1.0, 1.0, 1.0);
 
 	glEnable(GL_DEPTH_TEST);
+#else	
+	glEnable(GL_DEPTH_TEST);
+	
+	glDepthRange(1.0, 1.0);
+	glDepthFunc(GL_ALWAYS);
 	
+	glColor3ub(Pal[0x2F*3+0], Pal[0x2F*3+1], Pal[0x2F*3+2]);
+	glRectf(-1, 0, 1, 1);
+	
+	glColor3ub(Pal[0x2A*3+0], Pal[0x2A*3+1], Pal[0x2A*3+2]);
+	glRectf(1, -1, -1, 0);
+		
+	glColor3f(1.0, 1.0, 1.0);
+	
+	glDepthRange(0.0, 1.0);
+	glDepthFunc(GL_LESS);
+#endif
 	glPopMatrix();	
 }
 
@@ -320,6 +357,8 @@ void InitRenderView()
 	Byte *pal;
 	int i;
 	
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	
 	LastTexture = 0;
 	glEnable(GL_TEXTURE_2D);	
 		
@@ -417,18 +456,17 @@ void InitRenderView()
 	ReleaseAResource(rGamePal);
 
 	glEnable(GL_DEPTH_TEST);
-	glDepthFunc(GL_LEQUAL);
+	glDepthFunc(GL_LESS);
 	
 	glEnable(GL_ALPHA_TEST);
 	glAlphaFunc(GL_GREATER, 0.5);
-	/* glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); */
 	
 	glClearColor(0.0, 0.0, 0.0, 0.0);
 	
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
 	
-	glFrustum(-0.20, 0.20, -0.288675, 0.288675, 0.2, 182.0);
+	xgluPerspective(90.0, 400.0/640.0, 0.20, 182.0);
 /*	
 	glFrontFace(GL_CCW);
 	glCullFace(GL_BACK);
@@ -470,9 +508,8 @@ void IO_AttackShape(Word shape)
 
 void StartRenderView()
 {	
-
-/*	glViewport(0, VidHeight - ViewHeight, VidWidth, VidHeight); */
-
+	glViewport(0, VidHeight - ViewHeight, VidWidth, ViewHeight); 
+	
 	glMatrixMode(GL_MODELVIEW);
 	/* glLoadIdentity(); */
 	

macsrc/Makefile

@@ -3,11 +3,8 @@ CC = gcc
 
 CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -funroll-loops -mpentiumpro -mcpu=pentiumpro -march=pentiumpro 
 #CFLAGS = -g -Wall -O6 -fomit-frame-pointer -ffast-math -funroll-loops -mpentiumpro -mcpu=pentiumpro -march=pentiumpro 
-#CFLAGS = -g -Wall
-#CFLAGS = -g -Wall -ansi -pedantic
-#CFLAGS = -g
+CFLAGS = -g -Wall -ansi -pedantic
 #CFLAGS = -Os -g
-#CFLAGS = -g -Wall -I/home/relnev/cvs/oal/include
 
 OBJS 	 = Data.o Doors.o EnMove.o EnThink.o Intro.o Level.o \
 	   Missiles.o Sounds.o PlMove.o PlStuff.o PlThink.o PushWall.o \
@@ -21,7 +18,6 @@ GOBJS	 = $(SOFTOBJS) $(OBJS) vi_gtk.o
 GLOBJS	 = $(OGLOBJS)  $(OBJS) vi_glx.o
 
 LFLAGS = -lm 
-#LFLAGS = -lm -L/home/relnev/cvs/oal/linux/src -lopenal -lpthread -ldl
 #LFLAGS = -lm /home/relnev/ElectricFence-2.1/libefence.a
 #LFLAGS = -lm /home/relnev/ElectricFence-2.2.2/libefence.a -lpthread
 

macsrc/TODO

 TODO:
 * Pause key
+  - With windowed systems, put paused in the title bar?
+  + Being in a text menu could be the "pause"
+    - This would be fine for svgalib
 * SVGAlib Hack:
   - If user requests a gamemode which SVGAlib says it does not support, fail
   - Check to make sure linear addressing is supported
-  + If SVGAlib does not support 512x384x256, allow the user to pan around 
+  - If SVGAlib does not support 512x384x256, allow the user to pan around 
     with the keypad arrow keys if only mode supported 320x200x256 (center if
     640x400 or 480 is supported?)
   - Have a "force no 512 mode" for those who do not want mode changing.
@@ -11,10 +14,8 @@ TODO:
 * Finish OpenGL
   + Status bars, Introscreens [DrawShape]
     - Not exactly sure how I will implement this yet.
-  - Correct viewing frustum
   - Allow window resizing
-  - Could use the LastTexture to have less glBegin/Ends (would need to know
-    where to stop though (try IO_DisplayViewBuffer).
+  - Could use the LastTexture to have less glBegin/Ends.
   - When all drawing is implemented, remove any unnecessary state/matrix
     changes.
 * Save/Load Games
@@ -24,11 +25,12 @@ TODO:
     since this source does not have any code for determining sound position).
   - Check 'csnd' for a sample, then 'snd ' if not found.
   + Music is planned.
-    - Midi support would be not hard, all that would be needed is something
-      that can get the note ons and then play the notes at the right time.
-      (the songs seem to only use note ons and the instruments correspond to
-      sample numbers, not midi instruments.  If the final result does not
-      sound "desirable," go with Plan B)
+    - Output using timidity with sounds did not end up sounding good.
+      Probably the INST resources are used for ASDR/looping/etc...
+  - csnd: sox -t raw -r 11025 -c 1 -w -s a.dat -r 11025 -c 1 -w -s -t wav a.wav
+  - snd: sox -t raw -r 11025 -c 1 -w -u a.dat -r 11025 -c 1 -w -s -t wav a.wav
+  - csnd might be -b -s (odd)
+  - 11025 will probably be the best rate
 * Interface
   + Menus and dialog boxes
     + Command line (temporary workaround for no menus).
@@ -36,8 +38,12 @@ TODO:
       - Difficulty
     - Text only menus (similar to what snes9x has).
 * Different depths/visuals for software clients.
+  + Different functions to draw with different bpps.
+    - 15 bpp uses same draw routes as 16 but different palette one
+    - not sure how to do palette fades
 * Get it to compile/work with g++ if it is not too much trouble.
 * SDL version (software)
+* Mouse
 
 BUGS:
 * Software Drawing seems like its imprecise, stationary sprites move back and 

macsrc/vi_glx.c

@@ -40,9 +40,6 @@ XVisualInfo *vi;
 GLXContext ctx;
 Atom wmDeleteWindow;
 
-XColor clr[256];
-
-Byte *gfxbuf;
 Byte Pal[768];
 
 int attrib[] = {
@@ -137,10 +134,11 @@ int main(int argc, char *argv[])
 	cmap = XCreateColormap(dpy, root, vi->visual, AllocNone);
 	
 	attr.colormap = cmap;
-	attr.event_mask = KeyPressMask | KeyReleaseMask | ExposureMask;
+	attr.event_mask = KeyPressMask | KeyReleaseMask | ExposureMask |
+	                  StructureNotifyMask;
 	mask = CWColormap | CWEventMask;
 	
-	win = XCreateWindow(dpy, root, 0, 0, 320, 200, 0, CopyFromParent,
+	win = XCreateWindow(dpy, root, 0, 0, 640, 480, 0, CopyFromParent,
 			    InputOutput, vi->visual, mask, &attr);
 	
 	if (win == None) {
@@ -244,14 +242,10 @@ Word NewGameWindow(Word NewVidSize)
 	LongWord *LongPtr;
 	Byte *DestPtr;
 	int i;
-	
-	printf("Called: %d\n", NewVidSize);
-	
+		
 	if (NewVidSize == VidSize)
 		return VidSize;
 	
-	printf("Setting Size: %d (from %d)\n", NewVidSize, VidSize);
-		
 	if (NewVidSize < 4) {
 		w = VidXs[NewVidSize];
 		h = VidYs[NewVidSize];
@@ -260,19 +254,14 @@ Word NewGameWindow(Word NewVidSize)
 		fprintf(stderr, "Invalid Vid size: %d\n", NewVidSize);
 		exit(EXIT_FAILURE);
 	}
-	
-	sizehints.min_width = sizehints.max_width = sizehints.base_width = w;
-	sizehints.min_height = sizehints.max_height = sizehints.base_height = h;
-	sizehints.flags = PMinSize | PMaxSize | PBaseSize;
+
+	sizehints.min_width =  w;
+	sizehints.min_height = h;
+	sizehints.flags = PMinSize;
 	XSetWMNormalHints(dpy, win, &sizehints);
 	XResizeWindow(dpy, win, w, h);
 	XSync(dpy, False);
-	glViewport(0, 0, w, h);
 	
-	gfxbuf = (Byte *)malloc(w * h);
-		
-	VideoPointer = gfxbuf;
-	VideoWidth = w;
 	InitYTable();
 	SetAPalette(rBlackPal);
 	ClearTheScreen(BLACK);
@@ -563,7 +552,7 @@ void keyboard_handler(KeySym keycode, int press)
 			joystick1 |= JOYPAD_A;
 		
 		if (keys[SC_LEFTALT]) 
-			joystick1 |= JOYPAD_TL;
+			joystick1 |= JOYPAD_TR;
 		if (keys[SC_RIGHTALT])
 			joystick1 |= JOYPAD_TR;
 			
@@ -577,7 +566,22 @@ void keyboard_handler(KeySym keycode, int press)
 		if (keys[SC_RIGHTSHIFT])
 			joystick1 |= (JOYPAD_X|JOYPAD_Y);
 	}
-							
+	
+	if ((joystick1 & (JOYPAD_LFT|JOYPAD_RGT)) == (JOYPAD_LFT|JOYPAD_RGT))
+		joystick1 &= ~(JOYPAD_LFT|JOYPAD_RGT);
+	if ((joystick1 & (JOYPAD_UP|JOYPAD_DN)) == (JOYPAD_UP|JOYPAD_DN))
+		joystick1 &= ~(JOYPAD_UP|JOYPAD_DN);
+	
+	if (joystick1 & JOYPAD_TR) {
+		if (joystick1 & JOYPAD_LFT) {
+			joystick1 = (joystick1 & ~(JOYPAD_TR|JOYPAD_LFT)) | JOYPAD_TL;
+		} else if (joystick1 & JOYPAD_RGT) {
+			joystick1 = joystick1 & ~JOYPAD_RGT;
+		} else {
+			joystick1 &= ~JOYPAD_TR;
+		}
+	}
+	
 }
 
 int HandleEvents()
@@ -591,15 +595,18 @@ int HandleEvents()
 			switch(event.type) {
 				case KeyPress:
 					keyboard_handler(XKeycodeToKeysym(dpy, event.xkey.keycode, 0), 1);
-					/* ret = 1; */
+					ret = 1;
 					break; 
 				case KeyRelease:
 					keyboard_handler(XKeycodeToKeysym(dpy, event.xkey.keycode, 0), 0);
-					ret = 1;
+					ret = 0;
 					break;
 				case Expose:
 					BlastScreen();
 					break;
+				case ConfigureNotify:
+					glViewport(0, 0, event.xconfigure.width, event.xconfigure.height);
+					break;
 				case ClientMessage:
 					if (event.xclient.data.l[0] == wmDeleteWindow)
 						Quit(NULL);

macsrc/vi_gtk.c

@@ -634,7 +634,7 @@ void keyboard_handler(int keycode, int press)
 			joystick1 |= JOYPAD_A;
 		
 		if (keys[SC_LEFTALT]) 
-			joystick1 |= JOYPAD_TL;
+			joystick1 |= JOYPAD_TR;
 		if (keys[SC_RIGHTALT])
 			joystick1 |= JOYPAD_TR;
 			
@@ -648,6 +648,21 @@ void keyboard_handler(int keycode, int press)
 		if (keys[SC_RIGHTSHIFT])
 			joystick1 |= (JOYPAD_X|JOYPAD_Y);
 	}
+	
+	if ((joystick1 & (JOYPAD_LFT|JOYPAD_RGT)) == (JOYPAD_LFT|JOYPAD_RGT))
+		joystick1 &= ~(JOYPAD_LFT|JOYPAD_RGT);
+	if ((joystick1 & (JOYPAD_UP|JOYPAD_DN)) == (JOYPAD_UP|JOYPAD_DN))
+		joystick1 &= ~(JOYPAD_UP|JOYPAD_DN);
+		
+	if (joystick1 & JOYPAD_TR) {
+		if (joystick1 & JOYPAD_LFT) {
+			joystick1 = (joystick1 & ~(JOYPAD_TR|JOYPAD_LFT)) | JOYPAD_TL;
+		} else if (joystick1 & JOYPAD_RGT) {
+			joystick1 = joystick1 & ~JOYPAD_RGT;
+		} else {
+			joystick1 &= ~JOYPAD_TR;
+		}
+	}
 							
 }
 

macsrc/vi_svga.c

@@ -414,7 +414,7 @@ void keyboard_handler(int key, int press)
 			joystick1 |= JOYPAD_A;
 		
 		if (keys[SCANCODE_LEFTALT]) 
-			joystick1 |= JOYPAD_TL;
+			joystick1 |= JOYPAD_TR;
 		if (keys[SCANCODE_RIGHTALT])
 			joystick1 |= JOYPAD_TR;
 			
@@ -428,6 +428,21 @@ void keyboard_handler(int key, int press)
 		if (keys[SCANCODE_RIGHTSHIFT])
 			joystick1 |= (JOYPAD_X|JOYPAD_Y);	
 	}
+	
+	if ((joystick1 & (JOYPAD_LFT|JOYPAD_RGT)) == (JOYPAD_LFT|JOYPAD_RGT))
+		joystick1 &= ~(JOYPAD_LFT|JOYPAD_RGT);
+	if ((joystick1 & (JOYPAD_UP|JOYPAD_DN)) == (JOYPAD_UP|JOYPAD_DN))
+		joystick1 &= ~(JOYPAD_UP|JOYPAD_DN);
+		
+	if (joystick1 & JOYPAD_TR) {
+		if (joystick1 & JOYPAD_LFT) {
+			joystick1 = (joystick1 & ~(JOYPAD_TR|JOYPAD_LFT)) | JOYPAD_TL;
+		} else if (joystick1 & JOYPAD_RGT) {
+			joystick1 = joystick1 & ~JOYPAD_RGT;
+		} else {
+			joystick1 &= ~JOYPAD_TR;
+		}
+	}
 							
 }
 

macsrc/vi_xlib.c

@@ -521,7 +521,7 @@ void keyboard_handler(KeySym keycode, int press)
 			joystick1 |= JOYPAD_A;
 		
 		if (keys[SC_LEFTALT]) 
-			joystick1 |= JOYPAD_TL;
+			joystick1 |= JOYPAD_TR;
 		if (keys[SC_RIGHTALT])
 			joystick1 |= JOYPAD_TR;
 			
@@ -535,6 +535,21 @@ void keyboard_handler(KeySym keycode, int press)
 		if (keys[SC_RIGHTSHIFT])
 			joystick1 |= (JOYPAD_X|JOYPAD_Y);
 	}
+	
+	if ((joystick1 & (JOYPAD_LFT|JOYPAD_RGT)) == (JOYPAD_LFT|JOYPAD_RGT))
+		joystick1 &= ~(JOYPAD_LFT|JOYPAD_RGT);
+	if ((joystick1 & (JOYPAD_UP|JOYPAD_DN)) == (JOYPAD_UP|JOYPAD_DN))
+		joystick1 &= ~(JOYPAD_UP|JOYPAD_DN);
+		
+	if (joystick1 & JOYPAD_TR) {
+		if (joystick1 & JOYPAD_LFT) {
+			joystick1 = (joystick1 & ~(JOYPAD_TR|JOYPAD_LFT)) | JOYPAD_TL;
+		} else if (joystick1 & JOYPAD_RGT) {
+			joystick1 = joystick1 & ~JOYPAD_RGT;
+		} else {
+			joystick1 &= ~JOYPAD_TR;
+		}
+	}
 							
 }
 
@@ -549,11 +564,11 @@ int HandleEvents()
 			switch(event.type) {
 				case KeyPress:
 					keyboard_handler(XKeycodeToKeysym(dpy, event.xkey.keycode, 0), 1);
-					/* ret = 1; */
+					ret = 1;
 					break; 
 				case KeyRelease:
 					keyboard_handler(XKeycodeToKeysym(dpy, event.xkey.keycode, 0), 0);
-					ret = 1;
+					ret = 0;
 					break;
 				case Expose:
 					BlastScreen();