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

Fix: Probleme de merge réglé

Browse Source
This commit is contained in:
GolfOcean334 2024-04-25 10:10:42 +02:00
parent 2ffcf977d7
commit 5dc44c22cc
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
enginecustom/applicationclass.cpp
View File

@ -269,13 +269,12 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd)
// Set the file names of the bath model. // Set the file names of the bath model.
strcpy_s(modelFilename, "bath.txt"); strcpy_s(modelFilename, "bath.txt");
strcpy_s(textureFilename1, "marble01.tga"); Filename.push_back("marble01.tga");
// Create and initialize the bath model object. // Create and initialize the bath model object.
m_BathModel = new ModelClass; m_BathModel = new ModelClass;
result = m_BathModel->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureFilename1, textureFilename2, textureFilename3, textureFilename4, result = m_BathModel->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, Filename);
textureFilename5, textureFilename6);
if (!result) if (!result)
{ {
MessageBox(hwnd, L"Could not initialize the bath model object.", L"Error", MB_OK); 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. // Set the file names of the water model.
strcpy_s(modelFilename, "water.txt"); strcpy_s(modelFilename, "water.txt");
strcpy_s(textureFilename1, "water01.tga"); Filename.push_back("water01.tga");
// Create and initialize the water model object. // Create and initialize the water model object.
m_WaterModel = new ModelClass; m_WaterModel = new ModelClass;
result = m_WaterModel->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureFilename1, textureFilename2, textureFilename3, textureFilename4, result = m_WaterModel->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, Filename);
textureFilename5, textureFilename6);
if (!result) if (!result)
{ {
MessageBox(hwnd, L"Could not initialize the water model object.", L"Error", MB_OK); MessageBox(hwnd, L"Could not initialize the water model object.", L"Error", MB_OK);