Skip to content

Commit 72886f4

Browse files
HekbasHekbas
committed
Final Adjustments for Realese v0.2
1 parent 03d2797 commit 72886f4

7 files changed

Lines changed: 39 additions & 41 deletions

File tree

‎TheOneEditor/Gui.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,9 @@ bool Gui::Update(double dt)
261261
ImGui::EndMenu();
262262
}
263263

264+
265+
// Play/Pause/Stop
266+
ImGui::Dummy(ImVec2(250.0f, 0.0f));
264267
if (ImGui::Button("Play")) {
265268
app->Play();
266269
}

‎TheOneEditor/PanelGame.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ PanelGame::~PanelGame() {}
1414

1515
bool PanelGame::Draw()
1616
{
17-
// Flag to track whether Button 2 was clicked
18-
static bool showCameraSettings = false;
19-
2017
ImGuiWindowFlags settingsFlags = 0;
2118
settingsFlags = ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_MenuBar;
2219

‎TheOneEditor/PanelScene.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ PanelScene::~PanelScene() {}
1414

1515
bool PanelScene::Draw()
1616
{
17-
// Flag to track whether Button 2 was clicked
18-
static bool showCameraSettings = false;
19-
2017
ImGuiWindowFlags settingsFlags = 0;
2118
settingsFlags = ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_MenuBar;
2219

@@ -97,13 +94,13 @@ bool PanelScene::Draw()
9794
app->engine->Render(sceneCam);
9895

9996
// Game cameras Frustum
100-
for (const auto GO : app->sceneManager->GetGameObjects())
97+
/*for (const auto GO : app->sceneManager->GetGameObjects())
10198
{
10299
Camera* gameCam = GO.get()->GetComponent<Camera>();
103100
104101
if (gameCam != nullptr && gameCam->drawFrustum)
105102
app->engine->DrawFrustum(gameCam->viewProjectionMatrix);
106-
}
103+
}*/
107104
}
108105

109106
ImGui::End();

‎TheOneEditor/Renderer3D.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ bool Renderer3D::Start()
3434
sceneCamera = std::make_shared<GameObject>("EDITOR CAMERA");
3535
sceneCamera.get()->AddComponent<Transform>();
3636
sceneCamera.get()->AddComponent<Camera>();
37-
sceneCamera.get()->GetComponent<Transform>()->setPosition(vec3f(0, 2, -10));
37+
sceneCamera.get()->GetComponent<Transform>()->setPosition(vec3f(0, 15, -70));
38+
//hekbas check this
39+
/*sceneCamera.get()->GetComponent<Camera>()->center = {0, 0, 0};
40+
sceneCamera.get()->GetComponent<Camera>()->updateViewMatrix();*/
3841

3942
// hekbas test adding same component
4043
LOG(LogType::LOG_INFO, "# Testing Component Duplication");

‎TheOneEditor/SceneManager.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ bool SceneManager::Start()
4646
rotationSpeed = 30.0f;
4747

4848
std::shared_ptr<GameObject> gameCam = CreateCameraGO("Game Camera");
49-
gameCam.get()->GetComponent<Camera>()->setPosition({ -10, 4, 0 });
49+
gameCam.get()->GetComponent<Camera>()->setPosition({ -10, 8, 0 });
5050

5151
return true;
5252
}
@@ -72,7 +72,7 @@ bool SceneManager::Update(double dt)
7272

7373

7474
if (app->IsPlaying()) {
75-
demo->GetComponent<Transform>()->rotate({ 1, 0, 0 }, rotationAngle);
75+
demo->GetComponent<Transform>()->rotate({ 0, 1, 0 }, rotationAngle);
7676

7777
rotationAngle += rotationSpeed * dt;
7878

‎TheOneEditor/TheOneEditor.vcxproj.filters‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,20 @@
5252
<ClCompile Include="Importer.cpp">
5353
<Filter>Importers</Filter>
5454
</ClCompile>
55+
<ClCompile Include="Window.h">
56+
<Filter>Modules</Filter>
57+
</ClCompile>
5558
<ClCompile Include="Input.cpp">
56-
<Filter>Importers</Filter>
59+
<Filter>Modules</Filter>
5760
</ClCompile>
5861
<ClCompile Include="Renderer3D.cpp">
59-
<Filter>Importers</Filter>
62+
<Filter>Modules</Filter>
6063
</ClCompile>
6164
<ClCompile Include="SceneManager.cpp">
62-
<Filter>Importers</Filter>
65+
<Filter>Modules</Filter>
6366
</ClCompile>
6467
<ClCompile Include="Window.cpp">
65-
<Filter>Importers</Filter>
66-
</ClCompile>
67-
<ClCompile Include="Window.h">
68-
<Filter>Importers</Filter>
68+
<Filter>Modules</Filter>
6969
</ClCompile>
7070
</ItemGroup>
7171
<ItemGroup>
@@ -118,16 +118,16 @@
118118
<Filter>Importers</Filter>
119119
</ClInclude>
120120
<ClInclude Include="Input.h">
121-
<Filter>Importers</Filter>
121+
<Filter>Modules</Filter>
122122
</ClInclude>
123123
<ClInclude Include="Module.h">
124-
<Filter>Importers</Filter>
124+
<Filter>Modules</Filter>
125125
</ClInclude>
126126
<ClInclude Include="Renderer3D.h">
127-
<Filter>Importers</Filter>
127+
<Filter>Modules</Filter>
128128
</ClInclude>
129129
<ClInclude Include="SceneManager.h">
130-
<Filter>Importers</Filter>
130+
<Filter>Modules</Filter>
131131
</ClInclude>
132132
</ItemGroup>
133133
<ItemGroup>

‎TheOneEditor/imgui.ini‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ DockId=0x00000006,0
3333

3434
[Window][Scene]
3535
Pos=287,19
36-
Size=677,745
36+
Size=1254,745
3737
Collapsed=0
38-
DockId=0x00000008,0
38+
DockId=0x00000009,0
3939

4040
[Window][Assets]
4141
Pos=0,511
@@ -65,15 +65,15 @@ Size=481,105
6565
Collapsed=0
6666

6767
[Window][Settings]
68-
Pos=341,121
68+
Pos=661,301
6969
Size=597,298
7070
Collapsed=0
7171

7272
[Window][Game]
73-
Pos=966,19
74-
Size=575,745
73+
Pos=287,19
74+
Size=1254,745
7575
Collapsed=0
76-
DockId=0x0000000D,0
76+
DockId=0x00000009,1
7777

7878
[Table][0x8AACECBD,2]
7979
RefScale=13
@@ -87,17 +87,15 @@ Column 2 Weight=1.0470
8787
Column 3 Weight=1.0067
8888

8989
[Docking][Data]
90-
DockSpace ID=0x09EF459F Window=0x9A404470 Pos=0,19 Size=1920,1061 Split=X
91-
DockNode ID=0x00000007 Parent=0x09EF459F SizeRef=2181,701 Split=Y
92-
DockNode ID=0x00000001 Parent=0x00000007 SizeRef=1280,143
93-
DockNode ID=0x00000002 Parent=0x00000007 SizeRef=1280,575 Split=Y
94-
DockNode ID=0x00000003 Parent=0x00000002 SizeRef=763,745 Split=X Selected=0xE192E354
95-
DockNode ID=0x00000006 Parent=0x00000003 SizeRef=285,487 Selected=0x29EABFBD
96-
DockNode ID=0x00000009 Parent=0x00000003 SizeRef=1894,487 Split=X Selected=0xE192E354
97-
DockNode ID=0x00000008 Parent=0x00000009 SizeRef=677,735 CentralNode=1 Selected=0xE192E354
98-
DockNode ID=0x0000000D Parent=0x00000009 SizeRef=575,735 Selected=0x26816F31
99-
DockNode ID=0x00000004 Parent=0x00000002 SizeRef=763,314 Split=X Selected=0xD04A4B96
100-
DockNode ID=0x00000005 Parent=0x00000004 SizeRef=875,214 Selected=0xD04A4B96
101-
DockNode ID=0x0000000A Parent=0x00000004 SizeRef=664,214 Selected=0x49278EEE
102-
DockNode ID=0x0000000B Parent=0x09EF459F SizeRef=377,701 Selected=0xE7039252
90+
DockSpace ID=0x09EF459F Window=0x9A404470 Pos=0,19 Size=1920,1061 Split=X
91+
DockNode ID=0x00000007 Parent=0x09EF459F SizeRef=2181,701 Split=Y
92+
DockNode ID=0x00000001 Parent=0x00000007 SizeRef=1280,143
93+
DockNode ID=0x00000002 Parent=0x00000007 SizeRef=1280,575 Split=Y
94+
DockNode ID=0x00000003 Parent=0x00000002 SizeRef=763,745 Split=X Selected=0xE192E354
95+
DockNode ID=0x00000006 Parent=0x00000003 SizeRef=285,487 Selected=0x29EABFBD
96+
DockNode ID=0x00000009 Parent=0x00000003 SizeRef=1894,487 CentralNode=1 Selected=0xE192E354
97+
DockNode ID=0x00000004 Parent=0x00000002 SizeRef=763,314 Split=X Selected=0xD04A4B96
98+
DockNode ID=0x00000005 Parent=0x00000004 SizeRef=875,214 Selected=0xD04A4B96
99+
DockNode ID=0x0000000A Parent=0x00000004 SizeRef=664,214 Selected=0x49278EEE
100+
DockNode ID=0x0000000B Parent=0x09EF459F SizeRef=377,701 Selected=0xE7039252
103101

0 commit comments

Comments
 (0)