qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FBDEV GLX SVGAlib X11 all build, but nq-glx doesn't link yet due to some 

changes between nq and qw (gl_mtexable, texture_mode and GL_CheckBrightness)
This commit is contained in:
Bill Currie 2001-04-15 21:11:41 +00:00
parent 36cbe70826
commit 6fcf8395ca
42 changed files with 168 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
include/glquake.h
View File

@ -96,6 +96,16 @@ extern int player_fb_textures;
extern int skytexturenum; // index in cl.loadmodel, not gl texture object
extern cvar_t *r_novis;
extern cvar_t *r_particles;
extern cvar_t *r_norefresh;
extern cvar_t *r_drawviewmodel;
extern cvar_t *r_shadows;
extern cvar_t *r_wateralpha;
extern cvar_t *r_waterripple;
extern cvar_t *r_dynamic;
extern cvar_t *r_netgraph;
extern cvar_t *r_lightmap;
extern cvar_t *r_mirroralpha;
extern cvar_t *gl_affinemodels;
extern cvar_t *gl_clear;
@ -185,4 +195,49 @@ void GL_Set2D (void);
void GL_CheckGamma (unsigned char *pal);
void GL_CheckBrightness (unsigned char *pal);
typedef struct {
int key; // allows reusability
vec3_t origin, owner;
float size;
float die, decay; // duration settings
float minlight; // lighting threshold
float color[3]; // RGB
} fire_t;
struct entity_s;
void R_AddFire (vec3_t, vec3_t, struct entity_s *ent);
fire_t *R_AllocFire (int);
void R_DrawFire (fire_t *);
void R_UpdateFires (void);
void R_DrawBrushModel (struct entity_s *e);
void R_DrawWorld (void);
void R_RenderDlights (void);
void R_DrawSky (void);
void R_DrawSkyChain (msurface_t *s);
void EmitWaterPolys (msurface_t *fa);
void R_RotateForEntity (struct entity_s *e);
void EmitWaterPolys (msurface_t *fa);
void R_NetGraph (void);
void R_LoadSkys (const char *sky);
extern float bubble_sintable[], bubble_costable[];
extern float v_blend[4];
void AddLightBlend (float, float, float, float);
extern int c_brush_polys, c_alias_polys;
extern float r_world_matrix[16];
extern mplane_t frustum[4];
extern inline qboolean R_CullBox (vec3_t mins, vec3_t maxs)
{
int i;
for (i=0 ; i<4 ; i++)
if (BoxOnPlaneSide (mins, maxs, &frustum[i]) == 2)
return true;
return false;
}
#endif // __glquake_h

18
libs/video/targets/Makefile.am
View File

@ -23,12 +23,12 @@ libQFfbdev_la_SOURCES= fbset.c fbset_modes_y.y fbset_modes_l.l \
in_common.c in_fbdev.c vid.c vid_common_sw.c vid_fbdev.c
YACCLEX_CLEANFILES= fbset_modes_y.c fbset_modes_y.h \
fbset_modes_y.tab.h fbset_modes_l.c
EXTRA_libQFfbdev_la_SOURCES=fbset_modes_y.h
#EXTRA_libQFfbdev_la_SOURCES=fbset_modes_y.h
fbset_modes_y.lo: $(srcdir)/fbset_modes_y.c
$(COMPILE) -Wno-error -c $<
$(LTCOMPILE) -Wno-error -c $<
fbset_modes_l.lo: $(srcdir)/fbset_modes_l.c
$(COMPILE) -Wno-error -c $<
$(LTCOMPILE) -Wno-error -c $<
libQFmgl_la_LDFLAGS= -version-info 1:0:0
libQFmgl_la_SOURCES= in_common.c in_win.c vid.c vid_common_sw.c vid_mgl.c
@ -40,22 +40,22 @@ libQFsvga_la_LDFLAGS= -version-info 1:0:0
libQFsvga_la_SOURCES= d_copy.S in_common.c in_svgalib.c vid.c vid_common_sw.c \
vid_svgalib.c
libQFx11_la_LDFLAGS= -version-info 1:0:0
libQFx11_la_LDFLAGS= -version-info 1:0:0 $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB)
libQFx11_la_SOURCES= in_common.c in_x11.c vid.c context_x11.c dga_check.c \
vid_common_sw.c vid_x11.c
libQFglx_la_LDFLAGS= -version-info 1:0:0
libQFglx_la_LDFLAGS= -version-info 1:0:0 $(GLX_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS)
libQFglx_la_SOURCES= in_common.c in_x11.c vid.c context_x11.c dga_check.c \
vid_common_gl.c vid_glx.c
qfgl_ext.c vid_common_gl.c vid_glx.c
libQFsgl_la_LDFLAGS= -version-info 1:0:0
libQFsgl_la_SOURCES= in_common.c in_sdl.c vid.c vid_common_gl.c vid_sgl.c
libQFsgl_la_SOURCES= in_common.c in_sdl.c qfgl_ext.c vid.c vid_common_gl.c vid_sgl.c
libQFtdfx_la_LDFLAGS= -version-info 1:0:0
libQFtdfx_la_SOURCES= in_common.c in_svgalib.c vid.c vid_common_gl.c vid_3dfxsvga.c
libQFtdfx_la_SOURCES= in_common.c in_svgalib.c qfgl_ext.c vid.c vid_common_gl.c vid_3dfxsvga.c
libQFwgl_la_LDFLAGS= -version-info 1:0:0
libQFwgl_la_SOURCES= in_common.c in_win.c vid.c vid_wgl.c
libQFwgl_la_SOURCES= in_common.c in_win.c qfgl_ext.c vid.c vid_wgl.c
LIBLIST = $(lib_LTLIBRARIES) @LIBRARY_SEARCH_PATH@

5
libs/video/targets/in_common.c
View File

@ -153,3 +153,8 @@ IN_Init_Cvars (void)
"mouse sensitivity multiplier");
IN_LL_Init_Cvars ();
}
void
IN_HandlePause (qboolean paused)
{
}

0
qw/source/qfgl_ext.c → libs/video/targets/qfgl_ext.c
View File

5
libs/video/targets/vid.c
View File

@ -175,3 +175,8 @@ VID_InitGamma (unsigned char *pal)
VID_BuildGammaTable (vid_gamma->value);
}
void
VID_HandlePause (qboolean paused)
{
}

6
libs/video/targets/vid_common_gl.c
View File

@ -64,6 +64,10 @@ unsigned char d_15to8table[65536];
cvar_t *vid_mode;
extern byte gammatable[256];
QF_glActiveTextureARB qglActiveTexture = NULL;
QF_glMultiTexCoord2fARB qglMultiTexCoord2f = NULL;
int gl_filter_min = GL_LINEAR_MIPMAP_NEAREST, gl_filter_max = GL_LINEAR;
/*-----------------------------------------------------------------------*/
int texture_extension_number = 1;
@ -85,8 +89,6 @@ cvar_t *vid_use8bit;
cvar_t *brightness;
cvar_t *contrast;
extern int gl_filter_min, gl_filter_max;
/*-----------------------------------------------------------------------*/
void

2
nq/include/draw.h
View File

@ -29,7 +29,7 @@
#ifndef __draw_h
#define __draw_h
#include "wad.h"
#include "QF/wad.h"
extern qpic_t *draw_disc; // also used on sbar

6
nq/source/cl_input.c
View File

@ -33,13 +33,15 @@
#include <string.h>
#include "QF/msg.h"
#include "host.h"
#include "client.h"
#include "QF/cmd.h"
#include "QF/console.h"
#include "QF/compat.h"
#include "QF/keys.h"
#include "QF/input.h"
#include "host.h"
#include "client.h"
/*
===============================================================================

4
nq/source/cl_main.c
View File

@ -42,9 +42,11 @@
#include "host.h"
#include "server.h"
#include "QF/console.h"
#include "screen.h"
#include "QF/screen.h"
#include "QF/cmd.h"
byte *vid_colormap;
// we need to declare some mouse variables here, because the menu system
// references them even when on a unix system.

2
nq/source/cl_parse.c
View File

@ -41,7 +41,7 @@
#include "QF/msg.h"
#include "QF/sys.h"
#include "sbar.h"
#include "screen.h"
#include "QF/screen.h"
#include "server.h"
#include "QF/sound.h" // FIXME: DEFAULT_SOUND_PACKET_*
#include "game.h"

2
nq/source/console.c
View File

@ -46,7 +46,7 @@
#include "QF/input.h"
#include "QF/keys.h"
#include "QF/qargs.h"
#include "screen.h"
#include "QF/screen.h"
#include "QF/sys.h"
#include "QF/va.h"

2
nq/source/gl_draw.c
View File

@ -42,7 +42,7 @@
#include "QF/mathlib.h" // needed by: protocol.h, render.h,
// client.h,
// modelgen.h, glmodel.h
#include "wad.h"
#include "QF/wad.h"
#include "draw.h"
#include "QF/cvar.h"
#include "net.h" // needed by: client.h

4
nq/source/gl_refrag.c
View File

@ -32,9 +32,11 @@
#include "render.h"
#include "QF/model.h"
#include "client.h"
#include "QF/sys.h"
#include "QF/console.h"
#include "client.h"
#include "d_iface.h"
#include "glquake.h"
mnode_t *r_pefragtopnode;

4
nq/source/gl_rmisc.c
View File

@ -41,7 +41,7 @@
#include "QF/mathlib.h" // needed by: protocol.h, render.h,
// client.h,
// modelgen.h, glmodel.h
#include "wad.h"
#include "QF/wad.h"
#include "draw.h"
#include "QF/cvar.h"
#include "net.h" // needed by: client.h
@ -56,6 +56,8 @@
#include "glquake.h"
#include "r_local.h"
extern entity_t r_worldentity;
qboolean VID_Is8bit (void);
void R_InitBubble ();
void R_FireColor_f (void);

2
nq/source/gl_rsurf.c
View File

@ -44,7 +44,7 @@
#include "QF/mathlib.h" // needed by: protocol.h, render.h,
// client.h,
// modelgen.h, glmodel.h
#include "wad.h"
#include "QF/wad.h"
#include "draw.h"
#include "QF/cvar.h"
#include "net.h" // needed by: client.h

7
nq/source/gl_screen.c
View File

@ -44,7 +44,7 @@
#include "QF/mathlib.h" // needed by: protocol.h, render.h,
// client.h,
// modelgen.h, glmodel.h
#include "wad.h"
#include "QF/wad.h"
#include "draw.h"
#include "QF/cvar.h"
#include "net.h" // needed by: client.h
@ -53,7 +53,8 @@
#include "QF/cmd.h"
#include "sbar.h"
#include "QF/sound.h"
#include "screen.h"
#include "QF/screen.h"
#include "r_local.h"
#include "render.h" // needed by: client.h, gl_model.h,
// glquake.h
#include "client.h" // need cls in this file
@ -415,7 +416,7 @@ SCR_Init
==================
*/
void
SCR_InitCvars (void)
SCR_Init_Cvars (void)
{
scr_fov = Cvar_Get ("fov", "90", CVAR_NONE, NULL, "10 - 170");
scr_viewsize = Cvar_Get ("viewsize", "100", CVAR_ARCHIVE, NULL, "None");

7
nq/source/gl_warp.c
View File

@ -43,8 +43,11 @@
#include "QF/console.h"
#include "QF/model.h"
#include "QF/quakefs.h"
#include "glquake.h"
#include "QF/sys.h"
#include "QF/vid.h"
#include "glquake.h"
#include "render.h"
extern double realtime;
extern model_t *loadmodel;
@ -476,7 +479,7 @@ R_LoadSkys
*/
char *suf[6] = { "rt", "bk", "lf", "ft", "up", "dn" };
void
R_LoadSkys (char *skyname)
R_LoadSkys (const char *skyname)
{
int i;
QFile *f;

4
nq/source/host.c
View File

@ -49,7 +49,7 @@
#include "QF/vid.h"
#include "draw.h"
#include "QF/input.h"
#include "screen.h"
#include "QF/screen.h"
#include "gib.h"
#include "sv_progs.h"
@ -927,7 +927,7 @@ Host_Init (quakeparms_t *parms)
V_Init ();
S_Init_Cvars ();
SCR_InitCvars ();
SCR_Init_Cvars ();
VID_Init_Cvars ();
COM_Init ();

2
nq/source/host_cmd.c
View File

@ -37,7 +37,7 @@
#include "QF/compat.h"
#include "world.h"
#include "QF/va.h"
#include "screen.h"
#include "QF/screen.h"
#include "QF/msg.h"
#include "QF/model.h"
#include "QF/console.h"

2
nq/source/keys.c
View File

@ -48,7 +48,7 @@
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/keys.h"
#include "screen.h"
#include "QF/screen.h"
#include "QF/sys.h"
/*

7
nq/source/net_dgrm.c
View File

@ -36,13 +36,14 @@
#include "QF/cmd.h"
#include "QF/sys.h"
#include "QF/keys.h"
#include "client.h"
#include "server.h"
#include "QF/qendian.h"
#include "QF/msg.h"
#include "QF/qargs.h"
#include "screen.h"
#include "QF/screen.h"
#include "QF/console.h"
#include "client.h"
#include "server.h"
#include "net.h"
#include "game.h"
#include "sv_progs.h"

2
nq/source/r_view.c
View File

@ -36,7 +36,7 @@
#include "QF/cmd.h"
#include "chase.h"
#include "draw.h"
#include "screen.h"
#include "QF/screen.h"
#include "QF/console.h"
#include "QF/msg.h"

4
nq/source/sbar.c
View File

@ -38,8 +38,8 @@
#include "QF/vid.h"
#include "QF/va.h"
#include "draw.h"
#include "wad.h"
#include "screen.h"
#include "QF/wad.h"
#include "QF/screen.h"
#include "client.h"
#include "server.h"

4
nq/source/screen.c
View File

@ -34,7 +34,7 @@
#include "r_local.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "screen.h"
#include "QF/screen.h"
#include "sbar.h"
#include "QF/input.h"
#include "view.h"
@ -91,7 +91,7 @@ qboolean block_drawing;
void SCR_ScreenShot_f (void);
void
SCR_InitCvars (void)
SCR_Init_Cvars (void)
{
}

2
nq/source/sw_rmain.c
View File

@ -35,7 +35,7 @@
#include "QF/console.h"
#include "view.h"
#include "QF/cmd.h"
#include "screen.h"
#include "QF/screen.h"
#include "chase.h"
//define PASSAGES

2
nq/source/wad.c
View File

@ -31,7 +31,7 @@
#endif
#include "QF/qendian.h"
#include "wad.h"
#include "QF/wad.h"
#include "QF/sys.h"
#include "QF/quakefs.h"

2
qw/include/r_local.h
View File

@ -327,6 +327,6 @@ void R_ClipEdge (mvertex_t *pv0, mvertex_t *pv1, clipplane_t *clip);
void R_SplitEntityOnNode2 (mnode_t *node);
void R_MarkLights (vec3_t lightorigin, dlight_t *light, int bit, mnode_t *node);
void R_LoadSkys (char *);
void R_LoadSkys (const char *);
#endif // _R_LOCAL_H

2
qw/include/render.h
View File

@ -152,6 +152,6 @@ void D_DeleteSurfaceCache (void);
void D_InitCaches (void *buffer, int size);
void R_SetVrect (vrect_t *pvrect, vrect_t *pvrectin, int lineadj);
void R_LoadSkys (char *);
void R_LoadSkys (const char *);
#endif // _RENDER_H

2
qw/include/skin.h
View File

@ -29,6 +29,8 @@
#ifndef _SKIN_H
#define _SKIN_H
#include "client.h"
#define MAX_CACHED_SKINS 128
#define RSSHOT_WIDTH 320

2
qw/source/Makefile.am
View File

@ -163,7 +163,7 @@ ogl_SOURCES= noisetextures.c gl_textures.c gl_draw.c gl_dyn_fires.c \
gl_rlight.c gl_rmain.c gl_rmisc.c gl_rsurf.c \
gl_screen.c gl_skin.c gl_sky.c gl_sky_clip.c gl_view.c \
gl_warp.c gl_model_alias.c gl_model_brush.c \
gl_model_fullbright.c gl_model_sprite.c qfgl_ext.c
gl_model_fullbright.c gl_model_sprite.c
# ... 3Dfx Voodoo 1 and 2 SVGAlib-based console GL
qw_client_3dfx_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES)

7
qw/source/gl_dyn_part.c
View File

@ -41,11 +41,14 @@
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/qargs.h"
#include "QF/sys.h"
#include "client.h"
#include "glquake.h"
#include "host.h"
#include "r_dynamic.h"
#include "QF/qargs.h"
#include "QF/sys.h"
#include "render.h"
typedef enum {
pt_static, pt_grav, pt_blob, pt_blob2,

5
qw/source/gl_ngraph.c
View File

@ -38,9 +38,12 @@
#include <stdio.h>
#include "cl_parse.h"
#include "QF/compat.h"
#include "QF/cvar.h"
#include "QF/vid.h"
#include "cl_parse.h"
#include "client.h"
#include "draw.h"
#include "glquake.h"
#include "sbar.h"

2
qw/source/gl_rlight.c
View File

@ -39,7 +39,9 @@
#include <math.h>
#include <stdio.h>
#include "client.h"
#include "glquake.h"
#include "r_shared.h"
/*
R_AnimateLight

6
qw/source/gl_rmain.c
View File

@ -46,6 +46,8 @@
#include "QF/qargs.h"
#include "QF/sound.h"
#include "QF/sys.h"
#include "QF/vid.h"
#include "bothdefs.h"
#include "cl_cam.h"
#include "cl_main.h"
@ -54,8 +56,8 @@
#include "glquake.h"
#include "locs.h"
#include "r_dynamic.h"
#include "r_local.h"
#include "skin.h"
#include "QF/vid.h"
#include "view.h"
entity_t r_worldentity;
@ -1053,7 +1055,7 @@ R_SetFrustum (void)
/*
R_SetupFrame
*/
static void
void
R_SetupFrame (void)
{
// don't allow cheats in multiplayer

8
qw/source/gl_rmisc.c
View File

@ -41,12 +41,14 @@
#include "QF/cmd.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "glquake.h"
#include "r_dynamic.h"
#include "skin.h"
#include "QF/sys.h"
#include "QF/vid.h"
#include "glquake.h"
#include "r_dynamic.h"
#include "r_local.h"
#include "skin.h"
qboolean VID_Is8bit (void);
void R_InitBubble (void);

9
qw/source/gl_rsurf.c
View File

@ -40,10 +40,14 @@
#include <math.h>
#include <stdio.h>
#include "glquake.h"
#include "QF/compat.h"
#include "QF/sys.h"
#include "client.h"
#include "glquake.h"
#include "r_local.h"
#include "r_shared.h"
qboolean r_cache_thrash;
// extern cvar_t *gl_lightmap_align;
@ -353,9 +357,6 @@ extern int solidskytexture;
extern int alphaskytexture;
extern float speedscale; // for top sky and bottom sky
QF_glActiveTextureARB qglActiveTexture = NULL;
QF_glMultiTexCoord2fARB qglMultiTexCoord2f = NULL;
void
GL_UploadLightmap (int i, int x, int y, int w, int h)
{

8
qw/source/gl_screen.c
View File

@ -38,18 +38,20 @@
#include <time.h>
#include "cl_parse.h"
#include "QF/cmd.h"
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/keys.h"
#include "QF/sys.h"
#include "cl_parse.h"
#include "draw.h"
#include "glquake.h"
#include "host.h"
#include "QF/keys.h"
#include "pcx.h"
#include "r_local.h"
#include "sbar.h"
#include "skin.h"
#include "QF/sys.h"
#include "tga.h"
#include "view.h"

6
qw/source/gl_sky.c
View File

@ -38,7 +38,11 @@
#include "QF/compat.h"
#include "QF/console.h"
#include "QF/quakefs.h"
#include "QF/vid.h"
#include "glquake.h"
#include "render.h"
#include "tga.h"
#include "view.h"
@ -60,7 +64,7 @@ qboolean skyloaded = false;
*/
char *suf[6] = { "rt", "bk", "lf", "ft", "up", "dn" };
void
R_LoadSkys (char *skyname)
R_LoadSkys (const char *skyname)
{
int i;
QFile *f;

4
qw/source/gl_sky_clip.c
View File

@ -39,8 +39,10 @@
#include <stdarg.h>
#include "QF/console.h"
#include "glquake.h"
#include "QF/sys.h"
#include "client.h"
#include "glquake.h"
#include "view.h"
extern qboolean skyloaded;

3
qw/source/gl_textures.c
View File

@ -49,6 +49,7 @@
#include "QF/sys.h"
#include "QF/vid.h"
extern int gl_filter_min, gl_filter_max;
extern unsigned char d_15to8table[65536];
extern cvar_t *gl_picmip;
@ -169,10 +170,8 @@ static glformat_t formats[] = {
{"GL_RGBA16", GL_RGBA16}
};
int gl_filter_min = GL_LINEAR_MIPMAP_NEAREST, gl_filter_max = GL_LINEAR;
int gl_alpha_format = 4, gl_lightmap_format = 4, gl_solid_format = 3;
void
GL_TextureMode_f (void)
{

4
qw/source/gl_view.c
View File

@ -38,10 +38,12 @@
#include <stdio.h>
#include "QF/compat.h"
#include "bothdefs.h"
#include "client.h"
#include "glquake.h"
#include "view.h"
#include "QF/compat.h"
extern byte *vid_basepal;

2
qw/source/sw_rsky.c
View File

@ -278,6 +278,6 @@ R_SetSkyFrame (void)
skyboxes in GL targets, so we just do nothing here. --KB
*/
void
R_LoadSkys (char *name)
R_LoadSkys (const char *name)
{
}