Merge pull request 'textures-2' (#15) from textures-2 into master

Reviewed-on: #15

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
-C:\Users\Genos\source\repos\GRK_Roomfinal\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : zobacz poprzednią definicję „APIENTRY”
+D:\UAM\Grafika komputerowa\projekt\GRK_Room\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"
+D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(167,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"
+D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(186,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"
+D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(209,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"
+D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(228,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
+D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(246,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
+D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(334,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"
+D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(340,96): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(353,59): warning C4305: "argument": obcięcie z "double" do "T"
+D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(343,59): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(501,29): warning C4018: "<": niezgodność typu ze znakiem/bez znaku
+D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(491,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
+D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(516,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"
+D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(530,109): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-C:\Users\Genos\source\repos\GRK_Roomfinal\cw 9\src\room.hpp(593,2): warning C4305: "argument": obcięcie z "double" do "float"
+D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(763,21): warning C4305: "-=": 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"
+D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(765,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"
+D:\UAM\Grafika komputerowa\projekt\GRK_Room\cw 9\src\room.hpp(775,30): warning C4244: "=": konwersja z "double" do "float", możliwa utrata danych
   Trwa generowanie kodu
-  5 of 607 functions ( 0.8%) were compiled, the rest were copied from previous compilation.
+  3 of 608 functions ( 0.5%) were compiled, the rest were copied from previous compilation.
     0 functions were new in current compilation
-    7 functions had inline decision re-evaluated but remain unchanged
+    8 functions had inline decision re-evaluated but remain unchanged
   Zakończono generowanie kodu
-  grk-cw9.vcxproj -> C:\Users\Genos\source\repos\GRK_Roomfinal\Release\room.exe
+  grk-cw9.vcxproj -> D:\UAM\Grafika komputerowa\projekt\GRK_Room\Release\room.exe

cw 9/Release/room.exe.recipe

@@ -2,7 +2,7 @@
 <Project>
   <ProjectOutputs>
     <ProjectOutput>
-      <FullPath>C:\Users\Genos\source\repos\GRK_Roomfinal\Release\room.exe</FullPath>
+      <FullPath>D:\UAM\Grafika komputerowa\projekt\GRK_Room\Release\room.exe</FullPath>
     </ProjectOutput>
   </ProjectOutputs>
   <ContentFiles />

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|C:\Users\Genos\source\repos\GRK_Roomfinal\|
+Release|Win32|D:\UAM\Grafika komputerowa\projekt\GRK_Room\|

cw 9/models/chair/chair2.mtl

@@ -0,0 +1,13 @@
+# Blender MTL File: 'None'
+# Material Count: 1
+
+newmtl painted_wooden_chair_01
+Ns 250.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 wood_table_001_diff_4k.jpg

cw 9/models/desk/desk.obj

@@ -0,0 +1,483 @@
+# Blender v2.93.2 OBJ File: 'wooden_table_02_4k.blend'
+# www.blender.org
+mtllib desk.mtl
+o wooden_table_02_Cube.003
+v 0.567208 0.736872 0.347106
+v 0.561302 0.736872 0.353012
+v 0.567208 0.793511 0.347106
+v 0.529725 0.799418 0.315529
+v 0.561302 0.793511 0.353012
+v -0.561302 0.736872 0.353012
+v -0.567208 0.736872 0.347106
+v -0.529725 0.799418 0.315529
+v -0.567208 0.793511 0.347106
+v -0.561302 0.793511 0.353012
+v 0.561302 0.736872 -0.353012
+v 0.567208 0.736872 -0.347106
+v 0.529725 0.799418 -0.315529
+v 0.567208 0.793511 -0.347106
+v 0.561302 0.793511 -0.353012
+v -0.567208 0.736872 -0.347106
+v -0.561302 0.736872 -0.353012
+v -0.529725 0.799418 -0.315529
+v -0.561302 0.793511 -0.353012
+v -0.567208 0.793511 -0.347106
+v -0.561302 0.731601 0.347106
+v 0.561302 0.731601 0.347106
+v -0.561302 0.731601 -0.347106
+v 0.561302 0.731601 -0.347106
+v -0.529110 0.773347 0.314780
+v 0.529110 0.773347 0.314780
+v -0.529110 0.773347 -0.314780
+v 0.529110 0.773347 -0.314780
+v 0.529110 0.733739 0.314780
+v 0.531243 0.731601 0.316922
+v -0.531243 0.731601 0.316922
+v -0.529110 0.733739 0.314780
+v 0.531243 0.731601 -0.316922
+v 0.529110 0.733739 -0.314780
+v -0.531243 0.731601 -0.316922
+v -0.529110 0.733739 -0.314780
+v 0.561302 0.799418 0.347106
+v -0.561302 0.799418 0.347106
+v -0.561302 0.799418 -0.347106
+v 0.561302 0.799418 -0.347106
+v -0.463096 -0.000125 -0.248199
+v -0.458671 0.004075 -0.247986
+v -0.462882 0.004075 -0.243775
+v -0.421284 0.773744 -0.202356
+v -0.417073 0.773744 -0.206568
+v -0.508809 0.000125 -0.248191
+v -0.508670 0.004075 -0.243775
+v -0.512877 0.004323 -0.247973
+v -0.486929 0.773744 -0.206568
+v -0.482722 0.773744 -0.202356
+v -0.463089 0.000125 -0.293912
+v -0.462869 0.004323 -0.297981
+v -0.458671 0.004075 -0.293774
+v -0.417073 0.773744 -0.268005
+v -0.421284 0.773744 -0.272213
+v -0.508816 0.002601 -0.293919
+v -0.512877 0.007054 -0.293781
+v -0.508677 0.007054 -0.297980
+v -0.482722 0.773744 -0.272213
+v -0.486929 0.773744 -0.268005
+v -0.463096 -0.000125 0.248199
+v -0.458671 0.004075 0.247986
+v -0.462882 0.004075 0.243775
+v -0.421284 0.773744 0.202357
+v -0.417073 0.773744 0.206568
+v -0.508809 0.000125 0.248191
+v -0.508670 0.004075 0.243775
+v -0.512877 0.004323 0.247973
+v -0.486929 0.773744 0.206568
+v -0.482722 0.773744 0.202357
+v -0.463089 0.000125 0.293912
+v -0.462869 0.004323 0.297981
+v -0.458671 0.004075 0.293774
+v -0.417073 0.773744 0.268005
+v -0.421284 0.773744 0.272213
+v -0.508816 0.002601 0.293919
+v -0.512877 0.007054 0.293781
+v -0.508677 0.007054 0.297981
+v -0.482722 0.773744 0.272213
+v -0.486929 0.773744 0.268005
+v 0.463096 -0.000125 -0.248199
+v 0.458671 0.004074 -0.247986
+v 0.462882 0.004075 -0.243775
+v 0.421284 0.773744 -0.202357
+v 0.417073 0.773744 -0.206568
+v 0.508809 0.000125 -0.248191
+v 0.508670 0.004075 -0.243775
+v 0.512877 0.004323 -0.247973
+v 0.486929 0.773744 -0.206568
+v 0.482722 0.773744 -0.202357
+v 0.463089 0.000125 -0.293912
+v 0.462869 0.004323 -0.297981
+v 0.458671 0.004074 -0.293774
+v 0.417073 0.773744 -0.268005
+v 0.421284 0.773744 -0.272213
+v 0.508816 0.002601 -0.293919
+v 0.512877 0.007054 -0.293781
+v 0.508677 0.007054 -0.297981
+v 0.482722 0.773744 -0.272213
+v 0.486929 0.773744 -0.268005
+v 0.463096 -0.000125 0.248199
+v 0.458671 0.004074 0.247986
+v 0.462882 0.004075 0.243775
+v 0.421284 0.773744 0.202356
+v 0.417073 0.773744 0.206568
+v 0.508809 0.000125 0.248191
+v 0.508670 0.004075 0.243775
+v 0.512877 0.004323 0.247973
+v 0.486929 0.773744 0.206568
+v 0.482722 0.773744 0.202356
+v 0.463089 0.000125 0.293912
+v 0.462869 0.004323 0.297981
+v 0.458671 0.004074 0.293774
+v 0.417073 0.773744 0.268005
+v 0.421284 0.773744 0.272213
+v 0.508816 0.002601 0.293919
+v 0.512877 0.007054 0.293781
+v 0.508677 0.007054 0.297980
+v 0.482722 0.773744 0.272213
+v 0.486929 0.773744 0.268005
+vt 0.012167 0.894395
+vt 0.012161 0.862608
+vt 0.401654 0.862517
+vt 0.401672 0.894215
+vt 0.770729 0.637544
+vt 0.738930 0.637544
+vt 0.738908 0.007387
+vt 0.770625 0.007379
+vt 0.011087 0.358772
+vt 0.011087 0.004670
+vt 0.605569 0.004670
+vt 0.605569 0.358772
+vt 0.665754 0.637544
+vt 0.633954 0.637544
+vt 0.633932 0.007387
+vt 0.665648 0.007379
+vt 0.012153 0.781665
+vt 0.012159 0.749877
+vt 0.401667 0.750059
+vt 0.401653 0.781757
+vt 0.402511 0.898447
+vt 0.406213 0.894954
+vt 0.402459 0.858019
+vt 0.406193 0.861757
+vt 0.669880 0.006541
+vt 0.666388 0.002840
+vt 0.629432 0.006581
+vt 0.633174 0.002846
+vt 0.774855 0.006541
+vt 0.771365 0.002840
+vt 0.734408 0.006581
+vt 0.738150 0.002846
+vt 0.402486 0.785988
+vt 0.406185 0.782501
+vt 0.402477 0.745559
+vt 0.406213 0.749304
+vt 0.670203 0.637542
+vt 0.629261 0.637543
+vt 0.012154 0.786116
+vt 0.012153 0.745183
+vt 0.775179 0.637542
+vt 0.734237 0.637543
+vt 0.012161 0.898847
+vt 0.012163 0.857914
+vt 0.030357 0.917428
+vt 0.384349 0.917072
+vt 0.384371 0.939343
+vt 0.030379 0.939699
+vt 0.791830 0.023428
+vt 0.792136 0.620638
+vt 0.793836 0.619438
+vt 0.793540 0.024632
+vt 0.815803 0.024621
+vt 0.816101 0.619427
+vt 0.686854 0.023428
+vt 0.687161 0.620638
+vt 0.012407 0.719528
+vt 0.012407 0.366267
+vt 0.606199 0.366267
+vt 0.606199 0.719528
+vt 0.385556 0.915367
+vt 0.029151 0.915731
+vt 0.030336 0.804709
+vt 0.384312 0.804599
+vt 0.384318 0.826869
+vt 0.030343 0.826979
+vt 0.385520 0.802895
+vt 0.029131 0.803011
+vt 0.688564 0.024632
+vt 0.688861 0.619438
+vt 0.710827 0.024621
+vt 0.711126 0.619427
+vt 0.611519 0.619791
+vt 0.611679 0.024324
+vt 0.029925 0.727445
+vt 0.384741 0.727787
+vt 0.716494 0.619791
+vt 0.716655 0.024324
+vt 0.029921 0.840165
+vt 0.384711 0.840261
+vt 0.413096 0.829099
+vt 0.844696 0.829099
+vt 0.844696 0.859196
+vt 0.413096 0.859196
+vt 0.413096 0.795490
+vt 0.844696 0.795490
+vt 0.844696 0.825587
+vt 0.413096 0.825587
+vt 0.413096 0.761885
+vt 0.844696 0.761885
+vt 0.844696 0.791983
+vt 0.413096 0.791983
+vt 0.413096 0.728276
+vt 0.844696 0.728276
+vt 0.844696 0.758374
+vt 0.413096 0.758374
+vt 0.107983 0.983687
+vt 0.111358 0.984368
+vt 0.108613 0.987108
+vt 0.082406 0.983545
+vt 0.081894 0.986785
+vt 0.079217 0.984090
+vt 0.108067 0.957990
+vt 0.108635 0.954717
+vt 0.111358 0.957486
+vt 0.082448 0.957934
+vt 0.079161 0.957325
+vt 0.081842 0.954645
+vt 0.413096 0.724762
+vt 0.844696 0.724763
+vt 0.888655 0.437483
+vt 0.858557 0.437483
+vt 0.858557 0.005879
+vt 0.888655 0.005879
+vt 0.922263 0.437483
+vt 0.892166 0.437483
+vt 0.892166 0.005879
+vt 0.922263 0.005879
+vt 0.955869 0.437483
+vt 0.925771 0.437483
+vt 0.925771 0.005879
+vt 0.955869 0.005879
+vt 0.989477 0.437483
+vt 0.959380 0.437483
+vt 0.959380 0.005879
+vt 0.989477 0.005879
+vt 0.221686 0.960258
+vt 0.222316 0.956836
+vt 0.225061 0.959577
+vt 0.196110 0.960400
+vt 0.192920 0.959855
+vt 0.195597 0.957160
+vt 0.221771 0.985955
+vt 0.225061 0.986459
+vt 0.222338 0.989228
+vt 0.196151 0.986011
+vt 0.195545 0.989300
+vt 0.192865 0.986620
+vt 0.992991 0.437483
+vt 0.992991 0.005879
+vt 0.961249 0.441373
+vt 0.991346 0.441373
+vt 0.991346 0.872978
+vt 0.961249 0.872978
+vt 0.927640 0.441373
+vt 0.957737 0.441373
+vt 0.957737 0.872978
+vt 0.927640 0.872978
+vt 0.894035 0.441373
+vt 0.924132 0.441373
+vt 0.924132 0.872978
+vt 0.894035 0.872978
+vt 0.860426 0.441373
+vt 0.890524 0.441373
+vt 0.890524 0.872978
+vt 0.860426 0.872978
+vt 0.054205 0.960486
+vt 0.054834 0.957064
+vt 0.057579 0.959805
+vt 0.028628 0.960627
+vt 0.025438 0.960082
+vt 0.028115 0.957387
+vt 0.054289 0.986182
+vt 0.057579 0.986686
+vt 0.054856 0.989456
+vt 0.028669 0.986238
+vt 0.028063 0.989527
+vt 0.025383 0.986847
+vt 0.856912 0.441373
+vt 0.856912 0.872978
+vt 0.845719 0.893331
+vt 0.414117 0.893331
+vt 0.414117 0.863233
+vt 0.845719 0.863233
+vt 0.845719 0.926939
+vt 0.414117 0.926939
+vt 0.414117 0.896842
+vt 0.845719 0.896842
+vt 0.845719 0.960544
+vt 0.414117 0.960544
+vt 0.414117 0.930447
+vt 0.845719 0.930447
+vt 0.845719 0.994153
+vt 0.414117 0.994153
+vt 0.414117 0.964055
+vt 0.845719 0.964055
+vt 0.163985 0.985789
+vt 0.167323 0.986440
+vt 0.164631 0.989129
+vt 0.138369 0.985797
+vt 0.137835 0.989092
+vt 0.135147 0.986348
+vt 0.164045 0.960168
+vt 0.164650 0.956930
+vt 0.167323 0.959689
+vt 0.138385 0.960134
+vt 0.135092 0.959522
+vt 0.137781 0.956836
+vt 0.845719 0.997667
+vt 0.414117 0.997667
+vn 1.0000 0.0000 -0.0000
+vn -0.0000 0.0000 -1.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 0.0000 1.0000
+vn -1.0000 0.0000 0.0000
+vn 0.0000 -1.0000 0.0000
+vn 0.9985 -0.0540 -0.0000
+vn 0.9985 -0.0541 0.0000
+vn 0.0009 0.0335 -0.9994
+vn 0.0008 0.0335 -0.9994
+vn -0.9994 0.0337 0.0009
+vn -0.9994 0.0337 0.0008
+vn -0.9994 0.0339 0.0009
+vn 0.0000 -0.0537 0.9986
+vn 0.0527 -0.9972 0.0527
+vn -0.1078 -0.9930 0.0487
+vn 0.0486 -0.9930 -0.1078
+vn -0.1121 -0.9873 -0.1122
+vn 0.0008 0.0335 0.9994
+vn 0.0009 0.0336 0.9994
+vn -0.9994 0.0337 -0.0009
+vn -0.9994 0.0337 -0.0008
+vn -0.0000 -0.0537 -0.9986
+vn -0.0000 -0.0538 -0.9986
+vn 0.0527 -0.9972 -0.0527
+vn -0.1078 -0.9930 -0.0486
+vn 0.0486 -0.9930 0.1078
+vn -0.1122 -0.9873 0.1122
+vn -0.9985 -0.0540 -0.0000
+vn -0.0008 0.0335 -0.9994
+vn -0.0009 0.0334 -0.9994
+vn 0.9994 0.0337 0.0009
+vn 0.9994 0.0337 0.0008
+vn 0.0000 -0.0539 0.9985
+vn -0.0527 -0.9972 0.0527
+vn 0.1078 -0.9930 0.0486
+vn -0.0486 -0.9930 -0.1078
+vn 0.1122 -0.9873 -0.1122
+vn -0.9985 -0.0541 -0.0000
+vn -0.0009 0.0335 0.9994
+vn -0.0008 0.0335 0.9994
+vn 0.9994 0.0337 -0.0009
+vn 0.9994 0.0337 -0.0008
+vn -0.0527 -0.9972 -0.0527
+vn 0.1078 -0.9930 -0.0487
+vn -0.0486 -0.9930 0.1078
+vn 0.1121 -0.9873 0.1122
+usemtl wooden_table_02
+s 1
+f 12/1/1 14/2/1 3/3/1 1/4/1
+f 17/5/2 19/6/2 15/7/2 11/8/2
+f 18/9/3 8/10/3 4/11/3 13/12/3
+f 2/13/4 5/14/4 10/15/4 6/16/4
+f 7/17/5 9/18/5 20/19/5 16/20/5
+f 22/21/6 1/4/1 2/22/4
+f 3/3/1 37/23/3 5/24/4
+f 21/25/6 6/16/4 7/26/5
+f 38/27/3 9/28/5 10/15/4
+f 24/29/6 11/8/2 12/30/1
+f 40/31/3 14/32/1 15/7/2
+f 23/33/6 16/20/5 17/34/2
+f 39/35/3 19/36/2 20/19/5
+f 21/25/6 22/37/6 2/13/4 6/16/4
+f 1/4/1 3/3/1 5/24/4 2/22/4
+f 37/38/3 38/27/3 10/15/4 5/14/4
+f 9/28/5 7/26/5 6/16/4 10/15/4
+f 23/33/6 21/39/6 7/17/5 16/20/5
+f 38/40/3 39/35/3 20/19/5 9/18/5
+f 19/36/2 17/34/2 16/20/5 20/19/5
+f 24/29/6 23/41/6 17/5/2 11/8/2
+f 39/42/3 40/31/3 15/7/2 19/6/2
+f 14/32/1 12/30/1 11/8/2 15/7/2
+f 22/21/6 24/43/6 12/1/1 1/4/1
+f 40/44/3 37/23/3 3/3/1 14/2/1
+f 34/45/5 29/46/5 26/47/5 28/48/5
+f 33/49/6 35/50/6 23/41/6 24/29/6
+f 36/51/4 34/52/4 28/53/4 27/54/4
+f 31/55/6 30/56/6 22/37/6 21/25/6
+f 25/57/6 27/58/6 28/59/6 26/60/6
+f 30/61/6 33/62/6 24/43/6 22/21/6
+f 32/63/1 36/64/1 27/65/1 25/66/1
+f 35/67/6 31/68/6 21/39/6 23/33/6
+f 32/69/2 29/70/2 30/56/6 31/55/6
+f 36/64/1 32/63/1 31/68/6 35/67/6
+f 34/52/4 36/51/4 35/50/6 33/49/6
+f 29/46/5 34/45/5 33/62/6 30/61/6
+f 29/70/2 32/69/2 25/71/2 26/72/2
+f 4/73/3 8/74/3 38/27/3 37/38/3
+f 8/75/3 18/76/3 39/35/3 38/40/3
+f 18/77/3 13/78/3 40/31/3 39/42/3
+f 13/79/3 4/80/3 37/23/3 40/44/3
+f 53/81/7 54/82/7 45/83/8 42/84/7
+f 58/85/9 59/86/9 55/87/10 52/88/10
+f 48/89/11 49/90/12 60/91/13 57/92/11
+f 43/93/14 44/94/14 50/95/14 47/96/14
+f 41/97/15 42/98/7 43/99/14
+f 46/100/16 47/101/14 48/102/11
+f 51/103/17 52/104/10 53/105/7
+f 56/106/18 57/107/11 58/108/9
+f 46/100/16 41/97/15 43/99/14 47/101/14
+f 42/109/7 45/110/8 44/94/14 43/93/14
+f 49/90/12 48/89/11 47/96/14 50/95/14
+f 56/106/18 46/100/16 48/102/11 57/107/11
+f 59/86/9 58/85/9 57/92/11 60/91/13
+f 51/103/17 56/106/18 58/108/9 52/104/10
+f 54/82/7 53/81/7 52/88/10 55/87/10
+f 41/97/15 51/103/17 53/105/7 42/98/7
+f 46/100/16 56/106/18 51/103/17 41/97/15
+f 73/111/7 62/112/7 65/113/7 74/114/7
+f 78/115/19 72/116/19 75/117/19 79/118/20
+f 68/119/21 77/120/22 80/121/22 69/122/22
+f 63/123/23 67/124/23 70/125/23 64/126/24
+f 61/127/25 63/128/23 62/129/7
+f 66/130/26 68/131/21 67/132/23
+f 71/133/27 73/134/7 72/135/19
+f 76/136/28 78/137/19 77/138/22
+f 66/130/26 67/132/23 63/128/23 61/127/25
+f 62/139/7 63/123/23 64/126/24 65/140/7
+f 69/122/22 70/125/23 67/124/23 68/119/21
+f 76/136/28 77/138/22 68/131/21 66/130/26
+f 79/118/20 80/121/22 77/120/22 78/115/19
+f 71/133/27 72/135/19 78/137/19 76/136/28
+f 74/114/7 75/117/19 72/116/19 73/111/7
+f 61/127/25 62/129/7 73/134/7 71/133/27
+f 66/130/26 61/127/25 71/133/27 76/136/28
+f 93/141/29 82/142/29 85/143/29 94/144/29
+f 98/145/30 92/146/30 95/147/30 99/148/31
+f 88/149/32 97/150/33 100/151/33 89/152/33
+f 83/153/14 87/154/14 90/155/14 84/156/34
+f 81/157/35 83/158/14 82/159/29
+f 86/160/36 88/161/32 87/162/14
+f 91/163/37 93/164/29 92/165/30
+f 96/166/38 98/167/30 97/168/33
+f 86/160/36 87/162/14 83/158/14 81/157/35
+f 82/169/29 83/153/14 84/156/34 85/170/29
+f 89/152/33 90/155/14 87/154/14 88/149/32
+f 96/166/38 97/168/33 88/161/32 86/160/36
+f 99/148/31 100/151/33 97/150/33 98/145/30
+f 91/163/37 92/165/30 98/167/30 96/166/38
+f 94/144/29 95/147/30 92/146/30 93/141/29
+f 81/157/35 82/159/29 93/164/29 91/163/37
+f 86/160/36 81/157/35 91/163/37 96/166/38
+f 113/171/29 114/172/29 105/173/39 102/174/29
+f 118/175/40 119/176/40 115/177/41 112/178/41
+f 108/179/42 109/180/43 120/181/43 117/182/42
+f 103/183/23 104/184/23 110/185/23 107/186/23
+f 101/187/44 102/188/29 103/189/23
+f 106/190/45 107/191/23 108/192/42
+f 111/193/46 112/194/41 113/195/29
+f 116/196/47 117/197/42 118/198/40
+f 106/190/45 101/187/44 103/189/23 107/191/23
+f 102/199/29 105/200/39 104/184/23 103/183/23
+f 109/180/43 108/179/42 107/186/23 110/185/23
+f 116/196/47 106/190/45 108/192/42 117/197/42
+f 119/176/40 118/175/40 117/182/42 120/181/43
+f 111/193/46 116/196/47 118/198/40 112/194/41
+f 114/172/29 113/171/29 112/178/41 115/177/41
+f 101/187/44 111/193/46 113/195/29 102/188/29
+f 106/190/45 116/196/47 111/193/46 101/187/44

cw 9/models/desk/desk2.mtl

@@ -0,0 +1,13 @@
+# Blender MTL File: 'None'
+# Material Count: 1
+
+newmtl wooden_table_02
+Ns 250.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 wood_table_001_diff_4k.jpg

cw 9/models/desk/desk2.obj

@@ -0,0 +1,484 @@
+# Blender v3.4.1 OBJ File: ''
+# www.blender.org
+mtllib desk2.mtl
+o wooden_table_02_Cube.003
+v 0.567208 0.736872 -0.347106
+v 0.567208 0.793511 -0.347106
+v 0.567208 0.793511 0.347106
+v 0.567208 0.736872 0.347106
+v -0.561302 0.736872 -0.353012
+v -0.561302 0.793511 -0.353012
+v 0.561302 0.793511 -0.353012
+v 0.561302 0.736872 -0.353012
+v -0.529725 0.799418 -0.315529
+v -0.529725 0.799418 0.315529
+v 0.529725 0.799418 0.315529
+v 0.529725 0.799418 -0.315529
+v 0.561302 0.736872 0.353012
+v 0.561302 0.793511 0.353012
+v -0.561302 0.793511 0.353012
+v -0.561302 0.736872 0.353012
+v -0.567208 0.736872 0.347106
+v -0.567208 0.793511 0.347106
+v -0.567208 0.793511 -0.347106
+v -0.567208 0.736872 -0.347106
+v 0.561302 0.731601 0.347106
+v 0.561302 0.799418 0.347106
+v -0.561302 0.731601 0.347106
+v -0.561302 0.799418 0.347106
+v 0.561302 0.731601 -0.347106
+v 0.561302 0.799418 -0.347106
+v -0.561302 0.731601 -0.347106
+v -0.561302 0.799418 -0.347106
+v 0.529110 0.733739 -0.314780
+v 0.529110 0.733739 0.314780
+v 0.529110 0.773347 0.314780
+v 0.529110 0.773347 -0.314780
+v 0.531243 0.731601 -0.316922
+v -0.531243 0.731601 -0.316922
+v -0.529110 0.733739 -0.314780
+v -0.529110 0.773347 -0.314780
+v -0.531243 0.731601 0.316922
+v 0.531243 0.731601 0.316922
+v -0.529110 0.773347 0.314780
+v -0.529110 0.733739 0.314780
+v -0.458671 0.004075 -0.293774
+v -0.417073 0.773744 -0.268005
+v -0.417073 0.773744 -0.206568
+v -0.458671 0.004075 -0.247986
+v -0.508677 0.007054 -0.297980
+v -0.482722 0.773744 -0.272213
+v -0.421284 0.773744 -0.272213
+v -0.462869 0.004323 -0.297981
+v -0.512877 0.004323 -0.247973
+v -0.486929 0.773744 -0.206568
+v -0.486929 0.773744 -0.268005
+v -0.512877 0.007054 -0.293781
+v -0.462882 0.004075 -0.243775
+v -0.421284 0.773744 -0.202356
+v -0.482722 0.773744 -0.202356
+v -0.508670 0.004075 -0.243775
+v -0.463096 -0.000125 -0.248199
+v -0.508809 0.000125 -0.248191
+v -0.463089 0.000125 -0.293912
+v -0.508816 0.002601 -0.293919
+v -0.458671 0.004075 0.293774
+v -0.458671 0.004075 0.247986
+v -0.417073 0.773744 0.206568
+v -0.417073 0.773744 0.268005
+v -0.508677 0.007054 0.297981
+v -0.462869 0.004323 0.297981
+v -0.421284 0.773744 0.272213
+v -0.482722 0.773744 0.272213
+v -0.512877 0.004323 0.247973
+v -0.512877 0.007054 0.293781
+v -0.486929 0.773744 0.268005
+v -0.486929 0.773744 0.206568
+v -0.462882 0.004075 0.243775
+v -0.508670 0.004075 0.243775
+v -0.482722 0.773744 0.202357
+v -0.421284 0.773744 0.202357
+v -0.463096 -0.000125 0.248199
+v -0.508809 0.000125 0.248191
+v -0.463089 0.000125 0.293912
+v -0.508816 0.002601 0.293919
+v 0.458671 0.004074 -0.293774
+v 0.458671 0.004074 -0.247986
+v 0.417073 0.773744 -0.206568
+v 0.417073 0.773744 -0.268005
+v 0.508677 0.007054 -0.297981
+v 0.462869 0.004323 -0.297981
+v 0.421284 0.773744 -0.272213
+v 0.482722 0.773744 -0.272213
+v 0.512877 0.004323 -0.247973
+v 0.512877 0.007054 -0.293781
+v 0.486929 0.773744 -0.268005
+v 0.486929 0.773744 -0.206568
+v 0.462882 0.004075 -0.243775
+v 0.508670 0.004075 -0.243775
+v 0.482722 0.773744 -0.202357
+v 0.421284 0.773744 -0.202357
+v 0.463096 -0.000125 -0.248199
+v 0.508809 0.000125 -0.248191
+v 0.463089 0.000125 -0.293912
+v 0.508816 0.002601 -0.293919
+v 0.458671 0.004074 0.293774
+v 0.417073 0.773744 0.268005
+v 0.417073 0.773744 0.206568
+v 0.458671 0.004074 0.247986
+v 0.508677 0.007054 0.297980
+v 0.482722 0.773744 0.272213
+v 0.421284 0.773744 0.272213
+v 0.462869 0.004323 0.297981
+v 0.512877 0.004323 0.247973
+v 0.486929 0.773744 0.206568
+v 0.486929 0.773744 0.268005
+v 0.512877 0.007054 0.293781
+v 0.462882 0.004075 0.243775
+v 0.421284 0.773744 0.202356
+v 0.482722 0.773744 0.202356
+v 0.508670 0.004075 0.243775
+v 0.463096 -0.000125 0.248199
+v 0.508809 0.000125 0.248191
+v 0.463089 0.000125 0.293912
+v 0.508816 0.002601 0.293919
+vt 0.012167 0.894395
+vt 0.012161 0.862608
+vt 0.401654 0.862517
+vt 0.401672 0.894215
+vt 0.770729 0.637544
+vt 0.738930 0.637544
+vt 0.738908 0.007387
+vt 0.770625 0.007379
+vt 0.011087 0.358772
+vt 0.011087 0.004670
+vt 0.605569 0.004670
+vt 0.605569 0.358772
+vt 0.665754 0.637544
+vt 0.633954 0.637544
+vt 0.633932 0.007387
+vt 0.665648 0.007379
+vt 0.012153 0.781665
+vt 0.012159 0.749877
+vt 0.401667 0.750059
+vt 0.401653 0.781757
+vt 0.402511 0.898447
+vt 0.406213 0.894954
+vt 0.402459 0.858019
+vt 0.406193 0.861757
+vt 0.669880 0.006541
+vt 0.666388 0.002840
+vt 0.629432 0.006581
+vt 0.633174 0.002846
+vt 0.774855 0.006541
+vt 0.771365 0.002840
+vt 0.734408 0.006581
+vt 0.738150 0.002846
+vt 0.402486 0.785988
+vt 0.406185 0.782501
+vt 0.402477 0.745559
+vt 0.406213 0.749304
+vt 0.670203 0.637542
+vt 0.629261 0.637543
+vt 0.012154 0.786116
+vt 0.012153 0.745183
+vt 0.775179 0.637542
+vt 0.734237 0.637543
+vt 0.012161 0.898847
+vt 0.012163 0.857914
+vt 0.030357 0.917428
+vt 0.384349 0.917072
+vt 0.384371 0.939343
+vt 0.030379 0.939699
+vt 0.791830 0.023428
+vt 0.792136 0.620638
+vt 0.793836 0.619438
+vt 0.793540 0.024632
+vt 0.815803 0.024621
+vt 0.816101 0.619427
+vt 0.686854 0.023428
+vt 0.687161 0.620638
+vt 0.012407 0.719528
+vt 0.012407 0.366267
+vt 0.606199 0.366267
+vt 0.606199 0.719528
+vt 0.385556 0.915367
+vt 0.029151 0.915731
+vt 0.030336 0.804709
+vt 0.384312 0.804599
+vt 0.384318 0.826869
+vt 0.030343 0.826979
+vt 0.385520 0.802895
+vt 0.029131 0.803011
+vt 0.688564 0.024632
+vt 0.688861 0.619438
+vt 0.710827 0.024621
+vt 0.711126 0.619427
+vt 0.611519 0.619791
+vt 0.611679 0.024324
+vt 0.029925 0.727445
+vt 0.384741 0.727787
+vt 0.716494 0.619791
+vt 0.716655 0.024324
+vt 0.029921 0.840165
+vt 0.384711 0.840261
+vt 0.413096 0.829099
+vt 0.844696 0.829099
+vt 0.844696 0.859196
+vt 0.413096 0.859196
+vt 0.413096 0.795490
+vt 0.844696 0.795490
+vt 0.844696 0.825587
+vt 0.413096 0.825587
+vt 0.413096 0.761885
+vt 0.844696 0.761885
+vt 0.844696 0.791983
+vt 0.413096 0.791983
+vt 0.413096 0.728276
+vt 0.844696 0.728276
+vt 0.844696 0.758374
+vt 0.413096 0.758374
+vt 0.107983 0.983687
+vt 0.111358 0.984368
+vt 0.108613 0.987108
+vt 0.082406 0.983545
+vt 0.081894 0.986785
+vt 0.079217 0.984090
+vt 0.108067 0.957990
+vt 0.108635 0.954717
+vt 0.111358 0.957486
+vt 0.082448 0.957934
+vt 0.079161 0.957325
+vt 0.081842 0.954645
+vt 0.413096 0.724762
+vt 0.844696 0.724763
+vt 0.888655 0.437483
+vt 0.858557 0.437483
+vt 0.858557 0.005879
+vt 0.888655 0.005879
+vt 0.922263 0.437483
+vt 0.892166 0.437483
+vt 0.892166 0.005879
+vt 0.922263 0.005879
+vt 0.955869 0.437483
+vt 0.925771 0.437483
+vt 0.925771 0.005879
+vt 0.955869 0.005879
+vt 0.989477 0.437483
+vt 0.959380 0.437483
+vt 0.959380 0.005879
+vt 0.989477 0.005879
+vt 0.221686 0.960258
+vt 0.222316 0.956836
+vt 0.225061 0.959577
+vt 0.196110 0.960400
+vt 0.192920 0.959855
+vt 0.195597 0.957160
+vt 0.221771 0.985955
+vt 0.225061 0.986459
+vt 0.222338 0.989228
+vt 0.196151 0.986011
+vt 0.195545 0.989300
+vt 0.192865 0.986620
+vt 0.992991 0.437483
+vt 0.992991 0.005879
+vt 0.961249 0.441373
+vt 0.991346 0.441373
+vt 0.991346 0.872978
+vt 0.961249 0.872978
+vt 0.927640 0.441373
+vt 0.957737 0.441373
+vt 0.957737 0.872978
+vt 0.927640 0.872978
+vt 0.894035 0.441373
+vt 0.924132 0.441373
+vt 0.924132 0.872978
+vt 0.894035 0.872978
+vt 0.860426 0.441373
+vt 0.890524 0.441373
+vt 0.890524 0.872978
+vt 0.860426 0.872978
+vt 0.054205 0.960486
+vt 0.054834 0.957064
+vt 0.057579 0.959805
+vt 0.028628 0.960627
+vt 0.025438 0.960082
+vt 0.028115 0.957387
+vt 0.054289 0.986182
+vt 0.057579 0.986686
+vt 0.054856 0.989456
+vt 0.028669 0.986238
+vt 0.028063 0.989527
+vt 0.025383 0.986847
+vt 0.856912 0.441373
+vt 0.856912 0.872978
+vt 0.845719 0.893331
+vt 0.414117 0.893331
+vt 0.414117 0.863233
+vt 0.845719 0.863233
+vt 0.845719 0.926939
+vt 0.414117 0.926939
+vt 0.414117 0.896842
+vt 0.845719 0.896842
+vt 0.845719 0.960544
+vt 0.414117 0.960544
+vt 0.414117 0.930447
+vt 0.845719 0.930447
+vt 0.845719 0.994153
+vt 0.414117 0.994153
+vt 0.414117 0.964055
+vt 0.845719 0.964055
+vt 0.163985 0.985789
+vt 0.167323 0.986440
+vt 0.164631 0.989129
+vt 0.138369 0.985797
+vt 0.137835 0.989092
+vt 0.135147 0.986348
+vt 0.164045 0.960168
+vt 0.164650 0.956930
+vt 0.167323 0.959689
+vt 0.138385 0.960134
+vt 0.135092 0.959522
+vt 0.137781 0.956836
+vt 0.845719 0.997667
+vt 0.414117 0.997667
+vn 1.0000 -0.0000 0.0000
+vn 0.0000 -0.0000 -1.0000
+vn 0.0000 1.0000 0.0000
+vn -0.0000 -0.0000 1.0000
+vn -1.0000 -0.0000 -0.0000
+vn 0.0000 -1.0000 -0.0000
+vn 0.9985 -0.0540 0.0000
+vn 0.9985 -0.0541 -0.0000
+vn 0.0009 0.0335 -0.9994
+vn 0.0008 0.0335 -0.9994
+vn -0.9994 0.0337 0.0009
+vn -0.9994 0.0337 0.0008
+vn -0.9994 0.0339 0.0009
+vn 0.0000 -0.0537 0.9986
+vn 0.0527 -0.9972 0.0527
+vn -0.1078 -0.9930 0.0487
+vn 0.0486 -0.9930 -0.1078
+vn -0.1121 -0.9873 -0.1122
+vn 0.0008 0.0335 0.9994
+vn 0.0009 0.0336 0.9994
+vn -0.9994 0.0337 -0.0009
+vn -0.9994 0.0337 -0.0008
+vn -0.0000 -0.0537 -0.9986
+vn -0.0000 -0.0538 -0.9986
+vn 0.0527 -0.9972 -0.0527
+vn -0.1078 -0.9930 -0.0486
+vn 0.0486 -0.9930 0.1078
+vn -0.1122 -0.9873 0.1122
+vn -0.9985 -0.0540 0.0000
+vn -0.0008 0.0335 -0.9994
+vn -0.0009 0.0334 -0.9994
+vn 0.9994 0.0337 0.0009
+vn 0.9994 0.0337 0.0008
+vn -0.0000 -0.0538 0.9986
+vn -0.0527 -0.9972 0.0527
+vn 0.1078 -0.9930 0.0486
+vn -0.0486 -0.9930 -0.1078
+vn 0.1122 -0.9873 -0.1122
+vn -0.9985 -0.0539 -0.0000
+vn -0.0009 0.0335 0.9994
+vn -0.0008 0.0335 0.9994
+vn 0.9994 0.0337 -0.0009
+vn 0.9994 0.0337 -0.0008
+vn 0.9994 0.0335 -0.0008
+vn -0.0527 -0.9972 -0.0527
+vn 0.1078 -0.9930 -0.0487
+vn -0.0486 -0.9930 0.1078
+vn 0.1121 -0.9873 0.1122
+usemtl wooden_table_02
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1
+f 5/5/2 6/6/2 7/7/2 8/8/2
+f 9/9/3 10/10/3 11/11/3 12/12/3
+f 13/13/4 14/14/4 15/15/4 16/16/4
+f 17/17/5 18/18/5 19/19/5 20/20/5
+f 21/21/6 4/4/1 13/22/4
+f 3/3/1 22/23/3 14/24/4
+f 23/25/6 16/16/4 17/26/5
+f 24/27/3 18/28/5 15/15/4
+f 25/29/6 8/8/2 1/30/1
+f 26/31/3 2/32/1 7/7/2
+f 27/33/6 20/20/5 5/34/2
+f 28/35/3 6/36/2 19/19/5
+f 23/25/6 21/37/6 13/13/4 16/16/4
+f 4/4/1 3/3/1 14/24/4 13/22/4
+f 22/38/3 24/27/3 15/15/4 14/14/4
+f 18/28/5 17/26/5 16/16/4 15/15/4
+f 27/33/6 23/39/6 17/17/5 20/20/5
+f 24/40/3 28/35/3 19/19/5 18/18/5
+f 6/36/2 5/34/2 20/20/5 19/19/5
+f 25/29/6 27/41/6 5/5/2 8/8/2
+f 28/42/3 26/31/3 7/7/2 6/6/2
+f 2/32/1 1/30/1 8/8/2 7/7/2
+f 21/21/6 25/43/6 1/1/1 4/4/1
+f 26/44/3 22/23/3 3/3/1 2/2/1
+f 29/45/5 30/46/5 31/47/5 32/48/5
+f 33/49/6 34/50/6 27/41/6 25/29/6
+f 35/51/4 29/52/4 32/53/4 36/54/4
+f 37/55/6 38/56/6 21/37/6 23/25/6
+f 39/57/6 36/58/6 32/59/6 31/60/6
+f 38/61/6 33/62/6 25/43/6 21/21/6
+f 40/63/1 35/64/1 36/65/1 39/66/1
+f 34/67/6 37/68/6 23/39/6 27/33/6
+f 40/69/2 30/70/2 38/56/6 37/55/6
+f 35/64/1 40/63/1 37/68/6 34/67/6
+f 29/52/4 35/51/4 34/50/6 33/49/6
+f 30/46/5 29/45/5 33/62/6 38/61/6
+f 30/70/2 40/69/2 39/71/2 31/72/2
+f 11/73/3 10/74/3 24/27/3 22/38/3
+f 10/75/3 9/76/3 28/35/3 24/40/3
+f 9/77/3 12/78/3 26/31/3 28/42/3
+f 12/79/3 11/80/3 22/23/3 26/44/3
+f 41/81/7 42/82/7 43/83/8 44/84/7
+f 45/85/9 46/86/9 47/87/10 48/88/10
+f 49/89/11 50/90/12 51/91/13 52/92/11
+f 53/93/14 54/94/14 55/95/14 56/96/14
+f 57/97/15 44/98/7 53/99/14
+f 58/100/16 56/101/14 49/102/11
+f 59/103/17 48/104/10 41/105/7
+f 60/106/18 52/107/11 45/108/9
+f 58/100/16 57/97/15 53/99/14 56/101/14
+f 44/109/7 43/110/8 54/94/14 53/93/14
+f 50/90/12 49/89/11 56/96/14 55/95/14
+f 60/106/18 58/100/16 49/102/11 52/107/11
+f 46/86/9 45/85/9 52/92/11 51/91/13
+f 59/103/17 60/106/18 45/108/9 48/104/10
+f 42/82/7 41/81/7 48/88/10 47/87/10
+f 57/97/15 59/103/17 41/105/7 44/98/7
+f 58/100/16 60/106/18 59/103/17 57/97/15
+f 61/111/7 62/112/7 63/113/7 64/114/7
+f 65/115/19 66/116/19 67/117/19 68/118/20
+f 69/119/21 70/120/22 71/121/22 72/122/22
+f 73/123/23 74/124/23 75/125/23 76/126/24
+f 77/127/25 73/128/23 62/129/7
+f 78/130/26 69/131/21 74/132/23
+f 79/133/27 61/134/7 66/135/19
+f 80/136/28 65/137/19 70/138/22
+f 78/130/26 74/132/23 73/128/23 77/127/25
+f 62/139/7 73/123/23 76/126/24 63/140/7
+f 72/122/22 75/125/23 74/124/23 69/119/21
+f 80/136/28 70/138/22 69/131/21 78/130/26
+f 68/118/20 71/121/22 70/120/22 65/115/19
+f 79/133/27 66/135/19 65/137/19 80/136/28
+f 64/114/7 67/117/19 66/116/19 61/111/7
+f 77/127/25 62/129/7 61/134/7 79/133/27
+f 78/130/26 77/127/25 79/133/27 80/136/28
+f 81/141/29 82/142/29 83/143/29 84/144/29
+f 85/145/30 86/146/30 87/147/30 88/148/31
+f 89/149/32 90/150/33 91/151/33 92/152/33
+f 93/153/14 94/154/14 95/155/14 96/156/34
+f 97/157/35 93/158/14 82/159/29
+f 98/160/36 89/161/32 94/162/14
+f 99/163/37 81/164/29 86/165/30
+f 100/166/38 85/167/30 90/168/33
+f 98/160/36 94/162/14 93/158/14 97/157/35
+f 82/169/29 93/153/14 96/156/34 83/170/29
+f 92/152/33 95/155/14 94/154/14 89/149/32
+f 100/166/38 90/168/33 89/161/32 98/160/36
+f 88/148/31 91/151/33 90/150/33 85/145/30
+f 99/163/37 86/165/30 85/167/30 100/166/38
+f 84/144/29 87/147/30 86/146/30 81/141/29
+f 97/157/35 82/159/29 81/164/29 99/163/37
+f 98/160/36 97/157/35 99/163/37 100/166/38
+f 101/171/29 102/172/29 103/173/39 104/174/29
+f 105/175/40 106/176/40 107/177/41 108/178/41
+f 109/179/42 110/180/43 111/181/44 112/182/42
+f 113/183/23 114/184/23 115/185/23 116/186/23
+f 117/187/45 104/188/29 113/189/23
+f 118/190/46 116/191/23 109/192/42
+f 119/193/47 108/194/41 101/195/29
+f 120/196/48 112/197/42 105/198/40
+f 118/190/46 117/187/45 113/189/23 116/191/23
+f 104/199/29 103/200/39 114/184/23 113/183/23
+f 110/180/43 109/179/42 116/186/23 115/185/23
+f 120/196/48 118/190/46 109/192/42 112/197/42
+f 106/176/40 105/175/40 112/182/42 111/181/44
+f 119/193/47 120/196/48 105/198/40 108/194/41
+f 102/172/29 101/171/29 108/178/41 107/177/41
+f 117/187/45 119/193/47 101/195/29 104/188/29
+f 118/190/46 120/196/48 119/193/47 117/187/45

cw 9/models/roof/roof.mtl

@@ -0,0 +1,12 @@
+# Blender 3.4.1 MTL File: 'None'
+# www.blender.org
+
+newmtl None
+Ns 0.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.000000 0.000000 0.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 1

cw 9/models/roof/roof.obj

@@ -0,0 +1,156 @@
+# Blender 3.4.1
+# www.blender.org
+mtllib roof.mtl
+o top_2
+v -4.500000 2.299999 2.300000
+v -1.200000 2.299999 2.300000
+v 1.226617 2.301344 1.259008
+v 4.526618 2.301344 1.259008
+v 4.500000 2.299999 2.300000
+v 1.200000 2.299999 2.300000
+v -4.500000 2.300000 -2.299999
+v -4.502335 2.302826 -1.031157
+v 4.500000 2.300000 -2.299999
+v 1.200000 2.300000 -2.299999
+v -1.200000 2.300000 -2.299999
+v -4.473382 2.301344 1.259008
+v -1.173383 2.301344 1.259008
+v -1.202335 2.302826 -1.031157
+v 1.197665 2.302826 -1.031157
+v 4.497665 2.302826 -1.031157
+vn -0.0000 -1.0000 -0.0010
+vn -0.0000 -1.0000 -0.0013
+vn -0.0000 -1.0000 0.0008
+vn -0.0000 -1.0000 0.0022
+vt 0.182136 0.733848
+vt 0.247712 0.733848
+vt 0.303586 0.622952
+vt 0.356764 0.622952
+vt 0.356764 0.733848
+vt 0.303586 0.733848
+vt 0.182136 0.512055
+vt 0.182136 0.567503
+vt 0.356764 0.512055
+vt 0.303586 0.512055
+vt 0.247712 0.512055
+vt 0.182136 0.622952
+vt 0.247712 0.622952
+vt 0.247712 0.567503
+vt 0.303586 0.567503
+vt 0.356764 0.567503
+s 1
+usemtl None
+f 3/3/1 4/4/1 5/5/2 6/6/2
+f 12/12/1 13/13/1 2/2/2 1/1/2
+f 13/13/1 3/3/1 6/6/2 2/2/2
+f 14/14/3 15/15/3 3/3/1 13/13/1
+f 8/8/3 14/14/3 13/13/1 12/12/1
+f 15/15/3 16/16/3 4/4/1 3/3/1
+f 10/10/4 9/9/4 16/16/3 15/15/3
+f 7/7/4 11/11/4 14/14/3 8/8/3
+f 11/11/4 10/10/4 15/15/3 14/14/3
+o top_1
+v -5.000000 2.500000 -2.299999
+v -5.000000 2.500000 -2.500000
+v 4.500000 2.500000 -2.500000
+v 5.000000 2.500000 -2.500000
+v 5.000000 2.500000 2.300000
+v 5.000000 2.500000 2.500000
+v -4.500000 2.500000 2.500000
+v -5.000000 2.500000 2.500000
+v -4.500000 2.500000 2.300000
+v -5.000000 2.500000 2.300000
+v 4.500000 2.500000 2.300000
+v 4.500000 2.500000 2.500000
+v 0.502662 2.500000 -2.500000
+v -4.500000 2.500000 -2.500000
+v -1.200000 2.500000 2.300000
+v -1.200000 2.500000 2.500000
+v -0.487569 2.500000 -2.500000
+v -4.500000 2.500000 -2.299999
+v -0.487569 2.500000 -2.299999
+v -1.173383 2.501344 1.259008
+v -4.473382 2.501344 1.259008
+v 4.500000 2.500000 -2.299999
+v 5.000000 2.500000 -2.299999
+v 5.026618 2.501344 1.259008
+v 4.526618 2.501344 1.259008
+v -4.973382 2.501344 1.259008
+v -5.002335 2.502826 -1.031157
+v 1.226617 2.501344 1.259008
+v 1.200000 2.500000 2.300000
+v 0.502662 2.500000 -2.299999
+v 1.200000 2.500000 2.500000
+v 4.497665 2.502826 -1.031157
+v 1.197665 2.502826 -1.031157
+v -1.202335 2.502826 -1.031157
+v 4.997665 2.502826 -1.031157
+v -4.502335 2.502826 -1.031157
+vn -0.0000 1.0000 0.0006
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0011
+vn -0.0000 1.0000 0.0010
+vn -0.0000 1.0000 -0.0008
+vt 0.875000 0.512055
+vt 0.875000 0.500000
+vt 0.643236 0.500000
+vt 0.625000 0.500000
+vt 0.625000 0.733848
+vt 0.625000 0.750000
+vt 0.817864 0.750000
+vt 0.875000 0.750000
+vt 0.817864 0.733848
+vt 0.875000 0.733848
+vt 0.643236 0.733848
+vt 0.643236 0.750000
+vt 0.696414 0.500000
+vt 0.817864 0.500000
+vt 0.752288 0.733848
+vt 0.752288 0.750000
+vt 0.752288 0.500000
+vt 0.817864 0.512055
+vt 0.752288 0.512055
+vt 0.752288 0.622952
+vt 0.817864 0.622952
+vt 0.643236 0.512055
+vt 0.625000 0.512055
+vt 0.625000 0.622952
+vt 0.643236 0.622952
+vt 0.875000 0.622952
+vt 0.875000 0.567503
+vt 0.696414 0.622952
+vt 0.696414 0.733848
+vt 0.696414 0.512055
+vt 0.696414 0.750000
+vt 0.643236 0.567503
+vt 0.696414 0.567503
+vt 0.752288 0.567503
+vt 0.625000 0.567503
+vt 0.817864 0.567503
+s 1
+usemtl None
+f 25/25/5 26/26/5 24/24/6 23/23/6
+f 21/21/5 27/27/5 28/28/6 22/22/6
+f 31/31/5 25/25/5 23/23/6 32/32/6
+f 33/33/6 30/30/6 34/34/7 35/35/7
+f 36/36/8 37/37/8 25/25/5 31/31/5
+f 20/20/6 19/19/6 38/38/7 39/39/7
+f 40/40/8 41/41/8 27/27/5 21/21/5
+f 30/30/6 18/18/6 17/17/7 34/34/7
+f 37/37/8 42/42/8 26/26/5 25/25/5
+f 44/44/8 36/36/8 31/31/5 45/45/5
+f 29/29/6 33/33/6 35/35/7 46/46/7
+f 45/45/5 31/31/5 32/32/6 47/47/6
+f 27/27/5 45/45/5 47/47/6 28/28/6
+f 19/19/6 29/29/6 46/46/7 38/38/7
+f 41/41/8 44/44/8 45/45/5 27/27/5
+f 48/48/9 49/49/9 44/44/8 41/41/8
+f 49/49/9 50/50/9 36/36/8 44/44/8
+f 52/52/9 43/43/9 42/42/8 37/37/8
+f 51/51/9 48/48/9 41/41/8 40/40/8
+f 50/50/9 52/52/9 37/37/8 36/36/8
+f 35/35/7 34/34/7 52/52/9 50/50/9
+f 39/39/7 38/38/7 48/48/9 51/51/9
+f 34/34/7 17/17/7 43/43/9 52/52/9
+f 46/46/7 35/35/7 50/50/9 49/49/9
+f 38/38/7 46/46/7 49/49/9 48/48/9

cw 9/models/room/room_without_roof.mtl

@@ -0,0 +1,12 @@
+# Blender 3.4.1 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.003
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd D:/UAM/Grafika komputerowa/projekt/GRK_Room/cw 9/textures/wall/wall.png

cw 9/models/room/room_without_roof.obj

@@ -0,0 +1,529 @@
+# Blender 3.4.1
+# www.blender.org
+mtllib room_without_roof.mtl
+o room_Cube.009_room_Cube.013
+v 1.200000 1.970000 2.300000
+v 1.200000 1.970000 2.500000
+v -1.200000 1.970000 2.500000
+v -1.200000 1.970000 2.300000
+v 1.200000 1.015374 2.500000
+v -1.200000 1.015374 2.500000
+v 1.200000 1.015374 2.300000
+v -1.200000 1.015374 2.300000
+v 1.200000 1.970000 2.300000
+v 1.200000 1.970000 2.500000
+v 1.200000 1.015374 2.500000
+v 1.200000 1.015374 2.300000
+v -1.200000 1.970000 2.500000
+v -1.200000 1.970000 2.300000
+v -1.200000 1.015374 2.500000
+v -1.200000 1.015374 2.300000
+v -5.000000 1.970000 -2.300000
+v -5.000000 2.500000 -2.299999
+v -5.000000 2.500000 -2.500000
+v -5.000000 1.970000 -2.500000
+v 4.500000 1.970000 -2.500000
+v 4.500000 2.500000 -2.500000
+v 5.000000 2.500000 -2.500000
+v 5.000000 1.970000 -2.500000
+v 5.000000 1.970000 2.300000
+v 5.000000 2.500000 2.300000
+v 5.000000 2.500000 2.500000
+v 5.000000 1.970000 2.500000
+v -4.500000 1.970000 2.500000
+v -4.500000 2.500000 2.500000
+v -5.000000 2.500000 2.500000
+v -5.000000 1.970000 2.500000
+v 4.500000 -0.000000 2.300000
+v 5.000000 -0.000000 2.300000
+v 5.000000 -0.000000 2.500000
+v 4.500000 -0.000000 2.500000
+v -5.000000 2.500000 2.300000
+v 4.500000 2.500000 2.500000
+v 1.200000 -0.000000 2.300000
+v 1.200000 -0.000000 2.500000
+v 4.500000 1.970000 2.500000
+v 0.502662 1.970000 -2.500000
+v 0.502662 2.500000 -2.500000
+v -4.500000 2.500000 -2.500000
+v -4.500000 1.970000 -2.500000
+v -5.000000 -0.000000 2.300000
+v -4.500000 -0.000000 2.300000
+v -4.500000 -0.000000 2.500000
+v -5.000000 -0.000000 2.500000
+v -1.200000 2.500000 2.500000
+v -1.200000 1.970000 2.500000
+v -0.487569 2.500000 -2.500000
+v -5.000000 0.000000 -2.500000
+v -4.500000 0.000000 -2.500000
+v -4.500000 0.000000 -2.300000
+v -5.000000 0.000000 -2.300000
+v -4.973382 0.001344 1.259008
+v -4.473382 0.001344 1.259008
+v 0.502662 0.000000 -2.500000
+v 4.500000 0.000000 -2.500000
+v 4.500000 0.000000 -2.300000
+v 0.502662 0.000000 -2.300000
+v -1.200000 1.970000 2.300000
+v -4.500000 1.970000 2.300000
+v -4.500000 2.299999 2.300000
+v -1.200000 2.299999 2.300000
+v 5.000000 2.500000 -2.299999
+v 5.026618 2.501344 1.259008
+v -4.973382 2.501344 1.259008
+v 5.000000 0.000000 -2.500000
+v 5.000000 0.000000 -2.300000
+v 4.526618 0.001344 1.259008
+v 5.026618 0.001344 1.259008
+v 5.000000 1.970000 -2.300000
+v 5.026618 1.971344 1.259008
+v -5.000000 1.970000 2.300000
+v -5.002335 1.972826 -1.031157
+v -5.002335 2.502826 -1.031157
+v 4.526618 2.301344 1.259008
+v 4.500000 2.299999 2.300000
+v 1.200000 2.299999 2.300000
+v -4.502335 1.972826 -1.031157
+v -4.500000 1.970000 -2.300000
+v -4.500000 2.300000 -2.299999
+v -4.502335 2.302826 -1.031157
+v 4.526618 1.971344 1.259008
+v 4.500000 1.970000 2.300000
+v 0.502662 1.970000 -2.300000
+v 4.500000 1.970000 -2.300000
+v 4.500000 2.300000 -2.299999
+v 1.200000 2.300000 -2.299999
+v -0.487569 1.970000 -2.300000
+v -1.200000 2.300000 -2.299999
+v -4.473382 2.301344 1.259008
+v 1.200000 1.970000 2.300000
+v -0.487569 0.000000 -2.500000
+v -0.487569 0.000000 -2.300000
+v 1.200000 1.970000 2.500000
+v 1.200000 2.500000 2.500000
+v -0.487569 1.970000 -2.500000
+v -1.200000 -0.000000 2.300000
+v -1.200000 -0.000000 2.500000
+v 4.500000 1.015374 2.500000
+v 1.200000 1.015374 2.500000
+v -4.500000 1.015374 -2.500000
+v -0.487569 1.015374 -2.500000
+v -1.200000 1.015374 2.500000
+v -5.002335 1.018200 -1.031157
+v -5.000000 1.015374 -2.300000
+v -5.000000 1.015374 2.500000
+v -5.000000 1.015374 2.300000
+v 5.026618 1.016718 1.259008
+v 5.000000 1.015374 2.300000
+v 5.000000 1.015374 -2.500000
+v 5.000000 1.015374 -2.300000
+v -4.500000 1.015374 2.500000
+v -5.000000 1.015374 -2.500000
+v 0.502662 1.015374 -2.500000
+v 4.500000 1.015374 -2.500000
+v 5.000000 1.015374 2.500000
+v 0.502662 1.015374 -2.300000
+v 4.500000 1.015374 2.300000
+v 1.200000 1.015374 2.300000
+v -1.200000 1.015374 2.300000
+v -4.500000 1.015374 -2.300000
+v -0.487569 1.015374 -2.300000
+v 4.500000 1.015374 -2.300000
+v 4.526618 1.016718 1.259008
+v -4.502335 1.018200 -1.031157
+v -4.500000 1.015374 2.300000
+v -4.473382 1.016718 1.259008
+v -4.473382 1.971344 1.259008
+v 4.497665 1.018200 -1.031157
+v 4.497665 1.972826 -1.031157
+v 4.997665 1.018200 -1.031157
+v 4.997665 1.972826 -1.031157
+v -4.973382 1.971344 1.259008
+v -4.973382 1.016718 1.259008
+v 4.497665 2.302826 -1.031157
+v 4.997665 2.502826 -1.031157
+v 4.497665 0.002826 -1.031157
+v 4.997665 0.002826 -1.031157
+v -5.002335 0.002826 -1.031157
+v -4.502335 0.002826 -1.031157
+v -1.200000 1.970000 2.500000
+v -1.200000 1.970000 2.300000
+v -1.200000 1.015374 2.500000
+v -1.200000 1.015374 2.300000
+v 5.026618 1.016718 1.259008
+v 4.526618 1.016718 1.259008
+v 4.497665 1.018200 -1.031157
+v 4.997665 1.018200 -1.031157
+v 4.497665 1.972826 -1.031157
+v 4.997665 1.018200 -1.031157
+v 4.997665 1.972826 -1.031157
+v 4.497665 1.018200 -1.031157
+v 4.497665 1.972826 -1.031157
+v 4.997665 1.018200 -1.031157
+v 4.997665 1.972826 -1.031157
+v 5.026618 1.971344 1.259008
+v 4.526618 1.971344 1.259008
+v 4.497665 1.972826 -1.031157
+v 4.997665 1.972826 -1.031157
+v 5.026618 1.971344 1.259008
+v 4.526618 1.971344 1.259008
+v 5.026618 1.016718 1.259008
+v 4.526618 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.0009
+vn -0.0000 -0.0000 -1.0000
+vn 0.9999 -0.0000 0.0128
+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.0007
+vn -0.0000 -1.0000 0.0011
+vn -0.0000 -1.0000 -0.0010
+vn 1.0000 -0.0000 0.0009
+vn 1.0000 -0.0000 0.0066
+vn 1.0000 -0.0000 0.0065
+vn -0.9999 -0.0000 -0.0128
+vn -1.0000 -0.0000 0.0030
+vn -1.0000 -0.0000 0.0054
+vn 1.0000 -0.0000 -0.0030
+vn 1.0000 -0.0000 0.0018
+vn 1.0000 -0.0000 -0.0054
+vn -0.9997 -0.0000 -0.0256
+vn -1.0000 -0.0000 -0.0065
+vn 0.9997 -0.0000 0.0256
+vn 1.0000 -0.0000 -0.0051
+vn -0.0000 -1.0000 0.0008
+vn -1.0000 -0.0000 -0.0018
+vn -0.0000 1.0000 0.0006
+vn -0.0010 1.0000 0.0006
+vn -0.0002 1.0000 0.0014
+vn -0.0002 -0.0003 1.0000
+vn -0.0003 0.0005 1.0000
+vn -0.0001 -1.0000 -0.0002
+vn -0.0010 -1.0000 -0.0006
+vn -0.0000 0.0025 -1.0000
+vn -0.0000 -0.0025 -1.0000
+vt 0.000000 0.000000
+vt 0.000000 0.000000
+vt 0.000000 0.000000
+vt 0.000000 0.000000
+vt 0.476468 0.821414
+vt 0.476468 0.877288
+vt 0.303586 0.733848
+vt 0.247712 0.733848
+vt 0.303586 0.733848
+vt 0.571865 0.821414
+vt 0.476468 0.821414
+vt 0.303586 0.733848
+vt 0.571865 0.877288
+vt 0.247712 0.733848
+vt 0.476468 0.877288
+vt 0.247712 0.733848
+vt 0.571865 0.237945
+vt 0.625000 0.237945
+vt 0.625000 0.250000
+vt 0.571865 0.250000
+vt 0.571865 0.481764
+vt 0.625000 0.481764
+vt 0.625000 0.500000
+vt 0.571865 0.500000
+vt 0.571865 0.733848
+vt 0.625000 0.733848
+vt 0.625000 0.750000
+vt 0.571865 0.750000
+vt 0.571865 0.942864
+vt 0.625000 0.942864
+vt 0.625000 1.000000
+vt 0.625000 0.000000
+vt 0.571865 0.000000
+vt 0.571865 1.000000
+vt 0.356764 0.733848
+vt 0.924704 0.733848
+vt 0.375000 0.733848
+vt 0.375000 0.750000
+vt 0.356764 0.750000
+vt 0.375000 0.768236
+vt 0.625000 0.016152
+vt 0.625000 0.768236
+vt 0.303586 0.733848
+vt 0.693156 0.733848
+vt 0.303586 0.750000
+vt 0.375000 0.821414
+vt 0.571865 0.768236
+vt 0.571865 0.428586
+vt 0.625000 0.428586
+vt 0.625000 0.307136
+vt 0.571865 0.307136
+vt 0.125000 0.733848
+vt 0.375000 0.016152
+vt 0.182136 0.733848
+vt 0.164338 0.733848
+vt 0.182136 0.750000
+vt 0.375000 0.942864
+vt 0.125000 0.750000
+vt 0.375000 1.000000
+vt 0.375000 0.000000
+vt 0.625000 0.877288
+vt 0.571865 0.877288
+vt 0.625000 0.372712
+vt 0.125000 0.500000
+vt 0.375000 0.250000
+vt 0.182136 0.500000
+vt 0.375000 0.307136
+vt 0.182136 0.512055
+vt 0.125000 0.512055
+vt 0.375000 0.237945
+vt 0.125000 0.622952
+vt 0.375000 0.127048
+vt 0.182136 0.622952
+vt 0.303586 0.500000
+vt 0.375000 0.428586
+vt 0.356764 0.500000
+vt 0.375000 0.481764
+vt 0.356764 0.512055
+vt 0.303586 0.512055
+vt 0.449869 0.733848
+vt 0.247712 0.733848
+vt 0.164338 0.733848
+vt 0.182136 0.733848
+vt 0.164338 0.733848
+vt 0.182136 0.733848
+vt 0.449869 0.733848
+vt 0.625000 0.512055
+vt 0.625000 0.622952
+vt 0.625000 0.127048
+vt 0.375000 0.500000
+vt 0.375000 0.512055
+vt 0.356764 0.622952
+vt 0.375000 0.622952
+vt 0.571865 0.512055
+vt 0.571865 0.622952
+vt 0.571865 0.016152
+vt 0.571865 0.182497
+vt 0.625000 0.182497
+vt 0.356764 0.622952
+vt 0.356764 0.733848
+vt 0.924704 0.733848
+vt 0.693156 0.733848
+vt 0.182136 0.567503
+vt 0.182136 0.512055
+vt 0.182136 0.512055
+vt 0.182136 0.567503
+vt 0.356764 0.622952
+vt 0.924704 0.733848
+vt 0.356764 0.733848
+vt 0.303586 0.512055
+vt 0.356764 0.512055
+vt 0.356764 0.512055
+vt 0.303586 0.512055
+vt 0.247712 0.512055
+vt 0.247712 0.512055
+vt 0.182136 0.622952
+vt 0.693156 0.733848
+vt 0.247712 0.500000
+vt 0.375000 0.372712
+vt 0.247712 0.512055
+vt 0.571865 0.821414
+vt 0.625000 0.821414
+vt 0.571865 0.372712
+vt 0.247712 0.733848
+vt 0.449869 0.733848
+vt 0.247712 0.750000
+vt 0.375000 0.877288
+vt 0.476468 0.768236
+vt 0.476468 0.821414
+vt 0.476468 0.307136
+vt 0.414786 0.434393
+vt 0.476468 0.372712
+vt 0.476468 0.877288
+vt 0.476468 0.182497
+vt 0.476468 0.237945
+vt 0.476468 1.000000
+vt 0.476468 0.000000
+vt 0.476468 0.016152
+vt 0.476468 0.622952
+vt 0.476468 0.733848
+vt 0.476468 0.500000
+vt 0.476468 0.512055
+vt 0.476468 0.942864
+vt 0.476468 0.250000
+vt 0.441862 0.463192
+vt 0.476468 0.428586
+vt 0.476468 0.481764
+vt 0.476468 0.750000
+vt 0.303586 0.512055
+vt 0.356764 0.733848
+vt 0.924704 0.733848
+vt 0.693156 0.733848
+vt 0.449869 0.733848
+vt 0.247712 0.733848
+vt 0.182136 0.512055
+vt 0.247712 0.512055
+vt 0.356764 0.512055
+vt 0.356764 0.622952
+vt 0.182136 0.567503
+vt 0.182136 0.733848
+vt 0.164338 0.733848
+vt 0.182136 0.622952
+vt 0.182136 0.622952
+vt 0.356764 0.567503
+vt 0.356764 0.567503
+vt 0.476468 0.567503
+vt 0.571865 0.567503
+vt 0.571865 0.127048
+vt 0.476468 0.127048
+vt 0.356764 0.567503
+vt 0.625000 0.567503
+vt 0.356764 0.567503
+vt 0.375000 0.567503
+vt 0.125000 0.567503
+vt 0.375000 0.182497
+vt 0.182136 0.567503
+vt 0.571865 0.877288
+vt 0.247712 0.733848
+vt 0.476468 0.877288
+vt 0.247712 0.733848
+vt 0.476468 0.622952
+vt 0.356764 0.622952
+vt 0.356764 0.567503
+vt 0.476468 0.567503
+vt 0.356764 0.567503
+vt 0.356764 0.567503
+vt 0.476468 0.567503
+vt 0.571865 0.567503
+vt 0.571865 0.622952
+vt 0.356764 0.622952
+vt 0.356764 0.567503
+vt 0.571865 0.567503
+vt 0.571865 0.622952
+vt 0.356764 0.622952
+vt 0.476468 0.622952
+vt 0.356764 0.622952
+s 0
+usemtl Material.003
+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/19/3 20/20/3
+f 21/21/6 22/22/6 23/23/6 24/24/6
+f 25/25/7 26/26/7 27/27/4 28/28/4
+f 29/29/8 30/30/8 31/31/8 32/34/8
+f 33/35/9 34/37/10 35/38/1 36/39/1
+f 39/43/1 33/35/9 36/39/1 40/45/1
+f 28/28/8 27/27/8 38/42/8 41/47/8
+f 42/48/6 43/49/6 22/22/6 21/21/6
+f 20/20/6 19/19/6 44/50/6 45/51/6
+f 46/52/10 47/54/9 48/56/1 49/58/1
+f 51/62/8 50/61/8 30/30/8 29/29/8
+f 53/64/1 54/66/1 55/68/11 56/69/12
+f 57/71/13 58/73/13 47/54/9 46/52/10
+f 59/74/1 60/76/1 61/78/11 62/79/1
+f 63/80/6 64/82/6 65/84/6 66/86/6
+f 60/76/1 70/90/1 71/91/12 61/78/11
+f 72/92/13 73/93/13 34/37/10 33/35/9
+f 24/24/4 23/23/4 67/87/14 74/94/14
+f 75/95/15 68/88/16 26/26/7 25/25/7
+f 32/33/3 31/32/3 37/41/17 76/96/17
+f 77/97/18 78/98/19 18/18/5 17/17/5
+f 82/103/20 83/104/21 84/105/21 85/106/22
+f 86/107/17 87/109/23 80/100/23 79/99/24
+f 88/110/8 89/111/8 90/112/8 91/113/8
+f 83/104/8 92/114/8 93/115/8 84/105/8
+f 95/117/6 63/80/6 66/86/6 81/102/6
+f 54/66/1 96/118/1 97/120/1 55/68/11
+f 98/121/8 99/122/8 50/61/8 51/62/8
+f 45/51/6 44/50/6 52/63/6 100/123/6
+f 47/54/9 101/124/1 102/126/1 48/56/1
+f 41/47/8 38/42/8 99/122/8 98/121/8
+f 87/108/6 95/117/6 81/102/6 80/101/6
+f 92/114/8 88/110/8 91/113/8 93/115/8
+f 100/123/6 52/63/6 43/49/6 42/48/6
+f 101/124/1 39/43/1 40/45/1 102/126/1
+f 92/114/1 100/123/1 42/48/1 88/110/1
+f 103/128/8 41/47/8 98/121/8 104/129/8
+f 105/130/6 45/51/6 100/123/6 106/132/6
+f 108/134/18 77/97/18 17/17/5 109/135/5
+f 110/137/3 32/33/3 76/96/17 111/138/17
+f 112/139/15 75/95/15 25/25/7 113/140/7
+f 114/141/4 24/24/4 74/94/14 115/142/14
+f 107/133/8 51/62/8 29/29/8 116/143/8
+f 117/144/6 20/20/6 45/51/6 105/130/6
+f 118/146/6 42/48/6 21/21/6 119/147/6
+f 120/148/8 28/28/8 41/47/8 103/128/8
+f 116/143/8 29/29/8 32/34/8 110/136/8
+f 113/140/7 25/25/7 28/28/4 120/148/4
+f 119/147/6 21/21/6 24/24/6 114/141/6
+f 109/135/5 17/17/5 20/20/3 117/144/3
+f 121/149/3 118/145/3 59/74/3 62/79/3
+f 122/151/6 123/152/6 95/117/6 87/108/6
+f 125/155/8 126/156/8 92/114/8 83/104/8
+f 121/149/8 127/157/8 89/111/8 88/110/8
+f 128/158/17 122/150/23 87/109/23 86/107/17
+f 129/159/20 125/155/21 83/104/21 82/103/20
+f 124/153/6 130/161/6 64/82/6 63/80/6
+f 126/156/4 97/120/4 96/118/4 106/131/4
+f 130/160/25 131/162/7 132/163/7 64/83/25
+f 111/138/17 76/96/17 137/168/17 138/169/17
+f 134/165/18 86/107/17 79/99/24 139/170/19
+f 64/83/25 132/163/7 94/116/16 65/85/25
+f 76/96/17 37/41/17 69/89/24 137/168/17
+f 136/167/26 140/171/22 68/88/16 75/95/15
+f 141/172/27 142/173/27 73/93/13 72/92/13
+f 143/174/27 144/176/27 58/73/13 57/71/13
+f 56/69/12 55/68/11 144/176/27 143/174/27
+f 61/78/11 71/91/12 142/173/27 141/172/27
+f 74/94/14 67/87/14 140/171/22 136/167/26
+f 89/111/28 134/165/18 139/170/19 90/112/28
+f 115/142/14 74/94/14 136/167/26 135/166/26
+f 127/157/28 133/164/18 134/165/18 89/111/28
+f 132/163/7 82/103/20 85/106/22 94/116/16
+f 137/168/17 69/89/24 78/98/19 77/97/18
+f 57/72/24 138/169/17 108/134/18 143/175/19
+f 58/73/16 144/176/22 129/159/20 131/162/7
+f 61/78/28 141/172/19 133/164/18 127/157/28
+f 71/91/14 115/142/14 135/166/26 142/173/22
+f 46/53/17 111/138/17 138/169/17 57/72/24
+f 142/173/22 135/166/26 112/139/15 73/93/16
+f 141/172/19 72/92/24 128/158/17 133/164/18
+f 47/54/25 58/73/16 131/162/7 130/160/25
+f 92/114/4 126/156/4 106/131/4 100/123/4
+f 101/125/6 47/55/6 130/161/6 124/153/6
+f 144/176/22 55/68/21 125/155/21 129/159/20
+f 72/92/24 33/35/23 122/150/23 128/158/17
+f 62/79/8 61/78/8 127/157/8 121/149/8
+f 55/68/8 97/120/8 126/156/8 125/155/8
+f 39/44/6 101/125/6 124/153/6 123/152/6
+f 33/36/6 39/44/6 123/152/6 122/151/6
+f 88/110/3 42/48/3 118/145/3 121/149/3
+f 56/70/5 109/135/5 117/144/3 53/65/3
+f 60/77/6 119/147/6 114/141/6 70/90/6
+f 34/37/7 113/140/7 120/148/4 35/38/4
+f 48/57/8 116/143/8 110/136/8 49/59/8
+f 35/38/8 120/148/8 103/128/8 36/40/8
+f 59/75/6 118/146/6 119/147/6 60/77/6
+f 53/65/6 117/144/6 105/130/6 54/67/6
+f 102/127/8 107/133/8 116/143/8 48/57/8
+f 70/90/4 114/141/4 115/142/14 71/91/14
+f 73/93/16 112/139/15 113/140/7 34/37/7
+f 49/60/3 110/137/3 111/138/17 46/53/17
+f 143/175/19 108/134/18 109/135/5 56/70/5
+f 40/46/8 104/129/8 107/133/8 102/127/8
+f 54/67/6 105/130/6 106/132/6 96/119/6
+f 36/40/8 103/128/8 104/129/8 40/46/8
+f 138/169/29 131/162/29 129/159/29 108/134/29
+f 129/159/8 82/103/8 77/97/8 108/134/8
+f 82/103/10 132/163/10 137/168/10 77/97/10
+f 131/162/6 138/169/6 137/168/6 132/163/6
+f 124/154/6 63/81/6 146/178/8 148/180/8
+f 51/62/8 107/133/8 147/179/8 145/177/8
+f 151/183/29 150/182/29 149/181/30 152/184/31
+f 159/188/32 157/186/8 156/185/8 158/187/33
+f 162/191/10 163/192/34 160/189/35 161/190/10
+f 166/195/36 167/196/6 165/194/6 164/193/37
+l 155 153
+l 154 155

cw 9/models/vase/ceramic_vase_02_4k2.mtl

@@ -0,0 +1,13 @@
+# Blender MTL File: 'None'
+# Material Count: 1
+
+newmtl ceramic_vase_02
+Ns 250.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 concrete_floor_worn_001_disp_4k.png

cw 9/src/room.hpp

@@ -30,6 +30,7 @@ namespace models {
 	Core::RenderContext drawerContext;
 	Core::RenderContext planeContext;
 	Core::RenderContext roomContext;
+	Core::RenderContext roofContext;
 	Core::RenderContext deskContext;
 	Core::RenderContext spaceshipContext;
 	Core::RenderContext sphereContext;
@@ -57,11 +58,53 @@ namespace texture {
 	GLuint earth;
 	GLuint earthNormal;
 
+	GLuint spaceship;
+	GLuint spaceshipNormal;
+	GLuint spaceshipARM;
+
 	GLuint brick;
 	GLuint brickNormal;
 	GLuint brickARM;
 
 	GLuint floor;
+	GLuint floorNormal;
+	GLuint floorARM;
+
+	GLuint roof;
+	GLuint roofNormal;
+	GLuint roofARM;
+
+	GLuint wood;
+	GLuint woodNormal;
+	GLuint woodARM;
+
+	GLuint wood2;
+	GLuint woodNormal2;
+	GLuint woodARM2;
+
+	GLuint wood3;
+	GLuint woodNormal3;
+	GLuint woodARM3;
+
+	GLuint carpet;
+	GLuint carpetNormal;
+	GLuint carpetARM;
+
+	GLuint black;
+	GLuint blackNormal;
+	GLuint blackARM;
+
+	GLuint vase;
+	GLuint vaseNormal;
+	GLuint vaseARM;
+
+	GLuint white;
+	GLuint whiteNormal;
+	GLuint whiteARM;
+
+	GLuint red;
+	GLuint redNormal;
+	GLuint redARM;
 }
 
 Core::RenderContext cubeContext;
@@ -127,9 +170,10 @@ glm::mat4 lightVP = glm::ortho(-4.f, 3.f, -2.5f, 5.f, -10.0f, 20.0f) * glm::look
 glm::mat4 lightShipVP;
 
 float lastTime = -1.f;
-float deltaTime = 0.f;
+float deltaTime = 0.0f;
+float lastClickTime = 0.0f;
 
-float lightOn = 1.0f;
+bool lightOn = true;
 glm::vec3 carPosTranform = glm::vec3(0, 0, 0);
 
 void updateDeltaTime(float time) {
@@ -237,7 +281,7 @@ void drawSkyBox(Core::RenderContext& context, glm::mat4 modelMatrix) {
 	glUniformMatrix4fv(glGetUniformLocation(programSkybox, "transformation"), 1, GL_FALSE, (float*)&transformation);
 	glUniform1i(glGetUniformLocation(programSkybox, "skybox"), 0);
 	glUniform1f(glGetUniformLocation(programSkybox, "exposition"), exposition);
-	if (lightOn > 0.0f)
+	if (lightOn)
 		glUniform3f(glGetUniformLocation(program, "lightPos"), pointlightPos.x, pointlightPos.y, pointlightPos.z);
 	else
 		glUniform3f(glGetUniformLocation(program, "lightPos"), 1000.f, 1000.f, 1000.f);
@@ -245,9 +289,7 @@ void drawSkyBox(Core::RenderContext& context, glm::mat4 modelMatrix) {
 	glEnable(GL_DEPTH_TEST);
 }
 
-
+void drawObjectPBR(Core::RenderContext& context, glm::mat4 modelMatrix, GLuint textureID, GLuint textureNormalID, GLuint textureARMID) {
-
-void drawObjectPBR(Core::RenderContext& context, glm::mat4 modelMatrix, glm::vec3 color, float roughness, float metallic) {
 	glActiveTexture(GL_TEXTURE0);
 	glUniform1i(glGetUniformLocation(program, "depthMap"), 0);
 	glBindTexture(GL_TEXTURE_2D, depthMap);
@@ -265,17 +307,12 @@ 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);
-
-	//glUniform3f(glGetUniformLocation(program, "color"), color.x, color.y, color.z);
-
 	glUniform3f(glGetUniformLocation(program, "cameraPos"), cameraPos.x, cameraPos.y, cameraPos.z);
 
 	glUniform3f(glGetUniformLocation(program, "sunDir"), sunDir.x, sunDir.y, sunDir.z);
 	glUniform3f(glGetUniformLocation(program, "sunColor"), sunColor.x, sunColor.y, sunColor.z);
 
-	if (lightOn > 0.0f)
+	if (lightOn)
 		glUniform3f(glGetUniformLocation(program, "lightPos"), pointlightPos.x, pointlightPos.y, pointlightPos.z);
 	else
 		glUniform3f(glGetUniformLocation(program, "lightPos"), 1000.f, 1000.f, 1000.f);
@@ -287,59 +324,12 @@ 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(textureID, "colorTexture", program, 2);
-	Core::SetActiveTexture(texture::brickNormal, "normalSampler", program, 3);
+	Core::SetActiveTexture(textureNormalID, "normalSampler", program, 3);
-	Core::SetActiveTexture(texture::brickARM, "armSampler", program, 4);
+	Core::SetActiveTexture(textureARMID, "armSampler", program, 4);
 	Core::DrawContext(context);
 }
 
-void drawObjectTexture(Core::RenderContext& context, glm::mat4 modelMatrix, GLuint textureID, glm::vec3 color, float roughness, float metallic) {
-	glUseProgram(programTex);
-
-	glm::mat4 viewProjectionMatrix = createPerspectiveMatrix() * createCameraMatrix();
-	glm::mat4 transformation = viewProjectionMatrix * modelMatrix;
-
-	glUniformMatrix4fv(glGetUniformLocation(programTex, "transformation"), 1, GL_FALSE, (float*)&transformation);
-	glUniformMatrix4fv(glGetUniformLocation(programTex, "modelMatrix"), 1, GL_FALSE, (float*)&modelMatrix);
-
-	glUniform1f(glGetUniformLocation(programTex, "exposition"), exposition);
-
-	glUniform1f(glGetUniformLocation(programTex, "roughness"), roughness);
-	glUniform1f(glGetUniformLocation(programTex, "metallic"), metallic);
-	glUniform3f(glGetUniformLocation(programTex, "color"), color.x, color.y, color.z);
-
-	glUniform3f(glGetUniformLocation(programTex, "cameraPos"), cameraPos.x, cameraPos.y, cameraPos.z);
-
-	glUniform3f(glGetUniformLocation(programTex, "sunDir"), sunDir.x, sunDir.y, sunDir.z);
-	glUniform3f(glGetUniformLocation(programTex, "sunColor"), sunColor.x, sunColor.y, sunColor.z);
-
-	if (lightOn > 0.0f)
-		glUniform3f(glGetUniformLocation(programTex, "lightPos"), pointlightPos.x, pointlightPos.y, pointlightPos.z);
-	else
-		glUniform3f(glGetUniformLocation(programTex, "lightPos"), 1000.f, 1000.f, 1000.f);
-	glUniform3f(glGetUniformLocation(programTex, "lightColor"), pointlightColor.x, pointlightColor.y, pointlightColor.z);
-
-
-	glUniform3f(glGetUniformLocation(programTex, "spotlightConeDir"), spotlightConeDir.x, spotlightConeDir.y, spotlightConeDir.z);
-	glUniform3f(glGetUniformLocation(programTex, "spotlightPos"), spotlightPos.x, spotlightPos.y, spotlightPos.z);
-	glUniform3f(glGetUniformLocation(programTex, "spotlightColor"), spotlightColor.x, spotlightColor.y, spotlightColor.z);
-	glUniform1f(glGetUniformLocation(program, "spotlightPhi"), spotlightPhi);
-
-	glActiveTexture(GL_TEXTURE0);
-	glUniform1i(glGetUniformLocation(programTex, "depthMapSun"), 0);
-	glBindTexture(GL_TEXTURE_2D, depthMap);
-	glUniformMatrix4fv(glGetUniformLocation(programTex, "LightVPSun"), 1, GL_FALSE, (float*)&lightVP);
-
-	glActiveTexture(GL_TEXTURE1);
-	glUniform1i(glGetUniformLocation(programTex, "depthMapShip"), 1);
-	glBindTexture(GL_TEXTURE_2D, depthMapShip);
-	glUniformMatrix4fv(glGetUniformLocation(programTex, "lightShipVP"), 1, GL_FALSE, (float*)&lightShipVP);
-
-	Core::SetActiveTexture(textureID, "colorTexture", programTex, 0);
-	Core::DrawContext(context);
-	glUseProgram(0);
-}
-
 void renderShadowapSun(GLuint depthFBO, glm::mat4 light) {
 	float time = glfwGetTime();
 	glViewport(0, 0, SHADOW_WIDTH, SHADOW_HEIGHT);
@@ -534,7 +524,7 @@ void renderScene(GLFWwindow* window)
 
 	drawSkyBox(cubeContext, glm::translate(cameraPos));
 
-	if (lightOn > 0.0f) {
+	if (lightOn) {
 		glUseProgram(programSun);
 		glm::mat4 viewProjectionMatrix = createPerspectiveMatrix() * createCameraMatrix();
 		glm::mat4 transformation = viewProjectionMatrix * glm::translate(pointlightPos) * glm::scale(glm::vec3(0.1));
@@ -546,34 +536,33 @@ void renderScene(GLFWwindow* window)
 
 	glUseProgram(program);
 
-	drawObjectPBR(models::couchContext, glm::scale(glm::vec3(0.5f)) * glm::translate(glm::vec3(8.4f, 0, -0.4f)) * glm::eulerAngleY(3.15f), glm::vec3(0.03f, 0.03f, 0.03f), 0.2f, 0.0f);
+	//drawObjectPBR(models::couchContext, glm::scale(glm::vec3(0.5f)) * glm::translate(glm::vec3(8.4f, 0, -0.4f)) * glm::eulerAngleY(3.15f), glm::vec3(0.03f, 0.03f, 0.03f), 0.2f, 0.0f);
-	drawObjectPBR(models::coffeeTableContext, glm::translate(glm::vec3(2.8f, 0, 0.5f)), glm::vec3(1.f, 1.f, 1.f), 0.4f, 0.0f);
+	drawObjectPBR(models::coffeeTableContext, glm::translate(glm::vec3(2.8f, 0, 0.5f)), texture::white, texture::whiteNormal, texture::whiteARM);
-	drawObjectPBR(models::doorContext, glm::mat4(), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
+	drawObjectPBR(models::doorContext, glm::mat4(), texture::wood, texture::woodNormal, texture::woodARM);
-	drawObjectPBR(models::planeContext, glm::mat4(), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
+	drawObjectPBR(models::planeContext, glm::mat4(), texture::floor, texture::floorNormal, texture::floorARM);
-	drawObjectPBR(models::roomContext, glm::mat4(), glm::vec3(1.0f, 1.0f, 1.0f), 0.8f, 0.0f);
+	drawObjectPBR(models::roomContext, glm::mat4(), texture::brick, texture::brickNormal, texture::brickARM);
-	drawObjectPBR(models::deskContext, glm::eulerAngleY(3.14f) * glm::translate(glm::vec3(2.8f, 0.0f, 1.9f)), glm::vec3(1.0f, 1.0f, 1.0f), 0.0f, 0.0f);
+	drawObjectPBR(models::roofContext, glm::mat4(), texture::roof, texture::roofNormal, texture::roofARM);
-	drawObjectPBR(models::displayScreenContext, glm::scale(glm::vec3(0.1, 0.1, 0.1)) * glm::translate(glm::vec3(-28.5f, 9.0f, -20.0f)), glm::vec3(0.0f, 0.0f, 0.0f), 0.0f, 0.3f);
+	drawObjectPBR(models::deskContext, glm::eulerAngleY(3.14f) * glm::translate(glm::vec3(2.8f, 0.0f, 1.9f)), texture::wood2, texture::woodNormal2, texture::woodARM2);
+	drawObjectPBR(models::displayScreenContext, glm::scale(glm::vec3(0.1, 0.1, 0.1)) * glm::translate(glm::vec3(-28.5f, 9.0f, -20.0f)), texture::black, texture::blackNormal, texture::blackARM);
 
-	drawObjectPBR(models::chairContext, glm::scale(glm::vec3(1.0f, 1.2f, 1.0f)) * glm::eulerAngleY(3.14f) * glm::translate(glm::vec3(2.8f, 0.0f, 1.5f)), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.0f, 0.2f);
+	drawObjectPBR(models::chairContext, glm::scale(glm::vec3(1.0f, 1.2f, 1.0f)) * glm::eulerAngleY(3.14f) * glm::translate(glm::vec3(2.8f, 0.0f, 1.5f)), texture::wood, texture::woodNormal, texture::woodARM);
-	drawObjectPBR(models::tvContext, glm::mat4(), glm::vec3(0.0f, 0.0f, 0.0f), 0.0f, 0.2f);
+	drawObjectPBR(models::tvContext, glm::mat4(), texture::black, texture::blackNormal, texture::blackARM);
-	drawObjectPBR(models::ps5Context, glm::mat4(), glm::vec3(0.0f, 0.0f, 0.0f), 0.0f, 0.2f);
+	drawObjectPBR(models::ps5Context, glm::mat4(), texture::black, texture::blackNormal, texture::blackARM);
-	drawObjectPBR(models::tvStandContext, glm::mat4(), glm::vec3(1.0f, 1.0f, 1.0f), 0.0f, 0.2f);
+	drawObjectPBR(models::tvStandContext, glm::mat4(), texture::wood, texture::woodNormal, texture::woodARM);
-	drawObjectPBR(models::carpetContext, glm::mat4(), glm::vec3(0.6745098039215686f, 0.6352941176470588f, 0.6235294117647059f), 0.0f, 0.2f);
+	drawObjectPBR(models::carpetContext, glm::mat4(), texture::carpet, texture::carpetNormal, texture::carpetARM);
-	drawObjectPBR(models::cabinet1Context, glm::mat4(), glm::vec3(1.0f, 1.0f, 1.0f), 0.0f, 0.2f);
+	drawObjectPBR(models::cabinet1Context, glm::mat4(), texture::wood3, texture::woodNormal3, texture::woodARM3);
-	drawObjectPBR(models::cabinet2Context, glm::mat4(), glm::vec3(1.0f, 1.0f, 1.0f), 0.0f, 0.2f);
+	drawObjectPBR(models::cabinet2Context, glm::mat4(), texture::wood, texture::woodNormal, texture::woodARM);
-	drawObjectPBR(models::lampContext, glm::translate(glm::vec3(0.022f, 0.15f, 0.04f)), glm::vec3(1.0f, 1.0f, 1.0f), 0.0f, 0.2f);
+	drawObjectPBR(models::lampContext, glm::translate(glm::vec3(0.022f, 0.15f, 0.04f)), texture::black, texture::blackNormal, texture::blackARM);
-	drawObjectPBR(models::bookshelfContext, glm::mat4(), glm::vec3(1.0f, 1.0f, 1.0f), 0.0f, 0.2f);
+	drawObjectPBR(models::bookshelfContext, glm::mat4(), texture::wood, texture::woodNormal, texture::woodARM);
-	drawObjectPBR(models::lightSwitchContext, glm::mat4(), glm::vec3(1.0f, 1.0f, 1.0f), 0.0f, 0.2f);
+	drawObjectPBR(models::lightSwitchContext, glm::mat4(), texture::white, texture::whiteNormal, texture::whiteARM);
-	drawObjectPBR(models::easelContext, glm::mat4(), glm::vec3(0.6745098039215686f, 0.6352941176470588f, 0.6235294117647059f), 0.0f, 0.2f);
+	drawObjectPBR(models::easelContext, glm::mat4(), texture::wood2, texture::woodNormal2, texture::woodARM2);
-	drawObjectPBR(models::carContext, glm::translate(carPosTranform), glm::vec3(1.0f, 0.0f, 0.0f), 0.0f, 0.2f);
+	drawObjectPBR(models::carContext, glm::translate(carPosTranform), texture::red, texture::redNormal, texture::redARM);
-	drawObjectPBR(models::vaseContext, glm::translate(glm::vec3(1.1f, 1.41f, -2.2f)), glm::vec3(244.0f / 255.0f, 245.0f / 255.0f, 220.0f / 255.0f), 0.0f, 0.2f);
+	drawObjectPBR(models::vaseContext, glm::translate(glm::vec3(1.1f, 1.41f, -2.2f)), texture::vase, texture::vaseNormal, texture::vaseARM);
 	
 	// draw windows
-	drawObjectPBR(models::windowContext, glm::scale(glm::vec3(1.0f, 1.0f, 2.3f)) * glm::translate(glm::vec3(-2.9f, 0, -0.2f)), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
+	drawObjectPBR(models::windowContext, glm::scale(glm::vec3(1.0f, 1.0f, 2.3f)) * glm::translate(glm::vec3(-2.9f, 0, -0.2f)), texture::wood, texture::woodNormal, texture::woodARM);
-	drawObjectPBR(models::windowContext, glm::eulerAngleY(3.14f) * glm::scale(glm::vec3(1.0f, 1.0f, 2.3f)) * glm::translate(glm::vec3(-2.9f, 0, -0.3f)), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
+	drawObjectPBR(models::windowContext, glm::eulerAngleY(3.14f) * glm::scale(glm::vec3(1.0f, 1.0f, 2.3f)) * glm::translate(glm::vec3(-2.9f, 0, -0.3f)), texture::wood, texture::woodNormal, texture::woodARM);
-	drawObjectPBR(models::windowContext, glm::eulerAngleY(1.57f) * glm::scale(glm::vec3(1.0f, 1.0f, 2.45f)) * glm::translate(glm::vec3(-0.6f, 0, -0.25f)), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
+	drawObjectPBR(models::windowContext, glm::eulerAngleY(1.57f) * glm::scale(glm::vec3(1.0f, 1.0f, 2.45f)) * glm::translate(glm::vec3(-0.6f, 0, -0.25f)), texture::wood, texture::woodNormal, texture::woodARM);
-
-	//drawObjectTexture(models::planeContext, glm::mat4(), texture::floor, glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
 
 	glm::vec3 spaceshipSide = glm::normalize(glm::cross(spaceshipDir, glm::vec3(0.f, 1.f, 0.f)));
 	glm::vec3 spaceshipUp = glm::normalize(glm::cross(spaceshipSide, spaceshipDir));
@@ -588,8 +577,7 @@ void renderScene(GLFWwindow* window)
 	//drawObjectPBR(shipContext,
 	drawObjectPBR(models::spaceshipContext,
 		glm::translate(spaceshipPos) * specshipCameraRotrationMatrix * glm::eulerAngleY(glm::pi<float>()) * glm::scale(glm::vec3(0.03f)),
-		glm::vec3(0.3, 0.3, 0.5),
+		texture::spaceship, texture::spaceshipNormal, texture::spaceshipARM
-		0.2,1.0
 	);
 
 
@@ -648,32 +636,70 @@ void init(GLFWwindow* window)
 	loadCubemap(faces);
 	initDepthMap();
 
-	programTex = shaderLoader.CreateProgram("shaders/shader_tex.vert", "shaders/shader_tex.frag");
-	texture::earth = Core::LoadTexture("textures/room/earth.png");
-	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");
 
+	texture::spaceship = Core::LoadTexture("textures/spaceship/spaceship_albedo.png");
+	texture::spaceshipNormal = Core::LoadTexture("textures/spaceship/spaceship_normal.png");
+	texture::spaceshipARM = Core::LoadTexture("textures/spaceship/spaceship_amr.png");
+
+	texture::floor = Core::LoadTexture("textures/floor/floor.jpg");
+	texture::floorNormal = Core::LoadTexture("textures/floor/floor_normal.png");
+	texture::floorARM = Core::LoadTexture("textures/floor/floor_arm.png");
+
+	texture::roof = Core::LoadTexture("textures/roof/roof.png");
+	texture::roofNormal = Core::LoadTexture("textures/roof/roof_normal.png");
+	texture::roofARM = Core::LoadTexture("textures/roof/roof_arm.png");
+
+	texture::wood = Core::LoadTexture("textures/wood/wood.jpg");
+	texture::woodNormal = Core::LoadTexture("textures/wood/wood_normal.png");
+	texture::woodARM = Core::LoadTexture("textures/wood/wood_arm.png");
+
+	texture::wood2 = Core::LoadTexture("textures/wood_2/wood.jpg");
+	texture::woodNormal2 = Core::LoadTexture("textures/wood_2/wood_normal.png");
+	texture::woodARM2 = Core::LoadTexture("textures/wood_2/wood_arm.png");
+
+	texture::wood3 = Core::LoadTexture("textures/wood_3/wood.jpg");
+	texture::woodNormal3 = Core::LoadTexture("textures/wood_3/wood_normal.png");
+	texture::woodARM3 = Core::LoadTexture("textures/wood_3/wood_arm.png");
+
+	texture::carpet = Core::LoadTexture("textures/carpet/carpet.jpg");
+	texture::carpetNormal = Core::LoadTexture("textures/carpet/carpet_normal.png");
+	texture::carpetARM = Core::LoadTexture("textures/carpet/carpet_arm.png");
+
+	texture::black = Core::LoadTexture("textures/black/black.png");
+	texture::blackNormal = Core::LoadTexture("textures/black/black_normal.png");
+	texture::blackARM = Core::LoadTexture("textures/black/black_arm.png");
+
+	texture::vase = Core::LoadTexture("textures/vase/vase.png");
+	texture::vaseNormal = Core::LoadTexture("textures/vase/vase_normal.png");
+	texture::vaseARM = Core::LoadTexture("textures/vase/vase_arm.png");
+
+	texture::white = Core::LoadTexture("textures/white/white.png");
+	texture::whiteNormal = Core::LoadTexture("textures/white/white_normal.png");
+	texture::whiteARM = Core::LoadTexture("textures/white/white_arm.png");
+
+	texture::white = Core::LoadTexture("textures/red/red.png");
+	texture::whiteNormal = Core::LoadTexture("textures/red/red_normal.png");
+	texture::whiteARM = Core::LoadTexture("textures/red/red_arm.png");
+
 	loadModelToContext("./models/sphere.obj", sphereContext);
 	loadModelToContext("./models/cube.obj", cubeContext);
 	loadModelToContext("./models/couch.obj", models::couchContext);
 	loadModelToContext("./models/coffeeTable.obj", models::coffeeTableContext);
-	loadModelToContext("./models/ceramic_vase_02_4k.obj", models::vaseContext);
 	loadModelToContext("./models/door.obj", models::doorContext);
 	loadModelToContext("./models/drawer.obj", models::drawerContext);
 	loadModelToContext("./models/plane.obj", models::planeContext);
-	//loadModelToContext("./models/room_2.obj", models::roomContext);
+	loadModelToContext("./models/room/room_without_roof.obj", models::roomContext);
-	loadModelToContext("./models/room/room3.obj", models::roomContext);
+	loadModelToContext("./models/roof/roof.obj", models::roofContext);
 	loadModelToContext("./models/spaceship.obj", models::spaceshipContext);
 	loadModelToContext("./models/sphere.obj", models::sphereContext);
 	loadModelToContext("./models/window.obj", models::windowContext);
 	loadModelToContext("./models/test.obj", models::testContext);
-	loadModelToContext("./models/desk.obj", models::deskContext);
+	loadModelToContext("./models/desk/desk2.obj", models::deskContext);
 	loadModelToContext("./models/monitor.obj", models::displayScreenContext);
-	loadModelToContext("./models/chair.obj", models::chairContext);
+	loadModelToContext("./models/chair/chair2.obj", models::chairContext);
 	loadModelToContext("./models/tv/tv.obj", models::tvContext);
 	loadModelToContext("./models/tv_stand/tv_stand.obj", models::tvStandContext);
 	loadModelToContext("./models/ps5/ps5.obj", models::ps5Context);
@@ -744,10 +770,10 @@ void processInput(GLFWwindow* window)
 		printf("exposition = %ff);\n", exposition);
 	}
 
-	if (glfwGetKey(window, GLFW_KEY_L) == GLFW_PRESS)
+	if (glfwGetKey(window, GLFW_KEY_L) == GLFW_PRESS && glfwGetTime() > lastClickTime + 0.2f) {
-		lightOn -= 1.0f;
+		lightOn = !lightOn;
-	if (glfwGetKey(window, GLFW_KEY_K) == GLFW_PRESS)
+		lastClickTime = glfwGetTime();
-		lightOn += 1.0f;
+	}
 
 	//	if (glfwGetKey(window, GLFW_KEY_LEFT) == GLFW_PRESS)
 	if (glfwGetKey(window, GLFW_KEY_UP) == GLFW_PRESS)