diff --git a/enginecustom/applicationclass.cpp b/enginecustom/applicationclass.cpp
index 2c8f347..53c59bd 100644
--- a/enginecustom/applicationclass.cpp
+++ b/enginecustom/applicationclass.cpp
@@ -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;
diff --git a/enginecustom/enginecustom.vcxproj.filters b/enginecustom/enginecustom.vcxproj.filters
index ba3e166..f3b9958 100644
--- a/enginecustom/enginecustom.vcxproj.filters
+++ b/enginecustom/enginecustom.vcxproj.filters
@@ -22,6 +22,15 @@
{2f09e599-272c-4cd3-b095-62c0b10b439b}
+
+ {e7aac2a1-4fc0-42c7-b92f-15d3aec3736b}
+
+
+ {39c57c7f-e726-4443-8fbc-734e2d0c97d8}
+
+
+ {2978535b-193d-4876-83be-1c3c4470db62}
+
@@ -84,6 +93,33 @@
Fichiers sources
+
+ Fichiers sources
+
+
+ Fichiers sources
+
+
+ Fichiers sources
+
+
+ Fichiers sources
+
+
+ Fichiers sources
+
+
+ Fichiers sources
+
+
+ Fichiers sources
+
+
+ Fichiers sources
+
+
+ Fichiers sources
+
@@ -131,9 +167,6 @@
Fichiers d%27en-tête\ImGui
-
- Fichiers d%27en-tête
-
Fichiers d%27en-tête
@@ -146,6 +179,36 @@
Fichiers d%27en-tête
+
+ Fichiers d%27en-tête
+
+
+ Fichiers d%27en-tête
+
+
+ Fichiers d%27en-tête
+
+
+ Fichiers d%27en-tête
+
+
+ Fichiers d%27en-tête
+
+
+ Fichiers d%27en-tête
+
+
+ Fichiers d%27en-tête
+
+
+ Fichiers d%27en-tête
+
+
+ Fichiers d%27en-tête
+
+
+ Fichiers d%27en-tête
+
@@ -155,13 +218,66 @@
shader
-
-
+
+ Fonts
+
+
+ Fonts
+
+
+ shader
+
+
+ shader
+
+
+ Texture
+
+
+ Texture
+
+
+ Texture
+
+
+ Texture
+
-
+
+ Fonts
+
+
+ Assets
+
+
+ Assets
+
+
+ Assets
+
+
+ Assets
+
+
+ Assets
+
-
+
+ Fonts
+
+
+ Assets
+
+
+ Assets
+
+
+ Assets
+
+
+ Assets
+
\ No newline at end of file
diff --git a/enginecustom/imgui.ini b/enginecustom/imgui.ini
index 102e49b..56035b5 100644
--- a/enginecustom/imgui.ini
+++ b/enginecustom/imgui.ini
@@ -3,14 +3,17 @@ Pos=60,60
Size=400,400
[Window][Khaotic Engine]
-Pos=129,554
+Pos=2,63
Size=694,183
+Collapsed=1
[Window][Objects]
-Pos=5,7
+Pos=10,29
Size=492,353
+Collapsed=1
[Window][Terrain]
-Pos=1223,101
+Pos=913,27
Size=418,94
+Collapsed=1
diff --git a/enginecustom/modelclass.h b/enginecustom/modelclass.h
index 98f9ed2..9ae525d 100644
--- a/enginecustom/modelclass.h
+++ b/enginecustom/modelclass.h
@@ -86,7 +86,6 @@ private:
int m_vertexCount, m_indexCount;
TextureClass* m_Textures;
ModelType* m_model;
- int m_vertexCount, m_indexCount;
};
#endif
\ No newline at end of file