From 5dc44c22ccaca5183753abd15137a22f8bd248e5 Mon Sep 17 00:00:00 2001 From: GolfOcean334 <130740013+GolfOcean334@users.noreply.github.com> Date: Thu, 25 Apr 2024 10:10:42 +0200 Subject: [PATCH] =?UTF-8?q?Fix:=20Probleme=20de=20merge=20r=C3=A9gl=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- enginecustom/applicationclass.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/enginecustom/applicationclass.cpp b/enginecustom/applicationclass.cpp index 1410758..2075d4c 100644 --- a/enginecustom/applicationclass.cpp +++ b/enginecustom/applicationclass.cpp @@ -269,13 +269,12 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd) // Set the file names of the bath model. strcpy_s(modelFilename, "bath.txt"); - strcpy_s(textureFilename1, "marble01.tga"); + Filename.push_back("marble01.tga"); // Create and initialize the bath model object. m_BathModel = new ModelClass; - result = m_BathModel->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureFilename1, textureFilename2, textureFilename3, textureFilename4, - textureFilename5, textureFilename6); + result = m_BathModel->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, Filename); if (!result) { MessageBox(hwnd, L"Could not initialize the bath model object.", L"Error", MB_OK); @@ -284,13 +283,12 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd) // Set the file names of the water model. strcpy_s(modelFilename, "water.txt"); - strcpy_s(textureFilename1, "water01.tga"); + Filename.push_back("water01.tga"); // Create and initialize the water model object. m_WaterModel = new ModelClass; - result = m_WaterModel->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureFilename1, textureFilename2, textureFilename3, textureFilename4, - textureFilename5, textureFilename6); + result = m_WaterModel->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, Filename); if (!result) { MessageBox(hwnd, L"Could not initialize the water model object.", L"Error", MB_OK);