From 768d633a3d42504c2536470ba98aead8453bbe3b Mon Sep 17 00:00:00 2001 From: danij Date: Fri, 20 Apr 2012 06:11:48 +0100 Subject: [PATCH] Map Renderer|Cleanup: Removed some redundant temporary vectors --- doomsday/engine/portable/src/edit_bias.c | 9 +++------ doomsday/engine/portable/src/rend_fakeradio.c | 10 +++------- doomsday/engine/portable/src/rend_halo.c | 9 +++------ doomsday/engine/portable/src/rend_sky.c | 15 ++++++--------- 4 files changed, 15 insertions(+), 28 deletions(-) diff --git a/doomsday/engine/portable/src/edit_bias.c b/doomsday/engine/portable/src/edit_bias.c index bdabd8ac85..fa7c4ce713 100644 --- a/doomsday/engine/portable/src/edit_bias.c +++ b/doomsday/engine/portable/src/edit_bias.c @@ -955,17 +955,12 @@ static void SBE_HueOffset(double angle, float *offset) static void SBE_DrawHue(void) { - vec3f_t eye; vec3f_t center, off, off2; float steps = 32, inner = 10, outer = 30, s; double angle; float color[4], sel[4], hue, saturation; int i; - eye[0] = vOrigin[VX]; - eye[1] = vOrigin[VY]; - eye[2] = vOrigin[VZ]; - glDisable(GL_DEPTH_TEST); glDisable(GL_CULL_FACE); @@ -978,7 +973,9 @@ static void SBE_DrawHue(void) // The origin of the circle. for(i = 0; i < 3; ++i) - center[i] = eye[i] + hueOrigin[i] * hueDistance; + { + center[i] = (float)(vOrigin[i]) + hueOrigin[i] * hueDistance; + } // Draw the circle. glBegin(GL_QUAD_STRIP); diff --git a/doomsday/engine/portable/src/rend_fakeradio.c b/doomsday/engine/portable/src/rend_fakeradio.c index 7643e9fd82..49affac022 100644 --- a/doomsday/engine/portable/src/rend_fakeradio.c +++ b/doomsday/engine/portable/src/rend_fakeradio.c @@ -1546,21 +1546,17 @@ void Rend_RadioBspLeafEdges(BspLeaf* bspLeaf) static void drawPoint(coord_t pos[3], int radius, const float color[4]) { const viewdata_t* viewData = R_ViewData(viewPlayer - ddPlayers); - coord_t viewPos[3], viewToCenter[3], finalPos[3], leftOff[3], rightOff[3]; + coord_t viewToCenter[3], finalPos[3], leftOff[3], rightOff[3]; float scale, radX, radY; int i; - viewPos[VX] = vOrigin[VX]; - viewPos[VY] = vOrigin[VY]; - viewPos[VZ] = vOrigin[VZ]; - // viewSideVec is to the left. for(i = 0; i < 3; ++i) { - leftOff[i] = viewData->upVec[i] + viewData->sideVec[i]; + leftOff[i] = viewData->upVec[i] + viewData->sideVec[i]; rightOff[i] = viewData->upVec[i] - viewData->sideVec[i]; - viewToCenter[i] = pos[i] - viewPos[i]; + viewToCenter[i] = pos[i] - vOrigin[i]; } scale = (float) V3d_DotProductf(viewToCenter, viewData->frontVec) / diff --git a/doomsday/engine/portable/src/rend_halo.c b/doomsday/engine/portable/src/rend_halo.c index 03df4eab6f..f96a9866cf 100644 --- a/doomsday/engine/portable/src/rend_halo.c +++ b/doomsday/engine/portable/src/rend_halo.c @@ -146,7 +146,6 @@ boolean H_RenderHalo(coord_t x, coord_t y, coord_t z, float size, DGLuint tex, boolean viewRelativeRotate) { int i, k; - float viewPos[3]; float viewToCenter[3], mirror[3], normalViewToCenter[3]; float leftOff[3], rightOff[3], center[3], radius; float haloPos[3]; @@ -194,12 +193,10 @@ boolean H_RenderHalo(coord_t x, coord_t y, coord_t z, float size, DGLuint tex, // Calculate the mirrored position. // Project viewtocenter vector onto viewSideVec. - viewPos[VX] = vOrigin[VX]; - viewPos[VY] = vOrigin[VY]; - viewPos[VZ] = vOrigin[VZ]; - for(i = 0; i < 3; ++i) - normalViewToCenter[i] = viewToCenter[i] = center[i] - viewPos[i]; + { + normalViewToCenter[i] = viewToCenter[i] = center[i] - (float)(vOrigin[i]); + } V3f_Normalize(normalViewToCenter); // Calculate the dimming factor for secondary flares. diff --git a/doomsday/engine/portable/src/rend_sky.c b/doomsday/engine/portable/src/rend_sky.c index 8dc5ea0362..c16f05ecf9 100644 --- a/doomsday/engine/portable/src/rend_sky.c +++ b/doomsday/engine/portable/src/rend_sky.c @@ -99,7 +99,6 @@ static void renderSkyModels(void) { rendmodelparams_t params; skymodel_t* sky; - float pos[3]; float inter; int i, c; @@ -124,19 +123,17 @@ static void renderSkyModels(void) continue; } - // Calculate the coordinates for the model. - pos[0] = vOrigin[VX] * -sky->def->coordFactor[0]; - pos[1] = vOrigin[VY] * -sky->def->coordFactor[1]; - pos[2] = vOrigin[VZ] * -sky->def->coordFactor[2]; - inter = (sky->maxTimer > 0 ? sky->timer / (float) sky->maxTimer : 0); memset(¶ms, 0, sizeof(params)); + // Calculate the coordinates for the model. + params.origin[VX] = vOrigin[VX] * -sky->def->coordFactor[VX]; + params.origin[VY] = vOrigin[VZ] * -sky->def->coordFactor[VZ]; + params.origin[VZ] = vOrigin[VY] * -sky->def->coordFactor[VY]; + params.gzt = params.origin[VZ]; params.distance = 1; - params.origin[VX] = pos[0]; - params.origin[VY] = pos[2]; - params.origin[VZ] = params.gzt = pos[1]; + params.extraYawAngle = params.yawAngleOffset = sky->def->rotate[0]; params.extraPitchAngle = params.pitchAngleOffset = sky->def->rotate[1]; params.inter = inter;