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

Start new terrain

Browse Source
This commit is contained in:
CatChow0
2024-03-29 16:19:37 +01:00
parent 92ecd8e83a
commit 1dbbf4aa2d
9 changed files with 609 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
enginecustom/applicationclass.cpp
View File

@@ -153,12 +153,12 @@ void ApplicationClass::Shutdown()
m_cubes.clear();
// Liberez la memoire pour chaque cube du terrain
for (auto cube : m_terrainCubes)
for (auto cube : m_terrainChunk)
{
cube->Shutdown();
delete cube;
}
m_terrainCubes.clear();
m_terrainChunk.clear();
return;
}
@@ -236,7 +236,7 @@ bool ApplicationClass::Render(float rotation)
srMatrix = XMMatrixMultiply(scaleMatrix, rotateMatrix);
worldMatrix = XMMatrixMultiply(srMatrix, translateMatrix);
result = m_LightShader->Render(m_Direct3D->GetDeviceContext(), m_Model->GetIndexCount(), worldMatrix, viewMatrix, projectionMatrix, m_Model->GetTexture(),
result = m_LightShader->Render(m_Direct3D->GetDeviceContext(), cube->GetIndexCount(), worldMatrix, viewMatrix, projectionMatrix, cube->GetTexture(),
diffuseColor, lightPosition);
if (!result)
{
@@ -244,14 +244,15 @@ bool ApplicationClass::Render(float rotation)
}
}
// Render terrainCube after all the cubes have been combined
for (auto cube : m_terrainCubes)
// Render terrain
for (auto chunk : m_terrainChunk)
{
cube->Render(m_Direct3D->GetDeviceContext());
chunk->Render(m_Direct3D->GetDeviceContext());
scaleMatrix = chunk->GetScaleMatrix();
rotateMatrix = chunk->GetRotateMatrix();
translateMatrix = chunk->GetTranslateMatrix();
scaleMatrix = cube->GetScaleMatrix();
rotateMatrix = cube->GetRotateMatrix();
translateMatrix = cube->GetTranslateMatrix();
srMatrix = XMMatrixMultiply(scaleMatrix, rotateMatrix);
worldMatrix = XMMatrixMultiply(srMatrix, translateMatrix);
@@ -264,7 +265,6 @@ bool ApplicationClass::Render(float rotation)
}
// Present the rendered scene to the screen.
m_Direct3D->EndScene();
@@ -288,33 +288,28 @@ int ApplicationClass::GetScreenHeight() const
void ApplicationClass::GenerateTerrain()
{
char modelFilename[128];
char textureFilename[128];
// Set the file name of the model.
strcpy_s(modelFilename, "cube.txt");
char modelFilename[128];
// check if a chunk file already exists
strcpy_s(modelFilename, "chunk.txt");
// Set the name of the texture file that we will be loading.
char textureFilename[128];
strcpy_s(textureFilename, "stone01.tga");
// Create cube objects to fill a 10x10 grid of cubes
for (int i = -10; i < 10; i++)
{
for (int j = -10; j < 10; j++)
{
Object* newCube = new Object();
newCube->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureFilename);
Object* newTerrain = new Object();
newTerrain->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureFilename);
newCube->SetTranslateMatrix(XMMatrixTranslation(i * 2.0f, -4.0f, j * 2.0f));
newTerrain->SetTranslateMatrix(XMMatrixTranslation(0.0f, -1.0f, 0.0f));
newTerrain->SetRotateMatrix(XMMatrixRotationY(180.0f));
m_terrainCubes.push_back(newCube);
}
}
m_cubes.push_back(newTerrain);
}
void ApplicationClass::AddCube()
{
char modelFilename[128];
@@ -347,10 +342,10 @@ void ApplicationClass::DeleteCube(int index)
void ApplicationClass::DeleteTerrain()
{
for (auto cube : m_terrainCubes)
for (auto cube : m_terrainChunk)
{
cube->Shutdown();
delete cube;
}
m_terrainCubes.clear();
m_terrainChunk.clear();
}