- preliminary deformvertex ripples

- some hacky new modes for deformvertex normal
- refactor map2-8/animmap2-8/videomap2-8/clampanimmap2-8

Author: leilei-

code/renderer_oa/tr_init.c

@@ -223,11 +223,30 @@ cvar_t	*r_skytess;	// leilei - lower detail of skies
 cvar_t	*r_leidebug;		// Leilei - debug
 cvar_t	*r_leidebugeye;		// Leilei - eye debug
 
-cvar_t	*r_suggestiveThemes;		// leilei - mature content control
-
+cvar_t	*r_suggestiveThemes;	// leilei - mature content control
 cvar_t	*r_textureDither;	// leilei - Dithered texture
-
 cvar_t	*r_lerpbias;		// Leilei - lerping bias
+cvar_t	*r_ripples;		// leilei - Ripples
+
+// leilei - hardware support cvars, for shaders to think about
+
+cvar_t	*glhw_3dfx; 	// 1 = V1/Rush, 2 = V2, 3 = Banshee/V3, 4=Voodoo4/5
+			// V1 cannot handle depth function effects. No clamping on earlier ICDs.
+cvar_t	*glhw_rage; 	// 1 = Rage Pro, 2 = Rage XL, 3 = Rage128
+			// Rage Pro cannot do hardware alpha blends nor can modulate them.
+cvar_t	*glhw_mga;  	// 1 = Mystique, 2 = G100, 3 = G200
+			// Mystique / G100 does not have blending functions and the only alpha blending is dithered.
+cvar_t	*glhw_powervr;  // 1 = PCX2, 2 = Neon250, 3 = KYRO , 4 = GMA
+			// PCX2 does not have blending functions and will always render RGBA4444 textures as a blend.
+			// None of these cards have depth testing. No clamping or rectangle textures on PCX2.
+cvar_t	*glhw_geforce;  // 1 = 256, 2 = 2, 3 = 3, 4 = 4Ti, 5 = FX, 6 = 6, 7 = 7, 8 = 8, 9 = 9, 10 = Tesla
+			// 256 and 2 have early driver issues.
+cvar_t	*glhw_radeon;   // 1 = 7x00, 2 = 8x00-9200, 3 = 9500-x800, 4 = x1x00, 5 = HD2, 6 = HD3-4-5-6, 7 = GCN, 8 = Vega, 9 = RNA
+			// Vega and RNA have driver issues wrt OpenGL 2.
+cvar_t	*glhw_s3;       // 1 = ViRGE, 2 = Trio3D, 3 = Savage3D , 4 = Savage4/ProSavage, 5 = Savage 2000
+cvar_t	*glhw_software;  // 1 = Microsoft, 2 = SGI/Cosmo, 3 = Mesa, 4 = LLVMPipe Gallium, 5 = TinyGL
+			// Varies of pain
+
 
 // leilei - fallback shader hack
 
@@ -1319,6 +1338,7 @@ void R_Register( void )
 	r_leidebugeye = ri.Cvar_Get( "r_leidebugeye", "0" , CVAR_CHEAT);
 
 	r_lerpbias = ri.Cvar_Get( "r_lerpbias", "-2" , CVAR_ARCHIVE);
+	r_ripples = ri.Cvar_Get( "r_ripples", "1" , CVAR_ARCHIVE);
 
 	r_iconmip = ri.Cvar_Get ("r_iconmip", "0", CVAR_ARCHIVE | CVAR_LATCH );		// leilei - icon mip
 	r_iconBits = ri.Cvar_Get ("r_iconBits", "0", CVAR_ARCHIVE | CVAR_LATCH );	// leilei - icon bits
@@ -1612,6 +1632,10 @@ void R_Init( void )
 #ifdef GLSL_BACKEND
 	R_GLSL_Init();
 #endif
+
+	tr.refdef.enableRipples = 0; // leilei - set this 0 before shaders load, so we can keep the engine calm
+					// on processing unless we really do have a shader with a deformvertexes ripple in it
+					// in which this will be 1.
 	R_InitShaders();
 
 	R_InitSkins();
@@ -1620,7 +1644,6 @@ void R_Init( void )
 
 	R_InitFreeType();
 
-
 	err = qglGetError();
 	if ( err != GL_NO_ERROR )
 		ri.Printf (PRINT_ALL, "glGetError() = 0x%x\n", err);

code/renderer_oa/tr_local.h

@@ -208,6 +208,8 @@ typedef enum {
 	DEFORM_TEXT5,
 	DEFORM_TEXT6,
 	DEFORM_TEXT7,
+	DEFORM_RIPPLE,
+	DEFORM_AUTOSPRITE3,
 	DEFORM_LFX
 } deform_t;
 
@@ -539,6 +541,26 @@ typedef struct shader_s {
 #define		SHADMAT_CONCRETE	7 	// unused? redundant?
 #define		SHADMAT_ICE		8	// from slick
 
+// leilei - ripple
+#define	MAX_RIPPLES		120 // ripple verts will go through all of them, so we cant have too many to check
+
+
+typedef struct ripple_s {
+	vec3_t	origin;
+	float	radius;
+	float	radiusLp;
+	float	time;
+	float	life;
+	float	decay;				// leilei - will clean this
+	float	amp;				// changed by time
+	float	ampLp;
+	float   timeStart;
+	float   timeEnd;
+	float   ogRadius;			// doesnt change from creation
+	float   ogAmp;				// ditto
+} ripple_t;
+
+
 // trRefdef_t holds everything that comes in refdef_t,
 // as well as the locally generated scene information
 typedef struct {
@@ -573,6 +595,10 @@ typedef struct {
 	int			numDrawSurfs;
 	struct drawSurf_s	*drawSurfs;
 
+	int			num_ripple;
+	struct ripple_s	*ripple;
+	int			enableRipples;
+
 } trRefdef_t;
 
 
@@ -1474,6 +1500,7 @@ extern	cvar_t	*r_iconmip;	// leilei - icon mip - picmip for 2d icons
 extern	cvar_t	*r_iconBits;	// leilei - icon color depth for 2d icons
 
 extern cvar_t	*r_lerpbias;	// Leilei - lerping bias
+extern cvar_t	*r_ripples;	// Leilei - ripples
 
 extern	cvar_t	*r_lightmapBits;	// leilei - lightmap color depth
 extern	cvar_t	*r_lightmapColorNorm;	// leilei - lightmap color normalize
@@ -2123,7 +2150,8 @@ void RE_AddPolyToScene( qhandle_t hShader , int numVerts, const polyVert_t *vert
 void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, float b );
 void RE_AddAdditiveLightToScene( const vec3_t org, float intensity, float r, float g, float b );
 void RE_RenderScene( const refdef_t *fd );
-
+void RE_AddRippleToScene( const vec3_t org, float intensity ); // leilei - ripples
+void RE_ManageRipples( void ); // leilei - ripples
 /*
 =============================================================
 
@@ -2345,6 +2373,7 @@ typedef struct {
 	trRefEntity_t	entities[MAX_REFENTITIES];
 	srfPoly_t	*polys;//[MAX_POLYS];
 	polyVert_t	*polyVerts;//[MAX_POLYVERTS];
+	ripple_t	ripples[MAX_RIPPLES];
 	renderCommandList_t	commands;
 } backEndData_t;
 
@@ -2404,5 +2433,7 @@ void LFX_ShaderInit(void);
 void LFX_ParticleEffect (int effect, const vec3_t org, const vec3_t dir);
 void RE_GetViewPosition(vec3_t point);
 
+
+
 #endif //TR_LOCAL_H
 

code/renderer_oa/tr_particles.c

@@ -293,7 +293,7 @@ void R_AddParticleToScene (particle_t *p, vec3_t org, float alpha)
 	float		height;
 	float		time, time2;
 	float		ratio;
-	int		fogNum = 0;
+	int		fogNum = tess.fogNum;
 	float		invratio;
 	vec4_t		color;
 
@@ -313,6 +313,7 @@ void R_AddParticleToScene (particle_t *p, vec3_t org, float alpha)
 	ratio = time / time2;
 
 	// Do us some fogging fogger
+/*
 	{
 		byte fogFactors[3] = {255, 255, 255};
 		if(tr.world && p->fogNum > 0 && p->fogNum < tr.world->numfogs) {
@@ -324,7 +325,7 @@ void R_AddParticleToScene (particle_t *p, vec3_t org, float alpha)
 
 		}
 	}
-
+*/
 
 
 	{
@@ -2600,7 +2601,7 @@ void LFX_ParticleEffect200X (int effect, const vec3_t org, const vec3_t dir)
 		R_LFX_Burst (sprOrg, sprVel, 175, 15, colory, colory2, colory3, colory4, colory4, 15, 240, 22, 1);
 
 		R_LFX_Spark (sprOrg, sprVel, 175, 5, colory, colory2, colory3, colory4, colory4, 25, 1240, 0.8f, 1);
-
+		RE_AddRippleToScene( origin, 300 );
 	}
 
 	// BFG
@@ -2656,6 +2657,8 @@ void LFX_ParticleEffect200X (int effect, const vec3_t org, const vec3_t dir)
 		R_LFX_Burst (sprOrg, sprVel, 175, 15, colory, colory2, colory3, colory4, colory4, 15, 140, 32, 1);
 
 		R_LFX_Spark (sprOrg, sprVel, 175, 5, colory, colory2, colory3, colory4, colory4, 15, 1040, 0.8f, 1);
+
+		RE_AddRippleToScene( origin, 300 );
 	}
 
 	// Nail Hit
@@ -2696,7 +2699,7 @@ void LFX_ParticleEffect200X (int effect, const vec3_t org, const vec3_t dir)
 		colory4[1] = 0.0;
 		colory4[2] = 0.0;
 		colory4[3] = 0.0;
-
+		RE_AddRippleToScene( origin, 64 );
 		VectorMA( origin, 4, dir, sprOrg );
 		VectorScale( dir, 1, sprVel );
 
@@ -2827,6 +2830,8 @@ void LFX_ParticleEffect200X (int effect, const vec3_t org, const vec3_t dir)
 		colory4[2] = 0.0;
 		colory4[3] = 0.0;
 		VectorScale( dir, 39, sprVel );
+		RE_AddRippleToScene( origin, 64 );
+
 		R_LFX_Shock (origin, dir, 0, 0, colory, colory2, colory3, colory4, colory4, 1, 800, 80,14);
 		R_LFX_Burst (sprOrg, sprVel, 22, 266, colory, colory2, colory3, colory4, colory4, 1, 1900, 5, 7);
 		R_LFX_Spark (sprOrg, sprVel, 134, 4, colory, colory2, colory3, colory4, colory4, 7, 1286, 0.5f, 1);

code/renderer_oa/tr_scene.c

@@ -35,6 +35,8 @@ int			r_firstScenePoly;
 
 int			r_numpolyverts;
 
+int			r_numripples;
+int			r_firstSceneRipple;
 
 /*
 ====================
@@ -57,6 +59,9 @@ void R_InitNextFrame( void ) {
 	r_firstScenePoly = 0;
 
 	r_numpolyverts = 0;
+
+	r_numripples = 0;
+	r_firstSceneRipple = 0;
 }
 
 
@@ -70,6 +75,7 @@ void RE_ClearScene( void ) {
 	r_firstSceneDlight = r_numdlights;
 	r_firstSceneEntity = r_numentities;
 	r_firstScenePoly = r_numpolys;
+	r_firstSceneRipple = r_numripples;
 }
 
 /*
@@ -292,6 +298,8 @@ RE_AddLightToScene
 */
 void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, float b ) {
 	RE_AddDynamicLightToScene( org, intensity, r, g, b, qfalse );
+
+	//RE_AddRippleToScene( org, intensity );
 }
 
 /*
@@ -304,6 +312,90 @@ void RE_AddAdditiveLightToScene( const vec3_t org, float intensity, float r, flo
 	RE_AddDynamicLightToScene( org, intensity, r, g, b, qtrue );
 }
 
+
+
+/*
+=====================
+RE_AddRippleToScene
+
+leilei - manage the ripples here. do a delay. just do something
+
+=====================
+*/
+
+float riptime = 0;
+
+
+void RE_AddRippleToScene( const vec3_t org, float intensity ) {
+	ripple_t	*r;
+
+	if ( !tr.registered ) {
+		return;
+	}
+	if ( r_numripples >= MAX_RIPPLES ) {
+		return;
+	}
+	if ( !tr.refdef.enableRipples ) {
+		return;
+	}
+	if ( !r_ripples->value ) {
+		return;
+	}
+
+	r = &backEndData->ripples[r_numripples++];
+
+	while (r->amp >= 0.02f){ // next....
+		if (r_numripples < 0)
+			return; // dont!!!
+		if (r_numripples >= 96)
+			return; // dont!!!
+		r = &backEndData->ripples[r_numripples++]; // Go to the next ripple
+	}
+
+	//ri.Printf( PRINT_DEVELOPER, "RE_AddRippleToScene: numripples is %i\n", r_numripples);
+
+	// Got a clean ripple, initialize it
+	r->timeStart = 	backEnd.refdef.time;
+	r->timeEnd = 	backEnd.refdef.time + (1000);
+	
+	VectorCopy (org, r->origin);
+	r->radius = intensity;
+	r->amp = intensity * 0.12f;
+
+	r->ogAmp = r->amp;
+	r->ogRadius = r->radius;
+
+	if (riptime > tr.refdef.time + 500) // wait a sec, is there a big drift????
+		riptime = 0;
+}
+
+
+void RE_ManageRipples( void ) {
+	ripple_t	*r;
+	int f;
+	float pastrip;
+	float frip;
+	pastrip = tr.refdef.time - riptime;
+	if ( !tr.refdef.enableRipples ) {
+		return;
+	}
+
+	if ( !r_ripples->value ) {
+		return;
+	}
+
+	for (f=0; f<MAX_RIPPLES;f++)
+	{
+		r = &backEndData->ripples[f];
+		r->radius += 1-(pastrip)/160.0f;	// FIXME: this is currently wrong 
+		r->amp *= 1-(pastrip)/130.0f;		// as i only developed this on com_maxfps 144
+		if (r->amp <= 0.0004f){ r->amp =0; r_numripples--; }	// kill it if we don't amp much.
+
+	}
+	riptime = tr.refdef.time + 4;
+}
+
+
 /*
 @@@@@@@@@@@@@@@@@@@@@
 RE_RenderScene
@@ -388,6 +480,10 @@ void RE_RenderScene( const refdef_t *fd ) {
 	tr.refdef.numPolys = r_numpolys - r_firstScenePoly;
 	tr.refdef.polys = &backEndData->polys[r_firstScenePoly];
 
+	tr.refdef.num_ripple = r_numripples - r_firstSceneRipple;
+	tr.refdef.ripple = &backEndData->ripples[r_firstSceneRipple];
+
+
 	// turn off dynamic lighting globally by clearing all the
 	// dlights if it needs to be disabled or if vertex lighting is enabled
 	if ( r_dynamiclight->integer == 0 // ||
@@ -460,13 +556,15 @@ void RE_RenderScene( const refdef_t *fd ) {
 
 	VectorCopy( fd->vieworg, parms.pvsOrigin );
 
+	RE_ManageRipples();
+
 	R_RenderView( &parms );
 
 	// the next scene rendered in this frame will tack on after this one
 	r_firstSceneDrawSurf = tr.refdef.numDrawSurfs;
 	r_firstSceneEntity = r_numentities;
 	r_firstSceneDlight = r_numdlights;
 	r_firstScenePoly = r_numpolys;
-
+	r_firstSceneRipple = r_numripples;
 	tr.frontEndMsec += ri.Milliseconds() - startTime;
 }