From 3e3620d925dd89d766aca353944b1f14122ef106 Mon Sep 17 00:00:00 2001 From: CatChow0 Date: Sun, 29 Sep 2024 18:19:49 +0200 Subject: [PATCH] Patch - Update --- enginecustom/applicationclass.cpp | 54 +++++------------- enginecustom/{ => assets/Texture}/stone01.tga | Bin enginecustom/enginecustom.vcxproj | 3 - enginecustom/enginecustom.vcxproj.filters | 9 --- .../{assets/Model/TXT => }/font01.txt | 0 enginecustom/imgui.ini | 4 +- .../{assets/Model/TXT => }/sprite_data_01.txt | 0 7 files changed, 17 insertions(+), 53 deletions(-) rename enginecustom/{ => assets/Texture}/stone01.tga (100%) rename enginecustom/{assets/Model/TXT => }/font01.txt (100%) rename enginecustom/{assets/Model/TXT => }/sprite_data_01.txt (100%) diff --git a/enginecustom/applicationclass.cpp b/enginecustom/applicationclass.cpp index a26976c..56720fa 100644 --- a/enginecustom/applicationclass.cpp +++ b/enginecustom/applicationclass.cpp @@ -126,6 +126,7 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd) // Set the sprite info file we will be using. + // strcpy_s(spriteFilename, "sprite_data_01.txt"); // Create and initialize the sprite object. @@ -158,7 +159,7 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd) } // Set the file name of the bitmap file. - strcpy_s(bitmapFilename, "stone01.tga"); + strcpy_s(bitmapFilename, "assets/Texture/stone01.tga"); // Create and initialize the bitmap object. m_Bitmap = new BitmapClass; @@ -171,16 +172,11 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd) } // Set the file name of the model. - strcpy_s(modelFilename, "cube.txt"); + strcpy_s(modelFilename, "assets/Model/TXT/cube.txt"); // Charger les textures std::vector textureFilenames = { - L"stone01.png", - L"normal01.png", - L"spec02.png", - L"alpha01.png", - L"light01.png", - L"moss01.png" + L"assets/Texture/stone01.png" }; for (const auto& textureFilename : textureFilenames) @@ -278,16 +274,9 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd) m_ModelList = new ModelListClass; m_ModelList->Initialize(25); - // Set the file names of the bath model. - strcpy_s(modelFilename, "bath.txt"); // Charger les textures initiales pour m_BathModel std::vector bathTextures = { - L"marble01.png", - L"normal01.png", - L"spec02.png", - L"alpha01.png", - L"light01.png", - L"moss01.png" + L"assets/Texture/marble01.png" }; textures.clear(); @@ -304,7 +293,7 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd) } // Set the file name of the bath model. - strcpy_s(modelFilename, "bath.txt"); + strcpy_s(modelFilename, "assets/Model/TXT/bath.txt"); // Create and initialize the bath model object. m_BathModel = new ModelClass; @@ -317,15 +306,10 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd) } // Set the file names of the water model. - strcpy_s(modelFilename, "water.txt"); + strcpy_s(modelFilename, "assets/Model/TXT/water.txt"); // replace first element with the new filename std::vector waterTextures = { - L"water01.png", - L"normal01.png", - L"spec02.png", - L"alpha01.png", - L"light01.png", - L"moss01.png" + L"assets/Texture/water01.png" }; textures.clear(); @@ -1597,13 +1581,13 @@ void ApplicationClass::GenerateTerrain() scaleMatrix = XMMatrixScaling(scaleX, scaleY, scaleZ); // Set the file name of the model. - strcpy_s(modelFilename, "plane.txt"); + strcpy_s(modelFilename, "assets/Model/TXT/plane.txt"); // Liste des fichiers de texture std::vector terrainTexture = { - L"Bricks2K.png", - L"Bricks2K_normal.png", - L"Bricks2K_specular.png" + L"assets/Texture/Bricks2K.png", + L"assets/Texture/BricksNRM2K.png", + L"assets/Texture/BricksGLOSS2K.png" }; @@ -1679,11 +1663,7 @@ void ApplicationClass::AddKobject(WCHAR* filepath) /// Liste des fichiers de texture std::vector kobjTexture = { - L"moss01.png", - L"normal01.png", - L"spec02.png", - L"alpha01.png", - L"light01.png" + L"assets/Texture/moss01.png" }; @@ -1722,15 +1702,11 @@ void ApplicationClass::AddCube() bool result; // Set the file name of the model. - strcpy_s(modelFilename, "cube.txt"); + strcpy_s(modelFilename, "assets/Model/TXT/cube.txt"); // Liste des fichiers de texture std::vector cubeTexture = { - L"moss01.png", - L"normal01.png", - L"spec02.png", - L"alpha01.png", - L"light01.png" + L"assets/Texture/Bricks2K.png" }; diff --git a/enginecustom/stone01.tga b/enginecustom/assets/Texture/stone01.tga similarity index 100% rename from enginecustom/stone01.tga rename to enginecustom/assets/Texture/stone01.tga diff --git a/enginecustom/enginecustom.vcxproj b/enginecustom/enginecustom.vcxproj index 238a76e..0b0857a 100644 --- a/enginecustom/enginecustom.vcxproj +++ b/enginecustom/enginecustom.vcxproj @@ -250,7 +250,6 @@ - @@ -291,11 +290,9 @@ Text - - diff --git a/enginecustom/enginecustom.vcxproj.filters b/enginecustom/enginecustom.vcxproj.filters index 569a5d4..0ca0635 100644 --- a/enginecustom/enginecustom.vcxproj.filters +++ b/enginecustom/enginecustom.vcxproj.filters @@ -376,9 +376,6 @@ Assets - - Assets\Texture - Assets\Texture @@ -566,9 +563,6 @@ Assets\Model\TXT - - Assets\Model\TXT - Assets\Model\TXT @@ -578,9 +572,6 @@ Assets\Model\TXT - - Assets\Model\TXT - Assets\Model\TXT diff --git a/enginecustom/assets/Model/TXT/font01.txt b/enginecustom/font01.txt similarity index 100% rename from enginecustom/assets/Model/TXT/font01.txt rename to enginecustom/font01.txt diff --git a/enginecustom/imgui.ini b/enginecustom/imgui.ini index 992f2b5..a954d29 100644 --- a/enginecustom/imgui.ini +++ b/enginecustom/imgui.ini @@ -15,8 +15,8 @@ Pos=60,60 Size=342,82 [Window][Light] -Pos=1564,17 -Size=345,519 +Pos=1551,17 +Size=358,535 [Window][Shader Manager] Pos=34,253 diff --git a/enginecustom/assets/Model/TXT/sprite_data_01.txt b/enginecustom/sprite_data_01.txt similarity index 100% rename from enginecustom/assets/Model/TXT/sprite_data_01.txt rename to enginecustom/sprite_data_01.txt