Skip to content

Commit 52a8dfe

Browse files
committed
Fixes clang-format issues
1 parent 8d9e8ed commit 52a8dfe

File tree

5 files changed

+46
-29
lines changed

5 files changed

+46
-29
lines changed

editor/editor.app.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
}
2121
},
2222
"InputSystem": {
23-
"height": 1009,
23+
"height": 991,
2424
"inputSchemes": {
2525
"Editor": {
2626
"bools": [
@@ -91,7 +91,7 @@
9191
},
9292
"PhysicsSystem": {},
9393
"UISystem": {
94-
"height": 1009,
94+
"height": 991,
9595
"width": 1920
9696
}
9797
},

editor/editor_system.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,8 +1007,7 @@ int EditorSystem::exportScene(const String& sceneName, const String& sceneFilePa
10071007

10081008
for (auto& filePair : toCopy)
10091009
{
1010-
tasks.push_back(std::make_shared<Task>([=, &progress]()
1011-
{
1010+
tasks.push_back(std::make_shared<Task>([=, &progress]() {
10121011
progress++;
10131012
if (m_IsCopyFailed)
10141013
{
@@ -1018,7 +1017,7 @@ int EditorSystem::exportScene(const String& sceneName, const String& sceneFilePa
10181017
}
10191018

10201019
/// TODO: Fix the need for this dummy task (blocks the main thread while tasks are running)
1021-
tasks.push_back(std::make_shared<Task>([]() { }));
1020+
tasks.push_back(std::make_shared<Task>([]() {}));
10221021
progress++;
10231022

10241023
ThreadPool& threadPool = Application::GetSingleton()->getThreadPool();

editor/editor_system.h

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

33
#include "core/event_manager.h"
4-
#include "script/interpreter.h"
54
#include "framework/system.h"
5+
#include "script/interpreter.h"
66
#include "utility/imgui_helpers.h"
77

88
#include "vendor/ImGUI/imgui.h"
@@ -72,7 +72,8 @@ class EditorSystem : public System
7272
~EditorSystem();
7373

7474
void drawDefaultUI(float deltaMilliseconds);
75-
void drawProgressBar(Atomic<int>& progress, float& currentProgress, int& totalProgress);
75+
void drawProgressBar(Atomic<int>& progress, float& currentProgress,
76+
int& totalProgress);
7677

7778
void showDocumentation(const String& name, const sol::table& table);
7879

@@ -81,7 +82,8 @@ class EditorSystem : public System
8182
Variant saveBeforeQuit(const Event* event);
8283
Variant createNewScene(const Event* event);
8384
Variant createNewFile(const Event* event);
84-
int exportScene(const String& sceneName, const String& sceneFilePath, Atomic<int>& progress);
85+
int exportScene(const String& sceneName, const String& sceneFilePath,
86+
Atomic<int>& progress);
8587
void postExport();
8688

8789
Vector<ThemeDefinition> m_ThemeDefinitions;
@@ -101,9 +103,24 @@ class EditorSystem : public System
101103

102104
void openScene(String sceneName);
103105

104-
ImColor getWarningColor() const { return ColorToImColor((Color)ColorPresets::LightYellow); }
105-
ImColor getFatalColor() const { return ColorToImColor((Color)ColorPresets::IndianRed); }
106-
ImColor getSuccessColor() const { return ColorToImColor((Color)ColorPresets::LimeGreen); }
107-
ImColor getNormalColor() const { return ColorToImColor((Color)ColorPresets::White); }
108-
ImColor getLinkColor() const { return ColorToImColor((Color)ColorPresets::SteelBlue); }
106+
ImColor getWarningColor() const
107+
{
108+
return ColorToImColor((Color)ColorPresets::LightYellow);
109+
}
110+
ImColor getFatalColor() const
111+
{
112+
return ColorToImColor((Color)ColorPresets::IndianRed);
113+
}
114+
ImColor getSuccessColor() const
115+
{
116+
return ColorToImColor((Color)ColorPresets::LimeGreen);
117+
}
118+
ImColor getNormalColor() const
119+
{
120+
return ColorToImColor((Color)ColorPresets::White);
121+
}
122+
ImColor getLinkColor() const
123+
{
124+
return ColorToImColor((Color)ColorPresets::SteelBlue);
125+
}
109126
};

editor/themes/theme.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ void ThemeDefinition::apply() const
108108
setColor(c, "TextSelectedBg", colors[ImGuiCol_TextSelectedBg]);
109109
setColor(c, "DragDropTarget", colors[ImGuiCol_DragDropTarget]);
110110
setColor(c, "NavHighlight", colors[ImGuiCol_NavHighlight]);
111-
setColor(c, "NavWindowingHighlight", colors[ImGuiCol_NavWindowingHighlight]);
111+
setColor(c, "NavWindowingHighlight",
112+
colors[ImGuiCol_NavWindowingHighlight]);
112113
setColor(c, "NavWindowingDimBg", colors[ImGuiCol_NavWindowingDimBg]);
113114
setColor(c, "ModalWindowDimBg", colors[ImGuiCol_ModalWindowDimBg]);
114115
}

imgui.ini

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[Window][Rootex Editor]
22
Pos=0,0
3-
Size=1920,1009
3+
Size=1920,991
44
Collapsed=0
55

66
[Window][Output]
7-
Pos=0,629
8-
Size=1114,380
7+
Pos=0,620
8+
Size=1114,371
99
Collapsed=0
1010
DockId=0x00000003,0
1111

@@ -33,19 +33,19 @@ Collapsed=0
3333
DockId=0x0000000D,0
3434

3535
[Window][Toolbar]
36-
Pos=1116,629
37-
Size=333,380
36+
Pos=1116,620
37+
Size=333,371
3838
Collapsed=0
3939
DockId=0x00000004,0
4040

4141
[Window][Viewport]
42-
Pos=0,24
43-
Size=1449,603
42+
Pos=0,28
43+
Size=1449,590
4444
Collapsed=0
4545
DockId=0x00000008,0
4646

4747
[Window][Inspector]
48-
Pos=1451,427
48+
Pos=1451,409
4949
Size=469,582
5050
Collapsed=0
5151
DockId=0x00000009,0
@@ -154,8 +154,8 @@ Size=745,480
154154
Collapsed=0
155155

156156
[Window][Scene]
157-
Pos=1451,24
158-
Size=469,401
157+
Pos=1451,28
158+
Size=469,379
159159
Collapsed=0
160160
DockId=0x00000007,0
161161

@@ -190,8 +190,8 @@ Size=1280,693
190190
Collapsed=0
191191

192192
[Window][File Editor]
193-
Pos=0,24
194-
Size=1449,603
193+
Pos=0,28
194+
Size=1449,590
195195
Collapsed=0
196196
DockId=0x00000008,1
197197

@@ -201,13 +201,13 @@ Size=241,158
201201
Collapsed=0
202202

203203
[Window][Content Browser]
204-
Pos=0,629
205-
Size=1114,380
204+
Pos=0,620
205+
Size=1114,371
206206
Collapsed=0
207207
DockId=0x00000003,1
208208

209209
[Docking][Data]
210-
DockSpace ID=0x654E7FDC Window=0xDC8952A0 Pos=0,24 Size=1920,985 Split=X
210+
DockSpace ID=0x654E7FDC Window=0xDC8952A0 Pos=0,28 Size=1920,963 Split=X
211211
DockNode ID=0x00000001 Parent=0x654E7FDC SizeRef=1932,1359 Split=Y Selected=0x995B0CF8
212212
DockNode ID=0x00000008 Parent=0x00000001 SizeRef=1932,596 Selected=0x995B0CF8
213213
DockNode ID=0x0000000A Parent=0x00000001 SizeRef=1932,375 Split=X Selected=0xCB7211A8

0 commit comments

Comments
 (0)