diff options
author | Andrey Nazarov <skuller@skuller.net> | 2012-12-13 19:18:24 +0400 |
---|---|---|
committer | Andrey Nazarov <skuller@skuller.net> | 2012-12-13 21:22:34 +0400 |
commit | 9efdff180d08711142a6a00b9bd27371d4105cfc (patch) | |
tree | 685f383c55872e31e09002a3f43d93643e96f2ac | |
parent | 017874d389bbc5eab57029f0ad520e48fda0ad94 (diff) |
Add R_ prefix to refresh local function.
-rw-r--r-- | src/refresh/sw/edge.c | 10 | ||||
-rw-r--r-- | src/refresh/sw/misc.c | 6 | ||||
-rw-r--r-- | src/refresh/sw/poly.c | 8 | ||||
-rw-r--r-- | src/refresh/sw/raster.c | 8 | ||||
-rw-r--r-- | src/refresh/sw/sw.h | 2 |
5 files changed, 17 insertions, 17 deletions
diff --git a/src/refresh/sw/edge.c b/src/refresh/sw/edge.c index 529aa9a..2599d41 100644 --- a/src/refresh/sw/edge.c +++ b/src/refresh/sw/edge.c @@ -761,8 +761,8 @@ void D_CalcGradients(mface_t *pface) mipscale = 1.0 / (float)(1 << miplevel); - TransformVector(pface->texinfo->axis[0], p_saxis); - TransformVector(pface->texinfo->axis[1], p_taxis); + R_TransformVector(pface->texinfo->axis[0], p_saxis); + R_TransformVector(pface->texinfo->axis[1], p_taxis); t = xscaleinv * mipscale; d_sdivzstepu = p_saxis[0] * t; @@ -846,7 +846,7 @@ void D_TurbulentSurf(surf_t *s) // R_RotateBmodel () VectorSubtract(r_origin, currententity->origin, local_modelorg); - TransformVector(local_modelorg, transformed_modelorg); + R_TransformVector(local_modelorg, transformed_modelorg); R_RotateBmodel(); // FIXME: don't mess with the frustum, // make entity passed in @@ -931,7 +931,7 @@ void D_SolidSurf(surf_t *s) currententity = s->entity; //FIXME: make this passed in to // R_RotateBmodel () VectorSubtract(r_origin, currententity->origin, local_modelorg); - TransformVector(local_modelorg, transformed_modelorg); + R_TransformVector(local_modelorg, transformed_modelorg); R_RotateBmodel(); // FIXME: don't mess with the frustum, // make entity passed in @@ -1033,7 +1033,7 @@ void D_DrawSurfaces(void) // currententity = NULL; //&r_worldentity; VectorSubtract(r_origin, vec3_origin, modelorg); - TransformVector(modelorg, transformed_modelorg); + R_TransformVector(modelorg, transformed_modelorg); VectorCopy(transformed_modelorg, world_transformed_modelorg); if (sw_drawsird->integer) { diff --git a/src/refresh/sw/misc.c b/src/refresh/sw/misc.c index 45a5d3a..62609a3 100644 --- a/src/refresh/sw/misc.c +++ b/src/refresh/sw/misc.c @@ -195,10 +195,10 @@ void R_TransformFrustum(void) /* ================ -TransformVector +R_TransformVector ================ */ -void TransformVector(vec3_t in, vec3_t out) +void R_TransformVector(vec3_t in, vec3_t out) { out[0] = DotProduct(in, vright); out[1] = DotProduct(in, vup); @@ -217,7 +217,7 @@ void R_TransformPlane(cplane_t *p, float *normal, float *dist) d = DotProduct(r_origin, p->normal); *dist = p->dist - d; // TODO: when we have rotating entities, this will need to use the view matrix - TransformVector(p->normal, normal); + R_TransformVector(p->normal, normal); } diff --git a/src/refresh/sw/poly.c b/src/refresh/sw/poly.c index 620d091..860b59f 100644 --- a/src/refresh/sw/poly.c +++ b/src/refresh/sw/poly.c @@ -577,7 +577,7 @@ static void R_ClipAndDrawPoly(float alpha, int isturbulent, int textured) for (i = 0; i < nump; i++) { VectorSubtract(pv, r_origin, local); - TransformVector(local, transformed); + R_TransformVector(local, transformed); if (transformed[2] < NEAR_CLIP) transformed[2] = NEAR_CLIP; @@ -678,9 +678,9 @@ static void R_PolygonCalculateGradients(void) vec3_t p_normal, p_saxis, p_taxis; float distinv; - TransformVector(r_polydesc.vpn, p_normal); - TransformVector(r_polydesc.vright, p_saxis); - TransformVector(r_polydesc.vup, p_taxis); + R_TransformVector(r_polydesc.vpn, p_normal); + R_TransformVector(r_polydesc.vright, p_saxis); + R_TransformVector(r_polydesc.vup, p_taxis); distinv = 1.0 / (-(DotProduct(r_polydesc.viewer_position, r_polydesc.vpn)) + r_polydesc.dist); diff --git a/src/refresh/sw/raster.c b/src/refresh/sw/raster.c index e93622c..a50e877 100644 --- a/src/refresh/sw/raster.c +++ b/src/refresh/sw/raster.c @@ -83,7 +83,7 @@ void R_EmitEdge(mvertex_t *pv0, mvertex_t *pv1) // transform and project VectorSubtract(world, modelorg, local); - TransformVector(local, transformed); + R_TransformVector(local, transformed); if (transformed[2] < NEAR_CLIP) transformed[2] = NEAR_CLIP; @@ -112,7 +112,7 @@ void R_EmitEdge(mvertex_t *pv0, mvertex_t *pv1) // transform and project VectorSubtract(world, modelorg, local); - TransformVector(local, transformed); + R_TransformVector(local, transformed); if (transformed[2] < NEAR_CLIP) transformed[2] = NEAR_CLIP; @@ -462,7 +462,7 @@ void R_RenderFace(mface_t *fa, int clipflags) pplane = fa->plane; // FIXME: cache this? - TransformVector(pplane->normal, p_normal); + R_TransformVector(pplane->normal, p_normal); // FIXME: cache this? distinv = 1.0 / (pplane->dist - DotProduct(modelorg, pplane->normal)); @@ -576,7 +576,7 @@ void R_RenderBmodelFace(bedge_t *pedges, mface_t *psurf) pplane = psurf->plane; // FIXME: cache this? - TransformVector(pplane->normal, p_normal); + R_TransformVector(pplane->normal, p_normal); // FIXME: cache this? distinv = 1.0 / (pplane->dist - DotProduct(modelorg, pplane->normal)); diff --git a/src/refresh/sw/sw.h b/src/refresh/sw/sw.h index 1e38a05..9f17db7 100644 --- a/src/refresh/sw/sw.h +++ b/src/refresh/sw/sw.h @@ -455,7 +455,7 @@ extern float xscale, yscale; extern float xscaleinv, yscaleinv; extern float xscaleshrink, yscaleshrink; -extern void TransformVector(vec3_t in, vec3_t out); +extern void R_TransformVector(vec3_t in, vec3_t out); extern void SetUpForLineScan(fixed8_t startvertu, fixed8_t startvertv, fixed8_t endvertu, fixed8_t endvertv); |