From 41072eb020ee728572a0c5174448c756ac8c034e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 5 Apr 2021 19:20:41 +0200 Subject: [PATCH] - fixed uninitialized scale variable in sky code. --- source/common/rendering/hwrenderer/data/hw_renderstate.h | 2 +- source/common/rendering/hwrenderer/data/hw_skydome.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/common/rendering/hwrenderer/data/hw_renderstate.h b/source/common/rendering/hwrenderer/data/hw_renderstate.h index 07cc8819f..54aab25f8 100644 --- a/source/common/rendering/hwrenderer/data/hw_renderstate.h +++ b/source/common/rendering/hwrenderer/data/hw_renderstate.h @@ -273,7 +273,7 @@ public: mSpecialEffect = EFF_NONE; mLightIndex = -1; mStreamData.uInterpolationFactor = 0; - mRenderStyle = LegacyRenderStyles[STYLE_Translucent]; + mRenderStyle = DefaultRenderStyle(); mMaterial.Reset(); mBias.Reset(); mPassType = NORMAL_PASS; diff --git a/source/common/rendering/hwrenderer/data/hw_skydome.cpp b/source/common/rendering/hwrenderer/data/hw_skydome.cpp index 2a16ccbf3..5d5ee8000 100644 --- a/source/common/rendering/hwrenderer/data/hw_skydome.cpp +++ b/source/common/rendering/hwrenderer/data/hw_skydome.cpp @@ -202,7 +202,7 @@ void FSkyVertexBuffer::SkyVertexBuild(int r, int c, bool zflip) // And the texture coordinates. if (zflip) r = mRows * 2 - r; - vert.u = 0.5 + (-c / (float)mColumns); + vert.u = 0.5f + (-c / (float)mColumns); vert.v = (r / (float)(2*mRows)); // And finally the vertex. @@ -413,11 +413,13 @@ void FSkyVertexBuffer::SetupMatrices(FGameTexture *tex, float x_offset, float y_ { modelMatrix.translate(0.f, -1250.f, 0.f); modelMatrix.scale(1.f, texh / 230.f, 1.f); + yscale = 1.f; } else if (texh <= 240) { modelMatrix.translate(0.f, (200 - texh + texskyoffset) * skyoffsetfactor, 0.f); modelMatrix.scale(1.f, 1.f + ((texh - 200.f) / 200.f) * 1.17f, 1.f); + yscale = 1.f; } else {