diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
index 71c435c..f9490fb 100644
--- a/.vs/VSWorkspaceState.json
+++ b/.vs/VSWorkspaceState.json
@@ -1,9 +1,7 @@
 {
   "ExpandedNodes": [
-    "",
-    "\\cw 9",
-    "\\cw 9\\src"
+    ""
   ],
-  "SelectedNode": "\\cw 9\\src\\room.hpp",
+  "SelectedNode": "\\grk-project.sln",
   "PreviewInSolutionExplorer": false
 }
\ No newline at end of file
diff --git a/.vs/grk-project/v16/.suo b/.vs/grk-project/v16/.suo
index d5c2ffa..f6a7f80 100644
Binary files a/.vs/grk-project/v16/.suo and b/.vs/grk-project/v16/.suo differ
diff --git a/.vs/grk-project/v16/Browse.VC.db b/.vs/grk-project/v16/Browse.VC.db
index a0a6eea..e57426c 100644
Binary files a/.vs/grk-project/v16/Browse.VC.db and b/.vs/grk-project/v16/Browse.VC.db differ
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index 6396e9e..27c3e12 100644
Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ
diff --git a/Release/room.exe b/Release/room.exe
index c62da53..2498f9f 100644
Binary files a/Release/room.exe and b/Release/room.exe differ
diff --git a/Release/room.pdb b/Release/room.pdb
index fd337a9..938e56f 100644
Binary files a/Release/room.pdb and b/Release/room.pdb differ
diff --git a/cw 9/Release/Box.obj b/cw 9/Release/Box.obj
index 683a1fd..9b9e9d5 100644
Binary files a/cw 9/Release/Box.obj and b/cw 9/Release/Box.obj differ
diff --git a/cw 9/Release/Camera.obj b/cw 9/Release/Camera.obj
index bae1cd2..2ea1589 100644
Binary files a/cw 9/Release/Camera.obj and b/cw 9/Release/Camera.obj differ
diff --git a/cw 9/Release/Render_Utils.obj b/cw 9/Release/Render_Utils.obj
index 683c7be..0a62613 100644
Binary files a/cw 9/Release/Render_Utils.obj and b/cw 9/Release/Render_Utils.obj differ
diff --git a/cw 9/Release/SOIL.obj b/cw 9/Release/SOIL.obj
index 5f2ebd0..437fafb 100644
Binary files a/cw 9/Release/SOIL.obj and b/cw 9/Release/SOIL.obj differ
diff --git a/cw 9/Release/Shader_Loader.obj b/cw 9/Release/Shader_Loader.obj
index abd341e..374deca 100644
Binary files a/cw 9/Release/Shader_Loader.obj and b/cw 9/Release/Shader_Loader.obj differ
diff --git a/cw 9/Release/Texture.obj b/cw 9/Release/Texture.obj
index bcf9008..661d861 100644
Binary files a/cw 9/Release/Texture.obj and b/cw 9/Release/Texture.obj differ
diff --git a/cw 9/Release/grk-cw9.log b/cw 9/Release/grk-cw9.log
index 13a0aad..6b42f27 100644
--- a/cw 9/Release/grk-cw9.log	
+++ b/cw 9/Release/grk-cw9.log	
@@ -1,35 +1,35 @@
   main.cpp
 C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: "APIENTRY": ponowna definicja makra
-D:\UAM\Grafika komputerowa\projekt\GRK_Room\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : zobacz poprzednią definicję „APIENTRY”
-D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(120,30): warning C4305: "inicjowanie": obcięcie z "double" do "float"
-D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(138,38): warning C4305: "=": obcięcie z "double" do "float"
-D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(161,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
-D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(180,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
-D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(198,15): warning C4101: "textureID": lokalna zmienna, do której nie istnieje odwołanie
-D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(338,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
-D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(344,96): warning C4305: "argument": obcięcie z "double" do "T"
+C:\Users\Genos\source\repos\GRK_Roomfinal\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : zobacz poprzednią definicję „APIENTRY”
+C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(124,30): warning C4305: "inicjowanie": obcięcie z "double" do "float"
+C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(142,38): warning C4305: "=": obcięcie z "double" do "float"
+C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(165,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
+C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(184,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
+C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(202,15): warning C4101: "textureID": lokalna zmienna, do której nie istnieje odwołanie
+C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(344,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
+C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(350,96): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(347,59): warning C4305: "argument": obcięcie z "double" do "T"
+C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(353,59): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(495,29): warning C4018: "<": niezgodność typu ze znakiem/bez znaku
-D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(520,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
-D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(534,109): warning C4305: "argument": obcięcie z "double" do "T"
+C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(501,29): warning C4018: "<": niezgodność typu ze znakiem/bez znaku
+C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(526,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
+C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(540,109): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(587,2): warning C4305: "argument": obcięcie z "double" do "float"
-D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(727,21): warning C4305: "-=": obcięcie z "double" do "float"
-D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(729,21): warning C4305: "+=": obcięcie z "double" do "float"
+C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(593,2): warning C4305: "argument": obcięcie z "double" do "float"
+C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(737,21): warning C4305: "-=": obcięcie z "double" do "float"
+C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(739,21): warning C4305: "+=": obcięcie z "double" do "float"
   Trwa generowanie kodu
-  47 of 607 functions ( 7.7%) were compiled, the rest were copied from previous compilation.
+  5 of 607 functions ( 0.8%) were compiled, the rest were copied from previous compilation.
     0 functions were new in current compilation
-    9 functions had inline decision re-evaluated but remain unchanged
+    7 functions had inline decision re-evaluated but remain unchanged
   Zakończono generowanie kodu
-  grk-cw9.vcxproj -> D:\UAM\Grafika komputerowa\projekt\GRK_Room\Release\room.exe
+  grk-cw9.vcxproj -> C:\Users\Genos\source\repos\GRK_Roomfinal\Release\room.exe
diff --git a/cw 9/Release/image_DXT.obj b/cw 9/Release/image_DXT.obj
index c3b584e..b78dac2 100644
Binary files a/cw 9/Release/image_DXT.obj and b/cw 9/Release/image_DXT.obj differ
diff --git a/cw 9/Release/image_helper.obj b/cw 9/Release/image_helper.obj
index aa7b907..632277c 100644
Binary files a/cw 9/Release/image_helper.obj and b/cw 9/Release/image_helper.obj differ
diff --git a/cw 9/Release/main.obj b/cw 9/Release/main.obj
index 2481f4d..6b967e1 100644
Binary files a/cw 9/Release/main.obj and b/cw 9/Release/main.obj differ
diff --git a/cw 9/Release/room.exe.recipe b/cw 9/Release/room.exe.recipe
index 7cabe4c..c97f901 100644
--- a/cw 9/Release/room.exe.recipe	
+++ b/cw 9/Release/room.exe.recipe	
@@ -2,7 +2,7 @@
 <Project>
   <ProjectOutputs>
     <ProjectOutput>
-      <FullPath>D:\UAM\Grafika komputerowa\projekt\GRK_Room\Release\room.exe</FullPath>
+      <FullPath>C:\Users\Genos\source\repos\GRK_Roomfinal\Release\room.exe</FullPath>
     </ProjectOutput>
   </ProjectOutputs>
   <ContentFiles />
diff --git a/cw 9/Release/room.iobj b/cw 9/Release/room.iobj
index 2e646a8..1c66290 100644
Binary files a/cw 9/Release/room.iobj and b/cw 9/Release/room.iobj differ
diff --git a/cw 9/Release/room.ipdb b/cw 9/Release/room.ipdb
index f7188a1..2283b8c 100644
Binary files a/cw 9/Release/room.ipdb and b/cw 9/Release/room.ipdb differ
diff --git a/cw 9/Release/room.tlog/CL.command.1.tlog b/cw 9/Release/room.tlog/CL.command.1.tlog
index 628412d..bd14e89 100644
Binary files a/cw 9/Release/room.tlog/CL.command.1.tlog and b/cw 9/Release/room.tlog/CL.command.1.tlog differ
diff --git a/cw 9/Release/room.tlog/CL.read.1.tlog b/cw 9/Release/room.tlog/CL.read.1.tlog
index 56f184f..1bf2a32 100644
Binary files a/cw 9/Release/room.tlog/CL.read.1.tlog and b/cw 9/Release/room.tlog/CL.read.1.tlog differ
diff --git a/cw 9/Release/room.tlog/CL.write.1.tlog b/cw 9/Release/room.tlog/CL.write.1.tlog
index e58c3c4..709010b 100644
Binary files a/cw 9/Release/room.tlog/CL.write.1.tlog and b/cw 9/Release/room.tlog/CL.write.1.tlog differ
diff --git a/cw 9/Release/room.tlog/link.command.1.tlog b/cw 9/Release/room.tlog/link.command.1.tlog
index 02898c0..353ae3a 100644
Binary files a/cw 9/Release/room.tlog/link.command.1.tlog and b/cw 9/Release/room.tlog/link.command.1.tlog differ
diff --git a/cw 9/Release/room.tlog/link.read.1.tlog b/cw 9/Release/room.tlog/link.read.1.tlog
index 88a9cff..c6463b2 100644
Binary files a/cw 9/Release/room.tlog/link.read.1.tlog and b/cw 9/Release/room.tlog/link.read.1.tlog differ
diff --git a/cw 9/Release/room.tlog/link.write.1.tlog b/cw 9/Release/room.tlog/link.write.1.tlog
index 24237fa..639443e 100644
Binary files a/cw 9/Release/room.tlog/link.write.1.tlog and b/cw 9/Release/room.tlog/link.write.1.tlog differ
diff --git a/cw 9/Release/room.tlog/room.lastbuildstate b/cw 9/Release/room.tlog/room.lastbuildstate
index e062306..d14f87f 100644
--- a/cw 9/Release/room.tlog/room.lastbuildstate	
+++ b/cw 9/Release/room.tlog/room.lastbuildstate	
@@ -1,2 +1,2 @@
 PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.19041.0:
-Release|Win32|D:\UAM\Grafika komputerowa\projekt\GRK_Room\|
+Release|Win32|C:\Users\Genos\source\repos\GRK_Roomfinal\|
diff --git a/cw 9/Release/stb_image_aug.obj b/cw 9/Release/stb_image_aug.obj
index beae04c..2215ae5 100644
Binary files a/cw 9/Release/stb_image_aug.obj and b/cw 9/Release/stb_image_aug.obj differ
diff --git a/cw 9/Release/vc142.pdb b/cw 9/Release/vc142.pdb
index 76b7bf9..9c631a2 100644
Binary files a/cw 9/Release/vc142.pdb and b/cw 9/Release/vc142.pdb differ
diff --git a/cw 9/models/roomUV2.obj b/cw 9/models/roomUV2.obj
new file mode 100644
index 0000000..ef4d3fa
--- /dev/null
+++ b/cw 9/models/roomUV2.obj	
@@ -0,0 +1,703 @@
+# Blender 3.4.1
+# www.blender.org
+mtllib roomUV2.mtl
+o room_Cube.009_room_Cube.013
+v 0.480000 1.970000 2.300000
+v 0.480000 1.970000 2.500000
+v -0.480000 1.970000 2.500000
+v -0.480000 1.970000 2.300000
+v 0.480000 1.015374 2.500000
+v -0.480000 1.015374 2.500000
+v 0.480000 1.015374 2.300000
+v -0.480000 1.015374 2.300000
+v 0.480000 1.970000 2.300000
+v 0.480000 1.970000 2.500000
+v 0.480000 1.015374 2.500000
+v 0.480000 1.015374 2.300000
+v -0.480000 1.970000 2.500000
+v -0.480000 1.970000 2.300000
+v -0.480000 1.015374 2.500000
+v -0.480000 1.015374 2.300000
+v -2.000000 1.970000 -2.300000
+v -2.000000 2.500000 -2.299999
+v -2.000000 2.500000 -2.500000
+v -2.000000 1.970000 -2.500000
+v 1.800000 1.970000 -2.500000
+v 1.800000 2.500000 -2.500000
+v 2.000000 2.500000 -2.500000
+v 2.000000 1.970000 -2.500000
+v 2.000000 1.970000 2.300000
+v 2.000000 2.500000 2.300000
+v 2.000000 2.500000 2.500000
+v 2.000000 1.970000 2.500000
+v -1.800000 1.970000 2.500000
+v -1.800000 2.500000 2.500000
+v -2.000000 2.500000 2.500000
+v -2.000000 1.970000 2.500000
+v 1.800000 -0.000000 2.300000
+v 2.000000 -0.000000 2.300000
+v 2.000000 -0.000000 2.500000
+v 1.800000 -0.000000 2.500000
+v -1.800000 2.500000 2.300000
+v -2.000000 2.500000 2.300000
+v 1.800000 2.500000 2.300000
+v 1.800000 2.500000 2.500000
+v 0.480000 -0.000000 2.300000
+v 0.480000 -0.000000 2.500000
+v 1.800000 1.970000 2.500000
+v 0.480000 1.970000 -2.500000
+v 0.480000 2.500000 -2.500000
+v -1.800000 2.500000 -2.500000
+v -1.800000 1.970000 -2.500000
+v -2.000000 -0.000000 2.300000
+v -1.800000 -0.000000 2.300000
+v -1.800000 -0.000000 2.500000
+v -2.000000 -0.000000 2.500000
+v -0.480000 2.500000 2.300000
+v -0.480000 2.500000 2.500000
+v -0.480000 1.970000 2.500000
+v -0.480000 2.500000 -2.500000
+v -1.800000 2.500000 -2.299999
+v -0.480000 2.500000 -2.299999
+v -0.469353 2.501344 1.259008
+v -1.789353 2.501344 1.259008
+v -2.000000 0.000000 -2.500000
+v -1.800000 0.000000 -2.500000
+v -1.800000 0.000000 -2.300000
+v -2.000000 0.000000 -2.300000
+v -1.989353 0.001344 1.259008
+v -1.789353 0.001344 1.259008
+v 0.480000 0.000000 -2.500000
+v 1.800000 0.000000 -2.500000
+v 1.800000 0.000000 -2.300000
+v 0.480000 0.000000 -2.300000
+v -0.480000 1.970000 2.300000
+v -1.800000 1.970000 2.300000
+v -1.800000 2.299999 2.300000
+v -0.480000 2.299999 2.300000
+v 1.800000 2.500000 -2.299999
+v 2.000000 2.500000 -2.299999
+v 2.010647 2.501344 1.259008
+v 1.810647 2.501344 1.259008
+v -1.989353 2.501344 1.259008
+v 2.000000 0.000000 -2.500000
+v 2.000000 0.000000 -2.300000
+v 1.810647 0.001344 1.259008
+v 2.010647 0.001344 1.259008
+v 2.000000 1.970000 -2.300000
+v 2.010647 1.971344 1.259008
+v -2.000000 1.970000 2.300000
+v -2.000934 1.972826 -1.031157
+v -2.000934 2.502826 -1.031157
+v 0.490647 2.301344 1.259008
+v 1.810647 2.301344 1.259008
+v 1.800000 2.299999 2.300000
+v 0.480000 2.299999 2.300000
+v -1.800934 1.972826 -1.031157
+v -1.800000 1.970000 -2.300000
+v -1.800000 2.300000 -2.299999
+v -1.800934 2.302826 -1.031157
+v 1.810647 1.971344 1.259008
+v 1.800000 1.970000 2.300000
+v 0.480000 1.970000 -2.300000
+v 1.800000 1.970000 -2.300000
+v 1.800000 2.300000 -2.299999
+v 0.480000 2.300000 -2.299999
+v -0.480000 1.970000 -2.300000
+v -0.480000 2.300000 -2.299999
+v -1.789353 2.301344 1.259008
+v -0.469353 2.301344 1.259008
+v 0.480000 1.970000 2.300000
+v -0.480000 0.000000 -2.500000
+v -0.480000 0.000000 -2.300000
+v 0.490647 2.501344 1.259008
+v 0.480000 2.500000 2.300000
+v 0.480000 2.500000 -2.299999
+v 0.480000 1.970000 2.500000
+v 0.480000 2.500000 2.500000
+v -0.480000 1.970000 -2.500000
+v -0.480000 -0.000000 2.300000
+v -0.480000 -0.000000 2.500000
+v 1.800000 1.015374 2.500000
+v 0.480000 1.015374 2.500000
+v -1.800000 1.015374 -2.500000
+v -0.480000 1.015374 -2.500000
+v -0.480000 1.015374 2.500000
+v -2.000934 1.018200 -1.031157
+v -2.000000 1.015374 -2.300000
+v -2.000000 1.015374 2.500000
+v -2.000000 1.015374 2.300000
+v 2.010647 1.016718 1.259008
+v 2.000000 1.015374 2.300000
+v 2.000000 1.015374 -2.500000
+v 2.000000 1.015374 -2.300000
+v -1.800000 1.015374 2.500000
+v -2.000000 1.015374 -2.500000
+v 0.480000 1.015374 -2.500000
+v 1.800000 1.015374 -2.500000
+v 2.000000 1.015374 2.500000
+v 0.480000 1.015374 -2.300000
+v 1.800000 1.015374 2.300000
+v 0.480000 1.015374 2.300000
+v -0.480000 1.015374 2.300000
+v -1.800000 1.015374 -2.300000
+v -0.480000 1.015374 -2.300000
+v 1.800000 1.015374 -2.300000
+v 1.810647 1.016718 1.259008
+v -1.800934 1.018200 -1.031157
+v -1.800000 1.015374 2.300000
+v -1.789353 1.016718 1.259008
+v -1.789353 1.971344 1.259008
+v 1.799066 1.018200 -1.031157
+v 1.799066 1.972826 -1.031157
+v 1.999066 1.018200 -1.031157
+v 1.999066 1.972826 -1.031157
+v -1.989353 1.971344 1.259008
+v -1.989353 1.016718 1.259008
+v -0.480934 2.302826 -1.031157
+v 0.479066 2.302826 -1.031157
+v 1.799066 2.502826 -1.031157
+v 0.479066 2.502826 -1.031157
+v -0.480934 2.502826 -1.031157
+v 1.799066 2.302826 -1.031157
+v 1.999066 2.502826 -1.031157
+v 1.799066 0.002826 -1.031157
+v 1.999066 0.002826 -1.031157
+v -1.800934 2.502826 -1.031157
+v -2.000934 0.002826 -1.031157
+v -1.800934 0.002826 -1.031157
+v -0.480000 1.970000 2.500000
+v -0.480000 1.970000 2.300000
+v -0.480000 1.015374 2.500000
+v -0.480000 1.015374 2.300000
+v 2.010647 1.016718 1.259008
+v 1.810647 1.016718 1.259008
+v 1.799066 1.018200 -1.031157
+v 1.999066 1.018200 -1.031157
+v 1.799066 1.972826 -1.031157
+v 1.999066 1.018200 -1.031157
+v 1.999066 1.972826 -1.031157
+v 1.799066 1.018200 -1.031157
+v 1.799066 1.972826 -1.031157
+v 1.999066 1.018200 -1.031157
+v 1.999066 1.972826 -1.031157
+v 2.010647 1.971344 1.259008
+v 1.810647 1.971344 1.259008
+v 1.799066 1.972826 -1.031157
+v 1.999066 1.972826 -1.031157
+v 2.010647 1.971344 1.259008
+v 1.810647 1.971344 1.259008
+v 2.010647 1.016718 1.259008
+v 1.810647 1.016718 1.259008
+vn -0.0000 -1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -1.0000 -0.0000 -0.0000
+vn 1.0000 -0.0000 -0.0000
+vn -1.0000 -0.0000 -0.0004
+vn -0.0000 -0.0000 -1.0000
+vn 1.0000 -0.0000 0.0051
+vn -0.0000 -0.0000 1.0000
+vn -0.0000 -1.0000 -0.0004
+vn -0.0000 -1.0000 -0.0006
+vn -0.0000 1.0000 0.0006
+vn -0.0000 1.0000 -0.0011
+vn -0.0000 1.0000 0.0010
+vn -0.0000 -1.0000 0.0007
+vn -0.0000 -1.0000 0.0011
+vn -0.0000 -1.0000 -0.0010
+vn 1.0000 -0.0000 0.0004
+vn 1.0000 -0.0000 0.0026
+vn -1.0000 -0.0000 -0.0051
+vn -1.0000 -0.0000 0.0012
+vn -1.0000 -0.0000 0.0022
+vn -0.0000 -1.0000 -0.0013
+vn 1.0000 -0.0000 -0.0012
+vn 1.0000 -0.0000 0.0007
+vn 1.0000 -0.0000 -0.0022
+vn -0.9999 -0.0000 -0.0102
+vn -1.0000 -0.0000 -0.0026
+vn 0.9999 -0.0000 0.0102
+vn -0.0000 -1.0000 0.0008
+vn -0.0000 1.0000 -0.0008
+vn 1.0000 -0.0000 -0.0021
+vn -0.0000 -1.0000 0.0022
+vn -1.0000 -0.0000 -0.0007
+vn -0.0023 1.0000 0.0006
+vn -0.0005 1.0000 0.0014
+vn -0.0006 -0.0003 1.0000
+vn -0.0007 0.0005 1.0000
+vn -0.0002 -1.0000 -0.0004
+vn -0.0023 -1.0000 -0.0006
+vn -0.0000 0.0025 -1.0000
+vn -0.0000 -0.0025 -1.0000
+vt -0.457622 -0.307351
+vt -0.457446 -0.351523
+vt -0.224709 -0.350753
+vt -0.224885 -0.306581
+vt 1.126386 1.293828
+vt 0.893650 1.293059
+vt 1.126210 1.338000
+vt 0.893474 1.337230
+vt -0.322660 -0.105572
+vt -0.322484 -0.149743
+vt -0.553918 -0.150509
+vt -0.554094 -0.106337
+vt -0.553742 -0.194680
+vt -0.553918 -0.150509
+vt -0.322308 -0.193915
+vt -0.322484 -0.149743
+vt 0.840905 -0.072388
+vt 0.841372 -0.189442
+vt 1.067740 -0.180633
+vt 0.889859 -0.189282
+vt 0.881229 1.976378
+vt 1.066247 -0.148331
+vt 0.881695 1.859323
+vt 0.889392 -0.072227
+vt -0.039555 1.856276
+vt -0.040021 1.973331
+vt 1.848600 -0.129481
+vt -0.088508 1.973171
+vt 1.889777 -0.128489
+vt 0.885458 0.915010
+vt 0.885924 0.797955
+vt -0.088042 1.856116
+vt -0.277758 0.794106
+vt 1.925615 -0.903726
+vt -0.278224 0.911161
+vt -0.326711 0.911001
+vt 1.927109 -0.936027
+vt 2.093923 1.849182
+vt 2.094389 1.732127
+vt -0.326245 0.793946
+vt 1.173139 1.729080
+vt 1.144756 -0.954877
+vt 1.172673 1.846135
+vt 1.124186 1.845975
+vt 1.103579 -0.955870
+vt -0.322310 -0.193291
+vt -0.322777 -0.076236
+vt 1.124652 1.728919
+vt 0.934650 0.738065
+vt 0.980928 1.293347
+vt -1.102503 0.909059
+vt 0.934474 0.782237
+vt -0.276024 0.359015
+vt 0.885988 0.782077
+vt -0.324511 0.358855
+vt 2.096123 1.297036
+vt 0.886164 0.737905
+vt 2.047636 1.296875
+vt 1.143263 -0.922576
+vt 1.102086 -0.923568
+vt -0.273823 -0.193131
+vt 1.884439 -0.904718
+vt 1.885932 -0.937019
+vt 2.045436 1.849021
+vt 0.935812 0.446533
+vt -0.782490 0.910118
+vt 0.887326 0.446372
+vt 1.727623 1.295817
+vt 2.045902 1.731966
+vt -0.457446 -0.351522
+vt 0.280458 1.857335
+vt -0.224357 -0.439096
+vt 1.576836 -0.136029
+vt 0.279992 1.974390
+vt 1.107424 -0.147339
+vt 0.832742 1.976218
+vt 0.833208 1.859163
+vt 0.937995 -0.101196
+vt -0.276024 0.359015
+vt 0.937819 -0.057024
+vt -0.229740 0.911946
+vt 0.889333 -0.057185
+vt 1.174873 1.293989
+vt 0.889509 -0.101356
+vt 1.126386 1.293828
+vt -0.324511 0.358855
+vt 1.415027 -0.916028
+vt 1.492686 1.847193
+vt 1.416520 -0.948329
+vt 1.493152 1.730138
+vt 0.889509 -0.101563
+vt 1.379189 -0.140791
+vt 0.512728 1.975159
+vt 1.108917 -0.179641
+vt 1.380682 -0.173093
+vt 1.409447 -0.747847
+vt 1.137682 -0.754395
+vt 2.101680 -0.097347
+vt 0.887658 0.362864
+vt 0.883429 1.424232
+vt 2.101504 -0.053175
+vt 0.834942 1.424072
+vt 2.053017 -0.053336
+vt 0.885456 0.915634
+vt -1.094920 -0.994128
+vt 2.053193 -0.097508
+vt 0.839172 0.362704
+vt 1.190358 -0.098010
+vt -0.023646 0.359553
+vt 1.190182 -0.053838
+vt 0.022635 0.913077
+vt 2.099497 0.450381
+vt -0.701953 -0.440676
+vt 0.282192 1.422244
+vt 2.098335 0.741914
+vt -0.037821 1.421185
+vt 2.049849 0.741754
+vt 2.096123 1.297036
+vt -0.222157 -0.991242
+vt 2.051010 0.450221
+vt -0.701777 -0.484847
+vt -0.542170 -0.992300
+vt -0.551487 1.345978
+vt 0.889509 -0.101563
+vt -0.231474 1.347037
+vt -0.222158 -0.991036
+vt -0.231764 1.419919
+vt -0.551777 1.418861
+vt -0.223320 -0.699503
+vt 1.850094 -0.161783
+vt 1.891270 -0.160790
+vt 0.836971 0.914850
+vt -0.025849 0.912293
+vt 1.920035 -0.735544
+vt 1.878859 -0.736537
+vt 1.096506 -0.755387
+vt -0.021446 -0.192593
+vt 2.098159 0.786086
+vt -0.086308 1.421025
+vt 0.887658 0.362864
+vt 2.049673 0.785926
+vt 0.839172 0.362704
+vt 1.187014 0.741252
+vt 1.233305 1.293885
+vt 1.186837 0.785423
+vt -0.023649 0.360147
+vt 0.837438 0.797795
+vt -0.025383 0.795238
+vt -0.274290 -0.076076
+vt 0.533297 -0.074029
+vt 1.126034 1.382172
+vt -0.086836 1.553539
+vt 1.077022 -0.385565
+vt 0.533764 -0.191084
+vt 0.028198 -0.484293
+vt 1.235330 0.785911
+vt 0.027036 -0.192760
+vt -0.225327 -0.195946
+vt 0.982952 0.785373
+vt -1.104527 1.417033
+vt -0.784514 1.418092
+vt -0.224165 -0.487479
+vt 0.576108 1.350332
+vt 1.126210 1.338000
+vt -0.087257 1.597709
+vt -1.096654 -0.559038
+vt 0.883722 1.350725
+vt 0.883431 1.423608
+vt -1.096944 -0.486154
+vt 0.893039 -0.987347
+vt 0.585429 -0.988571
+vt 0.575818 1.423215
+vt 1.235039 0.858794
+vt -1.104237 1.344150
+vt 0.982661 0.858256
+vt -0.457270 -0.395694
+vt -0.543904 -0.557209
+vt -0.224181 -0.483268
+vt -0.223891 -0.556151
+vt 2.097857 0.861944
+vt -0.224181 -0.483268
+vt 0.889870 -0.192257
+vt 2.098147 0.789061
+vt -0.544194 -0.484326
+vt 0.891033 -0.483790
+vt -0.224533 -0.394924
+vt -0.776641 -0.557979
+vt -0.701953 -0.440676
+vt -0.776931 -0.485096
+vt 0.891877 -0.695814
+vt 0.030205 -0.987849
+vt 0.020611 1.421051
+vt 0.029043 -0.696317
+vt -0.784224 1.345208
+vt 2.100342 0.238357
+vt -0.224533 -0.394924
+vt 0.514929 1.423013
+vt 2.051855 0.238197
+vt -0.224357 -0.439096
+vt -0.774907 -0.993070
+vt 1.607094 -0.743084
+vt 1.612674 -0.911266
+vt 1.578329 -0.168330
+vt 1.725889 1.730908
+vt 1.614168 -0.943567
+vt 1.725423 1.847963
+vt -0.224710 -0.350753
+vt 0.513195 1.858104
+vt -0.702129 -0.396504
+vt 0.936657 0.234509
+vt -0.549753 0.910887
+vt 0.888171 0.234348
+vt 1.494886 1.295047
+vt 2.046742 1.521129
+vt 1.726729 1.520070
+vt 0.834048 1.648326
+vt -0.470695 -0.395739
+vt 0.514035 1.647267
+vt 1.493993 1.519301
+vt 0.889509 -0.101563
+vt 0.532457 0.136808
+vt -0.086836 1.553539
+vt 0.894600 1.381406
+vt 0.840065 0.138450
+vt 1.125493 1.518082
+vt -0.323617 0.134601
+vt -0.275130 0.134761
+vt -0.024542 0.584401
+vt -0.276917 0.583269
+vt -0.087202 1.645279
+vt 0.886765 0.587118
+vt 0.838278 0.586958
+vt 1.173980 1.518242
+vt 0.888552 0.138610
+vt 0.882535 1.648486
+vt -0.455792 -0.439861
+vt 0.281298 1.646497
+vt -0.038715 1.645439
+vt -0.325404 0.583109
+vt 2.095229 1.521289
+vt -0.543064 -0.768047
+vt -0.455615 -0.484033
+vt 0.981821 1.069093
+vt -1.103397 1.133313
+vt -0.783384 1.134371
+vt -0.550647 1.135141
+vt 0.889509 -0.101563
+vt 0.884562 1.139888
+vt -1.095814 -0.769875
+vt -0.470519 -0.439910
+vt -0.775801 -0.768816
+vt 2.097017 1.072782
+vt -0.223051 -0.766988
+vt 1.234199 1.069631
+vt 0.576948 1.139495
+vt -0.086905 1.509367
+vt 0.894776 1.337235
+vt -0.230634 1.136199
+vt 0.021742 1.137331
+vt -0.642127 1.507530
+vt 0.894424 1.425578
+vt 0.020901 1.348168
+vt -0.642479 1.595872
+vt 1.125858 1.426344
+vt 1.789408 1.071141
+vt 1.790248 0.860303
+vt 0.530664 0.586564
+vt 0.529824 0.797401
+vt -0.021912 -0.075538
+vt -0.642057 1.551702
+vt 1.126034 1.382172
+vt -0.022753 0.135299
+vt -0.642057 1.551702
+vt 0.894600 1.381407
+vt 0.584267 -0.697038
+vt 0.583422 -0.485014
+vt 1.859375 -0.366715
+vt 1.587610 -0.373263
+vt 1.389963 -0.378025
+vt 0.582260 -0.193481
+vt 1.790539 0.787420
+vt 1.900551 -0.365723
+vt 0.529358 0.914456
+vt 1.742238 0.740530
+vt 1.788515 1.295394
+vt 1.742062 0.784702
+vt 0.531558 0.362311
+vt 1.118198 -0.384573
+vt 1.745583 -0.098731
+vt 0.531563 0.361062
+vt 1.745407 -0.054560
+vt 0.577842 0.915241
+vt 0.889509 -0.101563
+vt 0.889509 -0.101563
+vt 0.889509 -0.101563
+vt 0.889509 -0.101563
+vt -0.641950 1.463359
+vt -0.641881 1.507531
+vt -0.086660 1.509368
+vt -0.086729 1.465196
+vt -0.456672 -0.219003
+vt -0.225238 -0.218238
+vt -0.456496 -0.263175
+vt -0.225062 -0.262409
+vt -0.641950 1.463359
+vt -0.641529 1.419189
+vt -0.086308 1.421025
+vt -0.086729 1.465195
+vt -0.225062 -0.262410
+vt -0.224886 -0.306581
+vt -0.456496 -0.263175
+vt -0.456320 -0.307347
+s 0
+usemtl None
+f 4/4/1 1/1/1 2/2/1 3/3/1
+s 1
+f 8/8/2 6/6/2 5/5/2 7/7/2
+f 12/12/3 11/11/3 10/10/3 9/9/3
+f 15/15/4 16/16/4 14/14/4 13/13/4
+f 17/17/5 18/18/5 19/20/3 20/24/3
+f 21/25/6 22/26/6 23/28/6 24/32/6
+f 25/33/7 26/35/7 27/36/4 28/40/4
+f 29/41/8 30/43/8 31/44/8 32/48/8
+f 33/49/9 34/52/10 35/54/1 36/57/1
+f 37/59/11 38/60/11 31/45/2 30/42/2
+f 26/34/11 39/62/11 40/63/2 27/37/2
+f 41/65/1 33/49/9 36/57/1 42/67/1
+f 28/39/8 27/38/8 40/64/8 43/69/8
+f 44/71/6 45/74/6 22/26/6 21/25/6
+f 20/23/6 19/21/6 46/76/6 47/77/6
+f 48/78/10 49/80/9 50/82/1 51/84/1
+f 52/87/11 37/59/11 30/42/2 53/89/2
+f 54/90/8 53/88/8 30/43/8 29/41/8
+f 55/92/2 46/75/2 56/94/12 57/95/12
+f 58/96/13 59/97/13 37/59/11 52/87/11
+f 60/98/1 61/101/1 62/103/14 63/106/15
+f 64/108/16 65/110/16 49/80/9 48/78/10
+f 66/112/1 67/115/1 68/117/14 69/120/1
+f 70/123/6 71/125/6 72/127/6 73/128/6
+f 23/29/2 22/27/2 74/130/12 75/131/12
+f 76/134/13 77/135/13 39/62/11 26/34/11
+f 46/75/2 19/22/2 18/19/12 56/94/12
+f 59/97/13 78/136/13 38/60/11 37/59/11
+f 67/115/1 79/138/1 80/141/15 68/117/14
+f 81/143/16 82/145/16 34/52/10 33/49/9
+f 24/31/4 23/30/4 75/132/17 83/147/17
+f 84/148/18 76/133/18 26/35/7 25/33/7
+f 32/47/3 31/46/3 38/61/19 85/149/19
+f 86/150/20 87/154/21 18/18/5 17/17/5
+f 88/155/16 89/157/16 90/158/22 91/162/22
+f 92/163/23 93/167/24 94/168/24 95/172/25
+f 96/173/19 97/175/26 90/159/26 89/156/27
+f 98/177/8 99/179/8 100/181/8 101/184/8
+f 93/166/8 102/187/8 103/189/8 94/169/8
+f 104/191/16 105/193/16 73/129/22 72/126/22
+f 106/194/6 70/123/6 73/128/6 91/161/6
+f 61/101/1 107/195/1 108/198/1 62/103/14
+f 109/201/13 58/96/13 52/87/11 110/202/11
+f 45/73/2 55/92/2 57/95/12 111/203/12
+f 112/204/8 113/206/8 53/88/8 54/90/8
+f 110/202/11 52/87/11 53/89/2 113/205/2
+f 47/77/6 46/76/6 55/93/6 114/208/6
+f 49/80/9 115/210/1 116/212/1 50/82/1
+f 39/62/11 110/202/11 113/205/2 40/63/2
+f 43/69/8 40/64/8 113/206/8 112/204/8
+f 22/27/2 45/73/2 111/203/12 74/130/12
+f 77/135/13 109/201/13 110/202/11 39/62/11
+f 97/174/6 106/194/6 91/161/6 90/160/6
+f 102/187/8 98/177/8 101/184/8 103/189/8
+f 105/193/16 88/155/16 91/162/22 73/129/22
+f 114/208/6 55/93/6 45/74/6 44/71/6
+f 115/210/1 41/65/1 42/67/1 116/212/1
+f 102/186/1 114/207/1 44/70/1 98/176/1
+f 117/214/8 43/69/8 112/204/8 118/215/8
+f 119/216/6 47/77/6 114/208/6 120/218/6
+f 122/221/20 86/150/20 17/17/5 123/224/5
+f 124/226/3 32/47/3 85/149/19 125/227/19
+f 126/228/18 84/148/18 25/33/7 127/229/7
+f 128/231/4 24/31/4 83/147/17 129/232/17
+f 121/219/8 54/90/8 29/41/8 130/233/8
+f 131/235/6 20/23/6 47/77/6 119/216/6
+f 132/237/6 44/71/6 21/25/6 133/238/6
+f 134/240/8 28/39/8 43/69/8 117/214/8
+f 130/233/8 29/41/8 32/48/8 124/225/8
+f 127/229/7 25/33/7 28/40/4 134/239/4
+f 133/238/6 21/25/6 24/32/6 128/230/6
+f 123/224/5 17/17/5 20/24/3 131/234/3
+f 135/242/3 132/236/3 66/113/3 69/121/3
+f 136/244/6 137/245/6 106/194/6 97/174/6
+f 139/249/8 140/251/8 102/187/8 93/166/8
+f 135/241/8 141/253/8 99/179/8 98/177/8
+f 142/254/19 136/243/26 97/175/26 96/173/19
+f 143/255/23 139/248/24 93/167/24 92/163/23
+f 138/246/6 144/258/6 71/125/6 70/123/6
+f 140/250/4 108/199/4 107/196/4 120/217/4
+f 144/258/28 145/259/7 146/262/7 71/125/28
+f 125/227/19 85/149/19 151/269/19 152/272/19
+f 153/275/29 154/276/29 88/155/16 105/193/16
+f 155/277/30 156/278/30 109/201/13 77/135/13
+f 156/278/30 157/279/30 58/96/13 109/201/13
+f 95/171/29 153/275/29 105/193/16 104/191/16
+f 148/266/20 96/173/19 89/156/27 158/281/21
+f 71/125/28 146/262/7 104/192/18 72/127/28
+f 154/276/29 158/280/29 89/157/16 88/155/16
+f 85/149/19 38/61/19 78/137/27 151/269/19
+f 150/268/31 159/283/25 76/133/18 84/148/18
+f 160/284/29 161/286/29 82/145/16 81/143/16
+f 162/288/30 87/153/30 78/136/13 59/97/13
+f 159/282/30 155/277/30 77/135/13 76/134/13
+f 163/289/29 164/291/29 65/110/16 64/108/16
+f 157/279/30 162/288/30 59/97/13 58/96/13
+f 57/95/12 56/94/12 162/288/30 157/279/30
+f 63/106/15 62/103/14 164/291/29 163/289/29
+f 75/131/12 74/130/12 155/277/30 159/282/30
+f 56/94/12 18/19/12 87/153/30 162/288/30
+f 68/117/14 80/141/15 161/286/29 160/284/29
+f 83/147/17 75/132/17 159/283/25 150/268/31
+f 101/185/32 100/182/32 158/280/29 154/276/29
+f 99/180/33 148/266/20 158/281/21 100/183/33
+f 94/170/32 103/190/32 153/275/29 95/171/29
+f 111/203/12 57/95/12 157/279/30 156/278/30
+f 74/130/12 111/203/12 156/278/30 155/277/30
+f 103/190/32 101/185/32 154/276/29 153/275/29
+f 129/232/17 83/147/17 150/268/31 149/267/31
+f 141/252/33 147/265/20 148/266/20 99/180/33
+f 146/262/7 92/163/23 95/172/25 104/192/18
+f 151/269/19 78/137/27 87/154/21 86/150/20
+f 64/109/27 152/272/19 122/221/20 163/290/21
+f 65/111/18 164/292/25 143/255/23 145/259/7
+f 68/118/33 160/285/21 147/265/20 141/252/33
+f 80/142/17 129/232/17 149/267/31 161/287/25
+f 48/79/19 125/227/19 152/272/19 64/109/27
+f 161/287/25 149/267/31 126/228/18 82/146/18
+f 160/285/21 81/144/27 142/254/19 147/265/20
+f 49/81/28 65/111/18 145/259/7 144/258/28
+f 102/188/4 140/250/4 120/217/4 114/209/4
+f 115/211/6 49/81/6 144/258/6 138/246/6
+f 164/292/25 62/104/24 139/248/24 143/255/23
+f 81/144/27 33/50/26 136/243/26 142/254/19
+f 69/122/8 68/119/8 141/253/8 135/241/8
+f 62/105/8 108/200/8 140/251/8 139/249/8
+f 41/66/6 115/211/6 138/246/6 137/245/6
+f 33/51/6 41/66/6 137/245/6 136/244/6
+f 98/178/3 44/72/3 132/236/3 135/242/3
+f 63/107/5 123/224/5 131/234/3 60/99/3
+f 67/116/6 133/238/6 128/230/6 79/139/6
+f 34/53/7 127/229/7 134/239/4 35/55/4
+f 50/83/8 130/233/8 124/225/8 51/85/8
+f 35/56/8 134/240/8 117/214/8 36/58/8
+f 66/114/6 132/237/6 133/238/6 67/116/6
+f 60/100/6 131/235/6 119/216/6 61/102/6
+f 116/213/8 121/219/8 130/233/8 50/83/8
+f 79/140/4 128/231/4 129/232/17 80/142/17
+f 82/146/18 126/228/18 127/229/7 34/53/7
+f 51/86/3 124/226/3 125/227/19 48/79/19
+f 163/290/21 122/221/20 123/224/5 63/107/5
+f 42/68/8 118/215/8 121/219/8 116/213/8
+f 61/102/6 119/216/6 120/218/6 107/197/6
+f 36/58/8 117/214/8 118/215/8 42/68/8
+f 152/273/11 145/260/11 143/256/11 122/222/11
+f 143/257/8 92/164/8 86/151/8 122/223/8
+f 92/165/10 146/263/10 151/270/10 86/152/10
+f 145/261/6 152/274/6 151/271/6 146/264/6
+f 138/247/6 70/124/6 166/294/8 168/296/8
+f 54/91/8 121/220/8 167/295/8 165/293/8
+f 171/299/11 170/298/11 169/297/34 172/300/35
+f 179/304/36 177/302/8 176/301/8 178/303/37
+f 182/307/10 183/308/38 180/305/39 181/306/10
+f 186/311/40 187/312/6 185/310/6 184/309/41
+l 175 173
+l 174 175
diff --git a/cw 9/shaders/shader_9_1.frag b/cw 9/shaders/shader_9_1.frag
index 7cfc3a0..3560d60 100644
--- a/cw 9/shaders/shader_9_1.frag	
+++ b/cw 9/shaders/shader_9_1.frag	
@@ -11,10 +11,11 @@ uniform sampler2D depthMapShip;
 
 uniform sampler2D colorTexture;
 uniform sampler2D normalSampler;
+uniform sampler2D armSampler;
 
 uniform vec3 cameraPos;
 
-uniform vec3 color;
+vec3 color;
 
 uniform vec3 sunDir;
 uniform vec3 sunColor;
@@ -27,8 +28,9 @@ uniform vec3 spotlightColor;
 uniform vec3 spotlightConeDir;
 uniform vec3 spotlightPhi;
 
-uniform float metallic;
-uniform float roughness;
+float metallic;
+float roughness;
+float ao;
 
 uniform float exposition;
 
@@ -121,23 +123,26 @@ vec3 PBRLight(vec3 lightDir, vec3 radiance, vec3 normal, vec3 V){
 	return (kD * color / PI + specular) * radiance * NdotL;
 }
 
-
 void main()
 {
-	//vec3 normal = vec3(0,0,1);
-    vec3 normal = normalize(vecNormal);
+    //vec3 normal = vec3(0,0,1);
+    //vec3 normal = normalize(vecNormal);
 
-    //color = texture2D(colorTexture, vecTex).xyz;
-    //vec3 normal = normalize((texture2D(normalSampler, vecTex).xyz) * 2 - 1);
+    color = texture2D(colorTexture, vecTex).xyz;
+    vec3 normal = normalize((texture2D(normalSampler, vecTex).xyz) * 2 - 1);
 
-    //vec3 viewDir = normalize(viewDirTS);
-    vec3 viewDir = normalize(cameraPos-worldPos);
+    vec3 viewDir = normalize(viewDirTS);
+    //vec3 viewDir = normalize(cameraPos-worldPos);
 
-	//vec3 lightDir = normalize(lightDirTS);
-	vec3 lightDir = normalize(lightPos-worldPos);
+	vec3 lightDir = normalize(lightDirTS);
+	//vec3 lightDir = normalize(lightPos-worldPos);
+
+    metallic = texture2D(armSampler, vecTex).z;
+    roughness = texture2D(armSampler, vecTex).y;
+    ao = texture2D(armSampler, vecTex).x;
 
 
-	vec3 ambient = AMBIENT*color;
+	vec3 ambient = AMBIENT*color*ao;
 	vec3 attenuatedlightColor = lightColor/pow(length(lightPos-worldPos),2);
 	vec3 ilumination;
 	ilumination = ambient+PBRLight(lightDir,attenuatedlightColor,normal,viewDir);
diff --git a/cw 9/src/room.hpp b/cw 9/src/room.hpp
index 77f44bb..56a0c26 100644
--- a/cw 9/src/room.hpp	
+++ b/cw 9/src/room.hpp	
@@ -57,6 +57,10 @@ namespace texture {
 	GLuint earth;
 	GLuint earthNormal;
 
+	GLuint brick;
+	GLuint brickNormal;
+	GLuint brickARM;
+
 	GLuint floor;
 }
 
@@ -261,10 +265,10 @@ void drawObjectPBR(Core::RenderContext& context, glm::mat4 modelMatrix, glm::vec
 
 	glUniform1f(glGetUniformLocation(program, "exposition"), exposition);
 
-	glUniform1f(glGetUniformLocation(program, "roughness"), roughness);
-	glUniform1f(glGetUniformLocation(program, "metallic"), metallic);
+	//glUniform1f(glGetUniformLocation(program, "roughness"), roughness);
+	//glUniform1f(glGetUniformLocation(program, "metallic"), metallic);
 
-	glUniform3f(glGetUniformLocation(program, "color"), color.x, color.y, color.z);
+	//glUniform3f(glGetUniformLocation(program, "color"), color.x, color.y, color.z);
 
 	glUniform3f(glGetUniformLocation(program, "cameraPos"), cameraPos.x, cameraPos.y, cameraPos.z);
 
@@ -283,7 +287,9 @@ void drawObjectPBR(Core::RenderContext& context, glm::mat4 modelMatrix, glm::vec
 	glUniform3f(glGetUniformLocation(program, "spotlightColor"), spotlightColor.x, spotlightColor.y, spotlightColor.z);
 	glUniform1f(glGetUniformLocation(program, "spotlightPhi"), spotlightPhi);
 
-
+	Core::SetActiveTexture(texture::brick, "colorTexture", program, 2);
+	Core::SetActiveTexture(texture::brickNormal, "normalSampler", program, 3);
+	Core::SetActiveTexture(texture::brickARM, "armSampler", program, 4);
 	Core::DrawContext(context);
 }
 
@@ -647,6 +653,10 @@ void init(GLFWwindow* window)
 	texture::earthNormal = Core::LoadTexture("textures/room/earth_normalmap.png");
 	texture::floor = Core::LoadTexture("textures/floor/floor_wood.jpg");
 
+	texture::brick = Core::LoadTexture("textures/room/brick.jpg");
+	texture::brickNormal = Core::LoadTexture("textures/room/brick_normal.jpg");
+	texture::brickARM = Core::LoadTexture("textures/room/brick_arm.jpg");
+
 	loadModelToContext("./models/sphere.obj", sphereContext);
 	loadModelToContext("./models/cube.obj", cubeContext);
 	loadModelToContext("./models/couch.obj", models::couchContext);
diff --git a/cw 9/textures/room/earth_normalmap2.jpg b/cw 9/textures/room/brick.jpg
similarity index 54%
rename from cw 9/textures/room/earth_normalmap2.jpg
rename to cw 9/textures/room/brick.jpg
index 8812904..baf69fd 100644
Binary files a/cw 9/textures/room/earth_normalmap2.jpg and b/cw 9/textures/room/brick.jpg differ
diff --git a/cw 9/textures/room/brick_arm.jpg b/cw 9/textures/room/brick_arm.jpg
new file mode 100644
index 0000000..1bac272
Binary files /dev/null and b/cw 9/textures/room/brick_arm.jpg differ
diff --git a/cw 9/textures/room/earth2.jpg b/cw 9/textures/room/brick_normal.jpg
similarity index 56%
rename from cw 9/textures/room/earth2.jpg
rename to cw 9/textures/room/brick_normal.jpg
index c1bed86..06abb74 100644
Binary files a/cw 9/textures/room/earth2.jpg and b/cw 9/textures/room/brick_normal.jpg differ
diff --git a/cw 9/textures/room/earth.png b/cw 9/textures/room/earth.png
deleted file mode 100644
index 2aed90c..0000000
Binary files a/cw 9/textures/room/earth.png and /dev/null differ
diff --git a/cw 9/textures/room/earth_normalmap.png b/cw 9/textures/room/earth_normalmap.png
deleted file mode 100644
index 6437240..0000000
Binary files a/cw 9/textures/room/earth_normalmap.png and /dev/null differ