diff --git a/enginecustom/enginecustom.vcxproj b/enginecustom/enginecustom.vcxproj index 864617b..6982ee3 100644 --- a/enginecustom/enginecustom.vcxproj +++ b/enginecustom/enginecustom.vcxproj @@ -288,9 +288,11 @@ $(OutDir)\assets\Texture\ + $(OutDir)\assets\Texture\ $(OutDir)\assets\Texture\ + $(OutDir)\assets\Texture\ $(OutDir)\assets\Texture\ @@ -298,12 +300,15 @@ $(OutDir)\assets\Texture\ + $(OutDir)\assets\Texture\ $(OutDir)\assets\Texture\ + $(OutDir)\assets\Texture\ $(OutDir)\assets\Texture\ + $(OutDir)\assets\Texture\ $(OutDir)\assets\Texture\ diff --git a/enginecustom/enginecustom.vcxproj.filters b/enginecustom/enginecustom.vcxproj.filters index 67b7a68..b2cb523 100644 --- a/enginecustom/enginecustom.vcxproj.filters +++ b/enginecustom/enginecustom.vcxproj.filters @@ -419,18 +419,6 @@ fonts - - Assets - - - Assets - - - Assets - - - Assets - shader @@ -602,26 +590,38 @@ Assets\Texture - - Fichiers de ressources - - - Fichiers de ressources - - - Fichiers de ressources - - - Fichiers de ressources - - - Fichiers de ressources - Assets\Model\OBJ Assets\Texture + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + \ No newline at end of file diff --git a/enginecustom/imgui.ini b/enginecustom/imgui.ini index 13f3ef4..749cc18 100644 --- a/enginecustom/imgui.ini +++ b/enginecustom/imgui.ini @@ -5,7 +5,7 @@ Collapsed=0 [Window][Khaotic Engine] Pos=1180,27 -Size=396,566 +Size=396,826 Collapsed=0 DockId=0x00000005,0 @@ -45,7 +45,7 @@ Collapsed=0 [Window][Render Window] Pos=8,27 -Size=1170,566 +Size=1170,826 Collapsed=0 DockId=0x00000002,0 @@ -85,7 +85,7 @@ DockSpace ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=8,27 Size=1568,826 Split=Y DockNode ID=0x0000000A Parent=0x00000007 SizeRef=395,411 Selected=0x031DC75C DockNode ID=0x00000008 Parent=0x0000000B SizeRef=1276,826 Split=X DockNode ID=0x00000002 Parent=0x00000008 SizeRef=878,826 CentralNode=1 Selected=0x9204953B - DockNode ID=0x00000005 Parent=0x00000008 SizeRef=396,826 Selected=0x0B098C4B + DockNode ID=0x00000005 Parent=0x00000008 SizeRef=396,826 Selected=0x9F035453 DockNode ID=0x0000000C Parent=0x0000000D SizeRef=1568,335 Selected=0x139FDA3F DockNode ID=0x0000000E Parent=0xCCBD8CF7 SizeRef=1568,258 Selected=0xAB74BEE9 diff --git a/enginecustom/imguiManager.cpp b/enginecustom/imguiManager.cpp index e2349df..ee394d4 100644 --- a/enginecustom/imguiManager.cpp +++ b/enginecustom/imguiManager.cpp @@ -522,7 +522,7 @@ void imguiManager::WidgetEngineSettingsWindow(ApplicationClass* app) void imguiManager::WidgetLogWindow(ApplicationClass* app) { - ImGui::Begin("Log Window"); + ImGui::Begin("Log Window" , &showLogWindow); // Filtre de recherche static ImGuiTextFilter filter; diff --git a/enginecustom/imguiManager.h b/enginecustom/imguiManager.h index 6d05f19..bf893b0 100644 --- a/enginecustom/imguiManager.h +++ b/enginecustom/imguiManager.h @@ -48,12 +48,12 @@ public: bool m_EnableCelShading; private: - bool showObjectWindow = false; - bool showTerrainWindow = false; - bool showLightWindow = false; - bool showShaderWindow = false; - bool showEngineSettingsWindow = false; - bool showLogWindow = false; + bool showObjectWindow; + bool showTerrainWindow; + bool showLightWindow; + bool showShaderWindow; + bool showEngineSettingsWindow; + bool showLogWindow; bool m_isPhyiscsEnabled = false;