renamed R_GetFragmentLocation to R_FragmentLocation

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

diff --git a/gl_textures.c b/gl_textures.c
index 2725277e38b033c7a38a12eb9aef93a9aafed024..78bd26a783d9c7dc56b570af7371d72162dad7d9 100644 (file)
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -1458,7 +1458,7 @@ int R_TextureHeight(rtexture_t *rt)
        return ((gltexture_t *)rt)->height;
 }
 
-void R_GetFragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2)
+void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2)
 {
        gltexture_t *glt;
        float iwidth, iheight;
@@ -1482,7 +1482,7 @@ void R_GetFragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy
                return;
        }
        if (!rt)
-               Host_Error("R_GetFragmentLocation: no texture supplied\n");
+               Host_Error("R_FragmentLocation: no texture supplied\n");
        glt = (gltexture_t *)rt;
        if (glt->flags & TEXF_FRAGMENT)
        {

diff --git a/model_brush.c b/model_brush.c
index 34e1726a77f76e93faa73c2df3ca77dcf0002b98..eecc655e3d80346657d852859aa51034ce10a36c 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -1073,7 +1073,7 @@ void Mod_GenerateLightmappedMesh (msurface_t *surf)
        }
 //     surf->lightmaptexture = R_LoadTexture(loadmodel->texturepool, va("lightmap%08x", lightmapnum), surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_PRECACHE);
 //     surf->lightmaptexture = R_LoadTexture(loadmodel->texturepool, va("lightmap%08x", lightmapnum), surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_PRECACHE);
-       R_GetFragmentLocation(surf->lightmaptexture, NULL, NULL, &xbase, &ybase, &xscale, &yscale);
+       R_FragmentLocation(surf->lightmaptexture, NULL, NULL, &xbase, &ybase, &xscale, &yscale);
        xscale = (xscale - xbase) * 16.0 / ((surf->extents[0] & ~15) + 16);
        yscale = (yscale - ybase) * 16.0 / ((surf->extents[1] & ~15) + 16);
 

diff --git a/r_textures.h b/r_textures.h
index 3bf15de7d04ebe8caf8881b27f0e7b5246f55f55..3684133f4c9bca1560ab406e98407cb1749c058a 100644 (file)
--- a/r_textures.h
+++ b/r_textures.h
@@ -55,7 +55,7 @@ rtexture_t *R_ProceduralTexture (rtexturepool_t *rtexturepool, char *identifier,
 void R_UpdateTexture(rtexture_t *rt, byte *data);
 
 // location of the fragment in the texture (note: any parameter except rt can be NULL)
-void R_GetFragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2);
+void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2);
 
 // returns the renderer dependent texture slot number (call this before each use, as a texture might not have been precached, or it might change over time if it is procedural)
 int R_GetTexture (rtexture_t *rt);