qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-03-09 18:01:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

A few substantive changes, mostly whitespace. EVIL!

Browse source
This commit is contained in:
Jeff Teunissen 2000-08-02 01:18:37 +00:00
parent 1cfc49b5b2
commit 86de6d99f0
1 changed files with 369 additions and 346 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

265
source/vid_sgl.c
View file

@ -99,22 +99,25 @@ static float mouse_x, mouse_y;
static float old_mouse_x, old_mouse_y; static float old_mouse_x, old_mouse_y;
static float old__windowed_mouse; static float old__windowed_mouse;
void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height) void
D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
{ {
} }
void D_EndDirectRect (int x, int y, int width, int height) void
D_EndDirectRect (int x, int y, int width, int height)
{ {
} }
void VID_Shutdown (void) void
VID_Shutdown (void)
{ {
if (!vid_initialized) if (!vid_initialized)
return; return;
Con_Printf("VID_Shutdown\n"); Con_Printf ("VID_Shutdown\n");
SDL_Quit(); SDL_Quit ();
} }
#ifndef WIN32 #ifndef WIN32
static void static void
@ -135,12 +138,14 @@ InitSig(void)
signal(SIGTRAP, signal_handler); signal(SIGTRAP, signal_handler);
signal(SIGIOT, signal_handler); signal(SIGIOT, signal_handler);
signal(SIGBUS, signal_handler); signal(SIGBUS, signal_handler);
/* signal(SIGFPE, signal_handler); */ // signal(SIGFPE, signal_handler);
signal(SIGSEGV, signal_handler); signal(SIGSEGV, signal_handler);
signal(SIGTERM, signal_handler); signal(SIGTERM, signal_handler);
} }
#endif #endif
void VID_SetPalette (unsigned char *palette)
void
VID_SetPalette (unsigned char *palette)
{ {
byte *pal; byte *pal;
unsigned r,g,b; unsigned r,g,b;
@ -150,7 +155,7 @@ void VID_SetPalette (unsigned char *palette)
unsigned short i; unsigned short i;
unsigned *table; unsigned *table;
FILE *f; FILE *f;
char s[255]; char s[256];
float dist, bestdist; float dist, bestdist;
static qboolean palflag = false; static qboolean palflag = false;
@ -161,8 +166,7 @@ void VID_SetPalette (unsigned char *palette)
pal = palette; pal = palette;
table = d_8to24table; table = d_8to24table;
for (i=0 ; i<256 ; i++) for (i=0; i<256; i++) {
{
r = pal[0]; r = pal[0];
g = pal[1]; g = pal[1];
b = pal[2]; b = pal[2];
@ -196,35 +200,37 @@ void VID_SetPalette (unsigned char *palette)
r = ((i & 0x1F) << 3)+4; r = ((i & 0x1F) << 3)+4;
g = ((i & 0x03E0) >> 2)+4; g = ((i & 0x03E0) >> 2)+4;
b = ((i & 0x7C00) >> 7)+4; b = ((i & 0x7C00) >> 7)+4;
pal = (unsigned char *)d_8to24table; pal = (unsigned char *) d_8to24table;
for (v=0,k=0,bestdist=10000.0; v<256; v++,pal+=4) { for (v=0, k=0, bestdist = 10000.0; v<256; v++, pal += 4) {
r1 = (int)r - (int)pal[0]; r1 = (int) r - (int) pal[0];
g1 = (int)g - (int)pal[1]; g1 = (int) g - (int) pal[1];
b1 = (int)b - (int)pal[2]; b1 = (int) b - (int) pal[2];
dist = sqrt(((r1*r1)+(g1*g1)+(b1*b1))); dist = sqrt (((r1 * r1) + (g1 * g1) + (b1 * b1)));
if (dist < bestdist) { if (dist < bestdist) {
k=v; k = v;
bestdist = dist; bestdist = dist;
} }
} }
d_15to8table[i]=k; d_15to8table[i]=k;
} }
snprintf(s, sizeof(s), "%s/glquake", com_gamedir); snprintf (s, sizeof (s), "%s/glquake", com_gamedir);
Sys_mkdir (s); Sys_mkdir (s);
snprintf(s, sizeof(s), "%s/glquake/15to8.pal", com_gamedir); snprintf(s, sizeof (s), "%s/glquake/15to8.pal", com_gamedir);
if ((f = fopen(s, "wb")) != NULL) { if ((f = fopen (s, "wb")) != NULL) {
fwrite(d_15to8table, 1<<15, 1, f); fwrite (d_15to8table, 1<<15, 1, f);
fclose(f); fclose (f);
} }
} }
} }
void VID_ShiftPalette (unsigned char *palette) void
VID_ShiftPalette (unsigned char *palette)
{ {
VID_SetPalette(palette); VID_SetPalette(palette);
} }
void GL_Init (void) void
GL_Init (void)
{ {
gl_vendor = glGetString (GL_VENDOR); gl_vendor = glGetString (GL_VENDOR);
Con_Printf ("GL_VENDOR: %s\n", gl_vendor); Con_Printf ("GL_VENDOR: %s\n", gl_vendor);
@ -236,8 +242,6 @@ void GL_Init (void)
gl_extensions = glGetString (GL_EXTENSIONS); gl_extensions = glGetString (GL_EXTENSIONS);
Con_Printf ("GL_EXTENSIONS: %s\n", gl_extensions); Con_Printf ("GL_EXTENSIONS: %s\n", gl_extensions);
// Con_Printf ("%s %s\n", gl_renderer, gl_version);
glClearColor (0,0,0,0); glClearColor (0,0,0,0);
glCullFace(GL_FRONT); glCullFace(GL_FRONT);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
@ -253,15 +257,15 @@ void GL_Init (void)
*/ */
glShadeModel (GL_FLAT); glShadeModel (GL_FLAT);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
// glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); // glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
} }
/* /*
@ -270,58 +274,64 @@ GL_BeginRendering
================= =================
*/ */
void GL_BeginRendering (int *x, int *y, int *width, int *height) void
GL_BeginRendering (int *x, int *y, int *width, int *height)
{ {
*x = *y = 0; *x = *y = 0;
*width = scr_width; *width = scr_width;
*height = scr_height; *height = scr_height;
} }
void GL_EndRendering (void) void
GL_EndRendering (void)
{ {
glFlush(); glFlush();
SDL_GL_SwapBuffers (); SDL_GL_SwapBuffers ();
} }
qboolean VID_Is8bit(void) qboolean
VID_Is8bit(void)
{ {
return is8bit; return is8bit;
} }
#ifdef GL_EXT_SHARED #ifdef GL_EXT_SHARED
void VID_Init8bitPalette() void
VID_Init8bitPalette (void)
{ {
// Check for 8bit Extensions and initialize them. // Check for 8bit Extensions and initialize them.
int i; int i;
char thePalette[256*3]; char thePalette[256*3];
char *oldPalette, *newPalette; char *oldPalette, *newPalette;
if (strstr(gl_extensions, "GL_EXT_shared_texture_palette") == NULL) if (strstr (gl_extensions, "GL_EXT_shared_texture_palette") == NULL)
return; return;
Con_SafePrintf("8-bit GL extensions enabled.\n"); Con_SafePrintf ("8-bit GL extensions enabled.\n");
glEnable( GL_SHARED_TEXTURE_PALETTE_EXT ); glEnable (GL_SHARED_TEXTURE_PALETTE_EXT);
oldPalette = (char *) d_8to24table; //d_8to24table3dfx; oldPalette = (char *) d_8to24table; //d_8to24table3dfx;
newPalette = thePalette; newPalette = thePalette;
for (i=0;i<256;i++) { for (i=0; i<256; i++) {
*newPalette++ = *oldPalette++; *newPalette++ = *oldPalette++;
*newPalette++ = *oldPalette++; *newPalette++ = *oldPalette++;
*newPalette++ = *oldPalette++; *newPalette++ = *oldPalette++;
oldPalette++; oldPalette++;
} }
glColorTableEXT(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGB, 256, GL_RGB, GL_UNSIGNED_BYTE, (void *) thePalette); glColorTableEXT (GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGB, 256, GL_RGB, GL_UNSIGNED_BYTE, (void *) thePalette);
is8bit = true; is8bit = true;
} }
#else #else
void VID_Init8bitPalette(void) void
VID_Init8bitPalette(void)
{ {
} }
#endif #endif
void VID_Init (unsigned char *palette) void
VID_Init (unsigned char *palette)
{ {
Uint32 flags = SDL_OPENGL; Uint32 flags = SDL_OPENGL;
int i; int i;
@ -340,12 +350,12 @@ void VID_Init (unsigned char *palette)
// Interpret command-line params // Interpret command-line params
// Set vid parameters // Set vid parameters
if ((i = COM_CheckParm("-width")) != 0) if ((i = COM_CheckParm ("-width")) != 0)
width = atoi(com_argv[i+1]); width = atoi (com_argv[i+1]);
if ((i = COM_CheckParm("-height")) != 0) if ((i = COM_CheckParm ("-height")) != 0)
height = atoi(com_argv[i+1]); height = atoi (com_argv[i+1]);
if ((i = COM_CheckParm("-conwidth")) != 0) if ((i = COM_CheckParm ("-conwidth")) != 0)
vid.conwidth = atoi(com_argv[i+1]); vid.conwidth = atoi(com_argv[i+1]);
else else
vid.conwidth = width; vid.conwidth = width;
@ -359,53 +369,49 @@ void VID_Init (unsigned char *palette)
i = COM_CheckParm ("-conheight"); i = COM_CheckParm ("-conheight");
if ( i != 0 ) // Set console height, but no smaller than 200 px if ( i != 0 ) // Set console height, but no smaller than 200 px
vid.conheight = atoi(com_argv[i+1]); vid.conheight = max (atoi (com_argv[i+1]), 200);
if (vid.conheight < 200)
vid.conheight = 200;
// Initialize the SDL library // Initialize the SDL library
if (SDL_Init(SDL_INIT_VIDEO) < 0) if (SDL_Init (SDL_INIT_VIDEO) < 0)
Sys_Error("Couldn't initialize SDL: %s\n", SDL_GetError()); Sys_Error ("Couldn't initialize SDL: %s\n", SDL_GetError ());
// Check if we want fullscreen // Check if we want fullscreen
if(vid_fullscreen->value) if (vid_fullscreen->value) {
{
flags |= SDL_FULLSCREEN; flags |= SDL_FULLSCREEN;
// Don't annoy Mesa/3dfx folks // Don't annoy Mesa/3dfx folks
#ifndef WIN32 #ifndef WIN32
setenv ("MESA_GLX_FX","fullscreen", 1); // FIXME: Maybe this could be put in a different spot, but I don't know where.
// Anyway, it's to work around a 3Dfx Glide bug.
SDL_ShowCursor (0);
SDL_WM_GrabInput (SDL_GRAB_ON);
setenv ("MESA_GLX_FX", "fullscreen", 1);
} else { } else {
setenv ("MESA_GLX_FX","disable",1); setenv ("MESA_GLX_FX", "window", 1);
#endif #endif
} }
// Setup GL Attributes // Setup GL Attributes
SDL_GL_SetAttribute (SDL_GL_RED_SIZE,1); SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 1);
SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE,1); SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 1);
SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE,1); SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 1);
SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER,1); SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE,1); SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 1);
if (SDL_SetVideoMode(width, height, 8, flags) == NULL) if (SDL_SetVideoMode (width, height, 8, flags) == NULL) {
{ Sys_Error ("Couldn't set video mode: %s\n", SDL_GetError ());
Sys_Error("Couldn't set video mode: %s\n", SDL_GetError());
SDL_Quit (); SDL_Quit ();
} }
scr_width = width; scr_width = width;
scr_height = height; scr_height = height;
if (vid.conheight > height) vid.height = vid.conheight = min (vid.conheight, height);
vid.conheight = height; vid.width = vid.conwidth = min (vid.conwidth, width);
if (vid.conwidth > width)
vid.conwidth = width;
vid.width = vid.conwidth;
vid.height = vid.conheight;
vid.aspect = ((float)vid.height / (float)vid.width) * (320.0 / 240.0); vid.aspect = ((float) vid.height / (float) vid.width) * (320.0 / 240.0);
vid.numpages = 2; vid.numpages = 2;
#ifndef WIN32 #ifndef WIN32
InitSig(); // trap evil signals InitSig (); // trap evil signals
#endif #endif
GL_Init(); GL_Init();
@ -443,23 +449,21 @@ IN_SendKeyEvents
================ ================
*/ */
void IN_SendKeyEvents (void) void
IN_SendKeyEvents (void)
{ {
SDL_Event event; SDL_Event event;
int sym, state, but; int sym, state, but;
int modstate; int modstate;
while (SDL_PollEvent(&event)) while (SDL_PollEvent(&event)) {
{
switch (event.type) { switch (event.type) {
case SDL_KEYDOWN: case SDL_KEYDOWN:
case SDL_KEYUP: case SDL_KEYUP:
sym = event.key.keysym.sym; sym = event.key.keysym.sym;
state = event.key.state; state = event.key.state;
modstate = SDL_GetModState(); modstate = SDL_GetModState ();
switch(sym) switch (sym) {
{
case SDLK_DELETE: sym = K_DEL; break; case SDLK_DELETE: sym = K_DEL; break;
case SDLK_BACKSPACE: sym = K_BACKSPACE; break; case SDLK_BACKSPACE: sym = K_BACKSPACE; break;
case SDLK_F1: sym = K_F1; break; case SDLK_F1: sym = K_F1; break;
@ -493,45 +497,65 @@ void IN_SendKeyEvents (void)
case SDLK_LALT: sym = K_ALT; break; case SDLK_LALT: sym = K_ALT; break;
case SDLK_CAPSLOCK: sym = K_CAPSLOCK; break; case SDLK_CAPSLOCK: sym = K_CAPSLOCK; break;
case SDLK_KP0: case SDLK_KP0:
if(modstate & KMOD_NUM) sym = K_INS; if (modstate & KMOD_NUM)
else sym = SDLK_0; sym = K_INS;
else
sym = SDLK_0;
break; break;
case SDLK_KP1: case SDLK_KP1:
if(modstate & KMOD_NUM) sym = K_END; if (modstate & KMOD_NUM)
else sym = SDLK_1; sym = K_END;
else
sym = SDLK_1;
break; break;
case SDLK_KP2: case SDLK_KP2:
if(modstate & KMOD_NUM) sym = K_DOWNARROW; if (modstate & KMOD_NUM)
else sym = SDLK_2; sym = K_DOWNARROW;
else
sym = SDLK_2;
break; break;
case SDLK_KP3: case SDLK_KP3:
if(modstate & KMOD_NUM) sym = K_PGDN; if (modstate & KMOD_NUM)
else sym = SDLK_3; sym = K_PGDN;
else
sym = SDLK_3;
break; break;
case SDLK_KP4: case SDLK_KP4:
if(modstate & KMOD_NUM) sym = K_LEFTARROW; if (modstate & KMOD_NUM)
else sym = SDLK_4; sym = K_LEFTARROW;
else
sym = SDLK_4;
break; break;
case SDLK_KP5: sym = SDLK_5; break; case SDLK_KP5: sym = SDLK_5; break;
case SDLK_KP6: case SDLK_KP6:
if(modstate & KMOD_NUM) sym = K_RIGHTARROW; if (modstate & KMOD_NUM)
else sym = SDLK_6; sym = K_RIGHTARROW;
else
sym = SDLK_6;
break; break;
case SDLK_KP7: case SDLK_KP7:
if(modstate & KMOD_NUM) sym = K_HOME; if (modstate & KMOD_NUM)
else sym = SDLK_7; sym = K_HOME;
else
sym = SDLK_7;
break; break;
case SDLK_KP8: case SDLK_KP8:
if(modstate & KMOD_NUM) sym = K_UPARROW; if (modstate & KMOD_NUM)
else sym = SDLK_8; sym = K_UPARROW;
else
sym = SDLK_8;
break; break;
case SDLK_KP9: case SDLK_KP9:
if(modstate & KMOD_NUM) sym = K_PGUP; if (modstate & KMOD_NUM)
else sym = SDLK_9; sym = K_PGUP;
else
sym = SDLK_9;
break; break;
case SDLK_KP_PERIOD: case SDLK_KP_PERIOD:
if(modstate & KMOD_NUM) sym = K_DEL; if (modstate & KMOD_NUM)
else sym = SDLK_PERIOD; sym = K_DEL;
else
sym = SDLK_PERIOD;
break; break;
case SDLK_KP_DIVIDE: sym = SDLK_SLASH; break; case SDLK_KP_DIVIDE: sym = SDLK_SLASH; break;
case SDLK_KP_MULTIPLY: sym = SDLK_ASTERISK; break; case SDLK_KP_MULTIPLY: sym = SDLK_ASTERISK; break;
@ -542,7 +566,8 @@ void IN_SendKeyEvents (void)
} }
// If we're not directly handled and still above 255 // If we're not directly handled and still above 255
// just force it to 0 // just force it to 0
if(sym > 255) sym = 0; if (sym > 255)
sym = 0;
Key_Event(sym, state); Key_Event(sym, state);
break; break;
@ -554,7 +579,7 @@ void IN_SendKeyEvents (void)
} else if (but == 3) { } else if (but == 3) {
but = 2; but = 2;
} }
switch(but) { switch (but) {
case 1: case 1:
case 2: case 2:
case 3: case 3:
@ -568,6 +593,8 @@ void IN_SendKeyEvents (void)
Key_Event(K_MWHEELDOWN, 1); Key_Event(K_MWHEELDOWN, 1);
Key_Event(K_MWHEELDOWN, 0); Key_Event(K_MWHEELDOWN, 0);
break; break;
default:
break;
} }
break; break;
@ -584,9 +611,7 @@ void IN_SendKeyEvents (void)
SDL_WarpMouse(vid.width/2, vid.height/2); SDL_WarpMouse(vid.width/2, vid.height/2);
} }
} }
} } else {
else
{
mouse_x = event.motion.xrel*2; mouse_x = event.motion.xrel*2;
mouse_y = event.motion.yrel*2; mouse_y = event.motion.yrel*2;
} }
@ -602,13 +627,13 @@ void IN_SendKeyEvents (void)
} }
} }
void IN_Init (void) void
IN_Init (void)
{ {
_windowed_mouse = Cvar_Get ("_windowed_mouse","0",CVAR_ARCHIVE,"None"); _windowed_mouse = Cvar_Get ("_windowed_mouse", "0", CVAR_ARCHIVE, "Grab mouse and keyboard input");
m_filter = Cvar_Get ("m_filter","0",CVAR_ARCHIVE,"None"); m_filter = Cvar_Get ("m_filter", "0", CVAR_ARCHIVE, "None");
if (COM_CheckParm ("-nomouse") && !_windowed_mouse->value)
if ( COM_CheckParm("-nomouse") && !_windowed_mouse->value)
return; return;
mouse_x = mouse_y = 0.0; mouse_x = mouse_y = 0.0;
@ -618,7 +643,8 @@ void IN_Init (void)
// FIXME: disable DGA if in_dgamouse says to // FIXME: disable DGA if in_dgamouse says to
} }
void IN_Shutdown (void) void
IN_Shutdown (void)
{ {
mouse_avail = 0; mouse_avail = 0;
} }
@ -629,15 +655,16 @@ IN_Commands(void)
if (old__windowed_mouse != _windowed_mouse->value) { if (old__windowed_mouse != _windowed_mouse->value) {
old__windowed_mouse = _windowed_mouse->value; old__windowed_mouse = _windowed_mouse->value;
if (!_windowed_mouse->value) { if (_windowed_mouse->value) { // grab the pointer
/* ungrab the pointer */ SDL_ShowCursor (0);
SDL_WM_GrabInput (SDL_GRAB_OFF);
} else {
/* grab the pointer */
SDL_WM_GrabInput (SDL_GRAB_ON); SDL_WM_GrabInput (SDL_GRAB_ON);
} else { // ungrab the pointer
SDL_WM_GrabInput (SDL_GRAB_OFF);
SDL_ShowCursor (1);
} }
} }
} }
void void
IN_Move(usercmd_t *cmd) IN_Move(usercmd_t *cmd)
{ {
@ -663,11 +690,7 @@ IN_Move(usercmd_t *cmd)
V_StopPitchDrift (); V_StopPitchDrift ();
if ( (in_mlook.state & 1) && !(in_strafe.state & 1)) { if ( (in_mlook.state & 1) && !(in_strafe.state & 1)) {
cl.viewangles[PITCH] += m_pitch->value * mouse_y; cl.viewangles[PITCH] = bound (-70, cl.viewangles[PITCH] + (m_pitch->value * mouse_y), 80);
if (cl.viewangles[PITCH] > 80)
cl.viewangles[PITCH] = 80;
if (cl.viewangles[PITCH] < -70)
cl.viewangles[PITCH] = -70;
} else { } else {
if ((in_strafe.state & 1) && noclip_anglehack) if ((in_strafe.state & 1) && noclip_anglehack)
cmd->upmove -= m_forward->value * mouse_y; cmd->upmove -= m_forward->value * mouse_y;