From f3118886042f1a39e3945f3a5ff0b6587cd347d1 Mon Sep 17 00:00:00 2001 From: lordhavoc Date: Sat, 26 Jan 2002 23:18:22 +0000 Subject: [PATCH] renamed R_GetFragmentLocation to R_FragmentLocation git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1409 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_textures.c | 4 ++-- model_brush.c | 2 +- r_textures.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gl_textures.c b/gl_textures.c index 2725277e..78bd26a7 100644 --- 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 34e1726a..eecc655e 100644 --- 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 3bf15de7..3684133f 100644 --- 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); -- 2.39.2