From 79048d1ad84e33d5eacbc5dfbef752948e9a787f Mon Sep 17 00:00:00 2001
From: Mateja <mail@matejamaric.com>
Date: Fri, 19 Feb 2021 14:56:08 +0100
Subject: Add texure loading check and loading time. Add ObjModel loadingTime.

---
 src/ObjModel.cpp |  4 ++++
 src/ObjModel.h   |  2 ++
 src/main.cpp     | 48 +++++++++++++++++++++++++++++++-----------------
 3 files changed, 37 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/ObjModel.cpp b/src/ObjModel.cpp
index f23cfc3..aa81cec 100644
--- a/src/ObjModel.cpp
+++ b/src/ObjModel.cpp
@@ -6,6 +6,8 @@ ObjModel::ObjModel() {}
 
 ObjModel::ObjModel(std::string fileName)
 {
+	std::chrono::high_resolution_clock::time_point time1 = std::chrono::high_resolution_clock::now();
+
 	int hlp = 0;
 	std::ifstream f(fileName);
 	std::string s0;
@@ -56,6 +58,8 @@ ObjModel::ObjModel(std::string fileName)
 		}
 	}
 
+	std::chrono::high_resolution_clock::time_point time2 = std::chrono::high_resolution_clock::now();
+	loadingTime = std::chrono::duration_cast<std::chrono::duration<double>>(time2 - time1);
 }
 
 ObjModel::ObjModel(const ObjModel& a) 
diff --git a/src/ObjModel.h b/src/ObjModel.h
index 9f66867..5ceed26 100644
--- a/src/ObjModel.h
+++ b/src/ObjModel.h
@@ -5,6 +5,7 @@
 #include<sstream>
 #include<fstream>
 #include<exception>
+#include<chrono>
 
 struct Triangle {
 	int p[3][3];
@@ -21,6 +22,7 @@ public:
 	std::vector<Texture_Coordinates> uvcoo;
 	std::vector<Vector4f> normals;
 	std::vector<Triangle> faces;
+  std::chrono::duration<double> loadingTime;
 	ObjModel();
 	ObjModel(std::string fileName);
 	ObjModel(const ObjModel& a);
diff --git a/src/main.cpp b/src/main.cpp
index f229003..11e199d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,4 @@
-#include<chrono>
-
-#include<SFML/Window.hpp>
+#include<SFML/Window.hpp>
 #include<SFML/Graphics.hpp>
 
 #include"Render.h"
@@ -30,22 +28,36 @@ int main()
 
 	Render render(width, height);	
 
-	sf::Image image;
-	image.loadFromFile("model/modelTexture.png");
-	Bitmap modelTexture(image.getSize().x, image.getSize().y);
-	const sf::Uint8* pp = image.getPixelsPtr();
-	for (int i = 0; i < image.getSize().x * image.getSize().y * 4; i += 4) {
-		modelTexture.pixels[i + 0] = (unsigned char)pp[i + 0];
-		modelTexture.pixels[i + 1] = (unsigned char)pp[i + 1];
-		modelTexture.pixels[i + 2] = (unsigned char)pp[i + 2];
-		modelTexture.pixels[i + 3] = (unsigned char)pp[i + 3];
-	}
+  Bitmap* modelTexture;
+
+  bool textureLoaded = false;
 
 	std::chrono::high_resolution_clock::time_point time1 = std::chrono::high_resolution_clock::now();
-	ObjModel model("model/model.obj");
+	sf::Image image;
+  textureLoaded = image.loadFromFile("model/modelTexture.png");
+  if (textureLoaded) {
+    modelTexture = new Bitmap(image.getSize().x, image.getSize().y);
+    const sf::Uint8* pp = image.getPixelsPtr();
+    for (int i = 0; i < image.getSize().x * image.getSize().y * 4; i += 4) {
+      modelTexture->pixels[i + 0] = (unsigned char)pp[i + 0];
+      modelTexture->pixels[i + 1] = (unsigned char)pp[i + 1];
+      modelTexture->pixels[i + 2] = (unsigned char)pp[i + 2];
+      modelTexture->pixels[i + 3] = (unsigned char)pp[i + 3];
+    }
+  }
 	std::chrono::high_resolution_clock::time_point time2 = std::chrono::high_resolution_clock::now();
-	std::chrono::duration<double> speed = std::chrono::duration_cast<std::chrono::duration<double>>(time2 - time1);
-	std::cout << "Model loading time: " << speed.count() << "s\n";
+	std::chrono::duration<double> modelTextureLoadingTime = std::chrono::duration_cast<std::chrono::duration<double>>(time2 - time1);
+
+	ObjModel model("model/model.obj");
+
+  if (textureLoaded) {
+    std::cout << "Texture loading time: " << modelTextureLoadingTime.count() << "\n";
+  }
+  else {
+    std::cerr << "Couldn't load and/or find texture!\n";
+  }
+
+	std::cout << "Model loading time: " << model.loadingTime.count() << "s\n";
 	std::cout << "Vertices count: " << model.vertices.size() << "\nNumber of normals: " << model.normals.size() << "\nUV count: " << model.uvcoo.size() << "\n";
 	std::cout << "Number of faces: " << model.faces.size() << "\n";
 
@@ -72,12 +84,14 @@ int main()
 
 		render.fill(255, 255, 255);
 		render.resetZBuf();
-		render.renderModel(projectedModel, modelTexture);
+		render.renderModel(projectedModel, *modelTexture);
 		
 		texture.update((sf::Uint8*)render.pixels);
 		window.draw(sprite);
 		window.display();
 	}
 
+  delete modelTexture;
+
 	return 0;
 }
-- 
cgit v1.2.3