qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-25 21:31:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed _EXPERIMENTAL_ from waterripple as it is very stable..

Browse source 
also made the cvar a multiplier (the old multiplier was 8), defaults
to 0.  The cvs2cl changelog should just be whitespace changes, whoops.
This commit is contained in:
Eric Windisch 2000-01-18 03:38:04 +00:00
parent 3f74fe38b8
commit 14168f693a
4 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/gl_rmisc.c
View file

@ -198,8 +198,8 @@ void R_Init (void)
Cvar_RegisterVariable (&r_waterwarp); Cvar_RegisterVariable (&r_waterwarp);
#ifdef _EXPERIMENTAL_ #ifdef _EXPERIMENTAL_
Cvar_RegisterVariable (&r_volfog); Cvar_RegisterVariable (&r_volfog);
Cvar_RegisterVariable (&r_waterripple);
#endif #endif
Cvar_RegisterVariable (&r_waterripple);
Cvar_RegisterVariable (&gl_clear); Cvar_RegisterVariable (&gl_clear);
Cvar_RegisterVariable (&gl_texsort); Cvar_RegisterVariable (&gl_texsort);

5
common/gl_vidglx.c
View file

@ -431,6 +431,11 @@ void GL_Init (void)
glAlphaFunc(GL_GREATER, 0.666); glAlphaFunc(GL_GREATER, 0.666);
glPolygonMode (GL_FRONT_AND_BACK, GL_FILL); glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
/* glShadeMode(GL_SMOOTH) should look better then GL_FLAT but
I don't know if it looks any better, sure is slower
glShadeModel (GL_SMOOTH);
*/
glShadeModel (GL_FLAT); glShadeModel (GL_FLAT);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

16
common/gl_warp.c
View file

@ -198,9 +198,7 @@ EmitWaterPolys ( msurface_t *fa ) {
float *v; float *v;
int i; int i;
float s, t, os, ot; float s, t, os, ot;
#ifdef _EXPERIMENTAL_
vec3_t nv; vec3_t nv;
#endif
for (p=fa->polys ; p ; p=p->next) { for (p=fa->polys ; p ; p=p->next) {
glBegin (GL_POLYGON); glBegin (GL_POLYGON);
@ -216,18 +214,14 @@ EmitWaterPolys ( msurface_t *fa ) {
glTexCoord2f (s, t); glTexCoord2f (s, t);
#ifdef _EXPERIMENTAL_
nv[0] = v[0]; //+ 8*sin(v[1]*0.05+realtime)*sin(v[2]*0.05+realtime);
nv[1] = v[1]; //+ 8*sin(v[0]*0.05+realtime)*sin(v[2]*0.05+realtime);
if(r_waterripple.value) { if(r_waterripple.value) {
nv[2] = v[2] + 8*sin(v[0]*0.05+realtime)*sin(v[2]*0.05+realtime); nv[0] = v[0]; //+8*sin(v[1]*0.05+realtime)*sin(v[2]*0.05+realtime);
} else { nv[1] = v[1]; //+8*sin(v[0]*0.05+realtime)*sin(v[2]*0.05+realtime);
nv[2] = v[2]; nv[2] = v[2] + r_waterripple.value*sin(v[0]*0.05+realtime)*sin(v[2]*0.05+realtime);
}
glVertex3fv (nv); glVertex3fv (nv);
#else } else {
glVertex3fv (v); glVertex3fv (v);
#endif // _EXPERIMENTAL_ }
} }
glEnd (); glEnd ();
} }

2
common/glquake.h
View file

@ -217,9 +217,7 @@ extern cvar_t r_netgraph;
extern cvar_t r_fog; extern cvar_t r_fog;
extern cvar_t r_waterwarp; extern cvar_t r_waterwarp;
extern cvar_t r_volfog; extern cvar_t r_volfog;
#ifdef _EXPERIMENTAL_
extern cvar_t r_waterripple; extern cvar_t r_waterripple;
#endif
extern cvar_t gl_clear; extern cvar_t gl_clear;
extern cvar_t gl_cull; extern cvar_t gl_cull;