diff --git a/enginecustom/alpha01.png b/enginecustom/alpha01.png new file mode 100644 index 0000000..b679fc9 Binary files /dev/null and b/enginecustom/alpha01.png differ diff --git a/enginecustom/alpha01.tga b/enginecustom/alpha01.tga deleted file mode 100644 index 74b7943..0000000 Binary files a/enginecustom/alpha01.tga and /dev/null differ diff --git a/enginecustom/applicationclass.cpp b/enginecustom/applicationclass.cpp index 3ac4459..8b7d5cf 100644 --- a/enginecustom/applicationclass.cpp +++ b/enginecustom/applicationclass.cpp @@ -175,12 +175,12 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd) // Charger les textures std::vector textureFilenames = { - L"stone01.tga", - L"normal01.tga", - L"spec02.tga", - L"alpha01.tga", - L"light01.tga", - L"moss01.tga" + L"stone01.png", + L"normal01.png", + L"spec02.png", + L"alpha01.png", + L"light01.png", + L"moss01.png" }; for (const auto& textureFilename : textureFilenames) @@ -282,12 +282,12 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd) strcpy_s(modelFilename, "bath.txt"); // Charger les textures initiales pour m_BathModel std::vector bathTextures = { - L"marble01.tga", - L"normal01.tga", - L"spec02.tga", - L"alpha01.tga", - L"light01.tga", - L"moss01.tga" + L"marble01.png", + L"normal01.png", + L"spec02.png", + L"alpha01.png", + L"light01.png", + L"moss01.png" }; textures.clear(); @@ -320,12 +320,12 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd) strcpy_s(modelFilename, "water.txt"); // replace first element with the new filename std::vector waterTextures = { - L"water01.tga", - L"normal01.tga", - L"spec02.tga", - L"alpha01.tga", - L"light01.tga", - L"moss01.tga" + L"water01.png", + L"normal01.png", + L"spec02.png", + L"alpha01.png", + L"light01.png", + L"moss01.png" }; textures.clear(); @@ -1676,11 +1676,11 @@ void ApplicationClass::AddKobject(WCHAR* filepath) /// Liste des fichiers de texture std::vector kobjTexture = { - L"moss01.tga", - L"normal01.tga", - L"spec02.tga", - L"alpha01.tga", - L"light01.tga" + L"moss01.png", + L"normal01.png", + L"spec02.png", + L"alpha01.png", + L"light01.png" }; @@ -1723,11 +1723,11 @@ void ApplicationClass::AddCube() // Liste des fichiers de texture std::vector cubeTexture = { - L"moss01.tga", - L"normal01.tga", - L"spec02.tga", - L"alpha01.tga", - L"light01.tga" + L"moss01.png", + L"normal01.png", + L"spec02.png", + L"alpha01.png", + L"light01.png" }; diff --git a/enginecustom/dirt01.png b/enginecustom/dirt01.png new file mode 100644 index 0000000..e27b5a9 Binary files /dev/null and b/enginecustom/dirt01.png differ diff --git a/enginecustom/dirt01.tga b/enginecustom/dirt01.tga deleted file mode 100644 index 453fd8d..0000000 Binary files a/enginecustom/dirt01.tga and /dev/null differ diff --git a/enginecustom/enginecustom.vcxproj b/enginecustom/enginecustom.vcxproj index 864fa1e..fcdcd97 100644 --- a/enginecustom/enginecustom.vcxproj +++ b/enginecustom/enginecustom.vcxproj @@ -224,24 +224,31 @@ - - + + + + - - - - - - - - - + + + + + + + + + + + + + + diff --git a/enginecustom/enginecustom.vcxproj.filters b/enginecustom/enginecustom.vcxproj.filters index 5c70cca..82f1b5c 100644 --- a/enginecustom/enginecustom.vcxproj.filters +++ b/enginecustom/enginecustom.vcxproj.filters @@ -37,6 +37,9 @@ {d710c862-b37d-4ad5-aa92-2456f9745881} + + {4873a73d-d11c-4d40-b847-b6d7fef4b23d} + @@ -361,15 +364,63 @@ - - assets - - - assets - Assets + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + + + Assets\Texture + @@ -409,30 +460,12 @@ fonts - - assets - Assets Assets - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - Assets @@ -520,18 +553,9 @@ shader - - assets - - - Assets - Assets - - Assets - Assets @@ -557,7 +581,7 @@ shader - Assets + Assets\Texture \ No newline at end of file diff --git a/enginecustom/font01.png b/enginecustom/font01.png new file mode 100644 index 0000000..e144e1a Binary files /dev/null and b/enginecustom/font01.png differ diff --git a/enginecustom/ground01.png b/enginecustom/ground01.png new file mode 100644 index 0000000..5113758 Binary files /dev/null and b/enginecustom/ground01.png differ diff --git a/enginecustom/imguiManager.cpp b/enginecustom/imguiManager.cpp index 002e579..5cda2f1 100644 --- a/enginecustom/imguiManager.cpp +++ b/enginecustom/imguiManager.cpp @@ -205,7 +205,7 @@ void imguiManager::WidgetObjectWindow(ApplicationClass* app) ofn.lpstrFile = szFile; ofn.lpstrFile[0] = '\0'; ofn.nMaxFile = sizeof(szFile); - ofn.lpstrFilter = L"Texture\0*.tga\0"; + ofn.lpstrFilter = L"Texture\0*.png\0"; ofn.nFilterIndex = 1; ofn.lpstrFileTitle = NULL; ofn.nMaxFileTitle = 0; diff --git a/enginecustom/light01.png b/enginecustom/light01.png new file mode 100644 index 0000000..d729c91 Binary files /dev/null and b/enginecustom/light01.png differ diff --git a/enginecustom/light01.tga b/enginecustom/light01.tga deleted file mode 100644 index 7aa0f52..0000000 Binary files a/enginecustom/light01.tga and /dev/null differ diff --git a/enginecustom/marble01.png b/enginecustom/marble01.png new file mode 100644 index 0000000..15c4856 Binary files /dev/null and b/enginecustom/marble01.png differ diff --git a/enginecustom/marble01.tga b/enginecustom/marble01.tga deleted file mode 100644 index 1a6d4ae..0000000 Binary files a/enginecustom/marble01.tga and /dev/null differ diff --git a/enginecustom/moss01.png b/enginecustom/moss01.png new file mode 100644 index 0000000..aab8ac3 Binary files /dev/null and b/enginecustom/moss01.png differ diff --git a/enginecustom/moss01.tga b/enginecustom/moss01.tga deleted file mode 100644 index 68fb9e3..0000000 Binary files a/enginecustom/moss01.tga and /dev/null differ diff --git a/enginecustom/normal01.png b/enginecustom/normal01.png new file mode 100644 index 0000000..36677ec Binary files /dev/null and b/enginecustom/normal01.png differ diff --git a/enginecustom/normal01.tga b/enginecustom/normal01.tga deleted file mode 100644 index dbcd466..0000000 Binary files a/enginecustom/normal01.tga and /dev/null differ diff --git a/enginecustom/spec02.png b/enginecustom/spec02.png new file mode 100644 index 0000000..78c9f7e Binary files /dev/null and b/enginecustom/spec02.png differ diff --git a/enginecustom/spec02.tga b/enginecustom/spec02.tga deleted file mode 100644 index b5085a7..0000000 Binary files a/enginecustom/spec02.tga and /dev/null differ diff --git a/enginecustom/sprite01.png b/enginecustom/sprite01.png new file mode 100644 index 0000000..ba1c7e3 Binary files /dev/null and b/enginecustom/sprite01.png differ diff --git a/enginecustom/sprite02.png b/enginecustom/sprite02.png new file mode 100644 index 0000000..973b0c5 Binary files /dev/null and b/enginecustom/sprite02.png differ diff --git a/enginecustom/sprite03.png b/enginecustom/sprite03.png new file mode 100644 index 0000000..75e6eba Binary files /dev/null and b/enginecustom/sprite03.png differ diff --git a/enginecustom/sprite04.png b/enginecustom/sprite04.png new file mode 100644 index 0000000..09f4357 Binary files /dev/null and b/enginecustom/sprite04.png differ diff --git a/enginecustom/stone01.png b/enginecustom/stone01.png new file mode 100644 index 0000000..41683ca Binary files /dev/null and b/enginecustom/stone01.png differ diff --git a/enginecustom/wall.png b/enginecustom/wall.png new file mode 100644 index 0000000..5e09f16 Binary files /dev/null and b/enginecustom/wall.png differ diff --git a/enginecustom/wall.tga b/enginecustom/wall.tga deleted file mode 100644 index f2267a5..0000000 Binary files a/enginecustom/wall.tga and /dev/null differ diff --git a/enginecustom/wall01.png b/enginecustom/wall01.png new file mode 100644 index 0000000..416d143 Binary files /dev/null and b/enginecustom/wall01.png differ diff --git a/enginecustom/water01.png b/enginecustom/water01.png new file mode 100644 index 0000000..8b580a3 Binary files /dev/null and b/enginecustom/water01.png differ diff --git a/enginecustom/water01.tga b/enginecustom/water01.tga deleted file mode 100644 index b770c8e..0000000 Binary files a/enginecustom/water01.tga and /dev/null differ