Skip to content

Commit 1a77a96

Browse files
author
Adrien GIVRY
committed
Fixing some bugs and weird code
1 parent 23a76ba commit 1a77a96

10 files changed

Lines changed: 17 additions & 34 deletions

File tree

Sources/Overload/OvCore/src/OvCore/ECS/Components/CAudioListener.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
OvCore::ECS::Components::CAudioListener::CAudioListener(ECS::Actor& p_owner) :
1111
AComponent(p_owner),
12-
m_audioListener(OvAudio::Entities::AudioListener(owner.transform.GetFTransform()))
12+
m_audioListener(owner.transform.GetFTransform())
1313
{
1414
m_audioListener.SetEnabled(false);
1515
}

Sources/Overload/OvCore/src/OvCore/ECS/Components/CAudioSource.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
OvCore::ECS::Components::CAudioSource::CAudioSource(ECS::Actor& p_owner) :
1717
AComponent(p_owner),
18-
m_audioSource(OvAudio::Entities::AudioSource(OvCore::Global::ServiceLocator::Get<OvAudio::Core::AudioPlayer>(), owner.transform.GetFTransform()))
18+
m_audioSource(OvCore::Global::ServiceLocator::Get<OvAudio::Core::AudioPlayer>(), owner.transform.GetFTransform())
1919
{
2020
}
2121

Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalBox.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ OvCore::ECS::Components::CPhysicalBox::CPhysicalBox(ECS::Actor & p_owner) :
1616
{
1717
m_physicalObject = std::make_unique<OvPhysics::Entities::PhysicalBox>(p_owner.transform.GetFTransform());
1818

19-
m_physicalObject->SetUserData<std::reference_wrapper<CPhysicalObject>>(std::ref(*this));
19+
m_physicalObject->SetUserData<std::reference_wrapper<CPhysicalObject>>(*this);
2020

2121
BindListener();
2222
Init();

Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalCapsule.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ OvCore::ECS::Components::CPhysicalCapsule::CPhysicalCapsule(ECS::Actor & p_owner
1717
{
1818
m_physicalObject = std::make_unique<PhysicalCapsule>(p_owner.transform.GetFTransform());
1919

20-
m_physicalObject->SetUserData<std::reference_wrapper<CPhysicalObject>>(std::ref(*this));
20+
m_physicalObject->SetUserData<std::reference_wrapper<CPhysicalObject>>(*this);
2121

2222
BindListener();
2323
Init();

Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalSphere.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ OvCore::ECS::Components::CPhysicalSphere::CPhysicalSphere(ECS::Actor & p_owner)
1717
{
1818
m_physicalObject = std::make_unique<PhysicalSphere>(p_owner.transform.GetFTransform());
1919

20-
m_physicalObject->SetUserData<std::reference_wrapper<CPhysicalObject>>(std::ref(*this));
20+
m_physicalObject->SetUserData<std::reference_wrapper<CPhysicalObject>>(*this);
2121

2222
BindListener();
2323
Init();

Sources/Overload/OvEditor/include/OvEditor/Panels/HardwareInfo.h

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,6 @@ namespace OvEditor::Panels
1717
class HardwareInfo : public OvUI::Panels::PanelWindow
1818
{
1919
public:
20-
/**
21-
* Defines some display modes for the hardware info information
22-
*/
23-
enum class EDisplayMode
24-
{
25-
PLOT_LINES,
26-
PLOT_HISTOGRAM
27-
};
28-
2920
/**
3021
* Constructor
3122
* @param p_title
@@ -41,8 +32,7 @@ namespace OvEditor::Panels
4132
bool p_opened,
4233
const OvUI::Settings::PanelWindowSettings& p_windowSettings,
4334
float p_logFrequency,
44-
size_t p_maxElements,
45-
EDisplayMode p_displayMode
35+
size_t p_maxElements
4636
);
4737

4838
/**

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ OvEditor::Core::Context::Context(const std::string& p_projectPath, const std::st
3939

4040
/* Settings */
4141
OvWindowing::Settings::DeviceSettings deviceSettings;
42+
deviceSettings.contextMajorVersion = 4;
43+
deviceSettings.contextMajorVersion = 3;
4244
windowSettings.title = "Overload Editor";
4345
windowSettings.width = 1280;
4446
windowSettings.height = 720;
@@ -158,8 +160,8 @@ void OvEditor::Core::Context::ResetProjectSettings()
158160
projectSettings.Add<bool>("vsync", true);
159161
projectSettings.Add<bool>("multisampling", true);
160162
projectSettings.Add<int>("samples", 4);
161-
projectSettings.Add<int>("opengl_major", 3);
162-
projectSettings.Add<int>("opengl_minor", 2);
163+
projectSettings.Add<int>("opengl_major", 4);
164+
projectSettings.Add<int>("opengl_minor", 3);
163165
projectSettings.Add<bool>("dev_build", true);
164166
}
165167

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void OvEditor::Core::Editor::SetupUI()
5353

5454
m_panelsManager.CreatePanel<OvEditor::Panels::MenuBar>("Menu Bar");
5555
m_panelsManager.CreatePanel<OvEditor::Panels::AssetBrowser>("Asset Browser", true, settings, m_context.engineAssetsPath, m_context.projectAssetsPath, m_context.projectScriptsPath);
56-
m_panelsManager.CreatePanel<OvEditor::Panels::HardwareInfo>("Hardware Info", false, settings, 0.2f, 50, HardwareInfo::EDisplayMode::PLOT_LINES);
56+
m_panelsManager.CreatePanel<OvEditor::Panels::HardwareInfo>("Hardware Info", false, settings, 0.2f, 50);
5757
m_panelsManager.CreatePanel<OvEditor::Panels::Profiler>("Profiler", true, settings, 0.25f);
5858
m_panelsManager.CreatePanel<OvEditor::Panels::Console>("Console", true, settings);
5959
m_panelsManager.CreatePanel<OvEditor::Panels::Hierarchy>("Hierarchy", true, settings);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ class ProjectHubPanel : public OvUI::Panels::PanelWindow
4141
collapsable = false;
4242
movable = false;
4343

44+
std::filesystem::create_directories(std::string(getenv("APPDATA")) + "\\OverloadTech\\OvEditor\\");
45+
4446
SetSize({ 1000, 580 });
4547
SetPosition({ 0.f, 0.f });
4648

Sources/Overload/OvEditor/src/OvEditor/Panels/HardwareInfo.cpp

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,16 @@ OvEditor::Panels::HardwareInfo::HardwareInfo
1717
bool p_opened,
1818
const OvUI::Settings::PanelWindowSettings& p_windowSettings,
1919
float p_logFrequency,
20-
size_t p_maxElements,
21-
EDisplayMode p_displayMode
20+
size_t p_maxElements
2221
) :
2322
PanelWindow(p_title, p_opened, p_windowSettings),
2423
m_logFrequency(p_logFrequency),
2524
m_maxElements(p_maxElements),
2625
m_hardwareInfo(new OvAnalytics::Hardware::HardwareInfo(m_logFrequency))
2726
{
28-
switch (p_displayMode)
29-
{
30-
case OvEditor::Panels::HardwareInfo::EDisplayMode::PLOT_LINES:
31-
m_cpuUsage = &CreateWidget<Plots::PlotLines>();
32-
m_gpuUsage = &CreateWidget<Plots::PlotLines>();
33-
m_ramUsage = &CreateWidget<Plots::PlotLines>();
34-
break;
35-
case OvEditor::Panels::HardwareInfo::EDisplayMode::PLOT_HISTOGRAM:
36-
m_cpuUsage = &CreateWidget<Plots::PlotHistogram>();
37-
m_gpuUsage = &CreateWidget<Plots::PlotHistogram>();
38-
m_ramUsage = &CreateWidget<Plots::PlotHistogram>();
39-
break;
40-
}
27+
m_cpuUsage = &CreateWidget<Plots::PlotLines>();
28+
m_gpuUsage = &CreateWidget<Plots::PlotLines>();
29+
m_ramUsage = &CreateWidget<Plots::PlotLines>();
4130

4231
m_cpuUsage->minScale = 0.0f;
4332
m_cpuUsage->maxScale = 100.0f;

0 commit comments

Comments
 (0)