Forgot to commit removal of DrawDecal

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1562 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/r_light.c b/r_light.c
index 9a46a5b5fb1e48505c183840b06b2e4a4545de17..b67dc484a5f207e124a15aa0ffe14a93d1503cf3 100644 (file)
--- a/r_light.c
+++ b/r_light.c
@@ -196,7 +196,7 @@ void R_DrawCoronas(void)
                                tvxyz[3][0] = rd->origin[0] + vright[0] * scale - vup[0] * scale;
                                tvxyz[3][1] = rd->origin[1] + vright[1] * scale - vup[1] * scale;
                                tvxyz[3][2] = rd->origin[2] + vright[2] * scale - vup[2] * scale;
-                               R_Mesh_DrawDecal(&m);
+                               R_Mesh_Draw(&m);
                        }
                }
        }

diff --git a/r_particles.c b/r_particles.c
index 0c888ecbaa2c3f7bb714d4429a1d76d85f14d05e..f69405bf5bf03caf45a5221d12df3464d9e23efd 100644 (file)
--- a/r_particles.c
+++ b/r_particles.c
@@ -232,7 +232,7 @@ void R_Particles_Init (void)
        R_RegisterModule("R_Particles", r_part_start, r_part_shutdown, r_part_newmap);
 }
 
-//int partindexarray[6] = {0, 1, 2, 0, 2, 3};
+int partindexarray[6] = {0, 1, 2, 0, 2, 3};
 
 void R_DrawParticles (void)
 {
@@ -266,14 +266,14 @@ void R_DrawParticles (void)
        m.transparent = true;
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-       //m.numtriangles = 2;
-       //m.index = partindexarray;
-       //m.numverts = 4;
+       m.numtriangles = 2;
+       m.index = partindexarray;
+       m.numverts = 4;
        m.vertex = &tvxyz[0][0];
-       //m.vertexstep = sizeof(float[4]);
+       m.vertexstep = sizeof(float[4]);
        m.tex[0] = R_GetTexture(particlefonttexture);
        m.texcoords[0] = &tvst[0][0];
-       //m.texcoordstep[0] = sizeof(float[2]);
+       m.texcoordstep[0] = sizeof(float[2]);
 
        for (i = 0, r = r_refdef.particles;i < r_refdef.numparticles;i++, r++)
        {
@@ -365,14 +365,14 @@ void R_DrawParticles (void)
                                                m.cr *= ifog;
                                                m.cg *= ifog;
                                                m.cb *= ifog;
-                                               R_Mesh_DrawDecal(&m);
+                                               R_Mesh_Draw(&m);
                                        }
                                }
                                else
-                                       R_Mesh_DrawDecal(&m);
+                                       R_Mesh_Draw(&m);
                        }
                        else
-                               R_Mesh_DrawDecal(&m);
+                               R_Mesh_Draw(&m);
                }
                else
                {
@@ -400,7 +400,7 @@ void R_DrawParticles (void)
                                                tvst[2][1] = texfog->t2;
                                                tvst[3][0] = texfog->s2;
                                                tvst[3][1] = texfog->t1;
-                                               R_Mesh_DrawDecal(&m);
+                                               R_Mesh_Draw(&m);
                                        }
                                        else
                                        {
@@ -415,12 +415,12 @@ void R_DrawParticles (void)
                                                        m.cr += fogcolor[0] * fog;
                                                        m.cg += fogcolor[1] * fog;
                                                        m.cb += fogcolor[2] * fog;
-                                                       R_Mesh_DrawDecal(&m);
+                                                       R_Mesh_Draw(&m);
                                                }
                                                else
                                                {
                                                        // render the first pass (alpha), then do additive fog
-                                                       R_Mesh_DrawDecal(&m);
+                                                       R_Mesh_Draw(&m);
 
                                                        m.blendfunc2 = GL_ONE;
                                                        m.cr = fogcolor[0];
@@ -435,15 +435,15 @@ void R_DrawParticles (void)
                                                        tvst[2][1] = texfog->t2;
                                                        tvst[3][0] = texfog->s2;
                                                        tvst[3][1] = texfog->t1;
-                                                       R_Mesh_DrawDecal(&m);
+                                                       R_Mesh_Draw(&m);
                                                }
                                        }
                                }
                                else
-                                       R_Mesh_DrawDecal(&m);
+                                       R_Mesh_Draw(&m);
                        }
                        else
-                               R_Mesh_DrawDecal(&m);
+                               R_Mesh_Draw(&m);
                }
        }
 }

diff --git a/r_sprites.c b/r_sprites.c
index 19e676718e10973dc74471f9011bff53f51da600..c34f5dbb741624c4d4933d082044feb9b52505c8 100644 (file)
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -107,7 +107,7 @@ void R_ClipSprite (void)
        R_ClipSpriteImage(org, right, up);
 }
 
-//int spritepolyindex[6] = {0, 1, 2, 0, 2, 3};
+int spritepolyindex[6] = {0, 1, 2, 0, 2, 3};
 
 void GL_DrawSpriteImage (int fog, mspriteframe_t *frame, int texture, vec3_t origin, vec3_t up, vec3_t right, float red, float green, float blue, float alpha)
 {
@@ -123,18 +123,18 @@ void GL_DrawSpriteImage (int fog, mspriteframe_t *frame, int texture, vec3_t ori
         || (currentrenderentity->model->flags & EF_ADDITIVE)
         || fog)
                m.blendfunc2 = GL_ONE;
-       //m.numtriangles = 2;
-       //m.index = spritepolyindex;
-       //m.numverts = 4;
+       m.numtriangles = 2;
+       m.index = spritepolyindex;
+       m.numverts = 4;
        m.vertex = &v[0][0];
-       //m.vertexstep = sizeof(float[4]);
+       m.vertexstep = sizeof(float[4]);
        m.cr = red;
        m.cg = green;
        m.cb = blue;
        m.ca = alpha;
        m.tex[0] = texture;
        m.texcoords[0] = &st[0][0];
-       //m.texcoordstep[0] = sizeof(float[2]);
+       m.texcoordstep[0] = sizeof(float[2]);
 
        v[0][0] = origin[0] + frame->down * up[0] + frame->left  * right[0];
        v[0][1] = origin[1] + frame->down * up[1] + frame->left  * right[1];
@@ -157,7 +157,7 @@ void GL_DrawSpriteImage (int fog, mspriteframe_t *frame, int texture, vec3_t ori
        st[3][0] = 1;
        st[3][1] = 1;
 
-       R_Mesh_DrawDecal(&m);
+       R_Mesh_Draw(&m);
 }
 
 /*