qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

more merge madness

Browse source
This commit is contained in:
Bill Currie 2001-05-15 03:27:55 +00:00
parent cf7487b692
commit eb65d61322
14 changed files with 44 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nq/include/render.h
View file

@ -124,7 +124,7 @@ extern struct texture_s *r_notexture_mip;
void R_Init (void);
void R_InitTextures (void);
void R_Textures_Init (void);
void R_InitEfrags (void);
void R_RenderView (void); // must set r_refdef first
void R_ViewChanged (vrect_t *pvrect, int lineadj, float aspect);

1
nq/source/gl_dyn_fires.c
View file

@ -43,7 +43,6 @@
#include "client.h"
#include "glquake.h"
#include "render.h"
#define MAX_FIRES 128 // rocket flames

2
nq/source/gl_dyn_part.c
View file

@ -48,8 +48,8 @@
#include "client.h"
#include "glquake.h"
#include "host.h"
#include "render.h"
#include "r_dynamic.h"
#include "render.h"
static particle_t *particles, **freeparticles;
static short r_numparticles, numparticles;

8
nq/source/gl_rmain.c
View file

@ -75,6 +75,7 @@ qboolean envmap; // true during envmap command capture
int playertextures; // up to 16 color translated skins
int player_fb_textures; // up to 128 skin fullbright maps
int mirrortexturenum; // quake texturenum, not gltexturenum
qboolean mirror;
@ -853,9 +854,10 @@ static void
R_DrawViewModel (void)
{
currententity = &cl.viewent;
if (!r_drawviewmodel->int_val
|| chase_active->int_val
|| envmap || !r_drawentities->int_val || (cl.items & IT_INVISIBILITY)
if (!r_drawviewmodel->int_val || chase_active->int_val
|| envmap
|| !r_drawentities->int_val
|| (cl.items & IT_INVISIBILITY)
|| cl.stats[STAT_HEALTH] <= 0 || !currententity->model)
return;

35
nq/source/gl_rmisc.c
View file

@ -41,19 +41,13 @@
#include "QF/cmd.h"
#include "QF/console.h"
#include "QF/cvar.h"
#include "QF/draw.h"
#include "QF/mathlib.h"
#include "QF/model.h"
#include "QF/skin.h"
#include "QF/sys.h"
#include "QF/varrays.h"
#include "QF/vid.h"
#include "QF/wad.h"
#include "QF/varrays.h"
#include "client.h"
#include "glquake.h"
#include "net.h"
#include "protocol.h"
#include "sbar.h"
#include "r_dynamic.h"
#include "r_local.h"
#include "render.h"
@ -64,7 +58,8 @@ qboolean VID_Is8bit (void);
qboolean allowskybox; // allow skyboxes? --KB
void R_InitBubble (void);
extern cvar_t *r_netgraph;
extern cvar_t *gl_lerp_anim;
extern cvar_t *r_netgraph;
extern void GDT_Init ();
@ -72,7 +67,7 @@ extern entity_t r_worldentity;
void
R_InitTextures (void)
R_Textures_Init (void)
{
int x, y, m;
byte *dest;
@ -197,9 +192,23 @@ R_Init (void)
R_InitBubble ();
GDT_Init ();
//XXX netgraphtexture = texture_extension_number;
//XXX texture_extension_number++;
playertextures = texture_extension_number;
texture_extension_number += 16;
texture_extension_number += 16;//MAX_CLIENTS;
player_fb_textures = texture_extension_number;
texture_extension_number += MAX_CACHED_SKINS;
glEnableClientState (GL_COLOR_ARRAY);
glEnableClientState (GL_VERTEX_ARRAY);
glEnableClientState (GL_TEXTURE_COORD_ARRAY);
// glInterleavedArrays(GL_T2F_C4F_N3F_V3F, 0, varray);
glTexCoordPointer (2, GL_FLOAT, sizeof(varray[0]), varray[0].texcoord);
glColorPointer (4, GL_FLOAT, sizeof(varray[0]), varray[0].color);
glVertexPointer (3, GL_FLOAT, sizeof(varray[0]), varray[0].vertex);
}
@ -354,8 +363,8 @@ R_TranslatePlayerSkin (int playernum)
void
R_NewMap (void)
{
int i;
cvar_t *r_skyname;
int i;
cvar_t *r_skyname;
for (i = 0; i < 256; i++)
d_lightstylevalue[i] = 264; // normal light value

1
nq/source/gl_screen.c
View file

@ -48,7 +48,6 @@
#include "QF/sys.h"
#include "QF/tga.h"
//#include "cl_parse.h"
#include "client.h"
#include "glquake.h"
#include "host.h"

3
nq/source/gl_textures.c
View file

@ -59,7 +59,7 @@ typedef struct {
char identifier[64];
int width, height;
int bytesperpixel;
// int texelformat; // eventually replace bytesperpixel
// int texelformat; // eventually replace bytesperpixel
qboolean mipmap;
unsigned short crc; // LordHavoc: CRC for texure validation
} gltexture_t;
@ -422,7 +422,6 @@ GL_Upload32 (unsigned int *data, int width, int height, qboolean mipmap,
}
/*
GL_Upload8_EXT

2
nq/source/host.c
View file

@ -924,7 +924,7 @@ Host_Init (quakeparms_t *parms)
Con_Printf ("Exe: " __TIME__ " " __DATE__ "\n");
Con_Printf ("%4.1f megabyte heap\n", parms->memsize / (1024 * 1024.0));
R_InitTextures (); // needed even for dedicated servers
R_Textures_Init (); // needed even for dedicated servers
if (cls.state != ca_dedicated) {
vid_basepal = (byte *) COM_LoadHunkFile ("gfx/palette.lmp");

4
nq/source/sw_rmain.c
View file

@ -144,11 +144,11 @@ void SetVisibilityByPassages (void);
/*
==================
R_InitTextures
R_Textures_Init
==================
*/
void
R_InitTextures (void)
R_Textures_Init (void)
{
int x, y, m;
byte *dest;

4
qw/source/gl_dyn_fires.c
View file

@ -1,7 +1,7 @@
/*
r_part.c
gl_dyn_fires.c
(description)
dynamic fires
Copyright (C) 1996-1997 Id Software, Inc.

1
qw/source/gl_rlight.c
View file

@ -306,7 +306,6 @@ R_PushDlights (vec3_t entorigin)
LIGHT SAMPLING
*/
mplane_t *lightplane;
vec3_t lightspot;

5
qw/source/gl_rmain.c
View file

@ -76,6 +76,10 @@ qboolean envmap; // true during envmap command capture
int playertextures; // up to 16 color translated skins
int player_fb_textures; // up to 128 skin fullbright maps
int mirrortexturenum; // quake texturenum, not gltexturenum
qboolean mirror;
mplane_t *mirror_plane;
// view origin
vec3_t vup;
vec3_t vpn;
@ -1051,7 +1055,6 @@ R_Clear (void)
glDepthRange (gldepthmin, gldepthmax);
}
void
R_RenderScene (void)
{

7
qw/source/gl_rmisc.c
View file

@ -55,7 +55,7 @@
varray_t2f_c4f_v3f_t varray[MAX_VARRAY_VERTS];
qboolean VID_Is8bit (void);
qboolean allowskybox; // allow skyboxes? --KB
qboolean allowskybox; // allow skyboxes? --KB
void R_InitBubble (void);
extern cvar_t *gl_lerp_anim;
@ -188,7 +188,7 @@ R_Init (void)
Cmd_AddCommand ("loadsky", R_LoadSky_f, "Load a skybox");
R_InitBubble ();
GDT_Init ();
netgraphtexture = texture_extension_number;
@ -233,11 +233,14 @@ R_NewMap (void)
// identify sky texture
skytexturenum = -1;
mirrortexturenum = -1;
for (i = 0; i < cl.worldmodel->numtextures; i++) {
if (!cl.worldmodel->textures[i])
continue;
if (!strncmp (cl.worldmodel->textures[i]->name, "sky", 3))
skytexturenum = i;
if (!strncmp (cl.worldmodel->textures[i]->name, "window02_1", 10))
mirrortexturenum = i;
cl.worldmodel->textures[i]->texturechain = NULL;
}
r_skyname = Cvar_FindVar ("r_skyname");

1
qw/source/gl_textures.c
View file

@ -175,7 +175,6 @@ static glformat_t formats[] = {
int gl_alpha_format = 4, gl_lightmap_format = 4, gl_solid_format = 3;
void
GL_TextureMode_f (void)
{