diff --git a/Editor/Editor.ico b/Editor/Editor.ico deleted file mode 100644 index 1f5429f44..000000000 Binary files a/Editor/Editor.ico and /dev/null differ diff --git a/Editor/Editor.rc b/Editor/Editor.rc index d84a71f94..41ab7afd7 100644 Binary files a/Editor/Editor.rc and b/Editor/Editor.rc differ diff --git a/Editor/Editor_Windows.vcxproj b/Editor/Editor_Windows.vcxproj index 90cde43d4..bc8f798a0 100644 --- a/Editor/Editor_Windows.vcxproj +++ b/Editor/Editor_Windows.vcxproj @@ -125,10 +125,6 @@ - - - - @@ -148,6 +144,9 @@ + + + diff --git a/Editor/GraphicsWindow.cpp b/Editor/GraphicsWindow.cpp index 83050b697..d0c2dc2bb 100644 --- a/Editor/GraphicsWindow.cpp +++ b/Editor/GraphicsWindow.cpp @@ -1326,7 +1326,7 @@ void GraphicsWindow::Create(EditorComponent* _editor) AddWidget(&fsrSlider); fsr2CheckBox.Create("FSR 2.1: "); - fsr2CheckBox.SetTooltip("FidelityFX FSR Upscaling, version 2.1. You can use this as a replacement for Temporal AA while also upscaling from lowered rendering resolution."); + fsr2CheckBox.SetTooltip("FidelityFX FSR Upscaling, version 2.1. You can use this as a replacement for Temporal AA while also upscaling from lowered rendering resolution.\nEnabling FSR 2.1 will apply reduced resolution rendering according to preset, but you can also modify resolution scaling to a custom value.\nDisabling FSR 2.1 will keep your resolution scaling settings, not reset them."); fsr2CheckBox.SetSize(XMFLOAT2(hei, hei)); fsr2CheckBox.SetPos(XMFLOAT2(x, y += step)); if (editor->main->config.GetSection("graphics").Has("fsr2")) @@ -1445,13 +1445,14 @@ void GraphicsWindow::UpdateSwapChainFormats(wi::graphics::SwapChain* swapChain) default: case 0: case 1: - swapChain->desc.allow_hdr = false; + editor->main->allow_hdr = false; break; case 2: case 3: - swapChain->desc.allow_hdr = true; + editor->main->allow_hdr = true; break; } + swapChain->desc.allow_hdr = editor->main->allow_hdr; bool success = wi::graphics::GetDevice()->CreateSwapChain(&swapChain->desc, nullptr, swapChain); assert(success); diff --git a/Editor/small.ico b/Editor/small.ico deleted file mode 100644 index 1f5429f44..000000000 Binary files a/Editor/small.ico and /dev/null differ diff --git a/Editor/wicked.ico b/Editor/wicked.ico new file mode 100644 index 000000000..f7f3f5bac Binary files /dev/null and b/Editor/wicked.ico differ diff --git a/Example_ImGui/Example_ImGui.vcxproj b/Example_ImGui/Example_ImGui.vcxproj index 8cb948ba4..c33102f28 100644 --- a/Example_ImGui/Example_ImGui.vcxproj +++ b/Example_ImGui/Example_ImGui.vcxproj @@ -135,10 +135,6 @@ - - - - {06163dcb-b183-4ed9-9c62-13ef1658e049} @@ -164,6 +160,9 @@ Document + + + diff --git a/Example_ImGui/Example_ImGui.vcxproj.filters b/Example_ImGui/Example_ImGui.vcxproj.filters index 80b1e3537..07555a08d 100644 --- a/Example_ImGui/Example_ImGui.vcxproj.filters +++ b/Example_ImGui/Example_ImGui.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -79,14 +79,6 @@ ImGui - - - Resource Files - - - Resource Files - - Resource Files @@ -98,4 +90,9 @@ + + + Resource Files + + \ No newline at end of file diff --git a/Example_ImGui/Tests.ico b/Example_ImGui/Tests.ico deleted file mode 100644 index e77e762e9..000000000 Binary files a/Example_ImGui/Tests.ico and /dev/null differ diff --git a/Example_ImGui/Tests.rc b/Example_ImGui/Tests.rc index 7897d40f4..149240ace 100644 --- a/Example_ImGui/Tests.rc +++ b/Example_ImGui/Tests.rc @@ -31,9 +31,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_WICKEDENGINETESTS ICON "Tests.ico" +IDI_WICKEDENGINETESTS ICON "wicked.ico" -IDI_SMALL ICON "small.ico" +IDI_SMALL ICON "wicked.ico" ///////////////////////////////////////////////////////////////////////////// diff --git a/Example_ImGui/small.ico b/Example_ImGui/small.ico deleted file mode 100644 index e77e762e9..000000000 Binary files a/Example_ImGui/small.ico and /dev/null differ diff --git a/Example_ImGui/wicked.ico b/Example_ImGui/wicked.ico new file mode 100644 index 000000000..f7f3f5bac Binary files /dev/null and b/Example_ImGui/wicked.ico differ diff --git a/Example_ImGui_Docking/Example_ImGui_Docking.vcxproj b/Example_ImGui_Docking/Example_ImGui_Docking.vcxproj index eedb90827..68f5c6355 100644 --- a/Example_ImGui_Docking/Example_ImGui_Docking.vcxproj +++ b/Example_ImGui_Docking/Example_ImGui_Docking.vcxproj @@ -138,10 +138,6 @@ - - - - {06163dcb-b183-4ed9-9c62-13ef1658e049} @@ -167,6 +163,9 @@ Document + + + diff --git a/Example_ImGui_Docking/Example_ImGui_Docking.vcxproj.filters b/Example_ImGui_Docking/Example_ImGui_Docking.vcxproj.filters index 98afed405..0fa3bc936 100644 --- a/Example_ImGui_Docking/Example_ImGui_Docking.vcxproj.filters +++ b/Example_ImGui_Docking/Example_ImGui_Docking.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -77,10 +77,9 @@ - - Resources - - + + + Resources diff --git a/Example_ImGui_Docking/Tests.ico b/Example_ImGui_Docking/Tests.ico deleted file mode 100644 index e77e762e9..000000000 Binary files a/Example_ImGui_Docking/Tests.ico and /dev/null differ diff --git a/Example_ImGui_Docking/Tests.rc b/Example_ImGui_Docking/Tests.rc index ec69f9837..bb7ded2f4 100644 --- a/Example_ImGui_Docking/Tests.rc +++ b/Example_ImGui_Docking/Tests.rc @@ -31,9 +31,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_WICKEDENGINETESTS ICON "Tests.ico" +IDI_WICKEDENGINETESTS ICON "wicked.ico" -IDI_SMALL ICON "small.ico" +IDI_SMALL ICON "wicked.ico" ///////////////////////////////////////////////////////////////////////////// diff --git a/Example_ImGui_Docking/small.ico b/Example_ImGui_Docking/small.ico deleted file mode 100644 index e77e762e9..000000000 Binary files a/Example_ImGui_Docking/small.ico and /dev/null differ diff --git a/Example_ImGui_Docking/wicked.ico b/Example_ImGui_Docking/wicked.ico new file mode 100644 index 000000000..f7f3f5bac Binary files /dev/null and b/Example_ImGui_Docking/wicked.ico differ diff --git a/Template_Windows/TemplateWindows.ico b/Template_Windows/TemplateWindows.ico deleted file mode 100644 index 1f5429f44..000000000 Binary files a/Template_Windows/TemplateWindows.ico and /dev/null differ diff --git a/Template_Windows/TemplateWindows.rc b/Template_Windows/TemplateWindows.rc index 2413670e4..a056bbe8a 100644 --- a/Template_Windows/TemplateWindows.rc +++ b/Template_Windows/TemplateWindows.rc @@ -31,9 +31,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_TEMPLATEWINDOWS ICON "TemplateWindows.ico" +IDI_TEMPLATEWINDOWS ICON "wicked.ico" -IDI_SMALL ICON "small.ico" +IDI_SMALL ICON "wicked.ico" ///////////////////////////////////////////////////////////////////////////// diff --git a/Template_Windows/Template_Windows.vcxproj b/Template_Windows/Template_Windows.vcxproj index 5800ebe37..0d1a9a1ce 100644 --- a/Template_Windows/Template_Windows.vcxproj +++ b/Template_Windows/Template_Windows.vcxproj @@ -119,10 +119,6 @@ - - - - {06163dcb-b183-4ed9-9c62-13ef1658e049} @@ -136,6 +132,9 @@ Document + + + diff --git a/Template_Windows/Template_Windows.vcxproj.filters b/Template_Windows/Template_Windows.vcxproj.filters index d35db9e48..903f4df71 100644 --- a/Template_Windows/Template_Windows.vcxproj.filters +++ b/Template_Windows/Template_Windows.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -39,16 +39,13 @@ Resource Files - - - Resource Files - - - Resource Files - - + + + Resource Files + + \ No newline at end of file diff --git a/Template_Windows/small.ico b/Template_Windows/small.ico deleted file mode 100644 index 1f5429f44..000000000 Binary files a/Template_Windows/small.ico and /dev/null differ diff --git a/Template_Windows/wicked.ico b/Template_Windows/wicked.ico new file mode 100644 index 000000000..f7f3f5bac Binary files /dev/null and b/Template_Windows/wicked.ico differ diff --git a/Tests/Tests.ico b/Tests/Tests.ico deleted file mode 100644 index 1f5429f44..000000000 Binary files a/Tests/Tests.ico and /dev/null differ diff --git a/Tests/Tests.rc b/Tests/Tests.rc index 1f8625aec..a9a1c89e1 100644 --- a/Tests/Tests.rc +++ b/Tests/Tests.rc @@ -31,9 +31,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_WICKEDENGINETESTS ICON "Tests.ico" +IDI_WICKEDENGINETESTS ICON "wicked.ico" -IDI_SMALL ICON "small.ico" +IDI_SMALL ICON "wicked.ico" ///////////////////////////////////////////////////////////////////////////// diff --git a/Tests/Tests.vcxproj b/Tests/Tests.vcxproj index ce05cfab6..69062a077 100644 --- a/Tests/Tests.vcxproj +++ b/Tests/Tests.vcxproj @@ -124,8 +124,7 @@ - - + diff --git a/Tests/Tests.vcxproj.filters b/Tests/Tests.vcxproj.filters index 2f38cb886..6a4ab94ae 100644 --- a/Tests/Tests.vcxproj.filters +++ b/Tests/Tests.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -44,15 +44,12 @@ - - Resource Files - - - Resource Files - images + + Resource Files + diff --git a/Tests/small.ico b/Tests/small.ico deleted file mode 100644 index 1f5429f44..000000000 Binary files a/Tests/small.ico and /dev/null differ diff --git a/Tests/wicked.ico b/Tests/wicked.ico new file mode 100644 index 000000000..f7f3f5bac Binary files /dev/null and b/Tests/wicked.ico differ diff --git a/WickedEngine/wiInitializer.cpp b/WickedEngine/wiInitializer.cpp index a3bd34a61..cc4d3c5ab 100644 --- a/WickedEngine/wiInitializer.cpp +++ b/WickedEngine/wiInitializer.cpp @@ -32,7 +32,11 @@ namespace wi::initializer size_t shaderdump_count = wi::renderer::GetShaderDumpCount(); if (shaderdump_count > 0) { - wi::backlog::post("Embedded shaders found: " + std::to_string(shaderdump_count)); + wi::backlog::post("\nEmbedded shaders found: " + std::to_string(shaderdump_count)); + } + else + { + wi::backlog::post("\nNo embedded shaders found, shaders will be compiled at runtime if needed.\n\tShader source path: " + wi::renderer::GetShaderSourcePath() + "\n\tShader binary path: " + wi::renderer::GetShaderPath()); } wi::backlog::post("");