ShibaGit/khaotic-engine-Reborn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 8 Wiki Activity

ca marcheeeeeeee

Browse Source
This commit is contained in:
StratiX0 2024-03-21 20:25:52 +01:00
parent b8724d7f28
commit e9fda93632
6 changed files with 81 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
enginecustom/Systemclass.cpp
View File

@ -53,6 +53,7 @@ bool SystemClass::Initialize()
ImGui_ImplWin32_Init(m_hwnd); ImGui_ImplWin32_Init(m_hwnd);
ImGui_ImplDX11_Init(m_Application->GetDirect3D()->GetDevice(), m_Application->GetDirect3D()->GetDeviceContext()); ImGui_ImplDX11_Init(m_Application->GetDirect3D()->GetDevice(), m_Application->GetDirect3D()->GetDeviceContext());
ImGui::StyleColorsDark();
return true; return true;
} }
@ -137,6 +138,14 @@ bool SystemClass::Frame()
return false; return false;
} }
// Do the frame processing for the application class object.
result = m_Application->Frame();
if (!result)
{
return false;
}
// Start the Dear ImGui frame
ImGui_ImplDX11_NewFrame(); ImGui_ImplDX11_NewFrame();
ImGui_ImplWin32_NewFrame(); ImGui_ImplWin32_NewFrame();
ImGui::NewFrame(); ImGui::NewFrame();
@ -147,15 +156,12 @@ bool SystemClass::Frame()
ImGui::SliderFloat("Slider", &value, 0.0f, 1.0f); ImGui::SliderFloat("Slider", &value, 0.0f, 1.0f);
ImGui::End(); ImGui::End();
// Assemble Together Draw Data
ImGui::Render(); ImGui::Render();
// Render Draw Data
ImGui_ImplDX11_RenderDrawData(ImGui::GetDrawData()); ImGui_ImplDX11_RenderDrawData(ImGui::GetDrawData());
// Do the frame processing for the application class object. this->m_Application->GetDirect3D()->m_swapChain->Present(0, NULL);
result = m_Application->Frame();
if (!result)
{
return false;
}
return true; return true;
} }
@ -297,6 +303,11 @@ void SystemClass::ShutdownWindows()
// Release the pointer to this class. // Release the pointer to this class.
ApplicationHandle = NULL; ApplicationHandle = NULL;
//Releases COM references that ImGui was given on setup
ImGui_ImplDX11_Shutdown();
ImGui_ImplWin32_Shutdown();
ImGui::DestroyContext();
return; return;
} }

1
enginecustom/applicationclass.h
View File

@ -39,6 +39,7 @@ private:
CameraClass* m_Camera; CameraClass* m_Camera;
ModelClass* m_Model; ModelClass* m_Model;
ColorShaderClass* m_ColorShader; ColorShaderClass* m_ColorShader;
IDXGISwapChain* m_swapChain;
}; };
#endif #endif

2
enginecustom/d3dclass.h
View File

@ -39,6 +39,7 @@ public:
ID3D11Device* GetDevice(); ID3D11Device* GetDevice();
ID3D11DeviceContext* GetDeviceContext(); ID3D11DeviceContext* GetDeviceContext();
IDXGISwapChain* m_swapChain;
void GetProjectionMatrix(XMMATRIX&); void GetProjectionMatrix(XMMATRIX&);
void GetWorldMatrix(XMMATRIX&); void GetWorldMatrix(XMMATRIX&);
@ -53,7 +54,6 @@ private:
bool m_vsync_enabled; bool m_vsync_enabled;
int m_videoCardMemory; int m_videoCardMemory;
char m_videoCardDescription[128]; char m_videoCardDescription[128];
IDXGISwapChain* m_swapChain;
ID3D11Device* m_device; ID3D11Device* m_device;
ID3D11DeviceContext* m_deviceContext; ID3D11DeviceContext* m_deviceContext;
ID3D11RenderTargetView* m_renderTargetView; ID3D11RenderTargetView* m_renderTargetView;

9
enginecustom/enginecustom.vcxproj
View File

@ -27,6 +27,7 @@
<ClCompile Include="include\backends\imgui_impl_dx11.cpp" /> <ClCompile Include="include\backends\imgui_impl_dx11.cpp" />
<ClCompile Include="include\backends\imgui_impl_win32.cpp" /> <ClCompile Include="include\backends\imgui_impl_win32.cpp" />
<ClCompile Include="include\imgui.cpp" /> <ClCompile Include="include\imgui.cpp" />
<ClCompile Include="include\imgui_demo.cpp" />
<ClCompile Include="include\imgui_draw.cpp" /> <ClCompile Include="include\imgui_draw.cpp" />
<ClCompile Include="include\imgui_tables.cpp" /> <ClCompile Include="include\imgui_tables.cpp" />
<ClCompile Include="include\imgui_widgets.cpp" /> <ClCompile Include="include\imgui_widgets.cpp" />
@ -40,6 +41,14 @@
<ClInclude Include="Cameraclass.h" /> <ClInclude Include="Cameraclass.h" />
<ClInclude Include="Colorshaderclass.h" /> <ClInclude Include="Colorshaderclass.h" />
<ClInclude Include="d3dclass.h" /> <ClInclude Include="d3dclass.h" />
<ClInclude Include="include\backends\imgui_impl_dx11.h" />
<ClInclude Include="include\backends\imgui_impl_win32.h" />
<ClInclude Include="include\imconfig.h" />
<ClInclude Include="include\imgui.h" />
<ClInclude Include="include\imgui_internal.h" />
<ClInclude Include="include\imstb_rectpack.h" />
<ClInclude Include="include\imstb_textedit.h" />
<ClInclude Include="include\imstb_truetype.h" />
<ClInclude Include="inputclass.h" /> <ClInclude Include="inputclass.h" />
<ClInclude Include="modelclass.h" /> <ClInclude Include="modelclass.h" />
<ClInclude Include="systemclass.h" /> <ClInclude Include="systemclass.h" />

51
enginecustom/enginecustom.vcxproj.filters
View File

@ -16,6 +16,12 @@
<Filter Include="shader"> <Filter Include="shader">
<UniqueIdentifier>{b016e481-576e-4d99-bdde-34cc10c55b1d}</UniqueIdentifier> <UniqueIdentifier>{b016e481-576e-4d99-bdde-34cc10c55b1d}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Fichiers d%27en-tête\ImGui">
<UniqueIdentifier>{dcad57f9-720f-4170-b850-be65a68a8e67}</UniqueIdentifier>
</Filter>
<Filter Include="Fichiers sources\ImGui">
<UniqueIdentifier>{2f09e599-272c-4cd3-b095-62c0b10b439b}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="Main.cpp"> <ClCompile Include="Main.cpp">
@ -42,6 +48,27 @@
<ClCompile Include="Cameraclass.cpp"> <ClCompile Include="Cameraclass.cpp">
<Filter>Fichiers sources</Filter> <Filter>Fichiers sources</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="include\imgui_demo.cpp">
<Filter>Fichiers sources\ImGui</Filter>
</ClCompile>
<ClCompile Include="include\backends\imgui_impl_dx11.cpp">
<Filter>Fichiers sources\ImGui</Filter>
</ClCompile>
<ClCompile Include="include\imgui_draw.cpp">
<Filter>Fichiers sources\ImGui</Filter>
</ClCompile>
<ClCompile Include="include\imgui.cpp">
<Filter>Fichiers sources\ImGui</Filter>
</ClCompile>
<ClCompile Include="include\backends\imgui_impl_win32.cpp">
<Filter>Fichiers sources\ImGui</Filter>
</ClCompile>
<ClCompile Include="include\imgui_tables.cpp">
<Filter>Fichiers sources\ImGui</Filter>
</ClCompile>
<ClCompile Include="include\imgui_widgets.cpp">
<Filter>Fichiers sources\ImGui</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="systemclass.h"> <ClInclude Include="systemclass.h">
@ -65,6 +92,30 @@
<ClInclude Include="Cameraclass.h"> <ClInclude Include="Cameraclass.h">
<Filter>Fichiers d%27en-tête</Filter> <Filter>Fichiers d%27en-tête</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\imconfig.h">
<Filter>Fichiers d%27en-tête\ImGui</Filter>
</ClInclude>
<ClInclude Include="include\imgui.h">
<Filter>Fichiers d%27en-tête\ImGui</Filter>
</ClInclude>
<ClInclude Include="include\imgui_internal.h">
<Filter>Fichiers d%27en-tête\ImGui</Filter>
</ClInclude>
<ClInclude Include="include\imstb_rectpack.h">
<Filter>Fichiers d%27en-tête\ImGui</Filter>
</ClInclude>
<ClInclude Include="include\imstb_textedit.h">
<Filter>Fichiers d%27en-tête\ImGui</Filter>
</ClInclude>
<ClInclude Include="include\imstb_truetype.h">
<Filter>Fichiers d%27en-tête\ImGui</Filter>
</ClInclude>
<ClInclude Include="include\backends\imgui_impl_dx11.h">
<Filter>Fichiers d%27en-tête\ImGui</Filter>
</ClInclude>
<ClInclude Include="include\backends\imgui_impl_win32.h">
<Filter>Fichiers d%27en-tête\ImGui</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />

4
enginecustom/imgui.ini
View File

@ -3,6 +3,6 @@ Pos=60,60
Size=400,400 Size=400,400
[Window][Khaotic Engine] [Window][Khaotic Engine]
Pos=60,60 Pos=137,66
Size=51,48 Size=144,109