From af01f223c18279db5838697feb7b770d31fde934 Mon Sep 17 00:00:00 2001
From: CatChow0 <thetrueshibadoggo@gmail.com>
Date: Sat, 1 Feb 2025 00:46:41 +0100
Subject: [PATCH] 
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

---
 .../.idea/git_toolbox_prj.xml                 |  15 ++
 .../.idea/workspace.xml                       | 159 +++++++++++++++++-
 enginecustom/imgui.ini                        |  18 +-
 enginecustom/shader-error.txt                 | Bin 148 -> 277 bytes
 enginecustom/src/hlsl/font.ps                 |  21 +--
 enginecustom/src/hlsl/font.vs                 |   9 +-
 .../src/inc/system/applicationclass.h         |   3 +-
 enginecustom/src/inc/system/imguiManager.h    |  13 ++
 enginecustom/src/inc/system/textclass.h       |   2 -
 .../src/src/system/applicationclass.cpp       |   4 +
 enginecustom/src/src/system/d3dclass.cpp      |   2 +-
 enginecustom/src/src/system/imguiManager.cpp  |  25 ++-
 12 files changed, 227 insertions(+), 44 deletions(-)
 create mode 100644 .idea/.idea.KhaoticEngineReborn/.idea/git_toolbox_prj.xml

diff --git a/.idea/.idea.KhaoticEngineReborn/.idea/git_toolbox_prj.xml b/.idea/.idea.KhaoticEngineReborn/.idea/git_toolbox_prj.xml
new file mode 100644
index 0000000..02b915b
--- /dev/null
+++ b/.idea/.idea.KhaoticEngineReborn/.idea/git_toolbox_prj.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml b/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
index f7995e8..cdb4dbd 100644
--- a/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
+++ b/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
@@ -7,7 +7,14 @@
     <list default="true" id="e81d6e08-efc7-40a0-909d-ec4943d948e9" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/enginecustom/imgui.ini" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/imgui.ini" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/Systemclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/Systemclass.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/shader-error.txt" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/shader-error.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/hlsl/font.ps" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/hlsl/font.ps" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/hlsl/font.vs" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/hlsl/font.vs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/applicationclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/applicationclass.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/imguiManager.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/imguiManager.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/textclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/textclass.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/applicationclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/applicationclass.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/d3dclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/d3dclass.cpp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -22,6 +29,123 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="HighlightingSettingsPerFile">
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0/um/d3d11.h" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/enginecustom/src/src/shader/CelShadingShader.cpp" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="MetaFilesCheckinStateConfiguration" checkMetaFiles="true" />
@@ -51,7 +175,7 @@
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
     &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
     &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.keymap&quot;,
     &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
 }</component>
@@ -113,7 +237,12 @@
       <workItem from="1738172392786" duration="67000" />
       <workItem from="1738173151768" duration="2361000" />
       <workItem from="1738175535254" duration="279000" />
-      <workItem from="1738178991872" duration="2427000" />
+      <workItem from="1738178991872" duration="2736000" />
+      <workItem from="1738244577624" duration="3000" />
+      <workItem from="1738321399968" duration="689000" />
+      <workItem from="1738358054789" duration="9000" />
+      <workItem from="1738358091089" duration="6675000" />
+      <workItem from="1738364887298" duration="2275000" />
     </task>
     <task id="LOCAL-00001" summary="Minor update - viewport window tweak">
       <option name="closed" value="true" />
@@ -123,7 +252,15 @@
       <option name="project" value="LOCAL" />
       <updated>1738175474520</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="Patch update - add menu button">
+      <option name="closed" value="true" />
+      <created>1738181617050</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1738181617050</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -131,9 +268,21 @@
   </component>
   <component name="UnityCheckinConfiguration" checkUnsavedScenes="true" />
   <component name="UnityProjectConfiguration" hasMinimizedUI="false" />
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="VcsManagerConfiguration">
     <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
     <MESSAGE value="Minor update - viewport window tweak" />
-    <option name="LAST_COMMIT_MESSAGE" value="Minor update - viewport window tweak" />
+    <MESSAGE value="Patch update - add menu button" />
+    <option name="LAST_COMMIT_MESSAGE" value="Patch update - add menu button" />
   </component>
 </project>
\ No newline at end of file
diff --git a/enginecustom/imgui.ini b/enginecustom/imgui.ini
index 86c6a64..f0a9069 100644
--- a/enginecustom/imgui.ini
+++ b/enginecustom/imgui.ini
@@ -4,8 +4,8 @@ Size=400,400
 Collapsed=0
 
 [Window][Khaotic Engine]
-Pos=1180,27
-Size=396,826
+Pos=1187,27
+Size=389,826
 Collapsed=0
 DockId=0x00000005,0
 
@@ -34,8 +34,8 @@ Collapsed=0
 DockId=0x00000001,2
 
 [Window][Engine Settings]
-Pos=1644,27
-Size=396,866
+Pos=1187,27
+Size=389,826
 Collapsed=0
 DockId=0x00000005,1
 
@@ -45,7 +45,7 @@ Collapsed=0
 
 [Window][Render Window]
 Pos=8,27
-Size=1170,826
+Size=1177,826
 Collapsed=0
 DockId=0x00000002,0
 
@@ -66,8 +66,8 @@ Collapsed=0
 DockId=0x0000000C,0
 
 [Window][Log Window]
-Pos=8,895
-Size=2032,226
+Pos=8,627
+Size=1568,226
 Collapsed=0
 DockId=0x00000006,0
 
@@ -82,8 +82,8 @@ DockSpace         ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=8,27 Size=1568,826 Split=Y
         DockNode  ID=0x00000009 Parent=0x00000007 SizeRef=395,413 Selected=0x321620B2
         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=0x9F035453
+        DockNode  ID=0x00000002 Parent=0x00000008 SizeRef=1177,826 CentralNode=1 Selected=0x9204953B
+        DockNode  ID=0x00000005 Parent=0x00000008 SizeRef=389,826 Selected=0x9F035453
     DockNode      ID=0x0000000C Parent=0x00000004 SizeRef=1568,335 Selected=0x139FDA3F
   DockNode        ID=0x00000006 Parent=0xCCBD8CF7 SizeRef=2032,226 Selected=0xAB74BEE9
 
diff --git a/enginecustom/shader-error.txt b/enginecustom/shader-error.txt
index 1cff77c8fedb05aeea8c5a5afed2305fd0d8580a..e2b3b9c879e684fb5a82ff6f7a74484b80818c21 100644
GIT binary patch
literal 277
zcmb`>L5jja5QSmaf_JE$3TDXY2qp(`_O4ts3~i^96n3gYRYk<pPhd840GB^J9^bhR
z-{k#t`?=sK;oe7aN(FL9jKu|Sq8$DzP3AHL(-it_Ikdw5G1}&^-&Mueep>^oio*3!
zepWS53+B;rKz2yN4LJ$N4EP)s&E_x|=1;&!%+tIC7l>df=BTUX`3<tu?pRd+VP#pv
Z#EMBerWZCq&CH{gP+^@Ui>_D8#V_PrV=Mpw

delta 112
zcmbQrG=)*Y*(xTqIJKxaCb1~9EU`GoB|o_|H#M)MIL1A*#G^E6BA>2%a%xU-Mq)~4
zUb<dEv4)YQj-ipRk+G(gLTXV_evv|iv4MfHl|oT!N@`kWUS>&Vex5>pnu2;sYDGzD
PQL1x(PJWR(FBby<hPfqx

diff --git a/enginecustom/src/hlsl/font.ps b/enginecustom/src/hlsl/font.ps
index 7de7ce3..4e9dc57 100644
--- a/enginecustom/src/hlsl/font.ps
+++ b/enginecustom/src/hlsl/font.ps
@@ -9,7 +9,6 @@ cbuffer PixelBuffer
     float4 pixelColor;
 };
 
-
 //////////////
 // TYPEDEFS //
 //////////////
@@ -25,23 +24,19 @@ struct PixelInputType
 float4 FontPixelShader(PixelInputType input) : SV_TARGET
 {
     float4 color;
-	
-	
+
     // Sample the texture pixel at this location.
     color = shaderTexture.Sample(SampleType, input.tex);
-	
+
     // If the color is black on the texture then treat this pixel as transparent.
-    if(color.r == 0.0f)
+    if (color.r == 0.0f && color.g == 0.0f && color.b == 0.0f)
     {
         color.a = 0.0f;
-    }
-	
-    // If the color is other than black on the texture then this is a pixel in the font so draw it using the font pixel color.
-    else
-    {
-        color.a = 1.0f;
-        color = color * pixelColor;
+        return color;
     }
 
+    // If the color is other than black on the texture then this is a pixel in the font so draw it using the font pixel color.
+    color = color * pixelColor;
+
     return color;
-}
+}
\ No newline at end of file
diff --git a/enginecustom/src/hlsl/font.vs b/enginecustom/src/hlsl/font.vs
index 0b71af3..1489bcb 100644
--- a/enginecustom/src/hlsl/font.vs
+++ b/enginecustom/src/hlsl/font.vs
@@ -8,7 +8,6 @@ cbuffer MatrixBuffer
     matrix projectionMatrix;
 };
 
-
 //////////////
 // TYPEDEFS //
 //////////////
@@ -24,14 +23,12 @@ struct PixelInputType
     float2 tex : TEXCOORD0;
 };
 
-
 ////////////////////////////////////////////////////////////////////////////////
 // Vertex Shader
 ////////////////////////////////////////////////////////////////////////////////
 PixelInputType FontVertexShader(VertexInputType input)
 {
     PixelInputType output;
-    
 
     // Change the position vector to be 4 units for proper matrix calculations.
     input.position.w = 1.0f;
@@ -40,9 +37,9 @@ PixelInputType FontVertexShader(VertexInputType input)
     output.position = mul(input.position, worldMatrix);
     output.position = mul(output.position, viewMatrix);
     output.position = mul(output.position, projectionMatrix);
-    
+
     // Store the texture coordinates for the pixel shader.
     output.tex = input.tex;
-    
+
     return output;
-}
+}
\ No newline at end of file
diff --git a/enginecustom/src/inc/system/applicationclass.h b/enginecustom/src/inc/system/applicationclass.h
index cf3afbe..6c0c062 100644
--- a/enginecustom/src/inc/system/applicationclass.h
+++ b/enginecustom/src/inc/system/applicationclass.h
@@ -179,7 +179,8 @@ private :
 	// ------------------------------------- //
 
 	XMMATRIX m_baseViewMatrix;
-	RenderTextureClass* m_RenderTexture, * m_RefractionTexture, * m_ReflectionTexture, * m_SceneTexture;
+	RenderTextureClass* m_RenderTexture, * m_RefractionTexture, * m_ReflectionTexture;
+	RenderTextureClass* m_SceneTexture;
 	DisplayPlaneClass* m_DisplayPlane;
 	int m_screenWidth, m_screenHeight;
 	CameraClass* m_Camera;
diff --git a/enginecustom/src/inc/system/imguiManager.h b/enginecustom/src/inc/system/imguiManager.h
index 0333dc0..1c71b01 100644
--- a/enginecustom/src/inc/system/imguiManager.h
+++ b/enginecustom/src/inc/system/imguiManager.h
@@ -9,6 +9,7 @@
 #include <imgui_impl_win32.h>
 #include <windows.h>
 #include <deque>
+#include "rendertextureclass.h"
 
 class ApplicationClass;
 
@@ -47,6 +48,16 @@ public:
 	bool m_EnableCelShading;
 
 private:
+
+	// --------------------------------------------- //
+	// ----------------- Functions ----------------- //
+	// --------------------------------------------- //
+
+	// --------------------------------------------- //
+	// ----------------- Variables ----------------- //
+	// --------------------------------------------- //
+
+	
 	bool showObjectWindow;
 	bool showTerrainWindow;
 	bool showLightWindow;
@@ -62,6 +73,8 @@ private:
 	ID3D11DeviceContext* m_deviceContext;
 	ImVec2 windowSize;
 
+	RenderTextureClass* m_renderTexture;
+
 	const std::deque<Logger::LogEntry>& logBuffer = Logger::Get().GetLogBuffer();
 };
 
diff --git a/enginecustom/src/inc/system/textclass.h b/enginecustom/src/inc/system/textclass.h
index c3acffa..005c7ff 100644
--- a/enginecustom/src/inc/system/textclass.h
+++ b/enginecustom/src/inc/system/textclass.h
@@ -6,8 +6,6 @@
 // MY CLASS INCLUDES //
 ///////////////////////
 #include "fontclass.h"
-
-
 ////////////////////////////////////////////////////////////////////////////////
 // Class name: TextClass
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/enginecustom/src/src/system/applicationclass.cpp b/enginecustom/src/src/system/applicationclass.cpp
index 4bdf65b..3ab76de 100644
--- a/enginecustom/src/src/system/applicationclass.cpp
+++ b/enginecustom/src/src/system/applicationclass.cpp
@@ -1040,6 +1040,7 @@ bool ApplicationClass::Render(float rotation, float x, float y, float z, float t
 		return false;
 	}
 
+	
 	// Update the render count text.
 	result = UpdateRenderCountString(GetRenderCount());
 	if (!result)
@@ -1185,6 +1186,9 @@ bool ApplicationClass::Render(float rotation, float x, float y, float z, float t
 		return false;
 	}
 
+	// Turn off alpha blending after rendering the 2D text.
+	m_Direct3D->DisableAlphaBlending();
+
 	// turn on the Z buffer
 	m_Direct3D->TurnZBufferOn();
 
diff --git a/enginecustom/src/src/system/d3dclass.cpp b/enginecustom/src/src/system/d3dclass.cpp
index 034e248..188a10e 100644
--- a/enginecustom/src/src/system/d3dclass.cpp
+++ b/enginecustom/src/src/system/d3dclass.cpp
@@ -405,7 +405,7 @@ bool D3DClass::Initialize(int screenWidth, int screenHeight, bool vsync, HWND hw
 	blendStateDescription.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE;
 	blendStateDescription.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO;
 	blendStateDescription.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
-	blendStateDescription.RenderTarget[0].RenderTargetWriteMask = 0x0f;
+	blendStateDescription.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
 
 	// Create the blend state using the description.
 	result = m_device->CreateBlendState(&blendStateDescription, &m_alphaEnableBlendingState);
diff --git a/enginecustom/src/src/system/imguiManager.cpp b/enginecustom/src/src/system/imguiManager.cpp
index b873dfc..bf2f16d 100644
--- a/enginecustom/src/src/system/imguiManager.cpp
+++ b/enginecustom/src/src/system/imguiManager.cpp
@@ -1,6 +1,5 @@
 #include "imguiManager.h"
 #include "applicationclass.h"
-#include <string>
 
 imguiManager::imguiManager()
 {
@@ -17,7 +16,7 @@ bool imguiManager::Initialize(HWND hwnd, ID3D11Device* device, ID3D11DeviceConte
 
 	m_device = device;
 	m_deviceContext = deviceContext;
-
+	
 	IMGUI_CHECKVERSION();
 	ImGui::CreateContext();
 	io = &ImGui::GetIO();
@@ -27,7 +26,11 @@ bool imguiManager::Initialize(HWND hwnd, ID3D11Device* device, ID3D11DeviceConte
 
 	ImGui_ImplWin32_Init(hwnd);
 	ImGui_ImplDX11_Init(m_device, m_deviceContext); 
+
+	// Setup style
 	ImGui::StyleColorsDark();
+	ImGuiStyle& style = ImGui::GetStyle();
+	style.Colors[ImGuiCol_WindowBg] = ImVec4(1.0f, 0.1f, 0.1f, 1.0f);
 
 	Logger::Get().Log("imgui initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
@@ -606,7 +609,16 @@ void imguiManager::WidgetRenderWindow(ApplicationClass* app, ImVec2 availableSiz
 {
 	ImGui::Begin("Render Window");
 
+	ImVec2 oldWindowSize = windowSize;
 	windowSize = ImGui::GetContentRegionAvail();
+	
+	// Si la taille de la fenêtre a changé, ajustez la taille de la fenêtre de l'application
+	if (oldWindowSize.x != windowSize.x || oldWindowSize.y != windowSize.y)
+	{
+		app->SetWindowSize(windowSize);
+	}
+
+	
 
 	// Get the aspect ratio of the scene in app
 	float aspectRatio = app->GetAspectRatio();
@@ -619,15 +631,14 @@ void imguiManager::WidgetRenderWindow(ApplicationClass* app, ImVec2 availableSiz
 	{
 		windowSize.y = windowSize.x / aspectRatio;
 	}
-	
-	app->SetWindowSize(windowSize);
 
 	// Assurez-vous que la texture est valide
-	RenderTextureClass* renderTexture = app->GetRenderTexture();
-	if (renderTexture)
+	m_renderTexture = app->GetRenderTexture();
+	if (m_renderTexture)
 	{
+		
 		// Obtenez la vue de la ressource shader de la texture rendue
-		ID3D11ShaderResourceView* texture = renderTexture->GetShaderResourceView();
+		ID3D11ShaderResourceView* texture = m_renderTexture->GetShaderResourceView();
 
 		// Affichez la texture dans une fenêtre ImGui
 		ImGui::Image((ImTextureID)texture, windowSize);