diff --git a/.gitignore b/.gitignore index 80ee0a9..c5fd1bc 100644 --- a/.gitignore +++ b/.gitignore @@ -34,9 +34,10 @@ build*/ Build*/ .vs/ .vscode/ +.idea/ out/ CMakeSettings.json # Exceptions .cache/ -*.patch \ No newline at end of file +*.patch diff --git a/Premake/ProjectUtil.lua b/Premake/ProjectUtil.lua index 354adb9..5777c8e 100644 --- a/Premake/ProjectUtil.lua +++ b/Premake/ProjectUtil.lua @@ -44,8 +44,8 @@ end systemToExecutableExtensionMap = { - windows = "exe", - linux = "sh" + windows = ".exe", + linux = "" } systemToDynamicLibExtensionMap = @@ -488,4 +488,4 @@ if InitBuildSettings == nil then BuildSettings:SetSilentFailOnDuplicateSetting(silentFailOnDuplicateSetting) end -end \ No newline at end of file +end diff --git a/Source/Game-Lib/Game-Lib/ECS/Systems/UpdateUnitEntities.cpp b/Source/Game-Lib/Game-Lib/ECS/Systems/UpdateUnitEntities.cpp index 15f0ae8..213c0ef 100644 --- a/Source/Game-Lib/Game-Lib/ECS/Systems/UpdateUnitEntities.cpp +++ b/Source/Game-Lib/Game-Lib/ECS/Systems/UpdateUnitEntities.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include namespace ECS::Systems { @@ -651,4 +651,4 @@ namespace ECS::Systems registry.clear(); } -} \ No newline at end of file +} diff --git a/Source/Game-Lib/Game-Lib/Editor/SpellEditor.cpp b/Source/Game-Lib/Game-Lib/Editor/SpellEditor.cpp index cdd7487..ae5984b 100644 --- a/Source/Game-Lib/Game-Lib/Editor/SpellEditor.cpp +++ b/Source/Game-Lib/Game-Lib/Editor/SpellEditor.cpp @@ -422,7 +422,7 @@ namespace Editor const std::vector& fieldNames = effectTypeToFieldNames[spellEffectType]; ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); - ImGui::Text(fieldNames[0].c_str()); + ImGui::TextUnformatted(fieldNames[0].c_str()); if (ImGui::InputScalar("##EffectValue1", ImGuiDataType_S32, ¤tSpellEffect.effectValues[0])) { isSpellEffectsDirty = true; @@ -432,7 +432,7 @@ namespace Editor ImGui::NextColumn(); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); - ImGui::Text(fieldNames[1].c_str()); + ImGui::TextUnformatted(fieldNames[1].c_str()); if (ImGui::InputScalar("##EffectValue2", ImGuiDataType_S32, ¤tSpellEffect.effectValues[1])) { isSpellEffectsDirty = true; @@ -442,7 +442,7 @@ namespace Editor ImGui::NextColumn(); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); - ImGui::Text(fieldNames[2].c_str()); + ImGui::TextUnformatted(fieldNames[2].c_str()); if (ImGui::InputScalar("##EffectValue3", ImGuiDataType_S32, ¤tSpellEffect.effectValues[2])) { isSpellEffectsDirty = true; @@ -452,7 +452,7 @@ namespace Editor ImGui::NextColumn(); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); - ImGui::Text(fieldNames[3].c_str()); + ImGui::TextUnformatted(fieldNames[3].c_str()); if (ImGui::InputScalar("##EffectMiscValue1", ImGuiDataType_S32, ¤tSpellEffect.effectMiscValues[0])) { isSpellEffectsDirty = true; @@ -462,7 +462,7 @@ namespace Editor ImGui::NextColumn(); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); - ImGui::Text(fieldNames[4].c_str()); + ImGui::TextUnformatted(fieldNames[4].c_str()); if (ImGui::InputScalar("##EffectMiscValue2", ImGuiDataType_S32, ¤tSpellEffect.effectMiscValues[1])) { isSpellEffectsDirty = true; @@ -472,7 +472,7 @@ namespace Editor ImGui::NextColumn(); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); - ImGui::Text(fieldNames[5].c_str()); + ImGui::TextUnformatted(fieldNames[5].c_str()); if (ImGui::InputScalar("##EffectMiscValue3", ImGuiDataType_S32, ¤tSpellEffect.effectMiscValues[2])) { isSpellEffectsDirty = true; @@ -912,4 +912,4 @@ namespace Editor } ImGui::End(); } -} \ No newline at end of file +} diff --git a/Source/Game-Lib/Game-Lib/Rendering/Light/LightRenderer.h b/Source/Game-Lib/Game-Lib/Rendering/Light/LightRenderer.h index 615813a..42c6e04 100644 --- a/Source/Game-Lib/Game-Lib/Rendering/Light/LightRenderer.h +++ b/Source/Game-Lib/Game-Lib/Rendering/Light/LightRenderer.h @@ -4,6 +4,7 @@ #include #include #include +#include #include diff --git a/Source/Shaders/Shaders.lua b/Source/Shaders/Shaders.lua index feabfea..1738224 100644 --- a/Source/Shaders/Shaders.lua +++ b/Source/Shaders/Shaders.lua @@ -16,7 +16,7 @@ Solution.Util.CreateProject(mod.Name, "Utility", Solution.Projects.Current.BinDi } Solution.Util.SetFiles(files) - local shaderCookerStandalonePath = (Solution.Projects.Current.BinDir .. "/%{cfg.buildcfg}/ShaderCookerStandalone.%{systemToExecutableExtensionMap[cfg.system]}") + local shaderCookerStandalonePath = (Solution.Projects.Current.BinDir .. "/%{cfg.buildcfg}/ShaderCookerStandalone%{systemToExecutableExtensionMap[cfg.system]}") local shaderOutputPath = (Solution.Projects.Current.BuildDir .. "/Data/Shaders") prebuildmessage ("Compiling Shaders...") @@ -31,4 +31,4 @@ Solution.Util.CreateProject(mod.Name, "Utility", Solution.Projects.Current.BinDi vpaths { ["/*"] = { "*.lua", mod.Name .. "/**" } } -end) \ No newline at end of file +end)