Skip to content

Commit d70a791

Browse files
authored
Fixed compilation warnings (#377)
1 parent 1cf3f8a commit d70a791

3 files changed

Lines changed: 19 additions & 5 deletions

File tree

Sources/Overload/OvEditor/src/OvEditor/Core/Context.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ std::array<int, 4> FindBestFitWindowSizeAndPosition(std::array<int, 4> p_workAre
6060
}
6161

6262
OVASSERT(false, "No resolution found to fit the work area");
63+
return {};
6364
}
6465

6566
OvEditor::Core::Context::Context(const std::string& p_projectPath, const std::string& p_projectName) :

Sources/Overload/OvEditor/src/OvEditor/Settings/EditorSettings.cpp

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
* @licence: MIT
55
*/
66

7-
#include "OvEditor/Settings/EditorSettings.h"
7+
#include <filesystem>
8+
9+
#include <OvEditor/Settings/EditorSettings.h>
810
#include <OvTools/Filesystem/IniFile.h>
11+
#include <OvTools/Utils/SystemCalls.h>
912

1013
template<class T>
1114
void LoadIniEntry(OvTools::Filesystem::IniFile& iniFile, const std::string& entry, OvEditor::Settings::EditorSettings::Property<T>& out)
@@ -16,10 +19,20 @@ void LoadIniEntry(OvTools::Filesystem::IniFile& iniFile, const std::string& entr
1619
}
1720
}
1821

22+
OvTools::Filesystem::IniFile GetEditorIniFile()
23+
{
24+
const auto filePath = std::filesystem::path{ OvTools::Utils::SystemCalls::GetPathToAppdata() } /
25+
"OverloadTech" /
26+
"OvEditor" /
27+
"editor.ini";
28+
29+
return OvTools::Filesystem::IniFile{ filePath.string() };
30+
}
31+
1932
void OvEditor::Settings::EditorSettings::Save()
2033
{
21-
std::string editorSettingsPath = std::string(getenv("APPDATA")) + "\\OverloadTech\\OvEditor\\editor.ini";
22-
OvTools::Filesystem::IniFile iniFile(editorSettingsPath);
34+
OvTools::Filesystem::IniFile iniFile = GetEditorIniFile();
35+
2336
iniFile.RemoveAll();
2437
iniFile.Add("show_geometry_bounds", ShowGeometryBounds.Get());
2538
iniFile.Add("show_light_bounds", ShowLightBounds.Get());
@@ -34,8 +47,7 @@ void OvEditor::Settings::EditorSettings::Save()
3447

3548
void OvEditor::Settings::EditorSettings::Load()
3649
{
37-
std::string editorSettingsPath = std::string(getenv("APPDATA")) + "\\OverloadTech\\OvEditor\\editor.ini";
38-
OvTools::Filesystem::IniFile iniFile(editorSettingsPath);
50+
OvTools::Filesystem::IniFile iniFile = GetEditorIniFile();
3951

4052
LoadIniEntry<bool>(iniFile, "show_geometry_bounds", ShowGeometryBounds);
4153
LoadIniEntry<bool>(iniFile, "show_light_bounds", ShowLightBounds);

Sources/Overload/OvRendering/include/OvRendering/Core/CompositeRenderer.inl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,6 @@ namespace OvRendering::Core
7878
}
7979

8080
OVASSERT(true, "Couldn't find a render pass matching the given type T.");
81+
return *static_cast<T*>(nullptr);
8182
}
8283
}

0 commit comments

Comments
 (0)