Fix the results of my last commit...

This commit is contained in:
Joseph Carter 2000-03-09 15:31:15 +00:00
parent cc8e1219bd
commit 932d705285
3 changed files with 24 additions and 25 deletions

View file

@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <quakedef.h>
#include <r_local.h>
#include <d_iface.h>
#include <glquake.h>

View file

@ -1,4 +1,5 @@
/*
gl_view.c - player eye positioning
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
@ -19,13 +20,11 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// view.c -- player eye positioning
#include "qtypes.h"
#include "quakedef.h"
#include "r_local.h"
#include "glquake.h"
#include "view.h"
#include <qtypes.h>
#include <quakedef.h>
#include <glquake.h>
#include <view.h>
extern int onground;

View file

@ -1,4 +1,5 @@
/*
r_alias.c - routines for setting up to draw alias models
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
@ -19,32 +20,32 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// r_alias.c: routines for setting up to draw alias models
#include "quakedef.h"
#include "r_local.h"
#include <quakedef.h>
#include <r_local.h>
#include <mathlib.h>
#include <sys.h>
#include <console.h>
#define LIGHT_MIN 5 // lowest light value we'll allow, to avoid the
// need for inner-loop light clamping
#define LIGHT_MIN 5 // lowest light value we'll allow, to
// avoid the need for inner-loop
// light clamping
mtriangle_t *ptriangles;
affinetridesc_t r_affinetridesc;
affinetridesc_t r_affinetridesc;
void * acolormap; // FIXME: should go away
trivertx_t *r_apverts;
// TODO: these probably will go away with optimized rasterization
mdl_t *pmdl;
vec3_t r_plightvec;
int r_ambientlight;
float r_shadelight;
aliashdr_t *paliashdr;
finalvert_t *pfinalverts;
auxvert_t *pauxverts;
mdl_t *pmdl;
vec3_t r_plightvec;
int r_ambientlight;
float r_shadelight;
aliashdr_t *paliashdr;
finalvert_t *pfinalverts;
auxvert_t *pauxverts;
static float ziscale;
static model_t *pmodel;
@ -52,11 +53,11 @@ static vec3_t alias_forward, alias_right, alias_up;
static maliasskindesc_t *pskindesc;
int r_amodels_drawn;
int a_skinwidth;
int r_anumverts;
int r_amodels_drawn;
int a_skinwidth;
int r_anumverts;
float aliastransform[3][4];
float aliastransform[3][4];
typedef struct {
int index0;
@ -72,7 +73,7 @@ static aedge_t aedges[12] = {
#define NUMVERTEXNORMALS 162
float r_avertexnormals[NUMVERTEXNORMALS][3] = {
#include "anorms.h"
#include "anorms.-c"
};
void R_AliasTransformAndProjectFinalVerts (finalvert_t *fv,