From 8324eb48c20d866596187aae108bf4d6c14d4233 Mon Sep 17 00:00:00 2001
From: "arthur.jamet" <arthur.jamet@epitech.eu>
Date: Fri, 4 Jun 2021 13:14:10 +0200
Subject: [PATCH] remove specialt exture

---
 assets/map/upper_floor.mtl | 20 ++++----------------
 assets/map/upper_floor.obj | 15 +++++++--------
 sources/Map/Map.cpp        |  2 +-
 sources/Runner/Runner.cpp  |  2 +-
 4 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/assets/map/upper_floor.mtl b/assets/map/upper_floor.mtl
index c6372183..3dec10d5 100644
--- a/assets/map/upper_floor.mtl
+++ b/assets/map/upper_floor.mtl
@@ -1,24 +1,12 @@
 # Blender MTL File: 'None'
-# Material Count: 2
+# Material Count: 1
 
-newmtl Material.001
-Ns 225.000000
+newmtl upper_floor.png
+Ns 323.999994
 Ka 1.000000 1.000000 1.000000
 Kd 0.800000 0.800000 0.800000
 Ks 0.500000 0.500000 0.500000
 Ke 0.000000 0.000000 0.000000
-Ni 1.450000
+Ni 1.000000
 d 1.000000
 illum 2
-map_Kd upper_floor.png
-
-newmtl floor
-Ns 225.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
-map_Kd unbreakable_wall.png
diff --git a/assets/map/upper_floor.obj b/assets/map/upper_floor.obj
index 17ebd6f0..78eb61fa 100644
--- a/assets/map/upper_floor.obj
+++ b/assets/map/upper_floor.obj
@@ -1,7 +1,7 @@
 # Blender v2.92.0 OBJ File: ''
 # www.blender.org
 mtllib upper_floor.mtl
-o floor
+o floor.001_floor.002
 v -0.500000 -0.500000 0.500000
 v 0.500000 -0.500000 0.500000
 v -0.500000 0.500000 0.500000
@@ -32,17 +32,17 @@ vt 0.828427 0.414214
 vt 0.414214 0.000000
 vt 0.414214 0.414214
 vt 0.414214 0.828427
-vt 0.000000 0.828427
-vt 0.414214 0.414214
-vt 0.000000 0.414214
+vt 0.134181 0.701308
+vt 0.548395 0.287095
+vt 0.134181 0.287095
 vn 0.0000 -0.0000 1.0000
 vn 0.0000 0.0000 -1.0000
 vn 0.0000 -1.0000 -0.0000
 vn 1.0000 0.0000 0.0000
 vn -1.0000 0.0000 0.0000
 vn 0.0000 1.0000 0.0000
-usemtl floor
-s 1
+usemtl floor.002
+s off
 f 1/1/1 2/2/1 3/3/1
 f 3/3/1 2/2/1 4/4/1
 f 5/5/2 6/6/2 7/7/2
@@ -53,6 +53,5 @@ f 2/15/4 8/10/4 4/16/4
 f 4/16/4 8/10/4 6/17/4
 f 7/18/5 1/19/5 5/20/5
 f 5/20/5 1/19/5 3/21/5
-usemtl Material.001
 f 3/22/6 4/23/6 5/24/6
-f 5/24/6 4/23/6 6/25/6
\ No newline at end of file
+f 5/24/6 4/23/6 6/25/6
diff --git a/sources/Map/Map.cpp b/sources/Map/Map.cpp
index 52f278e0..c83b32ca 100644
--- a/sources/Map/Map.cpp
+++ b/sources/Map/Map.cpp
@@ -127,7 +127,7 @@ namespace BBM
 		scene->addEntity("Upper Floor")
 			.addComponent<PositionComponent>(Vector3f(coords))
 			//.addComponent<CollisionComponent>(1)
-			.addComponent<Drawable3DComponent<RAY3D::Model>>(floorObj);
+			.addComponent<Drawable3DComponent<RAY3D::Model>>(floorObj, std::make_pair(MAP_DIFFUSE, floorPng));
 	}
 
 
diff --git a/sources/Runner/Runner.cpp b/sources/Runner/Runner.cpp
index 06c1e87e..db3896c9 100644
--- a/sources/Runner/Runner.cpp
+++ b/sources/Runner/Runner.cpp
@@ -53,7 +53,7 @@ namespace BBM
 
 	void enableRaylib(WAL::Wal &wal)
 	{
-		//RAY::TraceLog::setLevel(LOG_WARNING);
+		RAY::TraceLog::setLevel(LOG_WARNING);
 		RAY::Window &window = RAY::Window::getInstance(600, 400, "Bomberman", FLAG_WINDOW_RESIZABLE);
 
 		wal.addSystem<Renderer3DSystem<RAY3D::Model>>();