Skip to content

GCC fixes #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MellianStudios wants to merge 1 commit into
base: master
Choose a base branch
from
Open

GCC fixes #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ build*/
Build*/
.vs/
.vscode/
.idea/
out/
CMakeSettings.json

# Exceptions
.cache/
*.patch
*.patch
6 changes: 3 additions & 3 deletions Premake/ProjectUtil.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ end

systemToExecutableExtensionMap =
{
windows = "exe",
linux = "sh"
windows = ".exe",
linux = ""
}

systemToDynamicLibExtensionMap =
Expand Down Expand Up @@ -488,4 +488,4 @@ if InitBuildSettings == nil then

BuildSettings:SetSilentFailOnDuplicateSetting(silentFailOnDuplicateSetting)
end
end
end
4 changes: 2 additions & 2 deletions Source/Game-Lib/Game-Lib/ECS/Systems/UpdateUnitEntities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include <Jolt/Physics/Collision/CastResult.h>
#include <Jolt/Physics/Collision/RayCast.h>

#include <tracy/tracy.hpp>
#include <tracy/Tracy.hpp>

namespace ECS::Systems
{
Expand Down Expand Up @@ -651,4 +651,4 @@ namespace ECS::Systems

registry.clear<Components::UnitRebuildSkinTexture>();
}
}
}
14 changes: 7 additions & 7 deletions Source/Game-Lib/Game-Lib/Editor/SpellEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ namespace Editor
const std::vector<std::string>& 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, &currentSpellEffect.effectValues[0]))
{
isSpellEffectsDirty = true;
Expand All @@ -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, &currentSpellEffect.effectValues[1]))
{
isSpellEffectsDirty = true;
Expand All @@ -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, &currentSpellEffect.effectValues[2]))
{
isSpellEffectsDirty = true;
Expand All @@ -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, &currentSpellEffect.effectMiscValues[0]))
{
isSpellEffectsDirty = true;
Expand All @@ -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, &currentSpellEffect.effectMiscValues[1]))
{
isSpellEffectsDirty = true;
Expand All @@ -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, &currentSpellEffect.effectMiscValues[2]))
{
isSpellEffectsDirty = true;
Expand Down Expand Up @@ -912,4 +912,4 @@ namespace Editor
}
ImGui::End();
}
}
}
1 change: 1 addition & 0 deletions Source/Game-Lib/Game-Lib/Rendering/Light/LightRenderer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <Renderer/DescriptorSet.h>
#include <Renderer/Descriptors/SamplerDesc.h>
#include <Renderer/GPUVector.h>
#include <Renderer/RenderGraphBuilder.h>

#include <Base/Container/ConcurrentQueue.h>

Expand Down
4 changes: 2 additions & 2 deletions Source/Shaders/Shaders.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...")
Expand All @@ -31,4 +31,4 @@ Solution.Util.CreateProject(mod.Name, "Utility", Solution.Projects.Current.BinDi
vpaths {
["/*"] = { "*.lua", mod.Name .. "/**" }
}
end)
end)