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

Fusion Complete

Browse Source
This commit is contained in:
CatChow0
2024-03-29 17:01:58 +01:00
parent 513c12bee0
commit 2c493bc979
4 changed files with 138 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
enginecustom/applicationclass.cpp
View File

@@ -689,10 +689,11 @@ void ApplicationClass::GenerateTerrain()
// Set the name of the texture file that we will be loading.
char textureFilename[128];
char textureFilename2[128];
strcpy_s(textureFilename, "stone01.tga");
strcpy_s(textureFilename2, "moss01.tga");
Object* newTerrain = new Object();
newTerrain->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureFilename);
newTerrain->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureFilename, textureFilename2);
newTerrain->SetTranslateMatrix(XMMatrixTranslation(0.0f, -1.0f, 0.0f));
newTerrain->SetRotateMatrix(XMMatrixRotationY(180.0f));
@@ -705,16 +706,18 @@ void ApplicationClass::AddCube()
{
char modelFilename[128];
char textureFilename[128];
char textureFilename2[128];
// Set the file name of the model.
strcpy_s(modelFilename, "cube.txt");
// Set the name of the texture file that we will be loading.
strcpy_s(textureFilename, "stone01.tga");
strcpy_s(textureFilename2, "moss01.tga");
static int cubeCount = 0;
float position = cubeCount * 2.0f;
Object* newCube = new Object();
newCube->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureFilename);
newCube->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureFilename, textureFilename2);
newCube->SetTranslateMatrix(XMMatrixTranslation(position, 0.0f, 0.0f));
@@ -739,6 +742,9 @@ void ApplicationClass::DeleteTerrain()
delete cube;
}
m_terrainChunk.clear();
}
bool ApplicationClass::UpdateFps()
{
int fps;