Skip to content

Commit 208179c

Browse files
committed
Fixes on Release mode, pointer copying
1 parent 2fe93d3 commit 208179c

9 files changed

+12
-11
lines changed

Output/HelloEngine.exe

512 Bytes
Binary file not shown.

Output/Resources/Editor/Xmls/config.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
</window>
88
<renderer>
99
<vsync value="false" />
10-
<framerate value="90" />
10+
<framerate value="120" />
1111
</renderer>
1212
<openGL>
1313
<blend value="false" tag="0x0BE2" />
1414
<cullFace value="false" tag="0x0B44" />
15-
<texture2D value="false" tag="0x0DE1" />
1615
<wireframe value="false" />
1716
</openGL>
1817
</config>

Output/imgui.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,5 +178,5 @@ DockSpace ID=0x8B93E3BD Window=0xA787BDB4 Pos=0,20 Size=1920,997 Split=X
178178
DockNode ID=0x0000000A Parent=0x00000007 SizeRef=1920,333 Selected=0xD04A4B96
179179
DockNode ID=0x00000008 Parent=0x8B93E3BD SizeRef=642,997 Split=Y Selected=0x3D9ED4A2
180180
DockNode ID=0x0000000B Parent=0x00000008 SizeRef=414,670 Selected=0xE7039252
181-
DockNode ID=0x0000000C Parent=0x00000008 SizeRef=414,325 Selected=0xC91C3AEE
181+
DockNode ID=0x0000000C Parent=0x00000008 SizeRef=414,325 Selected=0x3FEF9A19
182182

Source/HelloEngine.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<SubSystem>Windows</SubSystem>
9090
<EnableCOMDATFolding>true</EnableCOMDATFolding>
9191
<OptimizeReferences>true</OptimizeReferences>
92-
<GenerateDebugInformation>false</GenerateDebugInformation>
92+
<GenerateDebugInformation>true</GenerateDebugInformation>
9393
<AdditionalLibraryDirectories>$(SolutionDir)Source\External\SDL\lib\x86;$(SolutionDir)Source\External\Glew\libx86;$(SolutionDir)Source\External\MathGeoLib\libx86\Release;$(SolutionDir)Source\External\Assimp\libx86;$(SolutionDir)Source\External\PhysFS\libx86;$(SolutionDir)Source\External\DevIL\lib</AdditionalLibraryDirectories>
9494
<AdditionalDependencies>SDL2.lib;SDL2main.lib;MathGeoLib.lib;glew32.lib;opengl32.lib;DevIL.lib;ILU.lib;ILUT.lib;%(AdditionalDependencies);assimp.lib;physfs.lib;zlibstatic.lib</AdditionalDependencies>
9595
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>

Source/ImWindowHierarchy.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void ImWindowHierarchy::Update()
8383
}
8484
else if (ImGui::IsMouseDown(ImGuiMouseButton_::ImGuiMouseButton_Left) && !hasSelectedAGameObject && ImGui::IsWindowHovered())
8585
{
86-
layerEditor->SetSelectGameObject(nullptr);
86+
layerEditor->selectedGameObject = nullptr;
8787
}
8888
}
8989
ImGui::EndChild();

Source/LayerEditor.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
LayerEditor::LayerEditor()
2727
{
28+
selectedGameObject = nullptr;
2829
}
2930

3031
LayerEditor::~LayerEditor()
@@ -102,7 +103,8 @@ void LayerEditor::Start()
102103

103104
// Create ImGui editor windows
104105
{
105-
imWindows[(uint)ImWindowID::CONFIGURATION] = configuration = new ImWindowConfiguration(); imWindows[(uint)ImWindowID::ABOUT] = new ImWindowAbout();
106+
imWindows[(uint)ImWindowID::CONFIGURATION] = configuration = new ImWindowConfiguration();
107+
imWindows[(uint)ImWindowID::ABOUT] = new ImWindowAbout();
106108
imWindows[(uint)ImWindowID::CONSOLE] = new ImWindowConsole();
107109
imWindows[(uint)ImWindowID::PROJECT] = new ImWindowProject();
108110
imWindows[(uint)ImWindowID::QUICKSAVE] = new ImWindowQuickSave();

Source/LayerEditor.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ class ImWindowConfiguration;
1111
enum class ImWindowID
1212
{
1313
CONFIGURATION,
14-
ABOUT,
1514
CONSOLE,
1615
PROJECT,
1716
HIERARCHY,
1817
INSPECTOR,
1918
QUICKSAVE,
19+
ABOUT,
2020
PERFORMANCE,
2121
GAME,
2222
SCENE,
@@ -44,12 +44,13 @@ class LayerEditor :public Layer
4444

4545
public:
4646
ImWindowConfiguration* configuration = nullptr;
47+
GameObject* selectedGameObject = nullptr;
48+
4749
private:
4850
ImWindow* imWindows[(uint)ImWindowID::MAX] = { nullptr };
4951

5052
LayerGame* game = nullptr;
5153

52-
GameObject* selectedGameObject = nullptr;
5354

5455
Application* app = nullptr;
5556

Source/ModuleXML.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,7 @@ void ModuleXML::CreateDefaultConfigFile()
177177
"</renderer>\n"
178178
"<openGL>\n"
179179
"<blend value = \"true\" tag = \"0x0BE2\" />\n"
180-
"<cullFace value = \"true\" tag = \"0x0B44\" />\n"
181-
"<texture2D value = \"true\" tag = \"0x0DE1\" />\n"
180+
"<cullFace value = \"true\" tag = \"0x0B44\" />\n"
182181
"<wireframe value = \"true\"/>\n"
183182
"</openGL>\n"
184183
"</config>";

Source/SceneCameraObject.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ void SceneCameraObject::UpdateInput()
2020
// Mouse motion ----------------
2121
if (editor == nullptr) editor = Application::Instance()->layers->editor;
2222

23-
GameObject* selectedGO = editor->GetSelectedGameObject();
23+
GameObject* selectedGO = editor->selectedGameObject;
2424

2525
float dx = -app->input->GetMouseXMotion();
2626
float dy = -app->input->GetMouseYMotion();

0 commit comments

Comments
 (0)