diff options
| author | SmileTheory <SmileTheory@gmail.com> | 2013-02-04 20:33:58 -0800 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-02-16 21:54:28 +0000 |
| commit | 5991530b912c629951c68a9b0767e356c00835e8 (patch) | |
| tree | fe6274290418821e04102bb64582866b9d3411d0 /src/rend2/tr_local.h | |
| parent | 209b348ef47e10cfd0da854fc9bc77c460a66518 (diff) | |
Merge Reaction renderer features, remove "#ifdef REACTION"s
Diffstat (limited to 'src/rend2/tr_local.h')
| -rw-r--r-- | src/rend2/tr_local.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/rend2/tr_local.h b/src/rend2/tr_local.h index 4b46f612..a5d57d35 100644 --- a/src/rend2/tr_local.h +++ b/src/rend2/tr_local.h @@ -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; @@ -1940,11 +1933,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]; @@ -2124,6 +2115,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; @@ -2481,7 +2473,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 ); /* |