okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge Reaction renderer features, remove "#ifdef REACTION"s

Browse source
This commit is contained in:
SmileTheory 2013-02-04 20:33:58 -08:00
parent 517c65d85e
commit 9bace5bac7
11 changed files with 122 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

18
code/rend2/tr_local.h
View file

@ -80,10 +80,8 @@ typedef struct {
qboolean needDlights; // true for bmodels that touch a dlight
qboolean lightingCalculated;
#ifdef REACTION
// JBravo: Mirrored models
qboolean mirrored; // mirrored matrix, needs reversed culling
#endif
vec3_t lightDir; // normalized direction towards light
vec3_t ambientLight; // color normalized to 0-255
int ambientLightInt; // 32 bit rgba packed
@ -1755,12 +1753,6 @@ typedef struct {
trRefEntity_t *currentEntity;
qboolean skyRenderedThisView; // flag for drawing sun
#ifdef REACTION
vec3_t sunFlarePos;
qboolean viewHasSunFlare;
qboolean frameHasSunFlare;
#endif
qboolean projection2D; // if qtrue, drawstretchpic doesn't need to change modes
byte color2D[4];
qboolean vertexes2D; // shader needs to be finished
@ -1814,7 +1806,7 @@ typedef struct {
image_t *renderImage;
image_t *godRaysImage;
image_t *sunRaysImage;
image_t *renderDepthImage;
image_t *pshadowMaps[MAX_DRAWN_PSHADOWS];
image_t *textureScratchImage[2];
@ -1832,7 +1824,7 @@ typedef struct {
FBO_t *renderFbo;
FBO_t *msaaResolveFbo;
FBO_t *godRaysFbo;
FBO_t *sunRaysFbo;
FBO_t *depthFbo;
FBO_t *pshadowFbos[MAX_DRAWN_PSHADOWS];
FBO_t *textureScratchFbo[2];
@ -1851,6 +1843,7 @@ typedef struct {
shader_t *flareShader;
shader_t *sunShader;
shader_t *sunFlareShader;
int numLightmaps;
int lightmapSize;
@ -1938,11 +1931,9 @@ typedef struct {
int numSkins;
skin_t *skins[MAX_SKINS];
#ifdef REACTION
GLuint sunFlareQuery[2];
int sunFlareQueryIndex;
qboolean sunFlareQueryActive[2];
#endif
float sinTable[FUNCTABLE_SIZE];
float squareTable[FUNCTABLE_SIZE];
@ -2122,6 +2113,7 @@ extern cvar_t *r_forceSun;
extern cvar_t *r_forceSunMapLightScale;
extern cvar_t *r_forceSunLightScale;
extern cvar_t *r_forceSunAmbientScale;
extern cvar_t *r_drawSunRays;
extern cvar_t *r_sunShadows;
extern cvar_t *r_shadowFilter;
extern cvar_t *r_shadowMapSize;
@ -2479,7 +2471,7 @@ SKIES
void R_BuildCloudData( shaderCommands_t *shader );
void R_InitSkyTexCoords( float cloudLayerHeight );
void R_DrawSkyBox( shaderCommands_t *shader );
void RB_DrawSun( void );
void RB_DrawSun( float scale, shader_t *shader );
void RB_ClipSkyPolygons( shaderCommands_t *shader );
/*