mirror of
https://github.com/ioquake/ioq3.git
synced 2024-11-10 07:11:46 +00:00
Remove a few name tags
This commit is contained in:
parent
2da0fd6de8
commit
d201443350
9 changed files with 12 additions and 23 deletions
|
@ -492,7 +492,7 @@ static qboolean S_Base_HearingThroughEntity( int entityNum, vec3_t origin )
|
||||||
|
|
||||||
if( listener_number == entityNum )
|
if( listener_number == entityNum )
|
||||||
{
|
{
|
||||||
// FIXME: <tim@ngus.net> 28/02/06 This is an outrageous hack to detect
|
// This is an outrageous hack to detect
|
||||||
// whether or not the player is rendering in third person or not. We can't
|
// whether or not the player is rendering in third person or not. We can't
|
||||||
// ask the renderer because the renderer has no notion of entities and we
|
// ask the renderer because the renderer has no notion of entities and we
|
||||||
// can't ask cgame since that would involve changing the API and hence mod
|
// can't ask cgame since that would involve changing the API and hence mod
|
||||||
|
|
|
@ -656,7 +656,7 @@ static qboolean S_AL_HearingThroughEntity( int entityNum )
|
||||||
|
|
||||||
if( lastListenerNumber == entityNum )
|
if( lastListenerNumber == entityNum )
|
||||||
{
|
{
|
||||||
// FIXME: <tim@ngus.net> 28/02/06 This is an outrageous hack to detect
|
// This is an outrageous hack to detect
|
||||||
// whether or not the player is rendering in third person or not. We can't
|
// whether or not the player is rendering in third person or not. We can't
|
||||||
// ask the renderer because the renderer has no notion of entities and we
|
// ask the renderer because the renderer has no notion of entities and we
|
||||||
// can't ask cgame since that would involve changing the API and hence mod
|
// can't ask cgame since that would involve changing the API and hence mod
|
||||||
|
|
|
@ -789,7 +789,7 @@ static void ParseFace( dsurface_t *ds, drawVert_t *verts, float *hdrVertColors,
|
||||||
surf->data = (surfaceType_t *)cv;
|
surf->data = (surfaceType_t *)cv;
|
||||||
|
|
||||||
#ifdef USE_VERT_TANGENT_SPACE
|
#ifdef USE_VERT_TANGENT_SPACE
|
||||||
// Tr3B - calc tangent spaces
|
// Calculate tangent spaces
|
||||||
{
|
{
|
||||||
srfVert_t *dv[3];
|
srfVert_t *dv[3];
|
||||||
|
|
||||||
|
@ -1022,7 +1022,7 @@ static void ParseTriSurf( dsurface_t *ds, drawVert_t *verts, float *hdrVertColor
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef USE_VERT_TANGENT_SPACE
|
#ifdef USE_VERT_TANGENT_SPACE
|
||||||
// Tr3B - calc tangent spaces
|
// Calculate tangent spaces
|
||||||
{
|
{
|
||||||
srfVert_t *dv[3];
|
srfVert_t *dv[3];
|
||||||
|
|
||||||
|
@ -2316,7 +2316,7 @@ static void R_LoadSubmodels( lump_t *l ) {
|
||||||
|
|
||||||
if(i == 0)
|
if(i == 0)
|
||||||
{
|
{
|
||||||
// Tr3B: add this for limiting VBO surface creation
|
// Add this for limiting VBO surface creation
|
||||||
s_worldData.numWorldSurfaces = out->numSurfaces;
|
s_worldData.numWorldSurfaces = out->numSurfaces;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -81,7 +81,6 @@ typedef struct {
|
||||||
|
|
||||||
qboolean needDlights; // true for bmodels that touch a dlight
|
qboolean needDlights; // true for bmodels that touch a dlight
|
||||||
qboolean lightingCalculated;
|
qboolean lightingCalculated;
|
||||||
// JBravo: Mirrored models
|
|
||||||
qboolean mirrored; // mirrored matrix, needs reversed culling
|
qboolean mirrored; // mirrored matrix, needs reversed culling
|
||||||
vec3_t lightDir; // normalized direction towards light
|
vec3_t lightDir; // normalized direction towards light
|
||||||
vec3_t ambientLight; // color normalized to 0-255
|
vec3_t ambientLight; // color normalized to 0-255
|
||||||
|
@ -764,7 +763,7 @@ enum
|
||||||
GLSL_MAT16
|
GLSL_MAT16
|
||||||
};
|
};
|
||||||
|
|
||||||
// Tr3B - shaderProgram_t represents a pair of one
|
// shaderProgram_t represents a pair of one
|
||||||
// GLSL vertex and one GLSL fragment shader
|
// GLSL vertex and one GLSL fragment shader
|
||||||
typedef struct shaderProgram_s
|
typedef struct shaderProgram_s
|
||||||
{
|
{
|
||||||
|
@ -912,7 +911,7 @@ enum
|
||||||
};
|
};
|
||||||
|
|
||||||
//
|
//
|
||||||
// Tr3B: these are fire wall functions to avoid expensive redundant glUniform* calls
|
// These are fire wall functions to avoid expensive redundant glUniform* calls
|
||||||
//#define USE_UNIFORM_FIREWALL 1
|
//#define USE_UNIFORM_FIREWALL 1
|
||||||
//#define LOG_GLSL_UNIFORMS 1
|
//#define LOG_GLSL_UNIFORMS 1
|
||||||
|
|
||||||
|
|
|
@ -495,7 +495,8 @@ qboolean R_CalcTangentVectors(srfVert_t * dv[3])
|
||||||
/*
|
/*
|
||||||
=================
|
=================
|
||||||
R_FindSurfaceTriangleWithEdge
|
R_FindSurfaceTriangleWithEdge
|
||||||
Tr3B - recoded from Q2E
|
|
||||||
|
Recoded from Q2E
|
||||||
=================
|
=================
|
||||||
*/
|
*/
|
||||||
static int R_FindSurfaceTriangleWithEdge(int numTriangles, srfTriangle_t * triangles, int start, int end, int ignore)
|
static int R_FindSurfaceTriangleWithEdge(int numTriangles, srfTriangle_t * triangles, int start, int end, int ignore)
|
||||||
|
@ -539,7 +540,8 @@ static int R_FindSurfaceTriangleWithEdge(int numTriangles, srfTriangle_t * trian
|
||||||
/*
|
/*
|
||||||
=================
|
=================
|
||||||
R_CalcSurfaceTriangleNeighbors
|
R_CalcSurfaceTriangleNeighbors
|
||||||
Tr3B - recoded from Q2E
|
|
||||||
|
Recoded from Q2E
|
||||||
=================
|
=================
|
||||||
*/
|
*/
|
||||||
void R_CalcSurfaceTriangleNeighbors(int numTriangles, srfTriangle_t * triangles)
|
void R_CalcSurfaceTriangleNeighbors(int numTriangles, srfTriangle_t * triangles)
|
||||||
|
|
|
@ -327,13 +327,6 @@ void RB_SunRays(void)
|
||||||
pos[0] = 0.5f + hpos[0] * hpos[3];
|
pos[0] = 0.5f + hpos[0] * hpos[3];
|
||||||
pos[1] = 0.5f - hpos[1] * hpos[3];
|
pos[1] = 0.5f - hpos[1] * hpos[3];
|
||||||
|
|
||||||
// viewport dimensions
|
|
||||||
// JBravo: Apparently not used
|
|
||||||
/* w = glConfig.vidWidth;
|
|
||||||
h = glConfig.vidHeight;
|
|
||||||
w2 = glConfig.vidWidth / 2;
|
|
||||||
h2 = glConfig.vidHeight / 2; */
|
|
||||||
|
|
||||||
// initialize quarter buffers
|
// initialize quarter buffers
|
||||||
{
|
{
|
||||||
float mul = 1.f;
|
float mul = 1.f;
|
||||||
|
|
|
@ -91,7 +91,6 @@ void R_AddPolygonSurfaces( void ) {
|
||||||
int i;
|
int i;
|
||||||
shader_t *sh;
|
shader_t *sh;
|
||||||
srfPoly_t *poly;
|
srfPoly_t *poly;
|
||||||
// JBravo: Fog fixes
|
|
||||||
int fogMask;
|
int fogMask;
|
||||||
|
|
||||||
tr.currentEntityNum = REFENTITYNUM_WORLD;
|
tr.currentEntityNum = REFENTITYNUM_WORLD;
|
||||||
|
@ -202,7 +201,6 @@ RE_AddRefEntityToScene
|
||||||
=====================
|
=====================
|
||||||
*/
|
*/
|
||||||
void RE_AddRefEntityToScene( const refEntity_t *ent ) {
|
void RE_AddRefEntityToScene( const refEntity_t *ent ) {
|
||||||
// JBravo: Mirrored models
|
|
||||||
vec3_t cross;
|
vec3_t cross;
|
||||||
|
|
||||||
if ( !tr.registered ) {
|
if ( !tr.registered ) {
|
||||||
|
@ -227,7 +225,6 @@ void RE_AddRefEntityToScene( const refEntity_t *ent ) {
|
||||||
backEndData->entities[r_numentities].e = *ent;
|
backEndData->entities[r_numentities].e = *ent;
|
||||||
backEndData->entities[r_numentities].lightingCalculated = qfalse;
|
backEndData->entities[r_numentities].lightingCalculated = qfalse;
|
||||||
|
|
||||||
// JBravo: Mirrored models
|
|
||||||
CrossProduct(ent->axis[0], ent->axis[1], cross);
|
CrossProduct(ent->axis[0], ent->axis[1], cross);
|
||||||
backEndData->entities[r_numentities].mirrored = (DotProduct(ent->axis[2], cross) < 0.f);
|
backEndData->entities[r_numentities].mirrored = (DotProduct(ent->axis[2], cross) < 0.f);
|
||||||
|
|
||||||
|
|
|
@ -842,7 +842,7 @@ RB_UpdateVBOs
|
||||||
|
|
||||||
Adapted from Tess_UpdateVBOs from xreal
|
Adapted from Tess_UpdateVBOs from xreal
|
||||||
|
|
||||||
Tr3B: update the default VBO to replace the client side vertex arrays
|
Update the default VBO to replace the client side vertex arrays
|
||||||
==============
|
==============
|
||||||
*/
|
*/
|
||||||
void RB_UpdateVBOs(unsigned int attribBits)
|
void RB_UpdateVBOs(unsigned int attribBits)
|
||||||
|
|
|
@ -18,9 +18,7 @@ YYCONST static char yysccsid[] = "@(#)yaccpar 1.8 (Berkeley +Cygnus.28) 01/20/91
|
||||||
#ifndef YYDONT_INCLUDE_STDIO
|
#ifndef YYDONT_INCLUDE_STDIO
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#endif
|
#endif
|
||||||
//#ifdef __cplusplus TA <tim@ngus.net> stdlib.h applies to C too
|
|
||||||
#include <stdlib.h> /* for malloc/realloc/free */
|
#include <stdlib.h> /* for malloc/realloc/free */
|
||||||
//#endif
|
|
||||||
#line 2 "lburg/gram.y"
|
#line 2 "lburg/gram.y"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "lburg.h"
|
#include "lburg.h"
|
||||||
|
|
Loading…
Reference in a new issue