From 8e665da007031865788afc178b47d4c25e520c03 Mon Sep 17 00:00:00 2001
From: GolfOcean334 <130740013+GolfOcean334@users.noreply.github.com>
Date: Tue, 9 Apr 2024 11:34:21 +0200
Subject: [PATCH] fix main

---
 enginecustom/applicationclass.cpp | 52 ++++++++++++++++++++-----------
 enginecustom/applicationclass.h   |  3 +-
 2 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/enginecustom/applicationclass.cpp b/enginecustom/applicationclass.cpp
index af4d091..4df57f1 100644
--- a/enginecustom/applicationclass.cpp
+++ b/enginecustom/applicationclass.cpp
@@ -633,10 +633,6 @@ bool ApplicationClass::Frame(InputClass* Input)
 		return false;
 	}
 
-
-	// Check if the mouse has been pressed.
-	mouseDown = Input->IsMousePressed();
-
 	// Update the mouse strings each frame.
 	result = UpdateMouseStrings(mouseX, mouseY, leftMouseDown);
 	if (!result)
@@ -1189,9 +1185,12 @@ int ApplicationClass::GetScreenHeight() const
 void ApplicationClass::GenerateTerrain()
 {
 	char modelFilename[128];
-	char textureFilename[128];
+	char textureFilename1[128];
 	char textureFilename2[128];
 	char textureFilename3[128];
+	char textureFilename4[128];
+	char textureFilename5[128];
+	char textureFilename6[128];
 
 	XMMATRIX scaleMatrix;
 	int scaleX, scaleY, scaleZ;
@@ -1204,9 +1203,12 @@ void ApplicationClass::GenerateTerrain()
 
 	// Set the file name of the model.
 	strcpy_s(modelFilename, "plane.txt");
-	strcpy_s(textureFilename, "stone01.tga");
-	strcpy_s(textureFilename2, "moss01.tga");
-	strcpy_s(textureFilename3, "alpha01.tga");
+	strcpy_s(textureFilename1, "stone01.tga");
+	strcpy_s(textureFilename2, "normal01.tga");
+	strcpy_s(textureFilename3, "spec02.tga");
+	strcpy_s(textureFilename4, "alpha01.tga");
+	strcpy_s(textureFilename5, "light01.tga");
+	strcpy_s(textureFilename6, "moss01.tga");
 
 	// for loop to generate terrain chunks for a 10x10 grid
 	for (int i = 0; i < 10; i++)
@@ -1214,7 +1216,7 @@ void ApplicationClass::GenerateTerrain()
 		for (int j = 0; j < 10; j++)
 		{
 			Object* newTerrain = new Object();
-			newTerrain->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureFilename, textureFilename2, textureFilename3);
+			newTerrain->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureFilename1, textureFilename2, textureFilename3, textureFilename4, textureFilename5, textureFilename6);
 
 			newTerrain->SetScaleMatrix(scaleMatrix);
 
@@ -1230,9 +1232,12 @@ void ApplicationClass::GenerateTerrain()
 void ApplicationClass::AddKobject(WCHAR* filepath)
 {
 	char modelFilename[128];
-	char textureFilename[128];
+	char textureFilename1[128];
 	char textureFilename2[128];
 	char textureFilename3[128];
+	char textureFilename4[128];
+	char textureFilename5[128];
+	char textureFilename6[128];
 
 	filesystem::path p(filepath);
 	string filename = p.stem().string();
@@ -1242,12 +1247,15 @@ void ApplicationClass::AddKobject(WCHAR* filepath)
 
 
 	// Set the name of the texture file that we will be loading.
-	strcpy_s(textureFilename, "stone01.tga");
-	strcpy_s(textureFilename2, "moss01.tga");
-	strcpy_s(textureFilename3, "alpha01.tga");
+	strcpy_s(textureFilename1, "stone01.tga");
+	strcpy_s(textureFilename2, "normal01.tga");
+	strcpy_s(textureFilename3, "spec02.tga");
+	strcpy_s(textureFilename4, "alpha01.tga");
+	strcpy_s(textureFilename5, "light01.tga");
+	strcpy_s(textureFilename6, "moss01.tga");
 
 	Object* newObject = new Object();
-	newObject->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureFilename, textureFilename2, textureFilename3);
+	newObject->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureFilename1, textureFilename2, textureFilename3, textureFilename4, textureFilename5, textureFilename6);
 
 	newObject->SetTranslateMatrix(XMMatrixTranslation(0.0f, 0.0f, 0.0f));
 	newObject->SetName(filename);
@@ -1258,21 +1266,27 @@ void ApplicationClass::AddKobject(WCHAR* filepath)
 void ApplicationClass::AddCube()
 {
 	char modelFilename[128];
-	char textureFilename[128];
+	char textureFilename1[128];
 	char textureFilename2[128];
 	char textureFilename3[128];
+	char textureFilename4[128];
+	char textureFilename5[128];
+	char textureFilename6[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");
-	strcpy_s(textureFilename3, "alpha01.tga");
+	strcpy_s(textureFilename1, "stone01.tga");
+	strcpy_s(textureFilename2, "normal01.tga");
+	strcpy_s(textureFilename3, "spec02.tga");
+	strcpy_s(textureFilename4, "alpha01.tga");
+	strcpy_s(textureFilename5, "light01.tga");
+	strcpy_s(textureFilename6, "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, textureFilename2, textureFilename3);
+	newCube->Initialize(m_Direct3D->GetDevice(), m_Direct3D->GetDeviceContext(), modelFilename, textureFilename1, textureFilename2, textureFilename3, textureFilename4, textureFilename5, textureFilename6);
 
 	newCube->SetTranslateMatrix(XMMatrixTranslation(position, 0.0f, 0.0f));
 
diff --git a/enginecustom/applicationclass.h b/enginecustom/applicationclass.h
index 8068974..0cfc8f0 100644
--- a/enginecustom/applicationclass.h
+++ b/enginecustom/applicationclass.h
@@ -29,6 +29,7 @@
 #include "frustumclass.h"
 #include "rendertextureclass.h"
 #include "displayplaneclass.h"
+#include "reflectionshaderclass.h"
 
 
 
@@ -148,8 +149,6 @@ private :
 	FpsClass* m_Fps;
 	TextClass* m_FpsString;
 	int m_previousFps;
-
-r-Manager
 };
 
 #endif
\ No newline at end of file