diff --git a/enginecustom/applicationclass.cpp b/enginecustom/applicationclass.cpp
index 7fba29b..3a2b9a1 100644
--- a/enginecustom/applicationclass.cpp
+++ b/enginecustom/applicationclass.cpp
@@ -267,7 +267,8 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd)
// Set the file names of the bath model.
strcpy_s(modelFilename, "bath.txt");
- Filename.push_back("marble01.tga");
+ // replace first element with the new filename
+ Filename[0] = "marble01.tga";
// Create and initialize the bath model object.
m_BathModel = new ModelClass;
@@ -281,7 +282,8 @@ bool ApplicationClass::Initialize(int screenWidth, int screenHeight, HWND hwnd)
// Set the file names of the water model.
strcpy_s(modelFilename, "water.txt");
- Filename.push_back("water01.tga");
+ // replace first element with the new filename
+ Filename[0] = "water01.tga";
// Create and initialize the water model object.
m_WaterModel = new ModelClass;
diff --git a/enginecustom/enginecustom.vcxproj b/enginecustom/enginecustom.vcxproj
index c05edbb..dca7e6a 100644
--- a/enginecustom/enginecustom.vcxproj
+++ b/enginecustom/enginecustom.vcxproj
@@ -151,7 +151,9 @@
Document
-
+
+ Document
+
Document
@@ -177,9 +179,15 @@
Document
-
-
-
+
+ Document
+
+
+ Document
+
+
+ Document
+
@@ -205,6 +213,7 @@
+
@@ -212,17 +221,19 @@
-
-
+
+
+
+
diff --git a/enginecustom/enginecustom.vcxproj.filters b/enginecustom/enginecustom.vcxproj.filters
index fcc6562..bfeafe0 100644
--- a/enginecustom/enginecustom.vcxproj.filters
+++ b/enginecustom/enginecustom.vcxproj.filters
@@ -319,9 +319,6 @@
-
- assets
-
assets
@@ -331,24 +328,9 @@
Assets
-
- Assets
-
-
- shader
-
-
- shader
-
-
- shader
-
-
- shader
-
@@ -484,5 +466,32 @@
Texture
+
+ shader
+
+
+ shader
+
+
+ shader
+
+
+ shader
+
+
+ assets
+
+
+ Assets
+
+
+ Assets
+
+
+ Assets
+
+
+ Assets
+
\ No newline at end of file
diff --git a/enginecustom/modelclass.cpp b/enginecustom/modelclass.cpp
index 7581ead..befa8be 100644
--- a/enginecustom/modelclass.cpp
+++ b/enginecustom/modelclass.cpp
@@ -271,7 +271,7 @@ void ModelClass::ReleaseTextures()
bool ModelClass::LoadModel(char* filename)
{
- Logger::Get().Log("Loading model", __FILE__, __LINE__);
+ Logger::Get().Log("Loading model: " + std::string(filename), __FILE__, __LINE__);
ifstream fin;
char input;
@@ -324,7 +324,7 @@ bool ModelClass::LoadModel(char* filename)
// Close the model file.
fin.close();
- Logger::Get().Log("Model loaded", __FILE__, __LINE__);
+ Logger::Get().Log("Model loaded "+ std::string(filename), __FILE__, __LINE__);
return true;
}
@@ -489,7 +489,7 @@ bool ModelClass::ChangeTexture(ID3D11Device* device, ID3D11DeviceContext* device
return false;
}
- Logger::Get().Log("Texture changed", __FILE__, __LINE__);
+ Logger::Get().Log("Texture changed", __FILE__, __LINE__, Logger::LogLevel::Debug);
return true;
}
\ No newline at end of file