diff --git a/enginecustom/KhaoticIcon.ico b/enginecustom/KhaoticIcon.ico new file mode 100644 index 0000000..21689f2 Binary files /dev/null and b/enginecustom/KhaoticIcon.ico differ diff --git a/enginecustom/Systemclass.cpp b/enginecustom/Systemclass.cpp index c5ebe29..4c42b81 100644 --- a/enginecustom/Systemclass.cpp +++ b/enginecustom/Systemclass.cpp @@ -276,8 +276,8 @@ void SystemClass::InitializeWindows(int& screenWidth, int& screenHeight) wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = m_hinstance; - wc.hIcon = LoadIcon(NULL, IDI_WINLOGO); - wc.hIconSm = wc.hIcon; + wc.hIcon = LoadIcon(m_hinstance,MAKEINTRESOURCE(IDI_ICON1)); + wc.hIconSm = LoadIcon(m_hinstance, MAKEINTRESOURCE(IDI_ICON1)); wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); wc.lpszMenuName = NULL; diff --git a/enginecustom/enginecustom.vcxproj b/enginecustom/enginecustom.vcxproj index 2237b7f..4d01a56 100644 --- a/enginecustom/enginecustom.vcxproj +++ b/enginecustom/enginecustom.vcxproj @@ -93,6 +93,7 @@ + @@ -150,6 +151,7 @@ + @@ -175,6 +177,9 @@ Document + + + 17.0 Win32Proj diff --git a/enginecustom/enginecustom.vcxproj.filters b/enginecustom/enginecustom.vcxproj.filters index 22eaea8..f876445 100644 --- a/enginecustom/enginecustom.vcxproj.filters +++ b/enginecustom/enginecustom.vcxproj.filters @@ -281,6 +281,9 @@ Fichiers d%27en-tĂȘte + + Fichiers d%27en-tĂȘte + @@ -313,6 +316,9 @@ Assets + + Assets + @@ -372,6 +378,8 @@ + + @@ -394,11 +402,8 @@ - - shader - - - shader - + + Fichiers de ressources + \ No newline at end of file diff --git a/enginecustom/imgui.ini b/enginecustom/imgui.ini index 5e3bc27..ab1c9f2 100644 --- a/enginecustom/imgui.ini +++ b/enginecustom/imgui.ini @@ -5,13 +5,14 @@ Size=400,400 [Window][Khaotic Engine] Pos=260,25 Size=694,210 +Collapsed=1 [Window][Objects] -Pos=222,19 +Pos=1348,34 Size=492,353 [Window][Terrain] -Pos=892,19 +Pos=1039,19 Size=418,94 [Window][Light] diff --git a/enginecustom/resources.h b/enginecustom/resources.h new file mode 100644 index 0000000..5cc1c08 --- /dev/null +++ b/enginecustom/resources.h @@ -0,0 +1,2 @@ +#pragma once +#define IDI_ICON1 101 diff --git a/enginecustom/resources.rc b/enginecustom/resources.rc new file mode 100644 index 0000000..db5399d --- /dev/null +++ b/enginecustom/resources.rc @@ -0,0 +1,3 @@ +#include "resources.h" + +IDI_ICON1 ICON DISCARDABLE "KhaoticIcon.ico" \ No newline at end of file diff --git a/enginecustom/systemclass.h b/enginecustom/systemclass.h index ec7e589..41f9b38 100644 --- a/enginecustom/systemclass.h +++ b/enginecustom/systemclass.h @@ -6,6 +6,7 @@ #include "inputclass.h" #include "applicationclass.h" #include "imguiManager.h" +#include "resources.h" class SystemClass {