From 4a52f3304ef8453262e09ad083d1d50b64028a94 Mon Sep 17 00:00:00 2001 From: Jan Date: Wed, 30 Mar 2022 19:25:41 +0200 Subject: [PATCH] Fix asset loaders for vertex and pixel shader not using correct file name --- src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPixelShader.cpp | 2 +- .../Game/IW4/AssetLoaders/AssetLoaderVertexShader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPixelShader.cpp b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPixelShader.cpp index 02fcaa09..698715be 100644 --- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPixelShader.cpp +++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPixelShader.cpp @@ -29,7 +29,7 @@ bool AssetLoaderPixelShader::LoadFromRaw(const std::string& assetName, ISearchPa std::ostringstream ss; ss << "shader_bin/ps_" << assetName << ".cso"; - const auto file = searchPath->Open(assetName); + const auto file = searchPath->Open(ss.str()); if (!file.IsOpen()) return false; diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexShader.cpp b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexShader.cpp index c747965d..65ea3bb3 100644 --- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexShader.cpp +++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderVertexShader.cpp @@ -29,7 +29,7 @@ bool AssetLoaderVertexShader::LoadFromRaw(const std::string& assetName, ISearchP std::ostringstream ss; ss << "shader_bin/vs_" << assetName << ".cso"; - const auto file = searchPath->Open(assetName); + const auto file = searchPath->Open(ss.str()); if (!file.IsOpen()) return false;