Patch - TODO : Serialized / Deserialized Component DATA - V12.7.1

.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml

@@ -7,14 +7,9 @@
     <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/inc/system/Skybox.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/Skybox.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/component.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/component.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/application_class.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/application_class.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/identity_component.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/identity_component.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/object.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/object.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/scene_manager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/scene_manager.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/stats.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/stats.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/Skybox.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/Skybox.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/application_class.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/application_class.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/object.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/object.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/stats.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/stats.cpp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -28,91 +23,21 @@
     <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="file://C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0/um/d3d11.h" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0/um/dinput.h" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.44.35207/include/memory" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/enginecustom/include/Inc/VertexTypes.h" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/enginecustom/include/Vulkan/Include/vulkan/vulkan_core.h" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/enginecustom/src/inc/system/ecs/component.h" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/identity_component.h" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/model_path_component.h" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/physics_component.h" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/render_component.h" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/shader_component.h" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/transform_component.h" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/enginecustom/src/inc/system/ecs/entity.h" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/enginecustom/src/inc/system/ecs/entity_manager.h" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/enginecustom/src/inc/system/ecs/systems/render_system.h" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/../../IDE_VS/VC/Tools/MSVC/14.38.33130/include/type_traits" root0="SKIP_HIGHLIGHTING" />
   </component>
   <component name="KubernetesApiPersistence">{}</component>
@@ -134,26 +59,26 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
+  <component name="PropertiesComponent">{
-  "keyToString": {
+  &quot;keyToString&quot;: {
-    "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    "C++ Project.enginecustom.executor": "Run",
+    &quot;C++ Project.enginecustom.executor&quot;: &quot;Run&quot;,
-    "C/C++ Project.KhaoticDemo.executor": "Run",
+    &quot;C/C++ Project.KhaoticDemo.executor&quot;: &quot;Run&quot;,
-    "C/C++ Project.enginecustom.executor": "Debug",
+    &quot;C/C++ Project.enginecustom.executor&quot;: &quot;Run&quot;,
-    "RunOnceActivity.ShowReadmeOnStart": "true",
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    "RunOnceActivity.git.unshallow": "true",
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    "git-widget-placeholder": "main",
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
-    "ignore.virus.scanning.warn.message": "true",
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    "node.js.detected.package.eslint": "true",
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    "node.js.detected.package.tslint": "true",
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    "node.js.selected.package.eslint": "(autodetect)",
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    "node.js.selected.package.tslint": "(autodetect)",
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    "nodejs_package_manager_path": "npm",
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    "settings.editor.selected.configurable": "preferences.pluginManager",
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.environmentSetup&quot;,
-    "vue.rearranger.settings.migration": "true"
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RunManager" selected="C/C++ Project.enginecustom">
     <configuration name="KhaoticDemo" type="CppProject" factoryName="C++ Project">
       <configuration_1 setup="1">
@@ -300,6 +225,14 @@
       <workItem from="1750335650897" duration="2051000" />
       <workItem from="1750344288223" duration="1751000" />
       <workItem from="1750351735497" duration="9648000" />
+      <workItem from="1750417484899" duration="2384000" />
+      <workItem from="1750420267631" duration="148000" />
+      <workItem from="1750592598277" duration="332000" />
+      <workItem from="1750699146323" duration="10385000" />
+      <workItem from="1750763086646" duration="4874000" />
+      <workItem from="1750770680795" duration="13425000" />
+      <workItem from="1750964683511" duration="27000" />
+      <workItem from="1750964770914" duration="2126000" />
     </task>
     <task id="LOCAL-00001" summary="Minor update - viewport window tweak">
       <option name="closed" value="true" />

enginecustom/DemoScene_V10.1.2.ker

@@ -1 +0,0 @@
-1 isosphere 0 10 0 0 -0 0 1 1 1 Content/Assets/Kobject/isosphere.obj ALPHA_MAPPING 1 Unknown 1 0 2 assets/Texture/Bricks2K.png F:\Github_Repo\khaotic-engine-Reborn\enginecustom\assets\Texture\moss01.png 1 assets/Texture/BricksNRM2K.png 1 assets/Texture/BricksGLOSS2K.png 1 F:\Github_Repo\khaotic-engine-Reborn\enginecustom\assets\Texture\alpha01.png

enginecustom/DemoScene_V10.8.1.ker

@@ -1 +0,0 @@
-0 vaisseautri 0 50 0 0 -0 0 1 1 1 Content/Assets/Kobject/vaisseautri.obj CEL_SHADING 1 Unknown 1 0 1 F:\Github_Repo\khaotic-engine-Reborn\enginecustom\assets\Texture\marble01.png 1 assets/Texture/BricksNRM2K.png 1 assets/Texture/BricksGLOSS2K.png 0

enginecustom/DemoScene_V12.6.0.ker

@@ -0,0 +1 @@
+1 CubePart_0_0_0 0 0 0 0 -0 0 1 1 1  LIGHTING 0 Terrain 0 0 1 assets/Texture/Bricks2K.png 1 assets/Texture/BricksNRM2K.png 1 assets/Texture/BricksGLOSS2K.png 0

enginecustom/enginecustom.vcxproj

@@ -119,6 +119,16 @@
     <ClInclude Include="src\inc\system\camera_class.h" />
     <ClInclude Include="src\inc\system\d_3d_class.h" />
     <ClInclude Include="src\inc\system\display_plane_class.h" />
+    <ClInclude Include="src\inc\system\ecs\component.h" />
+    <ClInclude Include="src\inc\system\ecs\components\identity_component.h" />
+    <ClInclude Include="src\inc\system\ecs\components\model_path_component.h" />
+    <ClInclude Include="src\inc\system\ecs\components\physics_component.h" />
+    <ClInclude Include="src\inc\system\ecs\components\render_component.h" />
+    <ClInclude Include="src\inc\system\ecs\components\shader_component.h" />
+    <ClInclude Include="src\inc\system\ecs\components\transform_component.h" />
+    <ClInclude Include="src\inc\system\ecs\entity.h" />
+    <ClInclude Include="src\inc\system\ecs\entity_manager.h" />
+    <ClInclude Include="src\inc\system\ecs\systems\render_system.h" />
     <ClInclude Include="src\inc\system\font_class.h" />
     <ClInclude Include="src\inc\system\fps_class.h" />
     <ClInclude Include="src\inc\system\fps_limiter.h" />
@@ -134,7 +144,6 @@
     <ClInclude Include="src\inc\system\physics.h" />
     <ClInclude Include="src\inc\system\position_class.h" />
     <ClInclude Include="src\inc\system\render_texture_class.h" />
-    <ClInclude Include="src\inc\system\sceneManager.h" />
     <ClInclude Include="src\inc\system\scene_manager.h" />
     <ClInclude Include="src\inc\system\shadow_map.h" />
     <ClInclude Include="src\inc\system\Skybox.h" />

enginecustom/imgui.ini

@@ -10,24 +10,24 @@ Collapsed=0
 
 [Window][Khaotic Engine]
 Pos=1267,19
-Size=317,609
+Size=317,842
 Collapsed=0
-DockId=0x00000002,0
+DockId=0x00000005,0
 
 [Window][render Stats]
 Pos=0,630
-Size=1584,231
+Size=792,231
 Collapsed=0
 DockId=0x00000009,0
 
 [Window][Objects]
 Pos=0,19
-Size=238,609
+Size=234,609
 Collapsed=0
 DockId=0x0000000B,0
 
 [Window][Terrain]
-Pos=0,19
+Pos=236,19
 Size=266,609
 Collapsed=0
 DockId=0x00000007,0
@@ -40,20 +40,28 @@ DockId=0x0000000A,0
 
 [Window][Light]
 Pos=0,19
-Size=238,609
+Size=234,609
 Collapsed=0
 DockId=0x0000000B,1
 
-[Docking][Data]
+[Window][Engine Settings]
-DockSpace         ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=0,19 Size=1584,842 Split=Y
+Pos=1267,462
-  DockNode        ID=0x00000003 Parent=0xCCBD8CF7 SizeRef=1584,609 Split=X
+Size=317,166
-    DockNode      ID=0x0000000B Parent=0x00000003 SizeRef=238,842 Selected=0x031DC75C
+Collapsed=0
-    DockNode      ID=0x0000000C Parent=0x00000003 SizeRef=1344,842 Split=X
+DockId=0x00000006,0
-      DockNode    ID=0x00000007 Parent=0x0000000C SizeRef=266,842 Selected=0x393905AB
+
-      DockNode    ID=0x00000008 Parent=0x0000000C SizeRef=1316,842 Split=X
+[Docking][Data]
-        DockNode  ID=0x00000001 Parent=0x00000008 SizeRef=1025,842 CentralNode=1
+DockSpace           ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=0,19 Size=1584,842 Split=Y
-        DockNode  ID=0x00000002 Parent=0x00000008 SizeRef=317,842 Selected=0x9F035453
+  DockNode          ID=0x00000003 Parent=0xCCBD8CF7 SizeRef=1584,609 Split=X
-  DockNode        ID=0x00000004 Parent=0xCCBD8CF7 SizeRef=1584,231 Split=X Selected=0xF5D1BB37
+    DockNode        ID=0x0000000B Parent=0x00000003 SizeRef=234,842 Selected=0x321620B2
-    DockNode      ID=0x00000009 Parent=0x00000004 SizeRef=792,231 Selected=0xF5D1BB37
+    DockNode        ID=0x0000000C Parent=0x00000003 SizeRef=1348,842 Split=X
-    DockNode      ID=0x0000000A Parent=0x00000004 SizeRef=790,231 Selected=0xAB74BEE9
+      DockNode      ID=0x00000007 Parent=0x0000000C SizeRef=266,842 Selected=0x393905AB
+      DockNode      ID=0x00000008 Parent=0x0000000C SizeRef=1316,842 Split=X
+        DockNode    ID=0x00000001 Parent=0x00000008 SizeRef=1265,842 CentralNode=1
+        DockNode    ID=0x00000002 Parent=0x00000008 SizeRef=317,842 Split=Y Selected=0x9F035453
+          DockNode  ID=0x00000005 Parent=0x00000002 SizeRef=317,441 Selected=0x9F035453
+          DockNode  ID=0x00000006 Parent=0x00000002 SizeRef=317,166 Selected=0x0B098C4B
+  DockNode          ID=0x00000004 Parent=0xCCBD8CF7 SizeRef=1584,231 Split=X Selected=0xF5D1BB37
+    DockNode        ID=0x00000009 Parent=0x00000004 SizeRef=792,231 Selected=0xF5D1BB37
+    DockNode        ID=0x0000000A Parent=0x00000004 SizeRef=790,231 Selected=0xAB74BEE9
 

enginecustom/src/inc/system/application_class.h

@@ -7,10 +7,7 @@
 ///////////////////////
 #include "d_3d_class.h"
 #include "camera_class.h"
-#include "object.h"
 #include "light_class.h"
-#include <vector>
-#include <filesystem>
 
 #include "bitmap_class.h"
 #include "sprite_class.h"
@@ -31,7 +28,16 @@
 #include "physics.h"
 #include "frustum.h"
 #include "skybox.h"
+#include "shadow_map.h"
+#include "stats.h"
 
+#include "ecs/components/identity_component.h"
+#include "ecs/components/render_component.h"
+#include "ecs/components/transform_component.h"
+#include "ecs/components/physics_component.h"
+#include "ecs/components/shader_component.h"
+#include "ecs/systems/render_system.h"
+#include "ecs/components/model_path_component.h"
 
 #include <fstream>
 #include <WICTextureLoader.h>
@@ -43,9 +49,10 @@
 #include <DirectXMath.h>
 #include <mutex>
 #include <memory>
+#include <vector>
+#include <filesystem>
 
-#include "shadow_map.h"
+#include "ecs/entity_manager.h"
-#include "stats.h"
 
 
 /////////////
@@ -96,19 +103,14 @@ public:
 
 	float get_speed() const { return speed_; };
 	void set_speed(const float speed) { this->speed_ = speed; };
-
+	
 	void add_cube();
-	void delete_kobject(int index);
+	void delete_entity_by_id(int entity_id);
-	size_t get_cube_count() const { return cubes_.size(); };
-	size_t get_terrain_cube_count() const { return terrain_chunk_.size(); };
-	std::vector<object*> get_cubes() const { return cubes_; };
-	std::vector<object*> get_terrain_cubes() const { return terrain_chunk_; };
-	std::vector<object*> get_kobjects() const { return object_; };
-	void set_kobjects(std::vector<object*> kobjects) { object_ = kobjects; };
 	void add_kobject(std::wstring& filepath);
 	void set_path(WCHAR* path) { path_ = path; };
 	void set_w_folder(const std::filesystem::path& w_folder) { w_folder_ = w_folder; };
 	std::filesystem::path get_w_folder() const { return w_folder_; };
+	int get_terrain_entity_count();
 
 	int get_object_id() const { return object_id_; };
 	void set_object_id(int object_id) { object_id_ = object_id; };
@@ -128,14 +130,20 @@ public:
 
 	void set_cel_shading(const bool enable) { enable_cel_shading_ = enable; };
 
-	void set_vsync(bool vsync);
+	void set_vsync(bool vsync) { 
+		vsync_enabled_ = vsync; 
+		if (direct_3d_) {
+			direct_3d_->set_vsync(vsync); 
+			Logger::Get().Log("Setting Vsync to " + std::to_string(vsync), __FILE__, __LINE__);
+		}
+	};
 	bool get_vsync() const { return vsync_enabled_; };
 
-	HWND get_hwnd() const;
+	HWND get_hwnd() const { return hwnd_; };
-	void set_hwnd(HWND hwnd);
+	void set_hwnd(HWND hwnd) { hwnd_ = hwnd; };
 
-	bool is_windowed() const;
+	bool is_windowed() const { return windowed_; };
-	void set_windowed(bool windowed);
+	void set_windowed(bool windowed) { windowed_ = windowed; };
 
 	void set_window_size(const ImVec2 size) { window_size_ = size; };
 	ImVec2 get_window_size() const { return window_size_; };
@@ -151,6 +159,7 @@ public:
 	void set_frustum(const frustum& frustum) { frustum_culling_ = frustum; };
 
 	void construct_frustum();
+	
 	int get_render_count() const { return render_count_; };
 	void set_render_count(const int render_count) { render_count_ = render_count; };
 	float get_frustum_tolerance() const { return frustum_culling_tolerance_; };
@@ -164,18 +173,23 @@ public:
 	stats* get_stats() const { return stats_; };
 	fps_class* get_fps() const { return fps_; };
 	
+	ecs::EntityManager* get_entity_manager() const { return entity_manager_.get(); };
+	void update_stats_after_modification();
+	std::map<std::string, std::shared_ptr<model_class>>& get_model_cache() { return g_model_cache; }
+	
 private:
 	bool render(float, float, float, float, float);
-	bool render_physics(bool key_left, bool key_right, bool key_up, bool key_down, float delta_time);
+	bool render_physics(float delta_time);
 	bool update_mouse_strings(int, int, bool);
 	bool update_fps();
 	bool update_render_count_string(int);
 	bool render_scene_to_texture(float);
 	bool render_refraction_to_texture();
 	bool render_reflection_to_texture();
-	bool render_pass(const std::vector<std::reference_wrapper<std::vector<object*>>>& RenderQueues, XMFLOAT4* diffuse, XMFLOAT4* position, XMFLOAT4* ambient, XMMATRIX view, XMMATRIX projection);
+	bool render_pass(XMFLOAT4* diffuse, XMFLOAT4* position, XMFLOAT4* ambient, XMMATRIX view, XMMATRIX projection);
 
 	void update_skybox_position();
+	void culling_thread_function();
 	
 public :
 	std::vector<ID3D11ShaderResourceView*> textures;
@@ -186,9 +200,7 @@ private :
 	std::thread culling_thread_;
 	std::atomic<bool> culling_active_;
 	std::mutex objects_mutex_;
-	void culling_thread_function();
+	
-
-
 	std::mutex terrain_mutex_;
 	std::vector<std::tuple<float, float, float, std::string, int>> terrain_generation_data_;
 	bool terrain_generation_ready_;
@@ -228,14 +240,13 @@ private :
 	// ------------- OBJECTS -------------- //
 	// ------------------------------------ //
 
+	std::unique_ptr<ecs::EntityManager> entity_manager_;
+	
 	object* selected_object_;
-	std::vector<object*> cubes_;
+	
-	std::vector<object*> terrain_chunk_;
 	float speed_ = 0.1f; // speed for the demo spinning object
-	std::vector<object*> object_;
 	std::vector<object*> imported_object_;
 	int object_id_ = 0;
-	std::vector<std::reference_wrapper<std::vector<object*>>> render_queues_;
 	std::vector<object*> skybox_;
 
 	// ----------------------------------- //

enginecustom/src/inc/system/ecs/component.h

@@ -0,0 +1,43 @@
+#pragma once
+#include <memory>
+#include <typeindex>
+#include <typeinfo>
+
+namespace ecs {
+
+// Classe de base pour tous les composants
+class Component {
+public:
+    Component() = default;
+    virtual ~Component() = default;
+
+    // Empêcher la copie
+    Component(const Component&) = delete;
+    Component& operator=(const Component&) = delete;
+
+    // Permettre le déplacement
+    Component(Component&&) = default;
+    Component& operator=(Component&&) = default;
+
+    // Fonction virtuelle pour initialiser le composant
+    virtual void Initialize() {}
+    
+    // Fonction virtuelle pour la mise à jour du composant
+    virtual void Update(float deltaTime) {}
+
+    // virtual std::string Serialize() {}
+    // virtual void Deserialize(const std::string& data) {}
+};
+
+// Alias utiles
+using ComponentPtr = std::shared_ptr<Component>;
+using ComponentTypeID = std::type_index;
+
+// Fonction pour obtenir l'ID de type d'un composant
+template<typename T>
+ComponentTypeID GetComponentTypeID() {
+    static_assert(std::is_base_of<Component, T>::value, "T must derive from Component");
+    return std::type_index(typeid(T));
+}
+
+}  // namespace ecs

enginecustom/src/inc/system/ecs/components/identity_component.h

@@ -0,0 +1,58 @@
+#pragma once
+#include "../component.h"
+#include <string>
+
+namespace ecs {
+
+enum class ObjectType
+{
+    Sphere,
+    Cube,
+    Terrain,
+    Unknown
+};
+
+class IdentityComponent : public Component {
+public:
+    IdentityComponent() : m_id(0), m_type(ObjectType::Unknown) {}
+    explicit IdentityComponent(int id) : m_id(id), m_type(ObjectType::Unknown) {}
+    IdentityComponent(int id, const std::string& name) : m_id(id), m_name(name), m_type(ObjectType::Unknown) {}
+    ~IdentityComponent() = default;
+
+    void Initialize() override {}
+    //void Update(float deltaTime) override {}
+
+    // Getters et setters
+    int GetId() const { return m_id; }
+    void SetId(int id) { m_id = id; }
+
+    const std::string& GetName() const { return m_name; }
+    void SetName(const std::string& name) { m_name = name; }
+
+    ObjectType GetType() const { return m_type; }
+    void SetType(ObjectType type) { m_type = type; }
+
+    // Conversions utiles
+    static std::string ObjectTypeToString(ObjectType type) {
+        switch (type) {
+            case ObjectType::Cube: return "Cube";
+            case ObjectType::Sphere: return "Sphere";
+            case ObjectType::Terrain: return "Terrain";
+            default: return "Unknown";
+        }
+    }
+
+    static ObjectType StringToObjectType(const std::string& str) {
+        if (str == "Cube") return ObjectType::Cube;
+        if (str == "Sphere") return ObjectType::Sphere;
+        if (str == "Terrain") return ObjectType::Terrain;
+        return ObjectType::Unknown;
+    }
+
+private:
+    int m_id;
+    std::string m_name;
+    ObjectType m_type;
+};
+
+}  // namespace ecs

enginecustom/src/inc/system/ecs/components/model_path_component.h

@@ -0,0 +1,24 @@
+#pragma once
+#include "../component.h"
+#include <string>
+
+namespace ecs {
+
+class ModelPathComponent : public Component {
+public:
+    ModelPathComponent() = default;
+    explicit ModelPathComponent(const std::wstring& path) : m_path(path) {}
+    ~ModelPathComponent() = default;
+
+    void Initialize() override {}
+    void Update(float deltaTime) override {}
+
+    // Getters et setters
+    const std::wstring& GetPath() const { return m_path; }
+    void SetPath(const std::wstring& path) { m_path = path; }
+
+private:
+    std::wstring m_path;
+};
+
+} // namespace ecs

enginecustom/src/inc/system/ecs/components/physics_component.h

@@ -0,0 +1,110 @@
+#pragma once
+#include "../component.h"
+#include <DirectXMath.h>
+
+using namespace DirectX;
+
+namespace ecs {
+
+class PhysicsComponent : public Component {
+public:
+    PhysicsComponent() {
+        m_Velocity = XMVectorZero();
+        m_Acceleration = XMVectorZero();
+        m_PreviousPosition = XMVectorZero();
+        m_Mass = 1.0f;
+        m_BoundingRadius = 1.0f;
+        m_IsGrounded = false;
+        m_IsPhysicsEnabled = false;
+        m_GravityEnabled = true;
+    }
+
+    ~PhysicsComponent() = default;
+
+    void Initialize() override {
+        // Initialisation du composant physique
+    }
+
+    void Update(float deltaTime) override {
+        if (!m_IsPhysicsEnabled) return;
+
+        // Mise à jour de la vélocité basée sur l'accélération
+        m_Velocity = m_Velocity + m_Acceleration * deltaTime;
+        
+        // Si la physique est activée et qu'une fonction de mise à jour de position est définie
+        if (m_UpdatePositionCallback) {
+            m_UpdatePositionCallback(m_Velocity * deltaTime);
+        }
+    }
+
+    // Lancement d'un objet
+    void LaunchObject(float alpha, float initialStretch, float springConstant) {
+        // Constants
+        const float gravity = -9.81f;
+    
+        // Convert alpha from degrees to radians if needed
+        float alphaRadians = alpha * (XM_PI / 180.0f);
+    
+        // Scale factors to make the physics simulation more visible
+        float scaleFactor = 200.0f;  // Adjust this based on your world scale
+    
+        // Calculate initial velocity magnitude
+        float velocityMagnitude = initialStretch * sqrtf(springConstant / m_Mass) * 
+                                  sqrtf(1.0f - powf((m_Mass * gravity * sinf(alphaRadians) / 
+                                  (springConstant * initialStretch)), 2.0f));
+    
+        // Apply scale factor
+        velocityMagnitude *= scaleFactor;
+    
+        // Calculate velocity components
+        XMVECTOR velocity = XMVectorSet(
+            velocityMagnitude * cosf(alphaRadians),  // vx = v0 * cos(alpha)
+            velocityMagnitude * sinf(alphaRadians),  // vy = v0 * sin(alpha)
+            0.0f,                                   // z-component (0 for 2D trajectory)
+            0.0f
+        );
+    
+        // Apply velocity
+        SetVelocity(velocity);
+        
+        // Enable physics and reset grounded state
+        SetPhysicsEnabled(true);
+        SetGrounded(false);
+    }
+
+    // Setters
+    void SetVelocity(XMVECTOR velocity) { m_Velocity = velocity; }
+    void SetAcceleration(XMVECTOR acceleration) { m_Acceleration = acceleration; }
+    void SetMass(float mass) { m_Mass = mass; }
+    void SetGrounded(bool isGrounded) { m_IsGrounded = isGrounded; }
+    void SetPhysicsEnabled(bool enabled) { m_IsPhysicsEnabled = enabled; }
+    void SetBoundingRadius(float radius) { m_BoundingRadius = radius; }
+    void SetPreviousPosition(XMVECTOR position) { m_PreviousPosition = position; }
+    void SetGravityEnabled(bool enabled) { m_GravityEnabled = enabled; }
+    void SetUpdatePositionCallback(std::function<void(XMVECTOR)> callback) { m_UpdatePositionCallback = callback; }
+
+    // Getters
+    XMVECTOR GetVelocity() const { return m_Velocity; }
+    XMVECTOR GetAcceleration() const { return m_Acceleration; }
+    float GetMass() const { return m_Mass; }
+    bool IsGrounded() const { return m_IsGrounded; }
+    bool IsPhysicsEnabled() const { return m_IsPhysicsEnabled; }
+    float GetBoundingRadius() const { return m_BoundingRadius; }
+    XMVECTOR GetPreviousPosition() const { return m_PreviousPosition; }
+    bool IsGravityEnabled() const { return m_GravityEnabled; }
+
+private:
+    XMVECTOR m_Velocity;
+    XMVECTOR m_Acceleration;
+    XMVECTOR m_PreviousPosition;
+    float m_Mass;
+    float m_BoundingRadius;
+    bool m_IsGrounded;
+    bool m_IsPhysicsEnabled;
+    bool m_GravityEnabled;
+    
+    // Callback pour mettre à jour la position (sera connecté au TransformComponent)
+    std::function<void(XMVECTOR)> m_UpdatePositionCallback;
+};
+
+}  // namespace ecs

enginecustom/src/inc/system/ecs/components/render_component.h

@@ -0,0 +1,124 @@
+#pragma once
+#include "../component.h"
+#include "model_class.h"
+#include <memory>
+#include <string>
+#include <map>
+#include <WICTextureLoader.h>
+
+// Déclaration externe de la variable globale définie dans application_class.h
+extern std::map<std::string, std::shared_ptr<model_class>> g_model_cache;
+
+namespace ecs {
+
+enum class TextureType
+{
+    Diffuse,
+    Normal,
+    Specular,
+    Alpha,
+    Reflection
+};
+
+class RenderComponent : public Component {
+public:
+    RenderComponent() : m_model(nullptr), m_isVisible(true) {}
+    ~RenderComponent() = default;
+
+    void Initialize() override {}
+    void Update(float deltaTime) override {}
+
+    // Initialisation avec un modèle existant
+    bool InitializeWithModel(std::shared_ptr<model_class> model) {
+        if (!model) return false;
+        m_model = model;
+        return true;
+    }
+
+    // Initialisation avec un chemin de fichier
+    bool InitializeFromFile(ID3D11Device* device, ID3D11DeviceContext* deviceContext, 
+                           const char* modelFilename, TextureContainer& textureContainer) {
+        // Vérifier si le modèle existe déjà dans le cache
+        std::string filename(modelFilename);
+        auto it = g_model_cache.find(filename);
+        if (it != g_model_cache.end()) {
+            m_model = it->second;
+        } else {
+            // Créer un nouveau modèle
+            auto new_model = std::make_shared<model_class>();
+            if (!new_model->Initialize(device, deviceContext, const_cast<char*>(modelFilename), textureContainer)) {
+                return false;
+            }
+            g_model_cache[filename] = new_model;
+            m_model = new_model;
+        }
+
+        m_modelFilePath = modelFilename;
+        return true;
+    }
+
+    // Charger des textures depuis un chemin
+    bool LoadTexturesFromPath(std::vector<std::wstring>& texturePaths, TextureContainer& texturesContainer,
+                             ID3D11Device* device, ID3D11DeviceContext* deviceContext) {
+        HRESULT result;
+        
+        int i = 0;
+        for (const auto& texturePath : texturePaths) {
+            ID3D11ShaderResourceView* texture = nullptr;
+            result = DirectX::CreateWICTextureFromFile(device, deviceContext, texturePath.c_str(), nullptr, &texture);
+            if (FAILED(result)) {
+                return false;
+            }
+            texturesContainer.AssignTexture(texturesContainer, texture, texturePath, i);
+            i++;
+        }
+
+        return true;
+    }
+
+    // Getters et setters
+    std::shared_ptr<model_class> GetModel() const { return m_model; }
+    void SetModel(std::shared_ptr<model_class> model) { m_model = model; }
+
+    const std::string& GetModelFilePath() const { return m_modelFilePath; }
+    void SetModelFilePath(const std::string& path) { m_modelFilePath = path; }
+
+    bool IsVisible() const { return m_isVisible; }
+    void SetVisible(bool visible) { m_isVisible = visible; }
+
+    // Accès aux textures
+    ID3D11ShaderResourceView* GetTexture(TextureType type, int index = 0) {
+        if (!m_model) return nullptr;
+        
+        switch (type) {
+            case TextureType::Diffuse: 
+                return m_model->GetTexture(::TextureType::Diffuse, index);
+            case TextureType::Normal: 
+                return m_model->GetTexture(::TextureType::Normal, index);
+            case TextureType::Specular: 
+                return m_model->GetTexture(::TextureType::Specular, index);
+            case TextureType::Alpha: 
+                return m_model->GetTexture(::TextureType::Alpha, index);
+            default: 
+                return nullptr;
+        }
+    }
+
+    // Pour le rendu
+    int GetIndexCount() const {
+        return m_model ? m_model->GetIndexCount() : 0;
+    }
+
+    void Render(ID3D11DeviceContext* deviceContext) {
+        if (m_model && m_isVisible) {
+            m_model->Render(deviceContext);
+        }
+    }
+
+private:
+    std::shared_ptr<model_class> m_model;
+    std::string m_modelFilePath;
+    bool m_isVisible;
+};
+
+}  // namespace ecs

enginecustom/src/inc/system/ecs/components/shader_component.h

@@ -0,0 +1,67 @@
+#pragma once
+#include "../component.h"
+
+namespace ecs {
+
+enum class ShaderType
+{
+    CEL_SHADING,
+    LIGHTING,
+    NORMAL_MAPPING,
+    SPECULAR_MAPPING,
+    REFLECTION,
+    REFRACTION,
+    TEXTURE,
+    SKYBOX,
+    SUNLIGHT,
+    ALPHA_MAPPING
+};
+
+class ShaderComponent : public Component {
+public:
+    ShaderComponent() : m_activeShader(ShaderType::LIGHTING) {}
+    ~ShaderComponent() = default;
+
+    void Initialize() override {}
+    void Update(float deltaTime) override {}
+
+    // Getters et setters
+    ShaderType GetActiveShader() const { return m_activeShader; }
+    void SetActiveShader(ShaderType shader) { m_activeShader = shader; }
+
+    // Conversions utiles
+    static ShaderType StringToShaderType(const std::string& str) {
+        if (str == "ALPHA_MAPPING") return ShaderType::ALPHA_MAPPING;
+        if (str == "CEL_SHADING") return ShaderType::CEL_SHADING;
+        if (str == "NORMAL_MAPPING") return ShaderType::NORMAL_MAPPING;
+        if (str == "SPECULAR_MAPPING") return ShaderType::SPECULAR_MAPPING;
+        if (str == "TEXTURE") return ShaderType::TEXTURE;
+        if (str == "LIGHTING") return ShaderType::LIGHTING;
+        if (str == "SUNLIGHT") return ShaderType::SUNLIGHT;
+        if (str == "SKYBOX") return ShaderType::SKYBOX;
+        if (str == "REFLECTION") return ShaderType::REFLECTION;
+        if (str == "REFRACTION") return ShaderType::REFRACTION;
+        return ShaderType::TEXTURE;
+    }
+
+    static std::string ShaderTypeToString(ShaderType type) {
+        switch (type) {
+            case ShaderType::ALPHA_MAPPING: return "ALPHA_MAPPING";
+            case ShaderType::CEL_SHADING: return "CEL_SHADING";
+            case ShaderType::NORMAL_MAPPING: return "NORMAL_MAPPING";
+            case ShaderType::SPECULAR_MAPPING: return "SPECULAR_MAPPING";
+            case ShaderType::TEXTURE: return "TEXTURE";
+            case ShaderType::LIGHTING: return "LIGHTING";
+            case ShaderType::SUNLIGHT: return "SUNLIGHT";
+            case ShaderType::SKYBOX: return "SKYBOX";
+            case ShaderType::REFLECTION: return "REFLECTION";
+            case ShaderType::REFRACTION: return "REFRACTION";
+            default: return "TEXTURE";
+        }
+    }
+
+private:
+    ShaderType m_activeShader;
+};
+
+}  // namespace ecs

enginecustom/src/inc/system/ecs/components/transform_component.h

@@ -0,0 +1,101 @@
+#pragma once
+#include "../component.h"
+#include <DirectXMath.h>
+
+using namespace DirectX;
+
+namespace ecs {
+
+class TransformComponent : public Component {
+public:
+    TransformComponent() {
+        m_ScaleMatrix = XMMatrixIdentity();
+        m_RotateMatrix = XMMatrixIdentity();
+        m_TranslateMatrix = XMMatrixIdentity();
+        m_WorldMatrix = XMMatrixIdentity();
+    }
+
+    ~TransformComponent() = default;
+
+    // Méthodes pour les matrices
+    void SetPosition(XMVECTOR position) {
+        XMFLOAT4X4 matrix;
+        XMStoreFloat4x4(&matrix, m_TranslateMatrix);
+        matrix._41 = XMVectorGetX(position);
+        matrix._42 = XMVectorGetY(position);
+        matrix._43 = XMVectorGetZ(position);
+        m_TranslateMatrix = XMLoadFloat4x4(&matrix);
+        UpdateWorldMatrix();
+    }
+
+    void SetRotation(XMVECTOR rotation) {
+        m_RotateMatrix = XMMatrixRotationRollPitchYawFromVector(rotation);
+        UpdateWorldMatrix();
+    }
+
+    void SetScale(XMVECTOR scale) {
+        XMFLOAT4X4 matrix;
+        XMStoreFloat4x4(&matrix, m_ScaleMatrix);
+        matrix._11 = XMVectorGetX(scale);
+        matrix._22 = XMVectorGetY(scale);
+        matrix._33 = XMVectorGetZ(scale);
+        m_ScaleMatrix = XMLoadFloat4x4(&matrix);
+        UpdateWorldMatrix();
+    }
+
+    XMVECTOR GetPosition() const {
+        XMFLOAT4X4 matrix;
+        XMStoreFloat4x4(&matrix, m_TranslateMatrix);
+        return XMVectorSet(matrix._41, matrix._42, matrix._43, 0.0f);
+    }
+
+    XMVECTOR GetRotation() const {
+        XMFLOAT4X4 matrix;
+        XMStoreFloat4x4(&matrix, m_RotateMatrix);
+        float rotationX = atan2f(matrix._32, matrix._33);
+        float rotationY = atan2f(-matrix._31, sqrtf(matrix._32 * matrix._32 + matrix._33 * matrix._33));
+        float rotationZ = atan2f(matrix._21, matrix._11);
+        return XMVectorSet(rotationX, rotationY, rotationZ, 0.0f);
+    }
+
+    XMVECTOR GetScale() const {
+        XMFLOAT4X4 matrix;
+        XMStoreFloat4x4(&matrix, m_ScaleMatrix);
+
+        XMVECTOR row1 = XMLoadFloat3(reinterpret_cast<XMFLOAT3*>(&matrix._11));
+        XMVECTOR row2 = XMLoadFloat3(reinterpret_cast<XMFLOAT3*>(&matrix._21));
+        XMVECTOR row3 = XMLoadFloat3(reinterpret_cast<XMFLOAT3*>(&matrix._31));
+
+        XMVECTOR scale = XMVectorSet(
+            XMVectorGetX(XMVector3Length(row1)),
+            XMVectorGetX(XMVector3Length(row2)),
+            XMVectorGetX(XMVector3Length(row3)),
+            0.0f
+        );
+
+        return scale;
+    }
+
+    void UpdateWorldMatrix() {
+        m_WorldMatrix = m_ScaleMatrix * m_RotateMatrix * m_TranslateMatrix;
+    }
+
+    // Getters pour les matrices
+    XMMATRIX GetScaleMatrix() const { return m_ScaleMatrix; }
+    XMMATRIX GetRotateMatrix() const { return m_RotateMatrix; }
+    XMMATRIX GetTranslateMatrix() const { return m_TranslateMatrix; }
+    XMMATRIX GetWorldMatrix() const { return m_WorldMatrix; }
+
+    // Setters pour les matrices
+    void SetScaleMatrix(XMMATRIX matrix) { m_ScaleMatrix = matrix; UpdateWorldMatrix(); }
+    void SetRotateMatrix(XMMATRIX matrix) { m_RotateMatrix = matrix; UpdateWorldMatrix(); }
+    void SetTranslateMatrix(XMMATRIX matrix) { m_TranslateMatrix = matrix; UpdateWorldMatrix(); }
+
+private:
+    XMMATRIX m_ScaleMatrix;
+    XMMATRIX m_RotateMatrix;
+    XMMATRIX m_TranslateMatrix;
+    XMMATRIX m_WorldMatrix;
+};
+
+}  // namespace ecs

enginecustom/src/inc/system/ecs/entity.h

@@ -0,0 +1,101 @@
+#pragma once
+#include "component.h"
+#include <unordered_map>
+#include <vector>
+#include <memory>
+#include <algorithm>
+#include <cassert>
+
+namespace ecs {
+
+// Identifiant unique pour les entités
+using EntityID = uint32_t;
+
+class Entity {
+public:
+    explicit Entity(EntityID id) : m_ID(id) {}
+    ~Entity() = default;
+
+    // Empêcher la copie
+    Entity(const Entity&) = delete;
+    Entity& operator=(const Entity&) = delete;
+
+    // Permettre le déplacement
+    Entity(Entity&&) = default;
+    Entity& operator=(Entity&&) = default;
+
+    // Getter pour l'ID
+    EntityID GetID() const { return m_ID; }
+
+    // Ajouter un composant
+    template<typename T, typename... Args>
+    std::shared_ptr<T> AddComponent(Args&&... args) {
+        static_assert(std::is_base_of<Component, T>::value, "T must derive from Component");
+        
+        ComponentTypeID typeID = GetComponentTypeID<T>();
+        
+        // Vérifier si le composant existe déjà
+        if (m_Components.find(typeID) != m_Components.end()) {
+            return std::static_pointer_cast<T>(m_Components[typeID]);
+        }
+        
+        // Créer et ajouter le composant
+        auto component = std::make_shared<T>(std::forward<Args>(args)...);
+        m_Components[typeID] = component;
+        
+        // Initialiser le composant
+        component->Initialize();
+        
+        return component;
+    }
+
+    // Récupérer un composant
+    template<typename T>
+    std::shared_ptr<T> GetComponent() {
+        static_assert(std::is_base_of<Component, T>::value, "T must derive from Component");
+        
+        ComponentTypeID typeID = GetComponentTypeID<T>();
+        
+        auto it = m_Components.find(typeID);
+        if (it != m_Components.end()) {
+            return std::static_pointer_cast<T>(it->second);
+        }
+        
+        return nullptr;
+    }
+
+    // Vérifier si l'entité possède un composant
+    template<typename T>
+    bool HasComponent() const {
+        static_assert(std::is_base_of<Component, T>::value, "T must derive from Component");
+        
+        ComponentTypeID typeID = GetComponentTypeID<T>();
+        return m_Components.find(typeID) != m_Components.end();
+    }
+
+    // Supprimer un composant
+    template<typename T>
+    void RemoveComponent() {
+        static_assert(std::is_base_of<Component, T>::value, "T must derive from Component");
+        
+        ComponentTypeID typeID = GetComponentTypeID<T>();
+        auto it = m_Components.find(typeID);
+        
+        if (it != m_Components.end()) {
+            m_Components.erase(it);
+        }
+    }
+
+    // Mettre à jour tous les composants
+    void UpdateComponents(float deltaTime) {
+        for (auto& [typeID, component] : m_Components) {
+            component->Update(deltaTime);
+        }
+    }
+
+private:
+    EntityID m_ID;
+    std::unordered_map<ComponentTypeID, ComponentPtr> m_Components;
+};
+
+}  // namespace ecs

enginecustom/src/inc/system/ecs/entity_manager.h

@@ -0,0 +1,107 @@
+#pragma once
+#include "entity.h"
+#include <vector>
+#include <unordered_map>
+#include <queue>
+
+namespace ecs {
+
+class EntityManager {
+public:
+    EntityManager() : m_NextEntityID(0) {}
+    ~EntityManager() = default;
+
+    // Créer une nouvelle entité
+    std::shared_ptr<Entity> CreateEntity() {
+        EntityID id;
+        
+        // Réutiliser les IDs des entités supprimées si possible
+        if (!m_FreeIDs.empty()) {
+            id = m_FreeIDs.front();
+            m_FreeIDs.pop();
+        } else {
+            id = m_NextEntityID++;
+        }
+        
+        auto entity = std::make_shared<Entity>(id);
+        m_Entities[id] = entity;
+        
+        return entity;
+    }
+
+    // Supprimer une entité
+    void DestroyEntity(EntityID id) {
+        auto it = m_Entities.find(id);
+        if (it != m_Entities.end()) {
+            m_Entities.erase(it);
+            m_FreeIDs.push(id); // Recycler l'ID
+        }
+    }
+
+    // Obtenir une entité par son ID
+    std::shared_ptr<Entity> GetEntity(EntityID id) {
+        auto it = m_Entities.find(id);
+        if (it != m_Entities.end()) {
+            return it->second;
+        }
+        return nullptr;
+    }
+
+    // Mettre à jour toutes les entités
+    void UpdateEntities(float deltaTime) {
+        for (auto& [id, entity] : m_Entities) {
+            entity->UpdateComponents(deltaTime);
+        }
+    }
+
+    // Obtenir toutes les entités
+    std::vector<std::shared_ptr<Entity>> GetAllEntities() {
+        std::vector<std::shared_ptr<Entity>> result;
+        result.reserve(m_Entities.size());
+        
+        for (const auto& [id, entity] : m_Entities) {
+            result.push_back(entity);
+        }
+        
+        return result;
+    }
+
+    // Obtenir toutes les entités qui ont un composant spécifique
+    template<typename T>
+    std::vector<std::shared_ptr<Entity>> GetEntitiesWithComponent() {
+        static_assert(std::is_base_of<Component, T>::value, "T must derive from Component");
+        
+        std::vector<std::shared_ptr<Entity>> result;
+        
+        for (auto& [id, entity] : m_Entities) {
+            if (entity->HasComponent<T>()) {
+                result.push_back(entity);
+            }
+        }
+        
+        return result;
+    }
+
+    // Obtenir le nombre d'entités
+    size_t GetEntityCount() const {
+        return m_Entities.size();
+    }
+
+    // Vider toutes les entités
+    void Clear() {
+        m_Entities.clear();
+        
+        // Vider la file des IDs libres
+        std::queue<EntityID> empty;
+        std::swap(m_FreeIDs, empty);
+        
+        m_NextEntityID = 0;
+    }
+
+private:
+    EntityID m_NextEntityID;
+    std::unordered_map<EntityID, std::shared_ptr<Entity>> m_Entities;
+    std::queue<EntityID> m_FreeIDs; // IDs à réutiliser
+};
+
+}  // namespace ecs

enginecustom/src/inc/system/ecs/systems/render_system.h

@@ -0,0 +1,222 @@
+#pragma once
+#include "../entity_manager.h"
+#include "../components/render_component.h"
+#include "../components/transform_component.h"
+#include "../components/shader_component.h"
+#include "shader_manager_class.h"
+#include <DirectXMath.h>
+
+namespace ecs {
+
+class RenderSystem {
+public:
+    RenderSystem(ID3D11DeviceContext* deviceContext, shader_manager_class* shaderManager) 
+        : m_deviceContext(deviceContext), m_shaderManager(shaderManager) {}
+    
+    // Rendu d'une entité spécifique
+    bool RenderEntity(std::shared_ptr<Entity> entity, 
+                      const DirectX::XMMATRIX& viewMatrix, 
+                      const DirectX::XMMATRIX& projectionMatrix,
+                      const DirectX::XMFLOAT4* diffuseColors,
+                      const DirectX::XMFLOAT4* lightPositions,
+                      const DirectX::XMFLOAT4* ambientColors,
+                      const DirectX::XMFLOAT3& cameraPosition,
+                      const DirectX::XMFLOAT4& sunlightDiffuse,
+                      const DirectX::XMFLOAT4& sunlightAmbient,
+                      const DirectX::XMFLOAT3& sunlightDirection,
+                      float sunlightIntensity) {
+        
+        // Vérifier si l'entité a tous les composants nécessaires
+        auto transform = entity->GetComponent<TransformComponent>();
+        auto render = entity->GetComponent<RenderComponent>();
+        auto shader = entity->GetComponent<ShaderComponent>();
+
+        if (!transform || !render || !shader || !render->GetModel())
+            return false;
+
+        // Calculer la matrice monde
+        XMMATRIX scaleMatrix = transform->GetScaleMatrix();
+        XMMATRIX rotateMatrix = transform->GetRotateMatrix();
+        XMMATRIX translateMatrix = transform->GetTranslateMatrix();
+
+        XMMATRIX worldMatrix = XMMatrixMultiply(
+            XMMatrixMultiply(scaleMatrix, rotateMatrix),
+            translateMatrix
+        );
+
+        // Rendre le modèle
+        render->Render(m_deviceContext);
+
+        // Sélectionner le shader approprié
+        switch (shader->GetActiveShader()) {
+            case ShaderType::ALPHA_MAPPING:
+                return m_shaderManager->render_alpha_map_shader(
+                    m_deviceContext,
+                    render->GetIndexCount(),
+                    worldMatrix,
+                    viewMatrix,
+                    projectionMatrix,
+                    render->GetTexture(TextureType::Diffuse, 0),
+                    render->GetTexture(TextureType::Diffuse, 1),
+                    render->GetTexture(TextureType::Alpha, 0)
+                );
+
+            case ShaderType::CEL_SHADING:
+                return m_shaderManager->render_cel_shading_shader(
+                    m_deviceContext,
+                    render->GetIndexCount(),
+                    worldMatrix,
+                    viewMatrix,
+                    projectionMatrix,
+                    render->GetTexture(TextureType::Diffuse, 0),
+                    sunlightDiffuse,
+                    sunlightAmbient,
+                    sunlightDirection,
+                    sunlightIntensity
+                );
+
+            case ShaderType::NORMAL_MAPPING:
+                return m_shaderManager->render_normal_map_shader(
+                    m_deviceContext,
+                    render->GetIndexCount(),
+                    worldMatrix,
+                    viewMatrix,
+                    projectionMatrix,
+                    render->GetTexture(TextureType::Diffuse, 0),
+                    render->GetTexture(TextureType::Normal, 0),
+                    sunlightDirection,
+                    sunlightDiffuse
+                );
+
+            case ShaderType::SPECULAR_MAPPING:
+
+                return m_shaderManager->render_spec_map_shader(
+                    m_deviceContext,
+                    render->GetIndexCount(),
+                    worldMatrix,
+                    viewMatrix,
+                    projectionMatrix,
+                    render->GetTexture(TextureType::Diffuse, 0),
+                    render->GetTexture(TextureType::Normal, 0),
+                    render->GetTexture(TextureType::Specular, 0),
+                    sunlightDirection,
+                    sunlightDiffuse,
+                    cameraPosition,
+                    sunlightDiffuse,        // Couleur speculaire (à ajuster)
+                    16.0f                   // Puissance speculaire (à ajuster)
+                );
+
+            case ShaderType::LIGHTING:
+                {
+                    // Créer des copies locales non constantes des tableaux
+                    DirectX::XMFLOAT4 localDiffuseColors[4];
+                    DirectX::XMFLOAT4 localLightPositions[4];
+                    DirectX::XMFLOAT4 localAmbientColors[4];
+                    
+                    // Copier les données
+                    for (int i = 0; i < 4; i++) {
+                        localDiffuseColors[i] = diffuseColors[i];
+                        localLightPositions[i] = lightPositions[i];
+                        localAmbientColors[i] = ambientColors[i];
+                    }
+                    
+                    return m_shaderManager->renderlight_shader(
+                        m_deviceContext,
+                        render->GetIndexCount(),
+                        worldMatrix,
+                        viewMatrix,
+                        projectionMatrix,
+                        render->GetTexture(TextureType::Diffuse, 0),
+                        localDiffuseColors,
+                        localLightPositions,
+                        localAmbientColors
+                    );
+                }
+
+            case ShaderType::SUNLIGHT:
+                return m_shaderManager->render_sunlight_shader(
+                    m_deviceContext,
+                    render->GetIndexCount(),
+                    worldMatrix,
+                    viewMatrix,
+                    projectionMatrix,
+                    render->GetTexture(TextureType::Diffuse, 0),
+                    sunlightDiffuse,
+                    sunlightAmbient,
+                    sunlightDirection,
+                    sunlightIntensity
+                );
+
+            case ShaderType::SKYBOX:
+                return m_shaderManager->render_skybox_shader(
+                    m_deviceContext,
+                    render->GetIndexCount(),
+                    worldMatrix,
+                    viewMatrix,
+                    projectionMatrix,
+                    render->GetTexture(TextureType::Diffuse, 0),
+                    sunlightDiffuse,
+                    sunlightAmbient,
+                    sunlightDirection,
+                    sunlightIntensity
+                );
+
+            case ShaderType::TEXTURE:
+            default:
+                return m_shaderManager->render_texture_shader(
+                    m_deviceContext,
+                    render->GetIndexCount(),
+                    worldMatrix,
+                    viewMatrix,
+                    projectionMatrix,
+                    render->GetTexture(TextureType::Diffuse, 0)
+                );
+        }
+    }
+
+    // Rendu de toutes les entités avec les composants nécessaires
+    int RenderAllEntities(EntityManager* entityManager,
+                         const DirectX::XMMATRIX& viewMatrix,
+                         const DirectX::XMMATRIX& projectionMatrix,
+                         const DirectX::XMFLOAT4* diffuseColors,
+                         const DirectX::XMFLOAT4* lightPositions,
+                         const DirectX::XMFLOAT4* ambientColors,
+                         const DirectX::XMFLOAT3& cameraPos,
+                         const DirectX::XMFLOAT4& sunlightDiffuse,
+                         const DirectX::XMFLOAT4& sunlightAmbient,
+                         const DirectX::XMFLOAT3& sunlightDirection,
+                         float sunlightIntensity) {
+        
+        int renderCount = 0;
+
+        // Récupérer toutes les entités qui ont les composants RenderComponent et TransformComponent
+        auto entities = entityManager->GetEntitiesWithComponent<RenderComponent>();
+        
+        for (auto& entity : entities) {
+            auto render = entity->GetComponent<RenderComponent>();
+            
+            // Vérifier si l'entité a un TransformComponent
+            auto transform = entity->GetComponent<TransformComponent>();
+            if (!transform) continue;
+
+            // Vérifier si le modèle est visible
+            if (!render->IsVisible()) continue;
+
+            // Effectuer le rendu
+            if (RenderEntity(entity, viewMatrix, projectionMatrix, 
+                            diffuseColors, lightPositions, ambientColors,cameraPos,
+                            sunlightDiffuse, sunlightAmbient, sunlightDirection,
+                            sunlightIntensity)) {
+                renderCount++;
+            }
+        }
+
+        return renderCount;
+    }
+
+private:
+    ID3D11DeviceContext* m_deviceContext;
+    shader_manager_class* m_shaderManager;
+};
+
+} // namespace ecs

enginecustom/src/inc/system/imguiManager.h

@@ -106,9 +106,12 @@ private:
 
 	const std::deque<Logger::LogEntry>& logBuffer = Logger::Get().GetLogBuffer();
 
-	int current_fps_, min_fps_, max_fps_, draw_calls_, total_vertex_count_, total_triangle_count_, visible_triangle_count_;
+	int current_fps_, min_fps_, max_fps_, draw_calls_, visible_triangle_count_;
 	float current_frame_time_, min_frame_time_, max_frame_time_ ;
 
+	std::shared_ptr<int> total_vertex_count_;
+	std::shared_ptr<int> total_triangle_count_;
+
 	// gpu information
 	char card_name_[128];
 	int video_memory_ = 0;

enginecustom/src/inc/system/scene_manager.h

@@ -3,6 +3,8 @@
 #include <string>
 #include <vector>
 
+#include "ecs/entity.h"
+
 class d_3d_class;
 class object;
 class application_class;
@@ -26,6 +28,8 @@ public:
 
 private:
 
+    std::vector<std::shared_ptr<ecs::Entity>> entity_;
+    
     application_class* app_;
     std::string scene_path_;
     std::vector<object*> object_vec_;

enginecustom/src/inc/system/stats.h

@@ -18,6 +18,7 @@ public:
 
     bool initialize(application_class* app);
     void update_geometric_stats();
+    void update_visible_count();
     void update_display_stats();
 
     int get_total_vertex_count() const;
@@ -36,6 +37,10 @@ public:
     std::string get_cpu_name();
     std::string get_gpu_driver_version(ID3D11Device* device);
 
+    std::shared_ptr<int>& get_vertex_count_ptr() { return total_vertex_count_; }
+    std::shared_ptr<int>& get_triangle_count_ptr() { return total_triangle_count_; }
+    
+
 private:
     std::thread update_display_thread_;
     
@@ -47,8 +52,9 @@ private:
     std::vector<object*> cubes_vec_;
     std::vector<object*> terrain_chunk_vec_;
 
-    int total_vertex_count_;
+    std::shared_ptr<int> total_vertex_count_;
-    int total_triangle_count_;
+    std::shared_ptr<int> total_triangle_count_;
+    
     int visible_triangle_count_ = 0;
     int current_fps_ = 0;
     int min_fps_ = 0;

enginecustom/src/src/system/imguiManager.cpp

@@ -17,6 +17,14 @@ imguiManager::imguiManager()
 	total_triangle_count_ = 0;
 	visible_triangle_count_ = 0;
 	current_frame_time_ = 0;
+
+	showObjectWindow = false;
+	showTerrainWindow = false;
+	showLightWindow = false;
+	showOldSceneWindow = false;
+	showEngineSettingsWindow = false;
+	showLogWindow = false;
+	showStatsWindow = false;
     
 	// Initialiser l'historique des frametimes à zéro
 	for (int i = 0; i < FRAME_HISTORY_COUNT; i++)
@@ -171,6 +179,9 @@ bool imguiManager::Initialize(HWND hwnd, ID3D11Device* device, ID3D11DeviceConte
 	}
 
 	stats_ = app_->get_stats();
+
+	total_triangle_count_ = stats_->get_triangle_count_ptr();
+	total_vertex_count_ = stats_->get_vertex_count_ptr();
     
     Logger::Get().Log("imgui initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
     
@@ -375,290 +386,313 @@ void imguiManager::WidgetAddObject()
 
 		}
 		ImGui::SameLine();
-		ImGui::Text("Number of cubes: %d", app_->get_cube_count());
+		ImGui::Text("Number of cubes: %d", app_->get_entity_manager()->GetEntityCount());
 	}
 }
 
 void imguiManager::WidgetObjectWindow()
 {
 	ImGui::Begin("Objects", &showObjectWindow);
+
+	// Obtenir toutes les entités avec un composant d'identité et de transformation
+	auto entities = app_->get_entity_manager()->GetEntitiesWithComponent<ecs::IdentityComponent>();
+	
 	int index = 0;
-	for (auto& object : app_->get_kobjects())
+	for (auto& entity : entities)
 	{
-		std::string headerName = object->GetName() + " " + std::to_string(index);
+		auto identity = entity->GetComponent<ecs::IdentityComponent>();
-		if (ImGui::CollapsingHeader(headerName.c_str()))
+		auto transform = entity->GetComponent<ecs::TransformComponent>();
+		auto render = entity->GetComponent<ecs::RenderComponent>();
+		auto shader = entity->GetComponent<ecs::ShaderComponent>();
+		auto physics = entity->GetComponent<ecs::PhysicsComponent>();
+		
+		if (identity && transform)
 		{
-
+			std::string headerName = identity->GetName() + " " + std::to_string(identity->GetId());
-			XMVECTOR position = object->GetPosition();
+			if (ImGui::CollapsingHeader(headerName.c_str()))
-			XMVECTOR rotation = object->GetRotation();
-			XMVECTOR scale = object->GetScale();
-
-			float pos[3] = { XMVectorGetX(position), XMVectorGetY(position), XMVectorGetZ(position) };
-			std::string posLabel = "Position##" + std::to_string(index);
-			if (ImGui::DragFloat3(posLabel.c_str(), pos))
 			{
-				object->SetPosition(XMVectorSet(pos[0], pos[1], pos[2], 0.0f));
+				// Position, Rotation, Scale
-			}
+				XMVECTOR position = transform->GetPosition();
+				XMVECTOR rotation = transform->GetRotation();
+				XMVECTOR scale = transform->GetScale();
 
-			float rot[3] = { XMVectorGetX(rotation), XMVectorGetY(rotation), XMVectorGetZ(rotation) };
+				float pos[3] = { XMVectorGetX(position), XMVectorGetY(position), XMVectorGetZ(position) };
-			std::string rotLabel = "Rotation##" + std::to_string(index);
+				std::string posLabel = "Position##" + std::to_string(identity->GetId());
-			if (ImGui::DragFloat3(rotLabel.c_str(), rot))
+				if (ImGui::DragFloat3(posLabel.c_str(), pos))
-			{
-				object->SetRotation(XMVectorSet(rot[0], rot[1], rot[2], 0.0f));
-			}
-
-			float scl[3] = { XMVectorGetX(scale), XMVectorGetY(scale), XMVectorGetZ(scale) };
-			std::string sclLabel = "Scale##" + std::to_string(index);
-			if (ImGui::DragFloat3(sclLabel.c_str(), scl))
-			{
-				object->SetScale(XMVectorSet(scl[0], scl[1], scl[2], 0.0f));
-			}
-			
-			 ImGui::Separator();
-
-            // Définir les types de textures_
-            std::vector<std::string> textureCategories = {
-                "Diffuse", "Normal", "Specular", "Alpha"
-            };
-
-            std::vector<TextureType> textureTypes = {
-                TextureType::Diffuse, TextureType::Normal, 
-                TextureType::Specular, TextureType::Alpha
-            };
-
-            // Créer un espace pour afficher les textures_ avec défilement
-            ImGui::BeginChild("TextureChild", ImVec2(0, 200), true, ImGuiWindowFlags_HorizontalScrollbar);
-            
-            // Pour chaque type de texture
-            for (int typeIndex = 0; typeIndex < textureCategories.size(); typeIndex++)
-            {
-                TextureType type = textureTypes[typeIndex];
-                std::string typeName = textureCategories[typeIndex];
-                
-                // Afficher le titre de la catégorie
-                ImGui::Text("%s:", typeName.c_str());
-                ImGui::SameLine();
-
-                // Compter combien de textures_ de ce type existent
-                int textureCount = 0;
-                while (object->get_model()->GetTexture(type, textureCount) != nullptr)
-                {
-                    textureCount++;
-                }
-
-                // Afficher toutes les textures_ existantes
-                ImGui::BeginGroup();
-                for (int texIndex = 0; texIndex < textureCount; texIndex++)
-                {
-                    ID3D11ShaderResourceView* texture = object->get_model()->GetTexture(type, texIndex);
-                    if (texture)
-                    {
-                        // ID unique pour chaque bouton de texture
-                        std::string buttonId = "tex##" + std::to_string(index) + "_" + 
-                                               std::to_string(typeIndex) + "_" + 
-                                               std::to_string(texIndex);
-                        
-                        if (ImGui::ImageButton(buttonId.c_str(), (ImTextureID)texture, ImVec2(48, 48)))
-                        {
-                            // Ouvrir une boîte de dialogue pour changer la texture
-                            OPENFILENAME ofn;
-                            WCHAR szFile[260];
-                            ZeroMemory(&ofn, sizeof(ofn));
-                            ofn.lStructSize = sizeof(ofn);
-                            ofn.hwndOwner = NULL;
-                            ofn.lpstrFile = szFile;
-                            szFile[0] = '\0';
-                            ofn.nMaxFile = sizeof(szFile);
-                            ofn.lpstrFilter = L"Texture\0*.png;*.jpg;*.dds\0";
-                            ofn.nFilterIndex = 1;
-                            ofn.lpstrInitialDir = NULL;
-                            ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
-
-                            if (GetOpenFileName(&ofn))
-                            {
-                                // Changer la texture existante
-                                object->get_model()->ChangeTexture(m_device, m_deviceContext, ofn.lpstrFile, type, texIndex);
-                            }
-                        }
-                        
-                        // Afficher l'indice de texture et prévisualisation au survol
-                        if (ImGui::IsItemHovered())
-                        {
-                            ImGui::BeginTooltip();
-                            ImGui::Text("%s %d", typeName.c_str(), texIndex);
-                            ImGui::Image((ImTextureID)texture, ImVec2(192, 192));
-                            ImGui::EndTooltip();
-                        }
-                        
-                        ImGui::SameLine();
-                    }
-                }
-                
-                // Bouton pour ajouter une nouvelle texture
-                std::string addButtonLabel = "+##" + std::to_string(index) + "_" + std::to_string(typeIndex);
-                if (ImGui::Button(addButtonLabel.c_str(), ImVec2(48, 48)))
-                {
-                    // Ouvrir une boîte de dialogue pour ajouter une texture
-                    OPENFILENAME ofn;
-                    WCHAR szFile[260];
-                    ZeroMemory(&ofn, sizeof(ofn));
-                    ofn.lStructSize = sizeof(ofn);
-                    ofn.hwndOwner = NULL;
-                    ofn.lpstrFile = szFile;
-                    szFile[0] = '\0';
-                    ofn.nMaxFile = sizeof(szFile);
-                    ofn.lpstrFilter = L"Texture\0*.png;*.jpg;*.dds\0";
-                    ofn.nFilterIndex = 1;
-                    ofn.lpstrInitialDir = NULL;
-                    ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
-
-                    if (GetOpenFileName(&ofn))
-                    {
-                        // Ajouter une nouvelle texture
-                        object->get_model()->AddTexture(m_device, m_deviceContext, ofn.lpstrFile, type);
-                    }
-                }
-                
-                ImGui::EndGroup();
-                ImGui::Separator();
-            }
-            
-            ImGui::EndChild();
-
-			ImGui::Separator();
-
-			// Delete button
-			std::string deleteLabel = "Delete##" + std::to_string(index);
-			if (ImGui::Button(deleteLabel.c_str()))
-			{
-				app_->delete_kobject(index);
-			}
-
-			ImGui::Separator();
-
-			// Liste des options
-			const char* shaderOptions[] = {
-				"Enable Global Lighting",
-				"Enable Lighting",
-				"Enable Cel Shading",
-				"Enable Normal Mapping",
-				"Enable Specular Mapping",
-				"Enable Alpha Mapping"
-			};
-			
-			ShaderType shaderTypes[] = {
-				ShaderType::SUNLIGHT,
-				ShaderType::LIGHTING,
-				ShaderType::CEL_SHADING,
-				ShaderType::NORMAL_MAPPING,
-				ShaderType::SPECULAR_MAPPING,
-				ShaderType::ALPHA_MAPPING
-			};
-
-			// Variable pour stocker l'option sélectionnée
-			static int currentShader = 0; // Index de l'option actuellement sélectionnée
-
-			// Création du menu déroulant
-			if (ImGui::BeginCombo("Shader Options", shaderOptions[currentShader]))
-			{
-				for (int i = 0; i < IM_ARRAYSIZE(shaderOptions); i++)
 				{
-					// Crée une option sélectionnable pour chaque shader
+					transform->SetPosition(XMVectorSet(pos[0], pos[1], pos[2], 0.0f));
-					bool isSelected = (currentShader == i);
+					transform->UpdateWorldMatrix();
-					if (ImGui::Selectable(shaderOptions[i], isSelected))
+				}
+
+				float rot[3] = { XMVectorGetX(rotation), XMVectorGetY(rotation), XMVectorGetZ(rotation) };
+				std::string rotLabel = "Rotation##" + std::to_string(identity->GetId());
+				if (ImGui::DragFloat3(rotLabel.c_str(), rot))
+				{
+					transform->SetRotation(XMVectorSet(rot[0], rot[1], rot[2], 0.0f));
+					transform->UpdateWorldMatrix();
+				}
+
+				float scl[3] = { XMVectorGetX(scale), XMVectorGetY(scale), XMVectorGetZ(scale) };
+				std::string sclLabel = "Scale##" + std::to_string(identity->GetId());
+				if (ImGui::DragFloat3(sclLabel.c_str(), scl))
+				{
+					transform->SetScale(XMVectorSet(scl[0], scl[1], scl[2], 0.0f));
+					transform->UpdateWorldMatrix();
+				}
+				
+				ImGui::Separator();
+
+				// Textures - Seulement si le composant de rendu existe
+				if (render && render->GetModel())
+				{
+					// Définir les types de textures_
+					std::vector<std::string> textureCategories = {
+						"Diffuse", "Normal", "Specular", "Alpha"
+					};
+
+					std::vector<TextureType> textureTypes = {
+						TextureType::Diffuse, TextureType::Normal, 
+						TextureType::Specular, TextureType::Alpha
+					};
+
+					// Créer un espace pour afficher les textures_ avec défilement
+					std::string textureChildId = "TextureChild##" + std::to_string(identity->GetId());
+					ImGui::BeginChild(textureChildId.c_str(), ImVec2(0, 200), true, ImGuiWindowFlags_HorizontalScrollbar);
+					
+					// Pour chaque type de texture
+					for (int typeIndex = 0; typeIndex < textureCategories.size(); typeIndex++)
 					{
-						// Met à jour l'option sélectionnée
+						TextureType type = textureTypes[typeIndex];
-						currentShader = i;
+						std::string typeName = textureCategories[typeIndex];
-						object->SetActiveShader(shaderTypes[i]);
+						
+						// Afficher le titre de la catégorie
+						std::string categoryLabel = typeName + "##" + std::to_string(identity->GetId());
+						ImGui::Text("%s:", typeName.c_str());
+						ImGui::SameLine();
+
+						// Compter combien de textures_ de ce type existent
+						int textureCount = 0;
+						while (render->GetModel()->GetTexture(type, textureCount) != nullptr)
+						{
+							textureCount++;
+						}
+
+						// Afficher toutes les textures_ existantes
+						std::string groupId = "TextureGroup_" + std::to_string(identity->GetId()) + "_" + std::to_string(typeIndex);
+						ImGui::BeginGroup();
+						for (int texIndex = 0; texIndex < textureCount; texIndex++)
+						{
+							ID3D11ShaderResourceView* texture = render->GetModel()->GetTexture(type, texIndex);
+							if (texture)
+							{
+								// ID unique pour chaque bouton de texture
+								std::string buttonId = "tex##" + std::to_string(identity->GetId()) + "_" + 
+													std::to_string(typeIndex) + "_" + 
+													std::to_string(texIndex);
+								
+								if (ImGui::ImageButton(buttonId.c_str(), (ImTextureID)texture, ImVec2(48, 48)))
+								{
+									// Ouvrir une boîte de dialogue pour changer la texture
+									OPENFILENAME ofn;
+									WCHAR szFile[260] = {0};
+									ZeroMemory(&ofn, sizeof(ofn));
+									ofn.lStructSize = sizeof(ofn);
+									ofn.hwndOwner = NULL;
+									ofn.lpstrFile = szFile;
+									ofn.nMaxFile = sizeof(szFile);
+									ofn.lpstrFilter = L"Texture\0*.png;*.jpg;*.dds\0";
+									ofn.nFilterIndex = 1;
+									ofn.lpstrInitialDir = NULL;
+									ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
+
+									if (GetOpenFileName(&ofn))
+									{
+										// Changer la texture existante
+										render->GetModel()->ChangeTexture(m_device, m_deviceContext, ofn.lpstrFile, type, texIndex);
+									}
+								}
+								
+								// Afficher l'indice de texture et prévisualisation au survol
+								if (ImGui::IsItemHovered())
+								{
+									ImGui::BeginTooltip();
+									ImGui::Text("%s %d", typeName.c_str(), texIndex);
+									ImGui::Image((ImTextureID)texture, ImVec2(192, 192));
+									ImGui::EndTooltip();
+								}
+								
+								ImGui::SameLine();
+							}
+						}
+						
+						// Bouton pour ajouter une nouvelle texture
+						std::string addButtonLabel = "+##" + std::to_string(identity->GetId()) + "_" + std::to_string(typeIndex);
+						if (ImGui::Button(addButtonLabel.c_str(), ImVec2(48, 48)))
+						{
+							// Ouvrir une boîte de dialogue pour ajouter une texture
+							OPENFILENAME ofn;
+							WCHAR szFile[260] = {0};
+							ZeroMemory(&ofn, sizeof(ofn));
+							ofn.lStructSize = sizeof(ofn);
+							ofn.hwndOwner = NULL;
+							ofn.lpstrFile = szFile;
+							ofn.nMaxFile = sizeof(szFile);
+							ofn.lpstrFilter = L"Texture\0*.png;*.jpg;*.dds\0";
+							ofn.nFilterIndex = 1;
+							ofn.lpstrInitialDir = NULL;
+							ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
+
+							if (GetOpenFileName(&ofn))
+							{
+								// Ajouter une nouvelle texture
+								render->GetModel()->AddTexture(m_device, m_deviceContext, ofn.lpstrFile, type);
+							}
+						}
+						
+						ImGui::EndGroup();
+						ImGui::Separator();
+					}
+					
+					ImGui::EndChild();
+				}
+
+				ImGui::Separator();
+
+				// Delete button
+				std::string deleteLabel = "Delete##" + std::to_string(identity->GetId());
+				if (ImGui::Button(deleteLabel.c_str()))
+				{
+					app_->delete_entity_by_id(identity->GetId());
+					// Sortir du boucle après suppression pour éviter des accès invalides
+					break;
+				}
+
+				ImGui::Separator();
+
+				// Shader options
+				if (shader)
+				{
+					// Liste des options de shader
+					const char* shaderOptions[] = {
+						"Enable Global Lighting",
+						"Enable Lighting",
+						"Enable Cel Shading",
+						"Enable Normal Mapping",
+						"Enable Specular Mapping",
+						"Enable Alpha Mapping"
+					};
+					
+					std::vector<ecs::ShaderType> shaderTypes = {
+						ecs::ShaderType::SUNLIGHT,
+						ecs::ShaderType::LIGHTING,
+						ecs::ShaderType::CEL_SHADING,
+						ecs::ShaderType::NORMAL_MAPPING,
+						ecs::ShaderType::SPECULAR_MAPPING,
+						ecs::ShaderType::ALPHA_MAPPING
+					};
+
+					// Trouver l'index actuel du shader pour cette entité spécifique
+					int currentShader = 0;
+					ecs::ShaderType activeShader = shader->GetActiveShader();
+					for (size_t i = 0; i < shaderTypes.size(); i++)
+					{
+						if (shaderTypes[i] == activeShader)
+						{
+							currentShader = static_cast<int>(i);
+							break;
+						}
 					}
 
-					// Si l'option sélectionnée est active, nous mettons en surbrillance
+					// Création du menu déroulant avec un ID unique pour chaque entité
-					if (isSelected)
+					std::string shaderComboId = "Shader Options##" + std::to_string(identity->GetId());
-						ImGui::SetItemDefaultFocus();
+					if (ImGui::BeginCombo(shaderComboId.c_str(), shaderOptions[currentShader]))
+					{
+						for (int i = 0; i < IM_ARRAYSIZE(shaderOptions); i++)
+						{
+							// Crée une option sélectionnable pour chaque shader avec ID unique
+							std::string shaderSelectableId = std::to_string(i) + "##shader_" + std::to_string(identity->GetId());
+							bool isSelected = (currentShader == i);
+							if (ImGui::Selectable(shaderOptions[i], isSelected))
+							{
+								// Met à jour l'option sélectionnée uniquement pour cette entité
+								currentShader = i;
+								shader->SetActiveShader(shaderTypes[i]);
+							}
+
+							// Si l'option sélectionnée est active, nous mettons en surbrillance
+							if (isSelected)
+								ImGui::SetItemDefaultFocus();
+						}
+						ImGui::EndCombo();
+					}
 				}
-				ImGui::EndCombo();
+				
-			}
+				ImGui::Separator();
 
-			
+				// Physics
-			ImGui::Separator();
+				bool isPhysicsEnabled = (physics != nullptr);
+				std::string physicsLabel = "Physics##" + std::to_string(identity->GetId());
+				
+				if (ImGui::Checkbox(physicsLabel.c_str(), &isPhysicsEnabled)) 
+				{
+					if (isPhysicsEnabled && !physics)
+					{
+						// Ajouter un composant de physique
+						physics = entity->AddComponent<ecs::PhysicsComponent>();
+						physics->Initialize();
+					}
+					else if (!isPhysicsEnabled && physics)
+					{
+						// Retirer le composant de physique
+						entity->RemoveComponent<ecs::PhysicsComponent>();
+						physics = nullptr;
+					}
+				}
 
-			// physics
+				if (physics)
-			std::string physicsLabel = "physics##" + std::to_string(index);
+				{
-			
+					// Gravity Enabled checkbox
-			if (ImGui::Checkbox(physicsLabel.c_str(), &m_isPhyiscsEnabled)) 
+					bool gravityEnabled = physics->IsGravityEnabled();
-			{
+					std::string gravityLabel = "Gravity##" + std::to_string(identity->GetId());
-				object->SetPhysicsEnabled(m_isPhyiscsEnabled);
+					if (ImGui::Checkbox(gravityLabel.c_str(), &gravityEnabled))
-			}
+					{
+						physics->SetGravityEnabled(gravityEnabled);
+					}
 
-			// Gravity Enabled checkbox
+					// 3 radio buttons pour le type d'objet physique avec IDs uniques
-			std::string gravityLabel = "Gravity##" + std::to_string(index);
+					std::string typeLabel = "Type##" + std::to_string(identity->GetId());
-			if (ImGui::Checkbox(gravityLabel.c_str(), &object->m_gravityEnabled))
+					ecs::ObjectType type = identity->GetType();
-			{
-				object->SetGravityEnabled(object->m_gravityEnabled);
-			}
-			
 
-			// 3 radio button on the same line to set the ObjectType
+					if (ImGui::RadioButton(("None##" + std::to_string(identity->GetId())).c_str(), 
-			std::string typeLabel = "Type##" + std::to_string(index);
+						type == ecs::ObjectType::Unknown))
-			ObjectType type = object->GetType();
+					{
-			if (ImGui::RadioButton("None", type == ObjectType::Unknown))
+						identity->SetType(ecs::ObjectType::Unknown);
-			{
+					}
-				object->SetType(ObjectType::Unknown);
+					ImGui::SameLine();
-			}
+					if (ImGui::RadioButton(("Cube##" + std::to_string(identity->GetId())).c_str(), 
-			ImGui::SameLine();
+						type == ecs::ObjectType::Cube))
-			if (ImGui::RadioButton("Cube", type == ObjectType::Cube))
+					{
-			{
+						identity->SetType(ecs::ObjectType::Cube);
-				object->SetType(ObjectType::Cube);
+					}
-			}
+					ImGui::SameLine();
-			ImGui::SameLine();
+					if (ImGui::RadioButton(("Sphere##" + std::to_string(identity->GetId())).c_str(), 
-			if (ImGui::RadioButton("Sphere", type == ObjectType::Sphere))
+						type == ecs::ObjectType::Sphere))
-			{
+					{
-				object->SetType(ObjectType::Sphere);
+						identity->SetType(ecs::ObjectType::Sphere);
-			}
+					}
+					ImGui::SameLine();
+					if (ImGui::RadioButton(("Terrain##" + std::to_string(identity->GetId())).c_str(), 
+						type == ecs::ObjectType::Terrain))
+					{
+						identity->SetType(ecs::ObjectType::Terrain);
+					}
 
-			// button to launch the object
+				}
-			std::string launchLabel = "Launch##" + std::to_string(index);
 
-			// paraeter to set the alpha, initial stretch and spring constant
+				ImGui::Separator();
-			float alpha = object->GetAlpha();
-			float initialStretch = object->GetInitialStretch();
-			float springConstant = object->GetSpringConstant();
-			if (ImGui::DragFloat("Alpha##" , &alpha, 0.01f, 0.0f, 1.0f))
-			{
-				object->SetAlpha(alpha);
 			}
-			if (ImGui::DragFloat("Initial Stretch##", &initialStretch, 0.01f, 0.0f, 1.0f))
+			index++;
-			{
-				object->SetInitialStretch(initialStretch);
-			}
-			if (ImGui::DragFloat("Spring Constant##", &springConstant, 0.01f, 0.0f, 100.0f))
-			{
-				object->SetSpringConstant(springConstant);
-			}
-			
-			if (ImGui::Button(launchLabel.c_str()))
-			{
-				object->LaunchObject();
-			}
-			ImGui::SameLine();
-			// button to stop the object
-			std::string stopLabel = "Stop##" + std::to_string(index);
-			if (ImGui::Button(stopLabel.c_str()))
-			{
-				object->SetVelocity(XMVectorSet(0.0f, 0.0f, 0.0f, 0.0f));
-				object->SetPosition(XMVectorSet(0.0f, 0.0f, 0.0f, 0.0f));
-			}
-			
-
-
-
-			ImGui::Separator();
-
-			// Demo spinning
-			std::string demoLabel = "Demo spinning##" + std::to_string(index);
-			ImGui::Checkbox(demoLabel.c_str(), &object->m_demoSpinning);
 		}
-		index++;
 	}
 	
 	ImGui::End();
@@ -668,7 +702,7 @@ void imguiManager::WidgetTerrainWindow()
 {
 	ImGui::Begin("Terrain", &showTerrainWindow);
 
-	ImGui::Text("Number of terrain cubes: %d", app_->get_terrain_cube_count());
+	ImGui::Text("Number of terrain cubes: %d", app_->get_terrain_entity_count());
 
 	ImGui::Separator();
 
@@ -989,8 +1023,11 @@ void imguiManager::WidgetRenderStats()
 	min_fps_ = stats_->get_min_fps();
 	max_fps_ = stats_->get_max_fps();
 	draw_calls_ = stats_->get_draw_calls();
-	total_vertex_count_ = stats_->get_total_vertex_count();
+
-	total_triangle_count_ = stats_->get_total_triangle_count();
+	
+	// total_vertex_count_ = stats_->get_total_vertex_count();
+	// total_triangle_count_ = stats_->get_total_triangle_count();
+	
 	visible_triangle_count_ = stats_->get_visible_triangle_count();
 	current_frame_time_ = stats_->get_frame_time();
 	
@@ -1039,9 +1076,9 @@ void imguiManager::WidgetRenderStats()
     ImGui::Separator();
 
     ImGui::Text("Statistiques de rendu:");
-    ImGui::Text("Vertices total: %d", total_vertex_count_);
+    ImGui::Text("Vertices total: %d", *total_vertex_count_);
 
-    ImGui::Text("Triangles total: %d", total_triangle_count_);
+    ImGui::Text("Triangles total: %d", *total_triangle_count_);
     ImGui::SameLine();
     ImGui::Text("Triangles visibles: %d", visible_triangle_count_);
 
@@ -1092,4 +1129,5 @@ void imguiManager::WidgetRenderStats()
 	ImGui::Columns(1);
 
     ImGui::End();
-}
+}
+

enginecustom/src/src/system/scene_manager.cpp

@@ -52,7 +52,7 @@ bool scene_manager::save_scene_as() {
         
         // Mettre à jour le chemin de scène
         scene_path_ = convert_w_string_to_string(filepath.wstring());
-        object_vec_ = app_->get_kobjects();
+        //object_vec_ = app_->get_kobjects(); // TODO
         
         // Sauvegarder la scène avec le nouveau chemin
         save_scene();
@@ -67,29 +67,32 @@ bool scene_manager::save_scene_as() {
 bool scene_manager::load_scene() {
 	Logger::Get().Log("Loading scene from " , __FILE__, __LINE__, Logger::LogLevel::Info);
 
-    object_vec_ = app_->get_kobjects();
     object_id_ = app_->get_object_id();
     w_folder_ = app_->get_w_folder();
     direct_3d_ = app_->get_direct_3d();
 	std::wstring scenePath = get_scene_path();
     
-    
+	if (!scenePath.empty()) {
-	if (!scenePath.empty())
-	{
 	    scene_path_ = convert_w_string_to_string(scenePath);
 	}
 	
 	std::ifstream inFile(scene_path_);
 	if (!inFile.is_open()) {
-		Logger::Get().Log("Failed to open file for loading scene: ", __FILE__, __LINE__, Logger::LogLevel::Error);
+		Logger::Get().Log("Failed to open file for loading scene: " + scene_path_, __FILE__, __LINE__, Logger::LogLevel::Error);
 		return false;
 	}
     
-    object_vec_.clear();
+    // Réinitialiser l'ID d'objet le plus élevé
     object_id_ = 0;
+    
+    // Récupérer l'EntityManager pour créer de nouvelles entités
+    auto entity_manager = app_->get_entity_manager();
+    
+    // Supprimer toutes les entités existantes
+    entity_manager->Clear();
 
-	// Sauvegarder le répertoire de travail actuel
+    // Sauvegarder le répertoire de travail actuel
-	std::wstring currentDirectory = w_folder_;
+    std::wstring currentDirectory = w_folder_;
 
     std::string line;
     while (std::getline(inFile, line)) {
@@ -104,47 +107,61 @@ bool scene_manager::load_scene() {
         float mass;
         bool physicsEnabled;
 
-        // Lire les données de base de l'objet
+        // Lire les données de base de l'entité
         iss >> id >> name
             >> position.x >> position.y >> position.z
             >> rotation.x >> rotation.y >> rotation.z
-            >> scale.x >> scale.y >> scale.z
+            >> scale.x >> scale.y >> scale.z;
-            >> modelPath >> shaderTypeStr
+        
+        // Lire le chemin du modèle - vérifier s'il est vide
+        iss >> modelPath;
+        
+        // Si le chemin du modèle est vide ou commence par une lettre majuscule (probablement un type de shader),
+        // c'est qu'il a été omis - utilisez une valeur par défaut
+        if (modelPath.empty() || (modelPath[0] >= 'A' && modelPath[0] <= 'Z')) {
+            // Reculer le curseur de lecture pour lire le type de shader à la place
+            iss.seekg(-static_cast<int>(modelPath.length()), std::ios::cur);
+            modelPath = "assets/Model/TXT/cube.txt"; // Valeur par défaut
+        }
+        
+        iss >> shaderTypeStr
             >> boundingRadius >> objectTypeStr
             >> mass >> physicsEnabled;
 
         if (iss.fail()) {
-            Logger::Get().Log("Failed to parse object data", __FILE__, __LINE__, Logger::LogLevel::Error);
+            Logger::Get().Log("Failed to parse entity data: " + line, __FILE__, __LINE__, Logger::LogLevel::Error);
             continue;
         }
 
-        // Créer un nouvel objet
+        // Mettre à jour l'ID d'objet le plus élevé si nécessaire
-        object* newObject = new object();
+        if (id >= object_id_) {
+            object_id_ = id + 1;
+        }
 
         // Convertir le chemin du modèle en wstring
         std::wstring wModelPath(modelPath.begin(), modelPath.end());
 
-    	// Vérifier si le chemin est relatif (ne commence pas par un disque comme C:)
+        // Vérifier si le chemin est relatif
-    	if (modelPath.length() > 1 && modelPath[1] != ':') {
+        if (modelPath != "NoModel" && modelPath.length() > 1 && modelPath[1] != ':') {
-    		// C'est un chemin relatif, préfixer avec le répertoire de travail
+            // C'est un chemin relatif, préfixer avec le répertoire de travail
-    		if (currentDirectory.back() != L'/' && currentDirectory.back() != L'\\') {
+            if (currentDirectory.back() != L'/' && currentDirectory.back() != L'\\') {
-    			// Ajouter un séparateur si nécessaire
+                // Ajouter un séparateur si nécessaire
-    			wModelPath = currentDirectory + L"\\" + wModelPath;
+                wModelPath = currentDirectory + L"\\" + wModelPath;
-    		} else {
+            } else {
-    			wModelPath = currentDirectory + wModelPath;
+                wModelPath = currentDirectory + wModelPath;
-    		}
+            }
-    	}
+        }
 
-        // Créer le conteneur de textures_ pour stocker les chemins
+        // Créer le conteneur de textures pour stocker les chemins
         TextureContainer objectTextures;
         
-        // IMPORTANT: Vider les conteneurs de chemins de textures_
+        // Vider les conteneurs de chemins de textures
         objectTextures.diffusePaths.clear();
         objectTextures.normalPaths.clear();
         objectTextures.specularPaths.clear();
         objectTextures.alphaPaths.clear();
 
-        // Lire les chemins des textures_ diffuses
+        // Lire les chemins des textures diffuses
         int diffuseTextureCount;
         iss >> diffuseTextureCount;
         for (int i = 0; i < diffuseTextureCount; i++) {
@@ -154,7 +171,7 @@ bool scene_manager::load_scene() {
             objectTextures.diffusePaths.push_back(wTexturePath);
         }
 
-        // Lire les chemins des textures_ normales
+        // Lire les chemins des textures normales
         int normalTextureCount;
         iss >> normalTextureCount;
         for (int i = 0; i < normalTextureCount; i++) {
@@ -164,7 +181,7 @@ bool scene_manager::load_scene() {
             objectTextures.normalPaths.push_back(wTexturePath);
         }
 
-        // Lire les chemins des textures_ spéculaires
+        // Lire les chemins des textures spéculaires
         int specularTextureCount;
         iss >> specularTextureCount;
         for (int i = 0; i < specularTextureCount; i++) {
@@ -174,7 +191,7 @@ bool scene_manager::load_scene() {
             objectTextures.specularPaths.push_back(wTexturePath);
         }
 
-        // Lire les chemins des textures_ alpha
+        // Lire les chemins des textures alpha
         int alphaTextureCount;
         iss >> alphaTextureCount;
         for (int i = 0; i < alphaTextureCount; i++) {
@@ -183,61 +200,101 @@ bool scene_manager::load_scene() {
             std::wstring wTexturePath(texturePath.begin(), texturePath.end());
             objectTextures.alphaPaths.push_back(wTexturePath);
         }
-
+        
-    	// preload texture
+        // Vérifier si on a un modèle à charger
-    	if (!newObject->get_model()->PreloadTextures(direct_3d_->get_device(),  direct_3d_->get_device_context(), objectTextures))
+        if (modelPath == "NoModel") {
-    	{
+            Logger::Get().Log("Skipping entity without model: " + name, __FILE__, __LINE__, Logger::LogLevel::Warning);
-    		// Gérer l'erreur
-    		return false;
-    	}
-
-        // Initialiser l'objet avec le modèle et les chemins de textures_
-        char modelFilename[256];
-        size_t convertedChars = 0;
-        wcstombs_s(&convertedChars, modelFilename, sizeof(modelFilename), wModelPath.c_str(), _TRUNCATE);
-
-        Logger::Get().Log("Loading model: " + std::string(modelFilename), __FILE__, __LINE__, Logger::LogLevel::Info);
-
-        // NE PAS charger les textures_ avant initialize
-        // Laisser la méthode initialize s'en charger à partir des chemins
-        if (!newObject->Initialize(direct_3d_->get_device(), direct_3d_->get_device_context(), modelFilename, objectTextures)) {
-            Logger::Get().Log("Failed to initialize object: " + name, __FILE__, __LINE__, Logger::LogLevel::Error);
-            delete newObject;
             continue;
         }
 
-        // Définir les propriétés de l'objet
+        // Récupérer le cache de modèles de l'application
-        newObject->SetId(id);
+        auto& modelCache = app_->get_model_cache();
-        newObject->SetName(name);
+        std::shared_ptr<model_class> sharedModel;
-        newObject->SetPosition(XMLoadFloat3(&position));
-        newObject->SetRotation(XMLoadFloat3(&rotation));
-        newObject->SetScale(XMLoadFloat3(&scale));
-        newObject->SetModelPath(wModelPath);
-        newObject->SetActiveShader(newObject->StringToShaderType(shaderTypeStr));
-        newObject->SetBoundingRadius(boundingRadius);
-        newObject->SetType(newObject->StringToObjectType(objectTypeStr));
-        newObject->SetMass(mass);
-        newObject->SetPhysicsEnabled(physicsEnabled);
 
-        // Mettre à jour l'ID global si nécessaire
+        // Vérifier si le modèle existe déjà dans le cache
-        if (id >= object_id_) {
+        std::string modelKey = modelPath;
-            object_id_ = id + 1;
+        auto it = modelCache.find(modelKey);
-            app_->set_object_id(object_id_);
+        if (it != modelCache.end()) {
+            // Utiliser le modèle existant du cache
+            Logger::Get().Log("Using cached model for: " + modelKey, __FILE__, __LINE__, Logger::LogLevel::Info);
+            sharedModel = it->second;
+        } else {
+            // Créer un nouveau modèle
+            char modelFilename[256];
+            size_t convertedChars = 0;
+            wcstombs_s(&convertedChars, modelFilename, sizeof(modelFilename), wModelPath.c_str(), _TRUNCATE);
+
+            Logger::Get().Log("Loading model: " + std::string(modelFilename), __FILE__, __LINE__, Logger::LogLevel::Info);
+
+            // Créer et initialiser le modèle
+            auto newModel = std::make_shared<model_class>();
+            
+            // Précharger les textures
+            if (!newModel->PreloadTextures(direct_3d_->get_device(), direct_3d_->get_device_context(), objectTextures)) {
+                Logger::Get().Log("Failed to preload textures for: " + name, __FILE__, __LINE__, Logger::LogLevel::Error);
+                continue;
+            }
+
+            if (!newModel->Initialize(direct_3d_->get_device(), direct_3d_->get_device_context(), modelFilename, objectTextures)) {
+                Logger::Get().Log("Failed to initialize model: " + name, __FILE__, __LINE__, Logger::LogLevel::Error);
+                continue;
+            }
+
+            // Ajouter le modèle au cache
+            modelCache[modelKey] = newModel;
+            sharedModel = newModel;
         }
+        
+        // Créer une nouvelle entité avec l'EntityManager
+        auto entity = entity_manager->CreateEntity();
 
-        object_vec_.push_back(newObject);
+        // Ajouter un composant d'identité
-        Logger::Get().Log("Loaded object: " + name, __FILE__, __LINE__, Logger::LogLevel::Info);
+        auto identityComponent = entity->AddComponent<ecs::IdentityComponent>(id);
+        identityComponent->SetName(name);
+        identityComponent->SetType(ecs::IdentityComponent::StringToObjectType(objectTypeStr));
+        
+        // Ajouter un composant de transformation
+        auto transformComponent = entity->AddComponent<ecs::TransformComponent>();
+        transformComponent->SetPosition(XMLoadFloat3(&position));
+        transformComponent->SetRotation(XMLoadFloat3(&rotation));
+        transformComponent->SetScale(XMLoadFloat3(&scale));
+        transformComponent->UpdateWorldMatrix();
+        
+        // Ajouter un composant de rendu avec le modèle
+        auto renderComponent = entity->AddComponent<ecs::RenderComponent>();
+        renderComponent->InitializeWithModel(sharedModel);
+        
+        // Ajouter un composant de shader
+        auto shaderComponent = entity->AddComponent<ecs::ShaderComponent>();
+        shaderComponent->SetActiveShader(ecs::ShaderComponent::StringToShaderType(shaderTypeStr));
+        
+        // Ajouter un composant de chemin de modèle
+        auto modelPathComponent = entity->AddComponent<ecs::ModelPathComponent>();
+        modelPathComponent->SetPath(wModelPath);
+        
+        // Ajouter un composant de physique si nécessaire
+        auto physicsComponent = entity->AddComponent<ecs::PhysicsComponent>();
+        physicsComponent->Initialize();
+        physicsComponent->SetMass(mass);
+        physicsComponent->SetBoundingRadius(boundingRadius);
+        physicsComponent->SetPhysicsEnabled(physicsEnabled);
+        
+        Logger::Get().Log("Entity loaded: " + name + " with ID: " + std::to_string(id), __FILE__, __LINE__, Logger::LogLevel::Info);
     }
 
-    // pass the vec to the application
+    // Mettre à jour l'ID global dans l'application
-    app_->set_kobjects(object_vec_);
+    app_->set_object_id(object_id_);
+    
+    // Mettre à jour les statistiques après le chargement
+    app_->update_stats_after_modification();
 	
-    Logger::Get().Log("Scene loaded successfully from ", __FILE__, __LINE__, Logger::LogLevel::Info);
+    Logger::Get().Log("Scene loaded successfully from " + scene_path_, __FILE__, __LINE__, Logger::LogLevel::Info);
     return true;
 }
 
 bool scene_manager::save_scene() {
 
+    entity_ = app_->get_entity_manager()->GetAllEntities();
     
     if (scene_path_.empty()) {
         Logger::Get().Log("Scene path is empty. Cannot save scene.", __FILE__, __LINE__, Logger::LogLevel::Error);
@@ -250,56 +307,102 @@ bool scene_manager::save_scene() {
         return false;
     }
 
-    for (const auto& object : object_vec_) {
+    for (const auto& object : entity_) {
         XMFLOAT3 position, scale, rotation;
-        XMStoreFloat3(&position, object->GetPosition());
+        int id = 0;
-        XMStoreFloat3(&scale, object->GetScale());
+        int mass = 0;
-        XMStoreFloat3(&rotation, object->GetRotation());
+        float boundingRadius = 0;
+        std::string name = "NONE";
+        std::string shaderType = "NONE";
+        std::string objectType = "NONE";
+        std::wstring model_path = L"";
+        bool physics_enabled = false;
+
+        auto transform = object->GetComponent<ecs::TransformComponent>();
+        if (transform) {
+            // convert XMVECTOR to XMFLOAT3
+            XMStoreFloat3(&position, transform->GetPosition());
+            XMStoreFloat3(&rotation, transform->GetRotation());
+            XMStoreFloat3(&scale, transform->GetScale());
+        }
+
+        
+        auto identity = object->GetComponent<ecs::IdentityComponent>();
+        if (identity) {
+
+            id = identity->GetId();
+            name = identity->GetName();
+            objectType = identity->ObjectTypeToString(identity->GetType());
+            
+        }
+
+        auto model_path_component = object->GetComponent<ecs::ModelPathComponent>();
+        if (model_path_component) {
+            
+            model_path = model_path_component->GetPath();
+        }
+
+        auto shader = object->GetComponent<ecs::ShaderComponent>();
+        if (shader)
+        {
+            shaderType = shader->ShaderTypeToString(shader->GetActiveShader());
+        }
+
+        auto physics = object->GetComponent<ecs::PhysicsComponent>();
+        if (physics) {
+            physics_enabled = physics->IsPhysicsEnabled();
+            mass = physics->GetMass();
+            boundingRadius = physics->GetBoundingRadius();
+        }
         
         // Écrire les données de base de l'objet
-        outFile << object->GetId() << " "
+        outFile << id << " "
-                << object->GetName() << " "
+                << name << " "
                 << position.x << " " << position.y << " " << position.z << " "
                 << rotation.x << " " << rotation.y << " " << rotation.z << " "
                 << scale.x << " " << scale.y << " " << scale.z << " "
-                << convert_w_string_to_string(object->GetModelPath()) << " "
+                << convert_w_string_to_string(model_path) << " "
-                << object->ShaderTypeToString(object->GetActiveShader()) << " "
+                << shaderType << " "
-                << object->GetBoundingRadius() << " "
+                << boundingRadius << " "
-                << object->ObjectTypeToString(object->GetType()) << " "
+                << objectType << " "
-                << object->GetMass() << " "
+                << mass << " "
-                << object->IsPhysicsEnabled();
+                << physics_enabled;
         
         // Sauvegarder les chemins des textures_
         // Format: nombre de textures_ diffuses, puis les chemins
         // Même chose pour les autres types de textures_
-        
+
-        // Textures diffuses
+
-        const auto& diffusePaths = object->get_model()->GetTextureContainer().GetPaths(TextureType::Diffuse);
+        auto render = object->GetComponent<ecs::RenderComponent>();
-        outFile << " " << diffusePaths.size();
+        if (render)
-        for (const auto& path : diffusePaths) {
+        {
-            outFile << " " << convert_w_string_to_string(path);
+            const auto& model = render->GetModel();
+
+            const auto& textureContainer = model->GetTextureContainer();
+
+            const auto& diffusePaths = textureContainer.GetPaths(TextureType::Diffuse);
+            outFile << " " << diffusePaths.size();
+            for (const auto& path : diffusePaths) {
+                outFile << " " << convert_w_string_to_string(path);
+            }
+
+            const auto& normalPaths = textureContainer.GetPaths(TextureType::Normal);
+            outFile << " " << normalPaths.size();
+            for (const auto& path : normalPaths) {
+                outFile << " " << convert_w_string_to_string(path);
+            }
+            const auto& specularPaths = textureContainer.GetPaths(TextureType::Specular);
+            outFile << " " << specularPaths.size();
+            for (const auto& path : specularPaths) {
+                outFile << " " << convert_w_string_to_string(path);
+            }
+            const auto& alphaPaths = textureContainer.GetPaths(TextureType::Alpha);
+            outFile << " " << alphaPaths.size();
+            for (const auto& path : alphaPaths) {
+                outFile << " " << convert_w_string_to_string(path);
+            }
         }
         
-        // Textures normales
-        const auto& normalPaths = object->get_model()->GetTextureContainer().GetPaths(TextureType::Normal);
-        outFile << " " << normalPaths.size();
-        for (const auto& path : normalPaths) {
-            outFile << " " << convert_w_string_to_string(path);
-        }
-        
-        // Textures spéculaires
-        const auto& specularPaths = object->get_model()->GetTextureContainer().GetPaths(TextureType::Specular);
-        outFile << " " << specularPaths.size();
-        for (const auto& path : specularPaths) {
-            outFile << " " << convert_w_string_to_string(path);
-        }
-        
-        // Textures alpha
-        const auto& alphaPaths = object->get_model()->GetTextureContainer().GetPaths(TextureType::Alpha);
-        outFile << " " << alphaPaths.size();
-        for (const auto& path : alphaPaths) {
-            outFile << " " << convert_w_string_to_string(path);
-        }
         
         outFile << std::endl;
     }
@@ -343,4 +446,5 @@ std::string scene_manager::convert_w_string_to_string(const std::wstring& wstr)
     std::string str(size_needed, 0);
     WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), &str[0], size_needed, NULL, NULL);
     return str;
-}
+}
+

enginecustom/src/src/system/stats.cpp

@@ -3,6 +3,8 @@
 
 stats::stats() : fps_(nullptr), drawcalls_(0)
 {
+    total_triangle_count_ = std::make_shared<int>(0);
+    total_vertex_count_ = std::make_shared<int>(0);
 }
 
 stats::~stats()
@@ -34,14 +36,21 @@ bool stats::initialize(application_class* app)
 
 void stats::update_geometric_stats()
 {
-    
+    // Utiliser le système ECS pour accéder aux entités avec des composants de rendu
-        object_vec_ = app_->get_kobjects();
+    if (app_ && app_->get_entity_manager())
-        cubes_vec_ = app_->get_cubes();
+    {
-        terrain_chunk_vec_ = app_->get_terrain_cubes();
+        *total_vertex_count_ = get_total_vertex_count();
+        *total_triangle_count_ = get_total_triangle_count();
+        
+        update_visible_count();
 
-        total_vertex_count_ = get_total_vertex_count();
+        Logger::Get().Log("Statistics updated: " + std::to_string(*total_vertex_count_) + " vertices, " + std::to_string(*total_triangle_count_) + " triangles", __FILE__, __LINE__, Logger::LogLevel::Debug);
-        total_triangle_count_ = get_total_triangle_count();
+    }
-        visible_triangle_count_ = get_visible_triangle_count();
+}
+
+void stats::update_visible_count()
+{
+    visible_triangle_count_ = get_visible_triangle_count();
 }
 
 void stats::update_display_stats()
@@ -57,88 +66,143 @@ void stats::update_display_stats()
 int stats::get_total_vertex_count() const
 {
     int totalVertices = 0;
+    
+    // Utiliser le système ECS pour accéder aux entités avec des composants de rendu
+    if (app_ && app_->get_entity_manager())
+    {
+        auto entities = app_->get_entity_manager()->GetEntitiesWithComponent<ecs::RenderComponent>();
+        
+        for (const auto& entity : entities)
+        {
+            auto renderComponent = entity->GetComponent<ecs::RenderComponent>();
+            if (renderComponent && renderComponent->GetModel())
+            {
+                totalVertices += renderComponent->GetModel()->GetVertexCount();
+            }
+        }
+    }
+    
+    // Ajouter également les éventuels objets restants de l'ancien système
     for (const auto& obj : object_vec_)
     {
-        if (obj)
+        if (obj && obj->get_model())
         {
             totalVertices += obj->get_model()->GetVertexCount();
         }
     }
-    // Ajoutez le nombre de sommets pour les cubes
+    
     for (const auto& cube : cubes_vec_)
     {
-        if (cube)
+        if (cube && cube->get_model())
         {
             totalVertices += cube->get_model()->GetVertexCount();
         }
     }
-    // Ajoutez le nombre de sommets pour le terrain
+    
     for (const auto& chunk : terrain_chunk_vec_)
     {
-        if (chunk)
+        if (chunk && chunk->get_model())
         {
             totalVertices += chunk->get_model()->GetVertexCount();
         }
     }
+    
     return totalVertices;
 }
 
 int stats::get_total_triangle_count() const
 {
     int totalTriangles = 0;
+    
+    // Utiliser le système ECS pour accéder aux entités avec des composants de rendu
+    if (app_ && app_->get_entity_manager())
+    {
+        auto entities = app_->get_entity_manager()->GetEntitiesWithComponent<ecs::RenderComponent>();
+        
+        for (const auto& entity : entities)
+        {
+            auto renderComponent = entity->GetComponent<ecs::RenderComponent>();
+            if (renderComponent && renderComponent->GetModel())
+            {
+                // Dans une topologie de liste de triangles, chaque triangle utilise 3 indices
+                totalTriangles += renderComponent->GetModel()->GetIndexCount() / 3;
+            }
+        }
+    }
+    
+    // Ajouter également les éventuels objets restants de l'ancien système
     for (const auto& obj : object_vec_)
     {
-        if (obj)
+        if (obj && obj->get_model())
         {
-            // Dans une topologie de liste de triangles, chaque triangle utilise 3 indices
             totalTriangles += obj->get_model()->GetIndexCount() / 3;
         }
     }
-    // Ajoutez le nombre de triangles pour les cubes
+    
     for (const auto& cube : cubes_vec_)
     {
-        if (cube)
+        if (cube && cube->get_model())
         {
             totalTriangles += cube->get_model()->GetIndexCount() / 3;
         }
     }
-    // Ajoutez le nombre de triangles pour le terrain
+    
     for (const auto& chunk : terrain_chunk_vec_)
     {
-        if (chunk)
+        if (chunk && chunk->get_model())
         {
             totalTriangles += chunk->get_model()->GetIndexCount() / 3;
         }
     }
+    
     return totalTriangles;
 }
 
 int stats::get_visible_triangle_count() const
 {
     int visibleTriangles = 0;
+    
+    // Utiliser le système ECS pour accéder aux entités avec des composants de rendu
+    if (app_ && app_->get_entity_manager())
+    {
+        auto entities = app_->get_entity_manager()->GetEntitiesWithComponent<ecs::RenderComponent>();
+        
+        for (const auto& entity : entities)
+        {
+            auto renderComponent = entity->GetComponent<ecs::RenderComponent>();
+            if (renderComponent && renderComponent->GetModel() && renderComponent->IsVisible())
+            {
+                // Dans une topologie de liste de triangles, chaque triangle utilise 3 indices
+                visibleTriangles += renderComponent->GetModel()->GetIndexCount() / 3;
+            }
+        }
+    }
+    
+    // Ajouter également les éventuels objets restants de l'ancien système
     for (const auto& obj : object_vec_)
     {
-        if (obj && obj->IsVisible())
+        if (obj && obj->get_model() && obj->IsVisible())
         {
             visibleTriangles += obj->get_model()->GetIndexCount() / 3;
         }
     }
-    // Ajoutez le nombre de triangles visibles pour les cubes
+    
     for (const auto& cube : cubes_vec_)
     {
-        if (cube && cube->IsVisible())
+        if (cube && cube->get_model() && cube->IsVisible())
         {
             visibleTriangles += cube->get_model()->GetIndexCount() / 3;
         }
     }
-    // Ajoutez le nombre de triangles visibles pour le terrain
+    
     for (const auto& chunk : terrain_chunk_vec_)
     {
-        if (chunk && chunk->IsVisible())
+        if (chunk && chunk->get_model() && chunk->IsVisible())
         {
             visibleTriangles += chunk->get_model()->GetIndexCount() / 3;
         }
     }
+    
     return visibleTriangles;
 }
 
@@ -215,4 +279,4 @@ std::string stats::get_gpu_driver_version(ID3D11Device* device)
     }
 
     return driverVersion;
-}
+}