Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
32b71ac97f | |||
5c3c6d944c | |||
8d32f51e8c | |||
644fc57762 |
50
.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
generated
50
.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
generated
@@ -7,9 +7,7 @@
|
|||||||
<list default="true" id="e81d6e08-efc7-40a0-909d-ec4943d948e9" name="Changes" comment="">
|
<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$/.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/imgui.ini" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/imgui.ini" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/applicationclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/applicationclass.h" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/applicationclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/applicationclass.cpp" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/modelclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/modelclass.cpp" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@@ -23,13 +21,8 @@
|
|||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||||
</component>
|
</component>
|
||||||
<component name="HighlightingSettingsPerFile">
|
<component name="HighlightingSettingsPerFile">
|
||||||
<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="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
|
<setting file="file://$PROJECT_DIR$/enginecustom/include/Inc/VertexTypes.h" 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="cidr-memory-view://4" root0="FORCE_HIGHLIGHTING" />
|
|
||||||
<setting file="file://$PROJECT_DIR$/enginecustom/include/Vulkan/Include/vulkan/vulkan_core.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/src/shader/CelShadingShader.cpp" root0="FORCE_HIGHLIGHTING" />
|
<setting file="file://$PROJECT_DIR$/enginecustom/src/src/shader/CelShadingShader.cpp" root0="FORCE_HIGHLIGHTING" />
|
||||||
<setting file="file://$PROJECT_DIR$/../../IDE_VS/VC/Tools/MSVC/14.38.33130/include/type_traits" root0="SKIP_HIGHLIGHTING" />
|
<setting file="file://$PROJECT_DIR$/../../IDE_VS/VC/Tools/MSVC/14.38.33130/include/type_traits" root0="SKIP_HIGHLIGHTING" />
|
||||||
@@ -46,25 +39,25 @@
|
|||||||
<option name="hideEmptyMiddlePackages" value="true" />
|
<option name="hideEmptyMiddlePackages" value="true" />
|
||||||
<option name="showLibraryContents" value="true" />
|
<option name="showLibraryContents" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent"><![CDATA[{
|
<component name="PropertiesComponent">{
|
||||||
"keyToString": {
|
"keyToString": {
|
||||||
"ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
"ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
||||||
"C++ Project.enginecustom.executor": "Run",
|
"C++ Project.enginecustom.executor": "Run",
|
||||||
"C/C++ Project.enginecustom.executor": "dotTrace Profiler",
|
"C/C++ Project.enginecustom.executor": "Run",
|
||||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||||
"RunOnceActivity.git.unshallow": "true",
|
"RunOnceActivity.git.unshallow": "true",
|
||||||
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
||||||
"git-widget-placeholder": "main",
|
"git-widget-placeholder": "main",
|
||||||
"ignore.virus.scanning.warn.message": "true",
|
"ignore.virus.scanning.warn.message": "true",
|
||||||
"node.js.detected.package.eslint": "true",
|
"node.js.detected.package.eslint": "true",
|
||||||
"node.js.detected.package.tslint": "true",
|
"node.js.detected.package.tslint": "true",
|
||||||
"node.js.selected.package.eslint": "(autodetect)",
|
"node.js.selected.package.eslint": "(autodetect)",
|
||||||
"node.js.selected.package.tslint": "(autodetect)",
|
"node.js.selected.package.tslint": "(autodetect)",
|
||||||
"nodejs_package_manager_path": "npm",
|
"nodejs_package_manager_path": "npm",
|
||||||
"settings.editor.selected.configurable": "preferences.build.unityPlugin",
|
"settings.editor.selected.configurable": "preferences.build.unityPlugin",
|
||||||
"vue.rearranger.settings.migration": "true"
|
"vue.rearranger.settings.migration": "true"
|
||||||
}
|
}
|
||||||
}]]></component>
|
}</component>
|
||||||
<component name="RunManager" selected="C/C++ Project.enginecustom">
|
<component name="RunManager" selected="C/C++ Project.enginecustom">
|
||||||
<configuration name="KhaoticDemo" type="CppProject" factoryName="C++ Project">
|
<configuration name="KhaoticDemo" type="CppProject" factoryName="C++ Project">
|
||||||
<configuration_1 setup="1">
|
<configuration_1 setup="1">
|
||||||
@@ -186,6 +179,7 @@
|
|||||||
<workItem from="1746538260893" duration="5781000" />
|
<workItem from="1746538260893" duration="5781000" />
|
||||||
<workItem from="1746546014271" duration="1814000" />
|
<workItem from="1746546014271" duration="1814000" />
|
||||||
<workItem from="1746619988287" duration="12282000" />
|
<workItem from="1746619988287" duration="12282000" />
|
||||||
|
<workItem from="1746711806997" duration="6619000" />
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00001" summary="Minor update - viewport window tweak">
|
<task id="LOCAL-00001" summary="Minor update - viewport window tweak">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
|
@@ -4,28 +4,28 @@ Size=400,400
|
|||||||
Collapsed=0
|
Collapsed=0
|
||||||
|
|
||||||
[Window][Khaotic Engine]
|
[Window][Khaotic Engine]
|
||||||
Pos=1233,27
|
Pos=1745,19
|
||||||
Size=343,599
|
Size=303,1110
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000005,0
|
DockId=0x00000005,0
|
||||||
|
|
||||||
[Window][Objects]
|
[Window][Objects]
|
||||||
Pos=8,27
|
Pos=0,19
|
||||||
Size=289,547
|
Size=281,307
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000007,0
|
DockId=0x00000007,0
|
||||||
|
|
||||||
[Window][Terrain]
|
[Window][Terrain]
|
||||||
Pos=8,27
|
Pos=0,19
|
||||||
Size=281,599
|
Size=281,883
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000008,0
|
DockId=0x00000008,0
|
||||||
|
|
||||||
[Window][Light]
|
[Window][Light]
|
||||||
Pos=8,27
|
Pos=0,328
|
||||||
Size=290,866
|
Size=281,306
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x0000000B,1
|
DockId=0x00000008,1
|
||||||
|
|
||||||
[Window][Shader Manager]
|
[Window][Shader Manager]
|
||||||
Pos=8,27
|
Pos=8,27
|
||||||
@@ -34,8 +34,8 @@ Collapsed=0
|
|||||||
DockId=0x00000001,2
|
DockId=0x00000001,2
|
||||||
|
|
||||||
[Window][Engine Settings]
|
[Window][Engine Settings]
|
||||||
Pos=8,27
|
Pos=0,19
|
||||||
Size=289,547
|
Size=281,307
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000007,1
|
DockId=0x00000007,1
|
||||||
|
|
||||||
@@ -51,7 +51,7 @@ DockId=0x00000007,0
|
|||||||
|
|
||||||
[Window][DockSpace]
|
[Window][DockSpace]
|
||||||
Pos=0,0
|
Pos=0,0
|
||||||
Size=1584,861
|
Size=2048,1129
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
|
|
||||||
[Window][Add Object]
|
[Window][Add Object]
|
||||||
@@ -66,32 +66,32 @@ Collapsed=0
|
|||||||
DockId=0x0000000C,0
|
DockId=0x0000000C,0
|
||||||
|
|
||||||
[Window][Log Window]
|
[Window][Log Window]
|
||||||
Pos=8,37
|
Pos=652,636
|
||||||
Size=16,19
|
Size=649,225
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000006,0
|
DockId=0x00000006,0
|
||||||
|
|
||||||
[Window][Render Stats]
|
[Window][Render Stats]
|
||||||
Pos=8,628
|
Pos=0,904
|
||||||
Size=1568,225
|
Size=1743,225
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x0000000E,0
|
DockId=0x00000004,0
|
||||||
|
|
||||||
[Docking][Data]
|
[Docking][Data]
|
||||||
DockSpace ID=0xC0DFADC4 Pos=8,27 Size=1568,826 Split=X
|
DockSpace ID=0xC0DFADC4 Pos=8,27 Size=1568,826 Split=X
|
||||||
DockNode ID=0x00000001 Parent=0xC0DFADC4 SizeRef=330,1094 Selected=0x393905AB
|
DockNode ID=0x00000001 Parent=0xC0DFADC4 SizeRef=330,1094 Selected=0x393905AB
|
||||||
DockNode ID=0x00000003 Parent=0xC0DFADC4 SizeRef=1700,1094 CentralNode=1
|
DockNode ID=0x00000003 Parent=0xC0DFADC4 SizeRef=1700,1094 CentralNode=1
|
||||||
DockSpace ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=8,27 Size=1568,826 Split=Y
|
DockSpace ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=0,19 Size=2048,1110 Split=X
|
||||||
DockNode ID=0x0000000A Parent=0xCCBD8CF7 SizeRef=1568,599 Split=Y
|
DockNode ID=0x00000002 Parent=0xCCBD8CF7 SizeRef=1743,826 Split=Y
|
||||||
DockNode ID=0x00000004 Parent=0x0000000A SizeRef=1568,598 Split=X
|
DockNode ID=0x0000000A Parent=0x00000002 SizeRef=1568,599 Split=X
|
||||||
DockNode ID=0x00000009 Parent=0x00000004 SizeRef=281,974 Split=Y Selected=0x031DC75C
|
DockNode ID=0x00000009 Parent=0x0000000A SizeRef=281,974 Split=Y Selected=0x031DC75C
|
||||||
DockNode ID=0x00000007 Parent=0x00000009 SizeRef=289,547 Selected=0x031DC75C
|
DockNode ID=0x00000007 Parent=0x00000009 SizeRef=289,547 Selected=0x0B098C4B
|
||||||
DockNode ID=0x00000008 Parent=0x00000009 SizeRef=289,545 Selected=0x393905AB
|
DockNode ID=0x00000008 Parent=0x00000009 SizeRef=289,545 Selected=0x393905AB
|
||||||
DockNode ID=0x0000000D Parent=0x00000004 SizeRef=1285,974 Split=X
|
DockNode ID=0x0000000D Parent=0x0000000A SizeRef=1460,974 Split=Y
|
||||||
DockNode ID=0x00000002 Parent=0x0000000D SizeRef=940,826 Split=Y
|
DockNode ID=0x0000000B Parent=0x0000000D SizeRef=1568,637 CentralNode=1 Selected=0x321620B2
|
||||||
DockNode ID=0x0000000B Parent=0x00000002 SizeRef=1568,637 CentralNode=1
|
DockNode ID=0x0000000C Parent=0x0000000D SizeRef=1568,335 Selected=0x139FDA3F
|
||||||
DockNode ID=0x0000000C Parent=0x00000002 SizeRef=1568,335 Selected=0x139FDA3F
|
DockNode ID=0x0000000E Parent=0x00000002 SizeRef=1568,225 Split=X Selected=0xD99DEA49
|
||||||
DockNode ID=0x00000005 Parent=0x0000000D SizeRef=343,826 Selected=0x9F035453
|
DockNode ID=0x00000004 Parent=0x0000000E SizeRef=882,225 Selected=0xD99DEA49
|
||||||
DockNode ID=0x00000006 Parent=0x0000000A SizeRef=1568,226 Selected=0xAB74BEE9
|
DockNode ID=0x00000006 Parent=0x0000000E SizeRef=881,225 Selected=0xAB74BEE9
|
||||||
DockNode ID=0x0000000E Parent=0xCCBD8CF7 SizeRef=1568,225 Selected=0xD99DEA49
|
DockNode ID=0x00000005 Parent=0xCCBD8CF7 SizeRef=303,826 Selected=0x9F035453
|
||||||
|
|
||||||
|
@@ -196,6 +196,12 @@ public :
|
|||||||
|
|
||||||
private :
|
private :
|
||||||
|
|
||||||
|
// Thread de culling
|
||||||
|
std::thread m_CullingThread;
|
||||||
|
std::atomic<bool> m_CullingActive;
|
||||||
|
std::mutex m_ObjectsMutex;
|
||||||
|
void CullingThreadFunction();
|
||||||
|
|
||||||
|
|
||||||
std::mutex m_TerrainMutex;
|
std::mutex m_TerrainMutex;
|
||||||
std::vector<std::tuple<float, float, float, std::string, int>> m_TerrainGenerationData;
|
std::vector<std::tuple<float, float, float, std::string, int>> m_TerrainGenerationData;
|
||||||
|
@@ -54,13 +54,19 @@ ApplicationClass::ApplicationClass() : m_ShouldQuit(false)
|
|||||||
ApplicationClass::~ApplicationClass()
|
ApplicationClass::~ApplicationClass()
|
||||||
{
|
{
|
||||||
m_ShouldQuit = true;
|
m_ShouldQuit = true;
|
||||||
|
m_CullingActive = false;
|
||||||
|
|
||||||
// Joindre le thread pour s'assurer qu'il se termine correctement
|
// Joindre les threads pour s'assurer qu'ils se terminent correctement
|
||||||
if (m_PhysicsThread.joinable())
|
if (m_PhysicsThread.joinable())
|
||||||
{
|
{
|
||||||
m_PhysicsThread.join();
|
m_PhysicsThread.join();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (m_CullingThread.joinable())
|
||||||
|
{
|
||||||
|
m_CullingThread.join();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -468,6 +474,9 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd,
|
|||||||
skybox->Initialize(m_Direct3D);
|
skybox->Initialize(m_Direct3D);
|
||||||
m_Skybox.push_back(skybox->ConstructSkybox());
|
m_Skybox.push_back(skybox->ConstructSkybox());
|
||||||
|
|
||||||
|
m_CullingActive = true;
|
||||||
|
m_CullingThread = std::thread(&ApplicationClass::CullingThreadFunction, this);
|
||||||
|
|
||||||
}
|
}
|
||||||
catch (const std::exception& e)
|
catch (const std::exception& e)
|
||||||
{
|
{
|
||||||
@@ -1593,9 +1602,72 @@ void ApplicationClass::SetScreenWidth(int width)
|
|||||||
m_screenWidth = width;
|
m_screenWidth = width;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ApplicationClass::CullingThreadFunction()
|
||||||
|
{
|
||||||
|
Logger::Get().Log("Thread de culling d<>marr<72>", __FILE__, __LINE__, Logger::LogLevel::Info);
|
||||||
|
|
||||||
|
while (m_CullingActive)
|
||||||
|
{
|
||||||
|
// Construction du frustum une fois par cycle de culling
|
||||||
|
ConstructFrustum();
|
||||||
|
|
||||||
|
// S'assurer que la skybox est toujours visible
|
||||||
|
{
|
||||||
|
std::lock_guard<std::mutex> lock(m_ObjectsMutex);
|
||||||
|
for (auto* skyboxObject : m_Skybox)
|
||||||
|
{
|
||||||
|
if (skyboxObject)
|
||||||
|
{
|
||||||
|
skyboxObject->SetVisible(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Traitement des files d'objets normaux (sans la skybox)
|
||||||
|
std::vector<std::reference_wrapper<std::vector<Object*>>> queues = {
|
||||||
|
std::ref(m_object), std::ref(m_cubes), std::ref(m_terrainChunk)
|
||||||
|
};
|
||||||
|
|
||||||
|
for (auto& queueRef : queues)
|
||||||
|
{
|
||||||
|
std::vector<Object*>& queue = queueRef.get();
|
||||||
|
|
||||||
|
std::lock_guard<std::mutex> lock(m_ObjectsMutex);
|
||||||
|
|
||||||
|
for (auto* object : queue)
|
||||||
|
{
|
||||||
|
if (!object) continue;
|
||||||
|
|
||||||
|
// Extraction des donn<6E>es de position
|
||||||
|
XMVECTOR position = object->GetPosition();
|
||||||
|
float x = XMVectorGetX(position);
|
||||||
|
float y = XMVectorGetY(position);
|
||||||
|
float z = XMVectorGetZ(position);
|
||||||
|
|
||||||
|
// Calcul du rayon approximatif
|
||||||
|
XMVECTOR scale = object->GetScale();
|
||||||
|
float radius = max(max(XMVectorGetX(scale), XMVectorGetY(scale)), XMVectorGetZ(scale));
|
||||||
|
|
||||||
|
// V<>rification du frustum
|
||||||
|
bool visible = m_FrustumCulling.CheckCube(x, y, z, radius, GetFrustumTolerance());
|
||||||
|
object->SetVisible(visible);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pause pour <20>viter de surcharger le CPU
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(16)); // ~60 Hz
|
||||||
|
}
|
||||||
|
|
||||||
|
Logger::Get().Log("Thread de culling termin<69>", __FILE__, __LINE__, Logger::LogLevel::Info);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::vector<Object*>>>& RenderQueues, XMFLOAT4* diffuse, XMFLOAT4* position, XMFLOAT4* ambient, XMMATRIX view, XMMATRIX projection)
|
bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::vector<Object*>>>& RenderQueues, XMFLOAT4* diffuse, XMFLOAT4* position, XMFLOAT4* ambient, XMMATRIX view, XMMATRIX projection)
|
||||||
{
|
{
|
||||||
XMMATRIX worldMatrix, scaleMatrix, rotateMatrix, translateMatrix, srMatrix;
|
std::lock_guard<std::mutex> lock(m_ObjectsMutex);
|
||||||
|
XMMATRIX scaleMatrix, rotateMatrix, translateMatrix ;
|
||||||
bool result;
|
bool result;
|
||||||
|
|
||||||
int renderCount = 0;
|
int renderCount = 0;
|
||||||
@@ -1619,33 +1691,28 @@ bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
XMVECTOR objposition = object->GetPosition();
|
|
||||||
float x = XMVectorGetX(objposition);
|
|
||||||
float y = XMVectorGetY(objposition);
|
|
||||||
float z = XMVectorGetZ(objposition);
|
|
||||||
float radius = object->GetBoundingRadius();
|
|
||||||
|
|
||||||
// Check if the object has physics enabled
|
// Check if the object has physics enabled
|
||||||
if (object->IsPhysicsEnabled())
|
if (object->IsPhysicsEnabled())
|
||||||
{
|
{
|
||||||
object->UpdatePosition(m_Timer->GetTime());
|
object->UpdatePosition(m_Timer->GetTime());
|
||||||
}
|
}
|
||||||
|
|
||||||
// V<>rifie si l'objet est dans le frustum
|
|
||||||
if (!m_FrustumCulling.CheckCube(x, y, z, radius, GetFrustumTolerance()))
|
if (!object->IsVisible())
|
||||||
{
|
{
|
||||||
object->SetVisible(false);
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
object->SetVisible(true); // L'objet est visible
|
|
||||||
renderCount++;
|
renderCount++;
|
||||||
|
|
||||||
scaleMatrix = object->GetScaleMatrix();
|
scaleMatrix = object->GetScaleMatrix();
|
||||||
rotateMatrix = object->GetRotateMatrix();
|
rotateMatrix = object->GetRotateMatrix();
|
||||||
translateMatrix = object->GetTranslateMatrix();
|
translateMatrix = object->GetTranslateMatrix();
|
||||||
|
|
||||||
srMatrix = XMMatrixMultiply(scaleMatrix, rotateMatrix);
|
XMMATRIX worldMatrix = XMMatrixMultiply(
|
||||||
worldMatrix = XMMatrixMultiply(srMatrix, translateMatrix);
|
XMMatrixMultiply(scaleMatrix, rotateMatrix),
|
||||||
|
translateMatrix
|
||||||
|
);
|
||||||
|
|
||||||
object->Render(m_Direct3D->GetDeviceContext());
|
object->Render(m_Direct3D->GetDeviceContext());
|
||||||
|
|
||||||
|
@@ -27,20 +27,118 @@ bool imguiManager::Initialize(HWND hwnd, ID3D11Device* device, ID3D11DeviceConte
|
|||||||
IMGUI_CHECKVERSION();
|
IMGUI_CHECKVERSION();
|
||||||
ImGui::CreateContext();
|
ImGui::CreateContext();
|
||||||
io = &ImGui::GetIO();
|
io = &ImGui::GetIO();
|
||||||
io->ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; // Enable Keyboard Controls
|
io->ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
|
||||||
io->ConfigFlags |= ImGuiConfigFlags_DockingEnable; // Enable Docking
|
io->ConfigFlags |= ImGuiConfigFlags_DockingEnable;
|
||||||
|
io->FontGlobalScale = 1.0f;
|
||||||
|
|
||||||
ImGui_ImplWin32_Init(hwnd);
|
ImGui_ImplWin32_Init(hwnd);
|
||||||
ImGui_ImplDX11_Init(m_device, m_deviceContext);
|
ImGui_ImplDX11_Init(m_device, m_deviceContext);
|
||||||
|
|
||||||
// Setup style
|
// Appliquer un th<74>me sombre de base
|
||||||
ImGui::StyleColorsDark();
|
ImGui::StyleColorsDark();
|
||||||
// Set the window background color to be a transparent black/gray
|
|
||||||
ImGui::GetStyle().Colors[ImGuiCol_WindowBg] = ImVec4(0, 0, 0, 0.5f);
|
|
||||||
// Set the menu bar background color to be a transparent black/gray
|
|
||||||
ImGui::GetStyle().Colors[ImGuiCol_MenuBarBg] = ImVec4(0, 0, 0, 0.5f);
|
|
||||||
|
|
||||||
|
// D<>finir les couleurs pour une interface de type <20>diteur sobre
|
||||||
|
ImGuiStyle& style = ImGui::GetStyle();
|
||||||
|
|
||||||
|
// Palette de couleurs sobres inspir<69>e des <20>diteurs modernes
|
||||||
|
ImVec4 background_dark = ImVec4(0.10f, 0.10f, 0.10f, 1.00f); // Fond fonc<6E>
|
||||||
|
ImVec4 background = ImVec4(0.15f, 0.15f, 0.15f, 1.00f); // Fond principal
|
||||||
|
ImVec4 background_light = ImVec4(0.20f, 0.20f, 0.20f, 1.00f); // Fond clair
|
||||||
|
ImVec4 accent = ImVec4(0.14f, 0.44f, 0.80f, 0.50f); // Accent bleu
|
||||||
|
ImVec4 accent_light = ImVec4(0.14f, 0.44f, 0.80f, 1.00f); // Accent bleu vif
|
||||||
|
ImVec4 text = ImVec4(1.0f, 1.0f, 1.0f, 1.00f); // Texte plus blanc
|
||||||
|
ImVec4 text_dim = ImVec4(0.70f, 0.70f, 0.70f, 1.00f);
|
||||||
|
|
||||||
|
// Ajustements de style g<>n<EFBFBD>raux
|
||||||
|
style.WindowPadding = ImVec2(4.0f, 4.0f); // Moins de padding dans les fen<65>tres
|
||||||
|
style.FramePadding = ImVec2(4.0f, 3.0f); // Moins de padding dans les cadres
|
||||||
|
style.ItemSpacing = ImVec2(4.0f, 3.0f); // Moins d'espace entre les widgets
|
||||||
|
style.ItemInnerSpacing = ImVec2(3.0f, 3.0f); // Moins d'espace interne
|
||||||
|
style.DisplayWindowPadding = ImVec2(0.0f, 0.0f); // Pas de padding pour l'affichage
|
||||||
|
style.DisplaySafeAreaPadding = ImVec2(0.0f, 0.0f);
|
||||||
|
style.TouchExtraPadding = ImVec2(0.0f, 0.0f);
|
||||||
|
style.IndentSpacing = 20.0f;
|
||||||
|
style.ScrollbarSize = 14.0f;
|
||||||
|
style.GrabMinSize = 10.0f;
|
||||||
|
|
||||||
|
// Arrondis
|
||||||
|
style.WindowRounding = 4.0f;
|
||||||
|
style.ChildRounding = 4.0f;
|
||||||
|
style.FrameRounding = 3.0f;
|
||||||
|
style.PopupRounding = 4.0f;
|
||||||
|
style.ScrollbarRounding = 9.0f;
|
||||||
|
style.GrabRounding = 3.0f;
|
||||||
|
style.TabRounding = 4.0f;
|
||||||
|
|
||||||
|
// Couleurs principales
|
||||||
|
style.Colors[ImGuiCol_Text] = text;
|
||||||
|
style.Colors[ImGuiCol_TextDisabled] = text_dim;
|
||||||
|
style.Colors[ImGuiCol_WindowBg] = background;
|
||||||
|
style.Colors[ImGuiCol_ChildBg] = background_dark;
|
||||||
|
style.Colors[ImGuiCol_PopupBg] = background_dark;
|
||||||
|
style.Colors[ImGuiCol_Border] = ImVec4(0.25f, 0.25f, 0.27f, 1.00f);
|
||||||
|
style.Colors[ImGuiCol_BorderShadow] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
|
||||||
|
|
||||||
|
// Encadrements
|
||||||
|
style.Colors[ImGuiCol_FrameBg] = background_light;
|
||||||
|
style.Colors[ImGuiCol_FrameBgHovered] = ImVec4(0.25f, 0.25f, 0.25f, 1.00f);
|
||||||
|
style.Colors[ImGuiCol_FrameBgActive] = ImVec4(0.30f, 0.30f, 0.30f, 1.00f);
|
||||||
|
|
||||||
|
// Titres
|
||||||
|
style.Colors[ImGuiCol_TitleBg] = background_dark;
|
||||||
|
style.Colors[ImGuiCol_TitleBgActive] = accent;
|
||||||
|
style.Colors[ImGuiCol_TitleBgCollapsed] = ImVec4(0.12f, 0.12f, 0.12f, 0.90f);
|
||||||
|
|
||||||
|
// <20>l<EFBFBD>ments de menu
|
||||||
|
style.Colors[ImGuiCol_MenuBarBg] = background_dark;
|
||||||
|
style.Colors[ImGuiCol_ScrollbarBg] = background_dark;
|
||||||
|
style.Colors[ImGuiCol_ScrollbarGrab] = ImVec4(0.40f, 0.40f, 0.40f, 1.00f);
|
||||||
|
style.Colors[ImGuiCol_ScrollbarGrabHovered] = ImVec4(0.50f, 0.50f, 0.50f, 1.00f);
|
||||||
|
style.Colors[ImGuiCol_ScrollbarGrabActive] = ImVec4(0.60f, 0.60f, 0.60f, 1.00f);
|
||||||
|
|
||||||
|
// Boutons et interactions
|
||||||
|
style.Colors[ImGuiCol_CheckMark] = accent_light;
|
||||||
|
style.Colors[ImGuiCol_SliderGrab] = accent;
|
||||||
|
style.Colors[ImGuiCol_SliderGrabActive] = accent_light;
|
||||||
|
style.Colors[ImGuiCol_Button] = background_light;
|
||||||
|
style.Colors[ImGuiCol_ButtonHovered] = ImVec4(0.30f, 0.30f, 0.30f, 1.00f);
|
||||||
|
style.Colors[ImGuiCol_ButtonActive] = accent;
|
||||||
|
|
||||||
|
// En-t<>tes et onglets
|
||||||
|
style.Colors[ImGuiCol_Header] = ImVec4(0.20f, 0.20f, 0.20f, 1.00f);
|
||||||
|
style.Colors[ImGuiCol_HeaderHovered] = ImVec4(0.25f, 0.25f, 0.25f, 1.00f);
|
||||||
|
style.Colors[ImGuiCol_HeaderActive] = accent;
|
||||||
|
|
||||||
|
style.Colors[ImGuiCol_Separator] = ImVec4(0.28f, 0.28f, 0.28f, 1.00f);
|
||||||
|
style.Colors[ImGuiCol_SeparatorHovered] = ImVec4(0.45f, 0.45f, 0.45f, 1.00f);
|
||||||
|
style.Colors[ImGuiCol_SeparatorActive] = accent;
|
||||||
|
|
||||||
|
style.Colors[ImGuiCol_Tab] = background_dark;
|
||||||
|
style.Colors[ImGuiCol_TabHovered] = accent;
|
||||||
|
style.Colors[ImGuiCol_TabActive] = accent;
|
||||||
|
style.Colors[ImGuiCol_TabUnfocused] = background_dark;
|
||||||
|
style.Colors[ImGuiCol_TabUnfocusedActive] = background;
|
||||||
|
|
||||||
|
// Autres <20>l<EFBFBD>ments
|
||||||
|
style.Colors[ImGuiCol_DockingPreview] = accent;
|
||||||
|
style.Colors[ImGuiCol_DockingEmptyBg] = background_light;
|
||||||
|
|
||||||
|
// Charger une police avec une meilleure nettet<65>
|
||||||
|
ImFontConfig fontConfig;
|
||||||
|
fontConfig.OversampleH = 2; // Sur<75>chantillonnage horizontal
|
||||||
|
fontConfig.OversampleV = 2; // Sur<75>chantillonnage vertical
|
||||||
|
fontConfig.PixelSnapH = true; // Alignement sur la grille de pixels
|
||||||
|
fontConfig.RasterizerMultiply = 1.2f; // L<>g<EFBFBD>re augmentation de l'<27>paisseur
|
||||||
|
|
||||||
|
io->Fonts->AddFontDefault(&fontConfig);
|
||||||
|
|
||||||
|
// OU charger une police personnalis<69>e (d<>commenter si vous avez la police)
|
||||||
|
// io->Fonts->AddFontFromFileTTF("assets/fonts/roboto.ttf", 16.0f, &fontConfig);
|
||||||
|
|
||||||
|
|
||||||
|
unsigned char* pixels;
|
||||||
|
int width, height;
|
||||||
|
io->Fonts->GetTexDataAsRGBA32(&pixels, &width, &height);
|
||||||
|
|
||||||
Logger::Get().Log("imgui initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
|
Logger::Get().Log("imgui initialized", __FILE__, __LINE__, Logger::LogLevel::Initialize);
|
||||||
|
|
||||||
@@ -77,22 +175,35 @@ void imguiManager::NewFrame()
|
|||||||
}
|
}
|
||||||
|
|
||||||
void imguiManager::SetupDockspace(ApplicationClass* app) {
|
void imguiManager::SetupDockspace(ApplicationClass* app) {
|
||||||
|
// Configuration du style pour supprimer l'espace autour des fen<65>tres dock<63>es
|
||||||
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
|
||||||
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
|
||||||
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
|
||||||
|
|
||||||
|
// Configuration du style pour les n<>uds de dock
|
||||||
|
ImGui::PushStyleVar(ImGuiStyleVar_DockingSeparatorSize, 1.0f); // R<>duit l'<27>paisseur des s<>parateurs
|
||||||
|
|
||||||
|
// Configuration de la fen<65>tre principale
|
||||||
ImGuiWindowFlags window_flags = ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoDocking;
|
ImGuiWindowFlags window_flags = ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoDocking;
|
||||||
ImGuiViewport* viewport = ImGui::GetMainViewport();
|
ImGuiViewport* viewport = ImGui::GetMainViewport();
|
||||||
ImGui::SetNextWindowPos(viewport->Pos);
|
ImGui::SetNextWindowPos(viewport->Pos);
|
||||||
ImGui::SetNextWindowSize(viewport->Size);
|
ImGui::SetNextWindowSize(viewport->Size);
|
||||||
ImGui::SetNextWindowViewport(viewport->ID);
|
ImGui::SetNextWindowViewport(viewport->ID);
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
|
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
|
|
||||||
window_flags |= ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove;
|
window_flags |= ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove;
|
||||||
window_flags |= ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoNavFocus;
|
window_flags |= ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoNavFocus;
|
||||||
|
|
||||||
ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0));
|
ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0));
|
||||||
|
|
||||||
ImGui::Begin("DockSpace", nullptr, window_flags);
|
ImGui::Begin("DockSpace", nullptr, window_flags);
|
||||||
ImGui::PopStyleVar(2);
|
|
||||||
|
// Pop des styles apr<70>s avoir cr<63><72> la fen<65>tre principale
|
||||||
|
ImGui::PopStyleVar(4); // 4 car nous avons pouss<73> 4 variables de style
|
||||||
ImGui::PopStyleColor();
|
ImGui::PopStyleColor();
|
||||||
|
|
||||||
|
// Configuration du DockSpace
|
||||||
|
ImGuiID dockspace_id = ImGui::GetID("MainDockSpace");
|
||||||
|
ImGuiDockNodeFlags dockspace_flags = ImGuiDockNodeFlags_PassthruCentralNode;
|
||||||
|
ImGui::DockSpace(dockspace_id, ImVec2(0.0f, 0.0f), dockspace_flags);
|
||||||
|
|
||||||
if (ImGui::BeginMenuBar()) {
|
if (ImGui::BeginMenuBar()) {
|
||||||
if (ImGui::BeginMenu("Windows")) {
|
if (ImGui::BeginMenu("Windows")) {
|
||||||
@@ -105,14 +216,11 @@ void imguiManager::SetupDockspace(ApplicationClass* app) {
|
|||||||
ImGui::EndMenu();
|
ImGui::EndMenu();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Scene file menu
|
|
||||||
if (ImGui::BeginMenu("Scene")) {
|
if (ImGui::BeginMenu("Scene")) {
|
||||||
if (ImGui::MenuItem("Save Scene")) {
|
if (ImGui::MenuItem("Save Scene")) {
|
||||||
// Save the scene
|
|
||||||
app->SaveScene();
|
app->SaveScene();
|
||||||
}
|
}
|
||||||
if (ImGui::MenuItem("Load Scene")) {
|
if (ImGui::MenuItem("Load Scene")) {
|
||||||
// Load the scene
|
|
||||||
app->LoadScene();
|
app->LoadScene();
|
||||||
}
|
}
|
||||||
ImGui::EndMenu();
|
ImGui::EndMenu();
|
||||||
@@ -121,9 +229,6 @@ void imguiManager::SetupDockspace(ApplicationClass* app) {
|
|||||||
ImGui::EndMenuBar();
|
ImGui::EndMenuBar();
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGuiID dockspace_id = ImGui::GetID("MainDockSpace");
|
|
||||||
ImGui::DockSpace(dockspace_id, ImVec2(0.0f, 0.0f), ImGuiDockNodeFlags_PassthruCentralNode);
|
|
||||||
|
|
||||||
ImGui::End();
|
ImGui::End();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user