From 0edac28ed464a4120dabb42cb8ca08845b4fe005 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Thu, 16 Nov 2017 13:49:25 -1000 Subject: [PATCH] Various CAutoMapper fixes --- Runtime/AutoMapper/CMapWorld.cpp | 4 +++- Runtime/Graphics/CBooRenderer.cpp | 16 ++++++++-------- .../Graphics/Shaders/CColoredQuadFilterGLSL.cpp | 8 ++++---- .../Graphics/Shaders/CColoredQuadFilterHLSL.cpp | 4 ++-- .../Graphics/Shaders/CRandomStaticFilterGLSL.cpp | 8 ++++---- .../Graphics/Shaders/CRandomStaticFilterHLSL.cpp | 8 ++++---- .../Graphics/Shaders/CScanLinesFilterGLSL.cpp | 8 ++++---- .../Graphics/Shaders/CScanLinesFilterHLSL.cpp | 4 ++-- .../Graphics/Shaders/CTextSupportShaderGLSL.cpp | 5 +++-- .../Graphics/Shaders/CTexturedQuadFilterGLSL.cpp | 16 ++++++++-------- .../Graphics/Shaders/CTexturedQuadFilterHLSL.cpp | 8 ++++---- Runtime/MP1/CPauseScreenBlur.cpp | 4 ++-- Runtime/World/CPlayer.cpp | 6 +++--- hecl | 2 +- 14 files changed, 52 insertions(+), 49 deletions(-) diff --git a/Runtime/AutoMapper/CMapWorld.cpp b/Runtime/AutoMapper/CMapWorld.cpp index 44c3c1b1c..214202852 100644 --- a/Runtime/AutoMapper/CMapWorld.cpp +++ b/Runtime/AutoMapper/CMapWorld.cpp @@ -50,13 +50,15 @@ void CMapWorld::SetWhichMapAreasLoaded(const IWorld& wld, int start, int count) for (int i=0 ; i<2 ; ++i) { - for (CMapAreaData* data = x10_listHeads[i] ; data ; data = data->NextMapAreaData()) + for (CMapAreaData* data = x10_listHeads[i] ; data ;) { + CMapAreaData* nextData = data->NextMapAreaData(); if (!IsMapAreaInBFSInfoVector(data, bfsInfos)) { data->Unlock(); MoveMapAreaToList(data, EMapAreaList::Unloaded); } + data = nextData; } } diff --git a/Runtime/Graphics/CBooRenderer.cpp b/Runtime/Graphics/CBooRenderer.cpp index 1135ec413..98060e9d9 100644 --- a/Runtime/Graphics/CBooRenderer.cpp +++ b/Runtime/Graphics/CBooRenderer.cpp @@ -659,12 +659,12 @@ void CBooRenderer::GenerateScanLinesVBO(boo::IGraphicsDataFactory::Context& ctx) for (int i=0 ; i<112 ; ++i) { + verts.push_back(zeus::CVector3f(-1.f, (i * (4.f / 448.f) + (1.f / 448.f)) * 2.f - 1.f, 0.f)); if (i != 0) verts.push_back(verts.back()); - verts.push_back(zeus::CVector3f(-1.f, 0.f, (i * (4.f / 448.f) + (1.f / 448.f)) * 2.f - 1.f)); - verts.push_back(zeus::CVector3f(-1.f, 0.f, (i * (4.f / 448.f) - (1.f / 448.f)) * 2.f - 1.f)); - verts.push_back(zeus::CVector3f( 1.f, 0.f, (i * (4.f / 448.f) + (1.f / 448.f)) * 2.f - 1.f)); - verts.push_back(zeus::CVector3f( 1.f, 0.f, (i * (4.f / 448.f) - (1.f / 448.f)) * 2.f - 1.f)); + verts.push_back(zeus::CVector3f(-1.f, (i * (4.f / 448.f) - (1.f / 448.f)) * 2.f - 1.f, 0.f)); + verts.push_back(zeus::CVector3f( 1.f, (i * (4.f / 448.f) + (1.f / 448.f)) * 2.f - 1.f, 0.f)); + verts.push_back(zeus::CVector3f( 1.f, (i * (4.f / 448.f) - (1.f / 448.f)) * 2.f - 1.f, 0.f)); if (i != 111) verts.push_back(verts.back()); } @@ -676,12 +676,12 @@ void CBooRenderer::GenerateScanLinesVBO(boo::IGraphicsDataFactory::Context& ctx) for (int i=0 ; i<112 ; ++i) { + verts.push_back(zeus::CVector3f(-1.f, (i * (4.f / 448.f) + (3.f / 448.f)) * 2.f - 1.f, 0.f)); if (i != 0) verts.push_back(verts.back()); - verts.push_back(zeus::CVector3f(-1.f, 0.f, (i * (4.f / 448.f) + (3.f / 448.f)) * 2.f - 1.f)); - verts.push_back(zeus::CVector3f(-1.f, 0.f, (i * (4.f / 448.f) + (1.f / 448.f)) * 2.f - 1.f)); - verts.push_back(zeus::CVector3f( 1.f, 0.f, (i * (4.f / 448.f) + (3.f / 448.f)) * 2.f - 1.f)); - verts.push_back(zeus::CVector3f( 1.f, 0.f, (i * (4.f / 448.f) + (1.f / 448.f)) * 2.f - 1.f)); + verts.push_back(zeus::CVector3f(-1.f, (i * (4.f / 448.f) + (1.f / 448.f)) * 2.f - 1.f, 0.f)); + verts.push_back(zeus::CVector3f( 1.f, (i * (4.f / 448.f) + (3.f / 448.f)) * 2.f - 1.f, 0.f)); + verts.push_back(zeus::CVector3f( 1.f, (i * (4.f / 448.f) + (1.f / 448.f)) * 2.f - 1.f, 0.f)); if (i != 111) verts.push_back(verts.back()); } diff --git a/Runtime/Graphics/Shaders/CColoredQuadFilterGLSL.cpp b/Runtime/Graphics/Shaders/CColoredQuadFilterGLSL.cpp index 29733ea33..833fa84bd 100644 --- a/Runtime/Graphics/Shaders/CColoredQuadFilterGLSL.cpp +++ b/Runtime/Graphics/Shaders/CColoredQuadFilterGLSL.cpp @@ -109,8 +109,8 @@ CColoredQuadFilter::Initialize(boo::GLDataFactory::Context& ctx) s_AddPipeline = ctx.newShaderPipeline(VS, FS, 0, nullptr, 1, uniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); - s_MultPipeline = ctx.newShaderPipeline(VS, FS, 0, nullptr, 1, uniNames, boo::BlendFactor::SrcColor, - boo::BlendFactor::DstColor, boo::Primitive::TriStrips, + s_MultPipeline = ctx.newShaderPipeline(VS, FS, 0, nullptr, 1, uniNames, boo::BlendFactor::Zero, + boo::BlendFactor::SrcColor, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); return new CColoredQuadFilterGLDataBindingFactory; } @@ -138,8 +138,8 @@ CColoredQuadFilter::Initialize(boo::VulkanDataFactory::Context& ctx) s_AddPipeline = ctx.newShaderPipeline(VS, FS, s_VtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); - s_MultPipeline = ctx.newShaderPipeline(VS, FS, s_VtxFmt, boo::BlendFactor::SrcColor, - boo::BlendFactor::DstColor, boo::Primitive::TriStrips, + s_MultPipeline = ctx.newShaderPipeline(VS, FS, s_VtxFmt, boo::BlendFactor::Zero, + boo::BlendFactor::SrcColor, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); return new CColoredQuadFilterVulkanDataBindingFactory; } diff --git a/Runtime/Graphics/Shaders/CColoredQuadFilterHLSL.cpp b/Runtime/Graphics/Shaders/CColoredQuadFilterHLSL.cpp index d72e8fd59..486256caf 100644 --- a/Runtime/Graphics/Shaders/CColoredQuadFilterHLSL.cpp +++ b/Runtime/Graphics/Shaders/CColoredQuadFilterHLSL.cpp @@ -95,8 +95,8 @@ CColoredQuadFilter::Initialize(boo::ID3DDataFactory::Context& ctx) boo::BlendFactor::One, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); s_MultPipeline = ctx.newShaderPipeline(VS, FS, nullptr, nullptr, nullptr, - s_VtxFmt, boo::BlendFactor::SrcColor, - boo::BlendFactor::DstColor, boo::Primitive::TriStrips, + s_VtxFmt, boo::BlendFactor::Zero, + boo::BlendFactor::SrcColor, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); return new CColoredQuadFilterD3DDataBindingFactory; } diff --git a/Runtime/Graphics/Shaders/CRandomStaticFilterGLSL.cpp b/Runtime/Graphics/Shaders/CRandomStaticFilterGLSL.cpp index 20d77cd6e..7be6e009d 100644 --- a/Runtime/Graphics/Shaders/CRandomStaticFilterGLSL.cpp +++ b/Runtime/Graphics/Shaders/CRandomStaticFilterGLSL.cpp @@ -177,11 +177,11 @@ CRandomStaticFilter::Initialize(boo::GLDataFactory::Context& ctx) s_AddPipeline = ctx.newShaderPipeline(VS, FS, 1, texNames, 1, uniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); - s_MultPipeline = ctx.newShaderPipeline(VS, FS, 1, texNames, 1, uniNames, boo::BlendFactor::SrcColor, - boo::BlendFactor::DstColor, boo::Primitive::TriStrips, + s_MultPipeline = ctx.newShaderPipeline(VS, FS, 1, texNames, 1, uniNames, boo::BlendFactor::Zero, + boo::BlendFactor::SrcColor, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); - s_CookieCutterPipeline = ctx.newShaderPipeline(VS, FSCookieCutter, 1, texNames, 1, uniNames, boo::BlendFactor::SrcColor, - boo::BlendFactor::DstColor, boo::Primitive::TriStrips, + s_CookieCutterPipeline = ctx.newShaderPipeline(VS, FSCookieCutter, 1, texNames, 1, uniNames, boo::BlendFactor::Zero, + boo::BlendFactor::SrcColor, boo::Primitive::TriStrips, boo::ZTest::LEqual, true, false, false, boo::CullMode::None); return new CRandomStaticFilterGLDataBindingFactory; } diff --git a/Runtime/Graphics/Shaders/CRandomStaticFilterHLSL.cpp b/Runtime/Graphics/Shaders/CRandomStaticFilterHLSL.cpp index 0973cc792..3d90dc339 100644 --- a/Runtime/Graphics/Shaders/CRandomStaticFilterHLSL.cpp +++ b/Runtime/Graphics/Shaders/CRandomStaticFilterHLSL.cpp @@ -160,12 +160,12 @@ CRandomStaticFilter::Initialize(boo::ID3DDataFactory::Context& ctx) boo::BlendFactor::One, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); s_MultPipeline = ctx.newShaderPipeline(VS, FS, nullptr, nullptr, nullptr, s_VtxFmt, - boo::BlendFactor::SrcColor, - boo::BlendFactor::DstColor, boo::Primitive::TriStrips, + boo::BlendFactor::Zero, + boo::BlendFactor::SrcColor, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); s_CookieCutterPipeline = ctx.newShaderPipeline(VS, FSCookieCutter, nullptr, nullptr, nullptr, s_VtxFmt, - boo::BlendFactor::SrcColor, - boo::BlendFactor::DstColor, boo::Primitive::TriStrips, + boo::BlendFactor::Zero, + boo::BlendFactor::SrcColor, boo::Primitive::TriStrips, boo::ZTest::LEqual, true, false, false, boo::CullMode::None); return new CRandomStaticFilterD3DDataBindingFactory; } diff --git a/Runtime/Graphics/Shaders/CScanLinesFilterGLSL.cpp b/Runtime/Graphics/Shaders/CScanLinesFilterGLSL.cpp index 373df2fbc..531eef997 100644 --- a/Runtime/Graphics/Shaders/CScanLinesFilterGLSL.cpp +++ b/Runtime/Graphics/Shaders/CScanLinesFilterGLSL.cpp @@ -115,8 +115,8 @@ CScanLinesFilter::Initialize(boo::GLDataFactory::Context& ctx) s_AddPipeline = ctx.newShaderPipeline(VS, FS, 0, nullptr, 1, uniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); - s_MultPipeline = ctx.newShaderPipeline(VS, FS, 0, nullptr, 1, uniNames, boo::BlendFactor::SrcColor, - boo::BlendFactor::DstColor, boo::Primitive::TriStrips, + s_MultPipeline = ctx.newShaderPipeline(VS, FS, 0, nullptr, 1, uniNames, boo::BlendFactor::Zero, + boo::BlendFactor::SrcColor, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); return new CScanLinesFilterGLDataBindingFactory; } @@ -144,8 +144,8 @@ CScanLinesFilter::Initialize(boo::VulkanDataFactory::Context& ctx) s_AddPipeline = ctx.newShaderPipeline(VS, FS, s_VtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); - s_MultPipeline = ctx.newShaderPipeline(VS, FS, s_VtxFmt, boo::BlendFactor::SrcColor, - boo::BlendFactor::DstColor, boo::Primitive::TriStrips, + s_MultPipeline = ctx.newShaderPipeline(VS, FS, s_VtxFmt, boo::BlendFactor::Zero, + boo::BlendFactor::SrcColor, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); return new CScanLinesFilterVulkanDataBindingFactory; } diff --git a/Runtime/Graphics/Shaders/CScanLinesFilterHLSL.cpp b/Runtime/Graphics/Shaders/CScanLinesFilterHLSL.cpp index be1f71a10..8f2aa5fff 100644 --- a/Runtime/Graphics/Shaders/CScanLinesFilterHLSL.cpp +++ b/Runtime/Graphics/Shaders/CScanLinesFilterHLSL.cpp @@ -100,8 +100,8 @@ CScanLinesFilter::Initialize(boo::ID3DDataFactory::Context& ctx) boo::BlendFactor::One, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); s_MultPipeline = ctx.newShaderPipeline(VS, FS, nullptr, nullptr, nullptr, - s_VtxFmt, boo::BlendFactor::SrcColor, - boo::BlendFactor::DstColor, boo::Primitive::TriStrips, + s_VtxFmt, boo::BlendFactor::Zero, + boo::BlendFactor::SrcColor, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); return new CScanLinesFilterD3DDataBindingFactory; } diff --git a/Runtime/Graphics/Shaders/CTextSupportShaderGLSL.cpp b/Runtime/Graphics/Shaders/CTextSupportShaderGLSL.cpp index 09225f00a..3bbaa0ece 100644 --- a/Runtime/Graphics/Shaders/CTextSupportShaderGLSL.cpp +++ b/Runtime/Graphics/Shaders/CTextSupportShaderGLSL.cpp @@ -82,9 +82,10 @@ BOO_GLSL_BINDING_HEAD "SBINDING(0) out VertToFrag vtf;\n" "void main()\n" "{\n" -" vtf.color = color * colorIn;\n" +" vec3 pos = posIn[gl_VertexID].xyz;\n" " vtf.uv = uvIn[gl_VertexID];\n" -" gl_Position = mtx * vec4(posIn[gl_VertexID].xyz, 1.0);\n" +" vtf.color = color * colorIn;\n" +" gl_Position = mtx * vec4(pos, 1.0);\n" "}\n"; static const char* ImgFS = diff --git a/Runtime/Graphics/Shaders/CTexturedQuadFilterGLSL.cpp b/Runtime/Graphics/Shaders/CTexturedQuadFilterGLSL.cpp index d7539a73f..2af1ad5bc 100644 --- a/Runtime/Graphics/Shaders/CTexturedQuadFilterGLSL.cpp +++ b/Runtime/Graphics/Shaders/CTexturedQuadFilterGLSL.cpp @@ -199,8 +199,8 @@ CTexturedQuadFilter::Initialize(boo::GLDataFactory::Context& ctx) s_AddPipeline = ctx.newShaderPipeline(VSNoFlip, FS, 1, texNames, 1, uniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); - s_MultPipeline = ctx.newShaderPipeline(VSNoFlip, FS, 1, texNames, 1, uniNames, boo::BlendFactor::SrcColor, - boo::BlendFactor::DstColor, boo::Primitive::TriStrips, + s_MultPipeline = ctx.newShaderPipeline(VSNoFlip, FS, 1, texNames, 1, uniNames, boo::BlendFactor::Zero, + boo::BlendFactor::SrcColor, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); return new CTexturedQuadFilterGLDataBindingFactory; } @@ -233,8 +233,8 @@ CTexturedQuadFilter::Initialize(boo::VulkanDataFactory::Context& ctx) s_AddPipeline = ctx.newShaderPipeline(VSNoFlip, FS, s_VtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); - s_MultPipeline = ctx.newShaderPipeline(VSNoFlip, FS, s_VtxFmt, boo::BlendFactor::SrcColor, - boo::BlendFactor::DstColor, boo::Primitive::TriStrips, + s_MultPipeline = ctx.newShaderPipeline(VSNoFlip, FS, s_VtxFmt, boo::BlendFactor::Zero, + boo::BlendFactor::SrcColor, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); return new CTexturedQuadFilterVulkanDataBindingFactory; } @@ -302,8 +302,8 @@ CTexturedQuadFilterAlpha::Initialize(boo::GLDataFactory::Context& ctx) s_AAddPipeline = ctx.newShaderPipeline(VSFlip, FSAlpha, 1, texNames, 1, uniNames, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); - s_AMultPipeline = ctx.newShaderPipeline(VSFlip, FSAlpha, 1, texNames, 1, uniNames, boo::BlendFactor::SrcColor, - boo::BlendFactor::DstColor, boo::Primitive::TriStrips, + s_AMultPipeline = ctx.newShaderPipeline(VSFlip, FSAlpha, 1, texNames, 1, uniNames, boo::BlendFactor::Zero, + boo::BlendFactor::SrcColor, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); return new CTexturedQuadFilterAlphaGLDataBindingFactory; } @@ -332,8 +332,8 @@ CTexturedQuadFilterAlpha::Initialize(boo::VulkanDataFactory::Context& ctx) s_AAddPipeline = ctx.newShaderPipeline(VSFlip, FSAlpha, s_AVtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, boo::Primitive::TriStrips, boo::ZTest::None, false, true, true, boo::CullMode::None); - s_AMultPipeline = ctx.newShaderPipeline(VSFlip, FSAlpha, s_AVtxFmt, boo::BlendFactor::SrcColor, - boo::BlendFactor::DstColor, boo::Primitive::TriStrips, + s_AMultPipeline = ctx.newShaderPipeline(VSFlip, FSAlpha, s_AVtxFmt, boo::BlendFactor::Zero, + boo::BlendFactor::SrcColor, boo::Primitive::TriStrips, boo::ZTest::None, false, true, true, boo::CullMode::None); return new CTexturedQuadFilterAlphaVulkanDataBindingFactory; } diff --git a/Runtime/Graphics/Shaders/CTexturedQuadFilterHLSL.cpp b/Runtime/Graphics/Shaders/CTexturedQuadFilterHLSL.cpp index 486dcb659..949f7560c 100644 --- a/Runtime/Graphics/Shaders/CTexturedQuadFilterHLSL.cpp +++ b/Runtime/Graphics/Shaders/CTexturedQuadFilterHLSL.cpp @@ -167,8 +167,8 @@ CTexturedQuadFilter::Initialize(boo::ID3DDataFactory::Context& ctx) boo::BlendFactor::One, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); s_MultPipeline = ctx.newShaderPipeline(VSNoFlip, FS, nullptr, nullptr, nullptr, - s_VtxFmt, boo::BlendFactor::SrcColor, - boo::BlendFactor::DstColor, boo::Primitive::TriStrips, + s_VtxFmt, boo::BlendFactor::Zero, + boo::BlendFactor::SrcColor, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); return new CTexturedQuadFilterD3DDataBindingFactory; } @@ -237,8 +237,8 @@ CTexturedQuadFilterAlpha::Initialize(boo::ID3DDataFactory::Context& ctx) boo::BlendFactor::One, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); s_AMultPipeline = ctx.newShaderPipeline(VSFlip, FSAlpha, nullptr, nullptr, nullptr, - s_AVtxFmt, boo::BlendFactor::SrcColor, - boo::BlendFactor::DstColor, boo::Primitive::TriStrips, + s_AVtxFmt, boo::BlendFactor::Zero, + boo::BlendFactor::SrcColor, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); return new CTexturedQuadFilterAlphaD3DDataBindingFactory; } diff --git a/Runtime/MP1/CPauseScreenBlur.cpp b/Runtime/MP1/CPauseScreenBlur.cpp index d24884735..498313365 100644 --- a/Runtime/MP1/CPauseScreenBlur.cpp +++ b/Runtime/MP1/CPauseScreenBlur.cpp @@ -9,8 +9,8 @@ namespace MP1 { CPauseScreenBlur::CPauseScreenBlur() +: x4_mapLightQuarter(g_SimplePool->GetObj("TXTR_MapLightQuarter")) { - x4_mapLightQuarter = g_SimplePool->GetObj("TXTR_MapLightQuarter"); x50_25_gameDraw = true; } @@ -106,7 +106,7 @@ void CPauseScreenBlur::Draw(const CStateManager&) const { zeus::CColor filterColor = zeus::CColor::lerp(zeus::CColor::skWhite, g_tweakGuiColors->GetPauseBlurFilterColor(), t); - const_cast(m_quarterFilter).DrawFilter(EFilterShape::FullscreenQuarters, filterColor, t); + const_cast(m_quarterFilter).DrawFilter(EFilterShape::FullscreenQuarters, filterColor, t * (31.f/32.f)); zeus::CColor scanLinesColor = zeus::CColor::lerp(zeus::CColor::skWhite, zeus::CColor(0.75f, 1.f), t); const_cast(m_linesFilter).draw(scanLinesColor); diff --git a/Runtime/World/CPlayer.cpp b/Runtime/World/CPlayer.cpp index d0e75410a..c5ff9a5aa 100644 --- a/Runtime/World/CPlayer.cpp +++ b/Runtime/World/CPlayer.cpp @@ -617,17 +617,17 @@ void CPlayer::Update(float dt, CStateManager& mgr) static const float skStrafeDistances[] = { - 11.8, 11.8, 11.8, 5.0, 6.0, 5.0, 5.0, 6.0 + 11.8f, 11.8f, 11.8f, 5.0f, 6.0f, 5.0f, 5.0f, 6.0f }; static const float skDashStrafeDistances[] = { - 30.0, 22.6, 10.0, 10.0, 10.0, 10.0, 10.0 + 30.0f, 22.6f, 10.0f, 10.0f, 10.0f, 10.0f, 10.0f }; static const float skOrbitForwardDistances[] = { - 11.8, 11.8, 11.8, 5.0, 6.0, 5.0, 5.0, 6.0 + 11.8f, 11.8f, 11.8f, 5.0f, 6.0f, 5.0f, 5.0f, 6.0f }; float CPlayer::UpdateCameraBob(float dt, CStateManager& mgr) diff --git a/hecl b/hecl index 97734162b..b57b00da0 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 97734162b1cbebac86078c07f4586a977091a9a7 +Subproject commit b57b00da0be1d40be7b413b923f1de0ddb432735