no more warping meshs of any kind

[xonotic/darkplaces.git] / gl_rmain.c

diff --git a/gl_rmain.c b/gl_rmain.c
index 3c20a454da7cb53a66988375a48fd43b87d3acf4..a8c8d056ebae58df717882bba917afd7513f4163 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -57,7 +57,6 @@ cvar_t r_speeds = {0, "r_speeds","0"};
 cvar_t r_fullbright = {0, "r_fullbright","0"};
 cvar_t r_wateralpha = {CVAR_SAVE, "r_wateralpha","1"};
 cvar_t r_dynamic = {CVAR_SAVE, "r_dynamic","1"};
-cvar_t r_waterripple = {CVAR_SAVE, "r_waterripple","0"};
 cvar_t r_fullbrights = {CVAR_SAVE, "r_fullbrights", "1"};
 
 cvar_t gl_fogenable = {0, "gl_fogenable", "0"};
@@ -240,7 +239,6 @@ void GL_Main_Init(void)
        Cvar_RegisterVariable (&r_fullbrights);
        Cvar_RegisterVariable (&r_wateralpha);
        Cvar_RegisterVariable (&r_dynamic);
-       Cvar_RegisterVariable (&r_waterripple);
        Cvar_RegisterVariable (&r_fullbright);
        Cvar_RegisterVariable (&r_multitexture);
        if (gamemode == GAME_NEHAHRA)
@@ -364,11 +362,11 @@ static void R_MarkEntities (void)
        int i;
        vec3_t v;
 
+       R_FarClip_Box(cl.worldmodel->normalmins, cl.worldmodel->normalmaxs);
+
        if (!r_drawentities.integer)
                return;
 
-       R_FarClip_Box(cl.worldmodel->normalmins, cl.worldmodel->normalmaxs);
-
        for (i = 0;i < r_refdef.numentities;i++)
        {
                currentrenderentity = r_refdef.entities[i];
@@ -525,12 +523,10 @@ static void R_SetupFrame (void)
 }
 
 
-static int blendviewpolyindex[3] = {0, 1, 2};
-
 static void R_BlendView(void)
 {
-       rmeshinfo_t m;
-       float tvxyz[3][4], r;
+       rmeshbufferinfo_t m;
+       float r;
 
        if (r_refdef.viewblend[3] < 0.01f)
                return;
@@ -542,25 +538,27 @@ static void R_BlendView(void)
        m.depthdisable = true; // magic
        m.numtriangles = 1;
        m.numverts = 3;
-       m.index = blendviewpolyindex;
-       m.vertex = &tvxyz[0][0];
-       m.vertexstep = sizeof(float[4]);
-       m.cr = r_refdef.viewblend[0];
-       m.cg = r_refdef.viewblend[1];
-       m.cb = r_refdef.viewblend[2];
-       m.ca = r_refdef.viewblend[3];
-       r = 64000;
-       tvxyz[0][0] = r_origin[0] + vpn[0] * 1.5 - vright[0] * r - vup[0] * r;
-       tvxyz[0][1] = r_origin[1] + vpn[1] * 1.5 - vright[1] * r - vup[1] * r;
-       tvxyz[0][2] = r_origin[2] + vpn[2] * 1.5 - vright[2] * r - vup[2] * r;
-       r *= 3;
-       tvxyz[1][0] = tvxyz[0][0] + vup[0] * r;
-       tvxyz[1][1] = tvxyz[0][1] + vup[1] * r;
-       tvxyz[1][2] = tvxyz[0][2] + vup[2] * r;
-       tvxyz[2][0] = tvxyz[0][0] + vright[0] * r;
-       tvxyz[2][1] = tvxyz[0][1] + vright[1] * r;
-       tvxyz[2][2] = tvxyz[0][2] + vright[2] * r;
-       R_Mesh_Draw(&m);
+       if (R_Mesh_Draw_GetBuffer(&m))
+       {
+               m.index[0] = 0;
+               m.index[1] = 1;
+               m.index[2] = 2;
+               m.color[0] = m.color[4] = m.color[8] = r_refdef.viewblend[0];
+               m.color[1] = m.color[5] = m.color[9] = r_refdef.viewblend[1];
+               m.color[2] = m.color[6] = m.color[10] = r_refdef.viewblend[2];
+               m.color[3] = m.color[7] = m.color[11] = r_refdef.viewblend[3];
+               r = 64000;
+               m.vertex[0] = r_origin[0] + vpn[0] * 1.5 - vright[0] * r - vup[0] * r;
+               m.vertex[1] = r_origin[1] + vpn[1] * 1.5 - vright[1] * r - vup[1] * r;
+               m.vertex[2] = r_origin[2] + vpn[2] * 1.5 - vright[2] * r - vup[2] * r;
+               r *= 3;
+               m.vertex[4] = m.vertex[0] + vup[0] * r;
+               m.vertex[5] = m.vertex[1] + vup[1] * r;
+               m.vertex[6] = m.vertex[2] + vup[2] * r;
+               m.vertex[8] = m.vertex[0] + vright[0] * r;
+               m.vertex[9] = m.vertex[1] + vright[1] * r;
+               m.vertex[10] = m.vertex[2] + vright[2] * r;
+       }
 }
 
 /*