diff --git a/.vs/grk-project/v16/.suo b/.vs/grk-project/v16/.suo index d9784ad..ab3cbc1 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 922d7cc..55e27af 100644 Binary files a/.vs/grk-project/v16/Browse.VC.db and b/.vs/grk-project/v16/Browse.VC.db differ diff --git a/Debug/room.exe b/Debug/room.exe index e583eff..109927e 100644 Binary files a/Debug/room.exe and b/Debug/room.exe differ diff --git a/Debug/room.pdb b/Debug/room.pdb index c15c930..fa733d7 100644 Binary files a/Debug/room.pdb and b/Debug/room.pdb differ diff --git a/cw 9/Debug/Box.obj b/cw 9/Debug/Box.obj index 9e87526..946766f 100644 Binary files a/cw 9/Debug/Box.obj and b/cw 9/Debug/Box.obj differ diff --git a/cw 9/Debug/Camera.obj b/cw 9/Debug/Camera.obj index 328937f..38f7c58 100644 Binary files a/cw 9/Debug/Camera.obj and b/cw 9/Debug/Camera.obj differ diff --git a/cw 9/Debug/Render_Utils.obj b/cw 9/Debug/Render_Utils.obj index da00406..03c15a6 100644 Binary files a/cw 9/Debug/Render_Utils.obj and b/cw 9/Debug/Render_Utils.obj differ diff --git a/cw 9/Debug/SOIL.obj b/cw 9/Debug/SOIL.obj index aa9d825..de25109 100644 Binary files a/cw 9/Debug/SOIL.obj and b/cw 9/Debug/SOIL.obj differ diff --git a/cw 9/Debug/Shader_Loader.obj b/cw 9/Debug/Shader_Loader.obj index 1963716..f045d29 100644 Binary files a/cw 9/Debug/Shader_Loader.obj and b/cw 9/Debug/Shader_Loader.obj differ diff --git a/cw 9/Debug/Texture.obj b/cw 9/Debug/Texture.obj index 6f998a9..e3aa50d 100644 Binary files a/cw 9/Debug/Texture.obj and b/cw 9/Debug/Texture.obj differ diff --git a/cw 9/Debug/grk-cw9.log b/cw 9/Debug/grk-cw9.log index 0ebdc9a..432a4b4 100644 --- a/cw 9/Debug/grk-cw9.log +++ b/cw 9/Debug/grk-cw9.log @@ -1,39 +1,33 @@ -C:\software\vs19\MSBuild\Microsoft\VC\v160\Microsoft.CppBuild.targets(513,5): warning MSB8028: The intermediate directory (Debug\) contains files shared from another project (grk-cw9.vcxproj). This can lead to incorrect clean and rebuild behavior. +C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Microsoft\VC\v160\Microsoft.CppBuild.targets(513,5): warning MSB8028: Katalog pośredni (Debug\) zawiera pliki udostępnione z innego projektu (grk-cw9.vcxproj). Może to spowodować niepoprawne zachowanie podczas oczyszczania i ponownej kompilacji. main.cpp -C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: 'APIENTRY': macro redefinition -C:\Users\s464961\Source\Repos\GRK_Room\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : see previous definition of 'APIENTRY' -C:\Users\s464961\source\repos\GRK_Room\cw 9\src\room.hpp(107,30): warning C4305: 'initializing': truncation from 'double' to 'float' -C:\Users\s464961\source\repos\GRK_Room\cw 9\src\room.hpp(122,38): warning C4305: '=': truncation from 'double' to 'float' -C:\Users\s464961\source\repos\GRK_Room\cw 9\src\room.hpp(145,16): warning C4305: 'initializing': truncation from 'double' to 'float' -C:\Users\s464961\source\repos\GRK_Room\cw 9\src\room.hpp(166,16): warning C4305: 'initializing': truncation from 'double' to 'float' -C:\Users\s464961\source\repos\GRK_Room\cw 9\src\room.hpp(185,15): warning C4101: 'textureID': unreferenced local variable -C:\Users\s464961\source\repos\GRK_Room\cw 9\src\room.hpp(268,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data -C:\Users\s464961\source\repos\GRK_Room\cw 9\src\room.hpp(279,96): warning C4305: 'argument': truncation from 'double' to 'T' +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\annas\Desktop\grafika_proj\GRK_Room\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : zobacz poprzednią definicję „APIENTRY” +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(175,30): warning C4305: "inicjowanie": obcięcie z "double" do "float" +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(194,38): warning C4305: "=": obcięcie z "double" do "float" +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(217,16): warning C4305: "inicjowanie": obcięcie z "double" do "float" +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(236,16): warning C4305: "inicjowanie": obcięcie z "double" do "float" +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(254,15): warning C4101: "textureID": lokalna zmienna, do której nie istnieje odwołanie +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(342,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(348,96): warning C4305: "argument": obcięcie z "double" do "T" with [ T=float ] -C:\Users\s464961\source\repos\GRK_Room\cw 9\src\room.hpp(283,59): warning C4305: 'argument': truncation from 'double' to 'T' +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(351,59): warning C4305: "argument": obcięcie z "double" do "T" with [ T=float ] -C:\Users\s464961\source\repos\GRK_Room\cw 9\src\room.hpp(440,29): warning C4018: '<': signed/unsigned mismatch -C:\Users\s464961\source\repos\GRK_Room\cw 9\src\room.hpp(480,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data -C:\Users\s464961\source\repos\GRK_Room\cw 9\src\room.hpp(493,108): warning C4305: 'argument': truncation from 'double' to 'T' +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(500,29): warning C4018: "<": niezgodność typu ze znakiem/bez znaku +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(525,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(539,109): warning C4305: "argument": obcięcie z "double" do "T" with [ T=float ] -C:\Users\s464961\source\repos\GRK_Room\cw 9\src\room.hpp(504,59): warning C4305: 'argument': truncation from 'double' to 'T' - with - [ - T=float - ] -C:\Users\s464961\source\repos\GRK_Room\cw 9\src\room.hpp(505,37): warning C4305: 'argument': truncation from 'double' to 'float' -C:\Users\s464961\source\repos\GRK_Room\cw 9\src\room.hpp(538,2): warning C4305: 'argument': truncation from 'double' to 'float' -C:\Users\s464961\source\repos\GRK_Room\cw 9\src\room.hpp(662,21): warning C4305: '-=': truncation from 'double' to 'float' -C:\Users\s464961\source\repos\GRK_Room\cw 9\src\room.hpp(664,21): warning C4305: '+=': truncation from 'double' to 'float' -Box.obj : warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/INCREMENTAL:NO' specification -LINK : warning LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library - grk-cw9.vcxproj -> C:\Users\s464961\Source\Repos\GRK_Room\Debug\room.exe +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(782,21): warning C4305: "-=": obcięcie z "double" do "float" +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(784,21): warning C4305: "+=": obcięcie z "double" do "float" +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(794,30): warning C4244: "=": konwersja z "double" do "float", możliwa utrata danych +Box.obj : warning LNK4075: zignorowano opcję „/EDITANDCONTINUE” z powodu określenia opcji „/INCREMENTAL:NO” +LINK : warning LNK4098: domyślna biblioteka „MSVCRT” powoduje konflikt z innymi bibliotekami; użyj opcji /NODEFAULTLIB:biblioteka + grk-cw9.vcxproj -> C:\Users\annas\Desktop\grafika_proj\GRK_Room\Debug\room.exe diff --git a/cw 9/Debug/image_DXT.obj b/cw 9/Debug/image_DXT.obj index a4946fe..9fe991b 100644 Binary files a/cw 9/Debug/image_DXT.obj and b/cw 9/Debug/image_DXT.obj differ diff --git a/cw 9/Debug/image_helper.obj b/cw 9/Debug/image_helper.obj index 27775a6..fc6da08 100644 Binary files a/cw 9/Debug/image_helper.obj and b/cw 9/Debug/image_helper.obj differ diff --git a/cw 9/Debug/main.obj b/cw 9/Debug/main.obj index 066c1e2..e3121fb 100644 Binary files a/cw 9/Debug/main.obj and b/cw 9/Debug/main.obj differ diff --git a/cw 9/Debug/room.exe.recipe b/cw 9/Debug/room.exe.recipe index 19f1cab..1e322a1 100644 --- a/cw 9/Debug/room.exe.recipe +++ b/cw 9/Debug/room.exe.recipe @@ -2,7 +2,7 @@ - C:\Users\Genos\Source\Repos\GRK_Room22\Debug\room.exe + C:\Users\annas\Desktop\grafika_proj\GRK_Room\Debug\room.exe diff --git a/cw 9/Debug/room.tlog/CL.command.1.tlog b/cw 9/Debug/room.tlog/CL.command.1.tlog index 5d46b65..cf222ef 100644 Binary files a/cw 9/Debug/room.tlog/CL.command.1.tlog and b/cw 9/Debug/room.tlog/CL.command.1.tlog differ diff --git a/cw 9/Debug/room.tlog/CL.read.1.tlog b/cw 9/Debug/room.tlog/CL.read.1.tlog index eba3c47..82e6c62 100644 Binary files a/cw 9/Debug/room.tlog/CL.read.1.tlog and b/cw 9/Debug/room.tlog/CL.read.1.tlog differ diff --git a/cw 9/Debug/room.tlog/CL.write.1.tlog b/cw 9/Debug/room.tlog/CL.write.1.tlog index 861d7d7..2ed51db 100644 Binary files a/cw 9/Debug/room.tlog/CL.write.1.tlog and b/cw 9/Debug/room.tlog/CL.write.1.tlog differ diff --git a/cw 9/Debug/room.tlog/link.command.1.tlog b/cw 9/Debug/room.tlog/link.command.1.tlog index 517646e..5fb06f1 100644 Binary files a/cw 9/Debug/room.tlog/link.command.1.tlog and b/cw 9/Debug/room.tlog/link.command.1.tlog differ diff --git a/cw 9/Debug/room.tlog/link.read.1.tlog b/cw 9/Debug/room.tlog/link.read.1.tlog index e223d75..c9f84cd 100644 Binary files a/cw 9/Debug/room.tlog/link.read.1.tlog and b/cw 9/Debug/room.tlog/link.read.1.tlog differ diff --git a/cw 9/Debug/room.tlog/link.write.1.tlog b/cw 9/Debug/room.tlog/link.write.1.tlog index 9250058..d32a982 100644 Binary files a/cw 9/Debug/room.tlog/link.write.1.tlog and b/cw 9/Debug/room.tlog/link.write.1.tlog differ diff --git a/cw 9/Debug/room.tlog/room.lastbuildstate b/cw 9/Debug/room.tlog/room.lastbuildstate index 80c57e1..83d4dcc 100644 --- a/cw 9/Debug/room.tlog/room.lastbuildstate +++ b/cw 9/Debug/room.tlog/room.lastbuildstate @@ -1,2 +1,2 @@ PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.19041.0: -Debug|Win32|C:\Users\Genos\Source\Repos\GRK_Room22\| +Debug|Win32|C:\Users\annas\Desktop\grafika_proj\GRK_Room\| diff --git a/cw 9/Debug/stb_image_aug.obj b/cw 9/Debug/stb_image_aug.obj index 8693d16..dc77be0 100644 Binary files a/cw 9/Debug/stb_image_aug.obj and b/cw 9/Debug/stb_image_aug.obj differ diff --git a/cw 9/Debug/vc142.idb b/cw 9/Debug/vc142.idb index cf623c6..edcb286 100644 Binary files a/cw 9/Debug/vc142.idb and b/cw 9/Debug/vc142.idb differ diff --git a/cw 9/Debug/vc142.pdb b/cw 9/Debug/vc142.pdb index 72de494..54ebbe2 100644 Binary files a/cw 9/Debug/vc142.pdb and b/cw 9/Debug/vc142.pdb differ diff --git a/cw 9/models/room/room_with_roof.mtl b/cw 9/models/room/room_with_roof.mtl new file mode 100644 index 0000000..18fc1e6 --- /dev/null +++ b/cw 9/models/room/room_with_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 +Ks 0.000000 0.000000 0.000000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 1 +map_Kd C:/Users/annas/Desktop/grafika_proj/GRK_Room/cw 9/textures/walls/wall.jpg diff --git a/cw 9/models/room/room_with_roof.obj b/cw 9/models/room/room_with_roof.obj new file mode 100644 index 0000000..ff54adc --- /dev/null +++ b/cw 9/models/room/room_with_roof.obj @@ -0,0 +1,713 @@ +# Blender 3.4.1 +# www.blender.org +mtllib room_with_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 -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 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.300000 +v -1.200000 2.500000 2.500000 +v -1.200000 1.970000 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 -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 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.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 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.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.173383 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.226617 2.501344 1.259008 +v 1.200000 2.500000 2.300000 +v 0.502662 2.500000 -2.299999 +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 -1.202335 2.302826 -1.031157 +v 1.197665 2.302826 -1.031157 +v 4.497665 2.502826 -1.031157 +v 1.197665 2.502826 -1.031157 +v -1.202335 2.502826 -1.031157 +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 -4.502335 2.502826 -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.0007 +vn -0.0000 1.0000 0.0006 +vn -0.0000 1.0000 0.0007 +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.0009 +vn 1.0000 -0.0000 0.0066 +vn 1.0000 -0.0000 0.0064 +vn -0.9999 -0.0000 -0.0128 +vn -1.0000 -0.0000 0.0030 +vn -1.0000 -0.0000 0.0054 +vn -0.0000 -1.0000 -0.0013 +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.0064 +vn 0.9997 -0.0000 0.0256 +vn -0.0000 -1.0000 0.0008 +vn -0.0000 1.0000 -0.0008 +vn 1.0000 -0.0000 -0.0050 +vn -0.0000 -1.0000 0.0022 +vn -1.0000 -0.0000 -0.0018 +vn 1.0000 -0.0000 -0.0051 +vn -1.0000 -0.0000 -0.0065 +vn 1.0000 -0.0000 0.0065 +vn -0.0009 1.0000 0.0006 +vn -0.0002 1.0000 0.0013 +vn -0.0002 -0.0003 1.0000 +vn -0.0003 0.0005 1.0000 +vn -0.0001 -1.0000 -0.0003 +vn -0.0009 -1.0000 -0.0006 +vn -0.0000 0.0025 -1.0000 +vn -0.0000 -0.0025 -1.0000 +vt 0.713432 1.257658 +vt 0.703017 1.257658 +vt 0.703017 0.302179 +vt 0.713432 0.302179 +vt 0.500368 0.700295 +vt 0.500368 1.655774 +vt 0.510783 0.700295 +vt 0.510783 1.655774 +vt 0.739470 2.041945 +vt 0.729055 2.041945 +vt 0.729055 2.421997 +vt 0.739470 2.421997 +vt 0.713433 2.397813 +vt 0.723848 2.397813 +vt 0.713433 2.017761 +vt 0.723848 2.017761 +vt 0.147521 0.779918 +vt 0.119921 0.779918 +vt 0.270794 -3.291463 +vt 0.119921 0.700295 +vt 0.650946 0.302177 +vt 0.260378 -3.291463 +vt 0.623346 0.302177 +vt 0.147521 0.700295 +vt 0.623346 4.084281 +vt 0.650946 4.084281 +vt 0.260378 0.490641 +vt 0.650946 4.283338 +vt 0.260378 0.689698 +vt 0.380300 0.700295 +vt 0.352699 0.700295 +vt 0.623346 4.283338 +vt 0.352699 2.611232 +vt 0.510342 0.689698 +vt 0.380300 2.611232 +vt 0.380300 2.690856 +vt 0.520757 0.689698 +vt 0.890494 -3.292393 +vt 0.862894 -3.292393 +vt 0.352699 2.690856 +vt 0.862894 0.489711 +vt 0.520757 -3.092406 +vt 0.890494 0.489711 +vt 0.890494 0.688768 +vt 0.520757 -3.291463 +vt 0.119921 2.690856 +vt 0.147521 2.690856 +vt 0.862894 0.688768 +vt 0.249963 -3.082739 +vt 0.500368 2.531610 +vt 0.000000 4.283338 +vt 0.249963 -3.281796 +vt 0.250110 2.611232 +vt 0.260378 -3.281796 +vt 0.250110 2.690856 +vt 0.760305 -3.292393 +vt 0.260378 -3.082739 +vt 0.760305 -3.093336 +vt 0.510342 -3.092406 +vt 0.510342 -3.291463 +vt 0.119921 2.611232 +vt 0.510342 0.490641 +vt 0.520757 0.490641 +vt 0.890494 -3.093336 +vt 0.249963 -1.768956 +vt 0.000000 2.969555 +vt 0.260378 -1.768956 +vt 0.760305 -1.779553 +vt 0.862894 -3.093336 +vt 0.703017 2.017761 +vt 0.623346 2.492876 +vt 0.739470 1.257656 +vt 0.260378 -1.100765 +vt 0.650946 2.492876 +vt 0.260378 -3.092406 +vt 0.650946 0.501234 +vt 0.623346 0.501234 +vt 0.249963 0.699365 +vt 0.250110 2.611232 +vt 0.249963 0.500308 +vt 1.000000 0.688768 +vt 0.000000 0.700295 +vt 0.260378 0.500308 +vt 0.760305 0.489711 +vt 0.260378 0.699365 +vt 0.760305 0.688768 +vt 0.250110 2.690856 +vt 0.510342 -1.778623 +vt 0.890494 -0.824072 +vt 0.520757 -1.778623 +vt 0.862894 -0.824072 +vt 0.250110 0.700295 +vt 0.260378 -1.494993 +vt 0.650946 2.098648 +vt 0.270794 -3.092406 +vt 0.270794 -1.494993 +vt 0.456131 -1.768026 +vt 0.456131 -3.081809 +vt 0.000000 0.699365 +vt 0.250110 0.700295 +vt 0.520757 0.302177 +vt 0.000000 0.500308 +vt 0.520757 0.501234 +vt 0.010415 0.500308 +vt 1.000000 2.520083 +vt 0.760305 4.271811 +vt 0.010415 0.699365 +vt 0.250110 0.779918 +vt 0.195753 0.688768 +vt 0.250041 2.196753 +vt 0.195753 0.489711 +vt 0.999930 1.103248 +vt 0.000000 -1.491333 +vt 0.739470 2.041945 +vt 0.520757 2.492876 +vt 0.000000 -3.082739 +vt 0.520757 4.084281 +vt 0.010415 -3.082739 +vt 0.500368 0.700295 +vt 0.760305 0.688768 +vt 0.010415 -1.491333 +vt 0.729055 2.041945 +vt 0.760305 2.280174 +vt 0.102589 2.014078 +vt 0.250110 0.700295 +vt 0.102589 0.700295 +vt 0.897411 0.688768 +vt 0.119774 0.700295 +vt 0.760305 0.301248 +vt 0.880226 0.688768 +vt 0.119774 2.014078 +vt 0.760305 -1.012535 +vt 0.270793 0.490641 +vt 0.270793 0.689698 +vt 0.380300 0.779918 +vt 0.380369 2.196753 +vt 0.456131 0.700295 +vt 0.456131 0.501238 +vt 0.456131 -3.280866 +vt 0.119851 2.196753 +vt 0.000000 -3.281796 +vt 0.520757 4.283338 +vt 0.250110 0.700295 +vt 0.010415 -3.281796 +vt 0.250110 0.779918 +vt 0.195753 -3.093336 +vt 0.500298 2.117130 +vt 0.195753 -3.292393 +vt 0.250180 2.196753 +vt 0.352699 0.779918 +vt 0.352769 2.196753 +vt 0.147521 2.611232 +vt 0.147374 1.285062 +vt 0.729055 1.637708 +vt 0.650946 0.302178 +vt 0.336869 -3.292393 +vt 0.119774 1.285062 +vt 0.706095 -1.978609 +vt 0.380524 2.117130 +vt 0.706095 -3.292393 +vt 0.760305 -3.281796 +vt 0.380594 2.531610 +vt 0.119774 4.283338 +vt 0.119774 2.969555 +vt 0.760305 -1.968012 +vt 0.897264 2.014936 +vt 0.703017 1.637708 +vt 0.676981 0.304694 +vt 0.862894 4.271811 +vt 0.897411 2.520083 +vt 0.880226 2.520083 +vt 0.880079 4.271811 +vt 0.520757 0.301248 +vt 0.586833 0.302177 +vt 0.880079 2.014936 +vt 0.397709 2.117130 +vt 0.102589 4.283338 +vt 0.397779 2.531610 +vt 0.713432 2.017761 +vt 0.862894 2.280174 +vt 0.729055 1.257656 +vt 0.862894 0.688768 +vt 0.397779 0.700295 +vt 0.880079 0.688768 +vt 0.520757 -3.281796 +vt 0.380594 0.700295 +vt 0.880079 2.002551 +vt 0.520757 -1.968012 +vt 0.713432 2.411988 +vt 0.862894 2.674398 +vt 0.500368 2.440062 +vt 0.880079 2.958028 +vt 0.520757 -1.012535 +vt 0.706095 0.290651 +vt 0.880156 1.103248 +vt 0.706095 -1.023133 +vt 0.102589 2.969555 +vt 0.000000 -1.097105 +vt 0.510783 1.655773 +vt 0.520757 2.098648 +vt 0.010415 -1.097105 +vt 0.500368 1.655773 +vt 0.760305 2.674398 +vt 0.456131 -0.812545 +vt 0.510342 -0.823142 +vt 0.270794 -1.100765 +vt 0.862894 -1.779553 +vt 0.520757 -0.823142 +vt 0.890494 -1.779553 +vt 0.703017 2.411988 +vt 0.623346 2.098648 +vt 0.510783 2.440062 +vt 0.249963 -0.813475 +vt 0.000000 2.014078 +vt 0.260378 -0.813475 +vt 0.760305 -0.824072 +vt 0.813181 -3.093336 +vt 0.813181 -1.779553 +vt 0.573633 0.501234 +vt 0.510783 2.060010 +vt 0.573633 2.098648 +vt 0.813181 -0.824072 +vt 0.250110 0.700295 +vt 0.197087 1.285062 +vt 0.676982 1.216520 +vt 0.729055 2.017760 +vt 0.197234 0.779918 +vt 0.813181 0.688768 +vt 0.197234 2.690856 +vt 0.197234 2.611232 +vt 0.303057 2.196753 +vt 0.302987 2.611232 +vt 0.573633 4.283338 +vt 0.302987 0.700295 +vt 0.302987 0.779918 +vt 0.813181 0.489711 +vt 0.197234 0.700295 +vt 0.573633 0.302177 +vt 0.739470 1.637708 +vt 0.573633 2.492876 +vt 0.573633 4.084281 +vt 0.302987 2.690856 +vt 0.813181 -3.292393 +vt 0.813181 2.280174 +vt 0.729055 1.637708 +vt 0.447492 2.531610 +vt 0.052876 4.283338 +vt 0.052876 2.969555 +vt 0.052876 2.014078 +vt 0.250110 0.700295 +vt 0.947124 2.520083 +vt 0.813181 4.271811 +vt 0.500368 2.060010 +vt 0.813181 2.674398 +vt 0.447492 0.700295 +vt 0.813181 0.688768 +vt 0.447422 2.117130 +vt 0.946977 2.014936 +vt 0.650946 1.219036 +vt 0.703017 2.017760 +vt 0.947124 0.688768 +vt 0.052876 0.700295 +vt 0.947054 1.103248 +vt 0.650946 2.130860 +vt 0.729055 1.637710 +vt 0.897341 1.103248 +vt 0.676981 1.216519 +vt 0.729055 1.257658 +vt 0.447345 1.205441 +vt 0.397632 1.205441 +vt 0.303134 1.285062 +vt 0.352847 1.285062 +vt 0.147451 2.196753 +vt 0.650946 1.214002 +vt 0.703017 1.257658 +vt 0.197164 2.196753 +vt 0.676982 2.128344 +vt 0.703017 1.637710 +vt 0.586833 -1.011606 +vt 0.586833 -1.967083 +vt 0.336869 0.489711 +vt 0.336869 -0.824072 +vt 0.336869 -1.779553 +vt 0.586833 -3.280866 +vt 0.380447 1.205441 +vt 0.336869 0.688768 +vt 0.380447 1.285064 +vt 0.076491 -3.081809 +vt 0.500221 1.205441 +vt 0.076491 -3.280866 +vt 0.250257 1.285062 +vt 0.336869 -3.093336 +vt 0.076491 0.700295 +vt 0.249963 1.285064 +vt 0.076491 0.501238 +vt 0.999853 2.014936 +vt 0.250110 0.700295 +vt 0.250110 0.700295 +vt 0.250110 0.700295 +vt 0.250110 0.700295 +vt 0.676981 2.130860 +vt 0.703017 2.128344 +vt 0.703017 1.216519 +vt 0.676981 1.219035 +vt 0.739470 0.682231 +vt 0.739470 0.302179 +vt 0.713432 0.682231 +vt 0.713432 0.302179 +vt 0.703017 1.216520 +vt 0.676982 1.214003 +vt 0.676982 0.302179 +vt 0.703017 0.304695 +vt 0.739470 0.682231 +vt 0.713433 0.682231 +vt 0.739470 1.062283 +vt 0.713433 1.062283 +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/12 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/13 49/80/9 50/83/1 51/85/1 +f 52/88/11 37/59/11 30/42/2 53/90/2 +f 54/91/8 53/89/8 30/43/8 29/41/8 +f 55/93/2 46/75/2 56/95/14 57/96/14 +f 58/97/15 59/98/15 37/59/11 52/88/11 +f 60/99/1 61/102/1 62/104/16 63/107/17 +f 64/109/18 65/111/18 49/80/9 48/78/13 +f 66/113/1 67/116/1 68/118/16 69/121/1 +f 70/124/6 71/126/6 72/128/6 73/131/6 +f 23/29/2 22/27/2 74/133/14 75/134/14 +f 76/137/15 77/138/15 39/62/11 26/34/12 +f 46/75/2 19/22/2 18/19/14 56/95/14 +f 59/98/15 78/139/15 38/60/11 37/59/11 +f 67/116/1 79/141/1 80/144/17 68/118/16 +f 81/146/18 82/148/18 34/52/10 33/49/9 +f 24/31/4 23/30/4 75/135/19 83/150/19 +f 84/151/20 76/136/21 26/35/7 25/33/7 +f 32/47/3 31/46/3 38/61/22 85/152/22 +f 86/153/23 87/157/24 18/18/5 17/17/5 +f 88/158/18 89/160/18 90/161/25 91/165/25 +f 92/166/26 93/170/27 94/171/27 95/175/28 +f 96/176/22 97/178/29 90/162/29 89/159/30 +f 98/180/8 99/182/8 100/184/8 101/187/8 +f 93/169/8 102/190/8 103/192/8 94/172/8 +f 104/194/18 105/196/18 73/132/25 72/129/25 +f 106/197/6 70/124/6 73/131/6 91/164/6 +f 61/102/1 107/198/1 108/201/1 62/104/16 +f 109/204/15 58/97/15 52/88/11 110/205/11 +f 45/73/2 55/93/2 57/96/14 111/206/14 +f 112/207/8 113/209/8 53/89/8 54/91/8 +f 110/205/11 52/88/11 53/90/2 113/208/2 +f 47/77/6 46/76/6 55/94/6 114/211/6 +f 49/80/9 115/213/1 116/215/1 50/83/1 +f 39/62/11 110/205/11 113/208/2 40/63/2 +f 43/69/8 40/64/8 113/209/8 112/207/8 +f 22/27/2 45/73/2 111/206/14 74/133/14 +f 77/138/15 109/204/15 110/205/11 39/62/11 +f 97/177/6 106/197/6 91/164/6 90/163/6 +f 102/190/8 98/180/8 101/187/8 103/192/8 +f 105/196/18 88/158/18 91/165/25 73/132/25 +f 114/211/6 55/94/6 45/74/6 44/71/6 +f 115/213/1 41/65/1 42/67/1 116/215/1 +f 102/189/1 114/210/1 44/70/1 98/179/1 +f 117/217/8 43/69/8 112/207/8 118/218/8 +f 119/219/6 47/77/6 114/211/6 120/221/6 +f 122/224/23 86/153/23 17/17/5 123/227/5 +f 124/229/3 32/47/3 85/152/22 125/230/22 +f 126/231/20 84/151/20 25/33/7 127/232/7 +f 128/234/4 24/31/4 83/150/19 129/235/19 +f 121/222/8 54/91/8 29/41/8 130/236/8 +f 131/238/6 20/23/6 47/77/6 119/219/6 +f 132/240/6 44/71/6 21/25/6 133/241/6 +f 134/243/8 28/39/8 43/69/8 117/217/8 +f 130/236/8 29/41/8 32/48/8 124/228/8 +f 127/232/7 25/33/7 28/40/4 134/242/4 +f 133/241/6 21/25/6 24/32/6 128/233/6 +f 123/227/5 17/17/5 20/24/3 131/237/3 +f 135/245/3 132/239/3 66/114/3 69/122/3 +f 136/247/6 137/248/6 106/197/6 97/177/6 +f 139/252/8 140/254/8 102/190/8 93/169/8 +f 135/244/8 141/256/8 99/182/8 98/180/8 +f 142/257/22 136/246/29 97/178/29 96/176/22 +f 143/258/26 139/251/27 93/170/27 92/166/26 +f 138/249/6 144/262/6 71/126/6 70/124/6 +f 140/253/4 108/202/4 107/199/4 120/220/4 +f 144/261/31 145/263/7 146/266/7 71/127/31 +f 125/230/22 85/152/22 151/273/22 152/276/22 +f 153/279/32 154/280/32 88/158/18 105/196/18 +f 155/281/33 156/282/33 109/204/15 77/138/15 +f 156/282/33 157/283/33 58/97/15 109/204/15 +f 95/174/32 153/279/32 105/196/18 104/194/18 +f 148/270/23 96/176/22 89/159/30 158/285/24 +f 71/127/31 146/266/7 104/195/21 72/130/31 +f 154/280/32 158/284/32 89/160/18 88/158/18 +f 85/152/22 38/61/22 78/140/30 151/273/22 +f 150/272/34 159/287/28 76/136/21 84/151/20 +f 160/288/32 161/290/32 82/148/18 81/146/18 +f 162/292/33 87/156/33 78/139/15 59/98/15 +f 159/286/33 155/281/33 77/138/15 76/137/15 +f 163/293/32 164/295/32 65/111/18 64/109/18 +f 157/283/33 162/292/33 59/98/15 58/97/15 +f 57/96/14 56/95/14 162/292/33 157/283/33 +f 63/107/17 62/104/16 164/295/32 163/293/32 +f 75/134/14 74/133/14 155/281/33 159/286/33 +f 56/95/14 18/19/14 87/156/33 162/292/33 +f 68/118/16 80/144/17 161/290/32 160/288/32 +f 83/150/19 75/135/19 159/287/28 150/272/34 +f 101/188/35 100/185/35 158/284/32 154/280/32 +f 99/183/36 148/270/23 158/285/24 100/186/36 +f 94/173/35 103/193/35 153/279/32 95/174/32 +f 111/206/14 57/96/14 157/283/33 156/282/33 +f 74/133/14 111/206/14 156/282/33 155/281/33 +f 103/193/35 101/188/35 154/280/32 153/279/32 +f 129/235/19 83/150/19 150/272/34 149/271/37 +f 141/255/36 147/269/23 148/270/23 99/183/36 +f 146/266/7 92/166/26 95/175/28 104/195/21 +f 151/273/22 78/140/30 87/157/24 86/153/23 +f 64/110/38 152/276/22 122/224/23 163/294/24 +f 65/112/39 164/296/28 143/258/26 145/263/7 +f 68/119/36 160/289/24 147/269/23 141/255/36 +f 80/145/19 129/235/19 149/271/37 161/291/28 +f 48/79/22 125/230/22 152/276/22 64/110/38 +f 161/291/28 149/271/37 126/231/20 82/149/39 +f 160/289/24 81/147/38 142/257/22 147/269/23 +f 49/81/31 65/112/39 145/263/7 144/261/31 +f 102/191/4 140/253/4 120/220/4 114/212/4 +f 115/214/6 49/82/6 144/262/6 138/249/6 +f 164/296/28 62/105/27 139/251/27 143/258/26 +f 81/147/38 33/50/29 136/246/29 142/257/22 +f 69/123/8 68/120/8 141/256/8 135/244/8 +f 62/106/8 108/203/8 140/254/8 139/252/8 +f 41/66/6 115/214/6 138/249/6 137/248/6 +f 33/51/6 41/66/6 137/248/6 136/247/6 +f 98/181/3 44/72/3 132/239/3 135/245/3 +f 63/108/5 123/227/5 131/237/3 60/100/3 +f 67/117/6 133/241/6 128/233/6 79/142/6 +f 34/53/7 127/232/7 134/242/4 35/55/4 +f 50/84/8 130/236/8 124/228/8 51/86/8 +f 35/56/8 134/243/8 117/217/8 36/58/8 +f 66/115/6 132/240/6 133/241/6 67/117/6 +f 60/101/6 131/238/6 119/219/6 61/103/6 +f 116/216/8 121/222/8 130/236/8 50/84/8 +f 79/143/4 128/234/4 129/235/19 80/145/19 +f 82/149/39 126/231/20 127/232/7 34/53/7 +f 51/87/3 124/229/3 125/230/22 48/79/22 +f 163/294/24 122/224/23 123/227/5 63/108/5 +f 42/68/8 118/218/8 121/222/8 116/216/8 +f 61/103/6 119/219/6 120/221/6 107/200/6 +f 36/58/8 117/217/8 118/218/8 42/68/8 +f 152/277/11 145/264/11 143/259/11 122/225/11 +f 143/260/8 92/167/8 86/154/8 122/226/8 +f 92/168/13 146/267/13 151/274/13 86/155/13 +f 145/265/6 152/278/6 151/275/6 146/268/6 +f 138/250/6 70/125/6 166/298/8 168/300/8 +f 54/92/8 121/223/8 167/299/8 165/297/8 +f 171/303/11 170/302/11 169/301/40 172/304/41 +f 179/308/42 177/306/8 176/305/8 178/307/43 +f 182/311/13 183/312/44 180/309/45 181/310/13 +f 186/315/46 187/316/6 185/314/6 184/313/47 +l 175 173 +l 174 175 diff --git a/cw 9/models/room/room_without_roof3.mtl b/cw 9/models/room/room_without_roof3.mtl new file mode 100644 index 0000000..63ca8e2 --- /dev/null +++ b/cw 9/models/room/room_without_roof3.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 C:/Users/annas/Desktop/grafika_proj/GRK_Room/cw 9/textures/walls/wall.jpg diff --git a/cw 9/models/room/room_without_roof3.obj b/cw 9/models/room/room_without_roof3.obj new file mode 100644 index 0000000..270decf --- /dev/null +++ b/cw 9/models/room/room_without_roof3.obj @@ -0,0 +1,601 @@ +# Blender 3.4.1 +# www.blender.org +mtllib room_without_roof3.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.0007 +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.0064 +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.0064 +vn 0.9997 -0.0000 0.0256 +vn 1.0000 -0.0000 -0.0050 +vn -0.0000 -1.0000 0.0008 +vn -1.0000 -0.0000 -0.0018 +vn 1.0000 -0.0000 -0.0051 +vn -1.0000 -0.0000 -0.0065 +vn 1.0000 -0.0000 0.0065 +vn -0.0000 1.0000 0.0006 +vn -0.0009 1.0000 0.0006 +vn -0.0002 1.0000 0.0013 +vn -0.0002 -0.0003 1.0000 +vn -0.0003 0.0005 1.0000 +vn -0.0001 -1.0000 -0.0003 +vn -0.0009 -1.0000 -0.0006 +vn -0.0000 0.0025 -1.0000 +vn -0.0000 -0.0025 -1.0000 +vt 0.134725 3.453375 +vt 0.107625 3.453375 +vt 0.107625 2.015328 +vt 0.134725 2.015328 +vt 0.080525 2.015328 +vt 0.080525 3.453375 +vt 0.107625 2.015328 +vt 0.107625 3.453375 +vt 1.286511 3.151191 +vt 1.259411 3.151191 +vt 1.259411 3.723189 +vt 1.286511 3.723189 +vt 1.259411 3.151189 +vt 1.286511 3.151189 +vt 1.259411 2.579191 +vt 1.286511 2.579191 +vt 0.924721 1.518631 +vt 0.852906 1.518631 +vt 0.852906 1.398794 +vt 0.852523 -3.993880 +vt 0.780707 -3.993880 +vt 0.924721 1.398794 +vt 0.780707 1.698388 +vt 0.852523 1.698388 +vt 0.852523 1.997980 +vt 0.513769 1.997980 +vt 0.441953 1.997980 +vt 0.780707 1.997980 +vt 0.441953 4.874043 +vt 0.513769 4.874043 +vt 0.513769 4.993880 +vt 0.513769 -3.993880 +vt 0.441953 -3.993880 +vt 0.441953 4.993880 +vt 0.441953 1.698388 +vt 0.513769 1.698388 +vt 0.513769 1.997980 +vt 0.852906 4.394694 +vt 0.924721 4.394694 +vt 0.441953 1.997980 +vt 0.147914 -3.678337 +vt 0.826189 4.754207 +vt 1.164177 1.398794 +vt 0.147914 -3.977933 +vt 0.175014 4.874043 +vt 0.175014 -3.977933 +vt 0.175014 4.993880 +vt 0.175014 -3.993880 +vt 0.175014 -3.678337 +vt 0.175014 -3.694288 +vt 0.852906 4.274858 +vt 0.513769 -3.694288 +vt 0.147914 -1.701023 +vt 1.164177 -0.578522 +vt 0.175014 -1.701023 +vt 0.175014 -1.716974 +vt 0.441953 -3.694288 +vt 0.134725 3.195726 +vt 0.780707 -0.696760 +vt 0.161825 2.015328 +vt 0.852523 -0.696760 +vt 0.852523 -3.694288 +vt 0.780707 -3.694288 +vt 0.147914 2.013931 +vt 1.191660 4.274858 +vt 0.147914 1.714335 +vt -0.190457 2.015328 +vt 1.164177 -3.993880 +vt 0.175014 1.714335 +vt 0.175014 1.698388 +vt 0.175014 2.013931 +vt 0.175014 1.997980 +vt 1.191660 4.394694 +vt 0.513769 -0.278926 +vt 0.441953 -0.278926 +vt 0.514152 1.997981 +vt 0.852523 -1.290093 +vt -0.502494 2.013931 +vt 1.191660 1.398794 +vt 0.513769 -3.993880 +vt -0.502494 1.714335 +vt 0.513769 -3.694288 +vt -0.475394 1.714335 +vt -0.190457 4.771555 +vt 0.852523 1.398794 +vt -0.475394 2.013931 +vt 1.191660 1.518631 +vt 0.006858 1.997980 +vt 1.191478 3.651045 +vt 0.006858 1.698388 +vt -0.190639 2.639142 +vt -0.502494 -1.283189 +vt 0.161825 3.195725 +vt 0.513769 -0.696760 +vt -0.502494 -3.678337 +vt 0.513769 1.698388 +vt -0.475394 -3.678337 +vt 0.826189 1.997980 +vt 0.852523 -3.993880 +vt -0.475394 -1.283189 +vt 0.134725 3.195725 +vt 0.852523 -1.598732 +vt 1.431115 -2.016566 +vt 0.514152 1.997981 +vt 1.431115 -3.993880 +vt -0.457396 2.015328 +vt 1.475831 -3.993880 +vt -0.502111 2.015328 +vt 1.475831 -2.016566 +vt 0.513769 2.117817 +vt 0.513951 4.250230 +vt 0.852723 3.651045 +vt -0.502494 -3.977933 +vt 0.513769 1.997980 +vt 0.175015 1.997980 +vt -0.475394 -3.977933 +vt 0.175015 2.117817 +vt 0.006858 -3.694288 +vt 0.826007 4.130394 +vt 0.006858 -3.993880 +vt 0.175197 4.250230 +vt 0.441953 2.117817 +vt 0.442135 4.250230 +vt 0.924721 4.274858 +vt 0.924339 2.278901 +vt 1.259411 1.970793 +vt -0.054966 2.015330 +vt 0.852523 2.278901 +vt 0.514353 4.130394 +vt 0.514535 4.754207 +vt 1.475831 1.398794 +vt 1.475831 -0.578522 +vt -0.457779 4.011285 +vt 1.191660 1.970793 +vt 0.012779 2.019117 +vt 1.119461 1.398794 +vt -0.457396 4.771555 +vt -0.502111 4.771555 +vt 1.164177 1.398794 +vt -0.502494 4.011285 +vt 0.559068 4.130394 +vt 1.431115 1.398794 +vt 0.559250 4.754207 +vt 0.161825 3.195726 +vt 1.119461 -1.598732 +vt 0.134725 2.015328 +vt 1.119461 -3.993880 +vt 0.559250 1.997980 +vt 1.164177 -3.993880 +vt 0.514535 1.997980 +vt 1.164177 -2.016566 +vt 0.161825 3.789059 +vt 1.119461 -1.005399 +vt 1.259411 2.579191 +vt 1.164177 -0.578522 +vt -0.502293 2.639142 +vt 1.431115 -0.578522 +vt -0.502494 -0.689855 +vt 1.286511 1.398794 +vt 0.513769 -1.290093 +vt -0.475394 -0.689855 +vt 1.259411 1.398794 +vt 0.852523 -1.005399 +vt 0.441953 -1.716974 +vt 0.513769 -1.716974 +vt 0.134725 3.789059 +vt 0.780707 -1.290093 +vt 1.286511 2.579191 +vt 0.147914 -0.262979 +vt 1.164177 -2.016566 +vt 0.175014 -0.262979 +vt 0.175014 -0.278926 +vt 0.312599 -3.694288 +vt 0.312599 -1.716974 +vt 0.651354 -3.694288 +vt 1.286511 2.007193 +vt 0.651354 -1.290093 +vt 0.312599 -0.278926 +vt 0.514152 1.997981 +vt 1.053692 2.278901 +vt -0.122712 2.015328 +vt 1.259411 2.542791 +vt 1.054075 1.518631 +vt 0.312599 1.997980 +vt 1.054075 4.394694 +vt 1.054075 4.274858 +vt 0.312782 4.250230 +vt 0.312599 4.874043 +vt 0.651354 1.997980 +vt 0.312599 1.997980 +vt 0.312599 2.117817 +vt 0.312599 1.698388 +vt 1.054075 1.398794 +vt 0.651354 -3.993880 +vt 0.161825 2.587327 +vt 0.651354 -0.696760 +vt 0.651354 1.698388 +vt 0.312599 4.993880 +vt 0.312599 -3.993880 +vt 0.990108 -1.598732 +vt 0.134725 2.587327 +vt 0.688604 4.754207 +vt 1.301762 1.398794 +vt 1.301762 -0.578522 +vt 1.301762 -2.016566 +vt 0.514152 1.997981 +vt -0.328042 4.771555 +vt 0.990108 1.398794 +vt 1.259411 2.007193 +vt 0.990108 -1.005399 +vt 0.688604 1.997980 +vt 0.990108 -3.993880 +vt 0.688422 4.130394 +vt -0.328425 4.011285 +vt -0.190458 2.019116 +vt 1.191660 2.542791 +vt -0.328042 2.015328 +vt 1.301762 -3.993880 +vt -0.328224 2.639142 +vt -0.190458 3.391461 +vt 1.259411 1.970793 +vt -0.457578 2.639142 +vt 0.012779 3.391462 +vt 1.259411 1.398794 +vt 0.688221 2.758252 +vt 0.558868 2.758252 +vt 0.312982 2.878087 +vt 0.442336 2.878087 +vt 0.924540 3.651045 +vt -0.054966 3.387674 +vt 1.191660 1.398794 +vt 1.053893 3.651045 +vt -0.122712 3.387674 +vt 1.191660 1.970793 +vt 0.514152 2.758252 +vt 0.514152 2.878087 +vt -0.303463 -3.676940 +vt 0.825806 2.758252 +vt -0.303463 -3.976532 +vt 0.175397 2.878087 +vt -0.303463 2.015328 +vt 1.191277 2.278903 +vt -0.303463 1.715737 +vt -0.190840 4.011285 +vt 0.514152 1.997981 +vt 0.514152 1.997981 +vt 0.514152 1.997981 +vt 0.514152 1.997981 +vt -0.122712 3.391461 +vt -0.054966 3.387674 +vt -0.054966 2.015329 +vt -0.122712 2.019116 +vt 1.259411 3.686788 +vt 1.259411 3.114790 +vt 1.191660 3.686788 +vt 1.191660 3.114790 +vt 0.080525 3.391461 +vt 0.012779 3.387674 +vt 0.012779 2.015329 +vt 0.080525 2.019116 +vt 1.259411 2.542792 +vt 1.191660 2.542792 +vt 1.259411 3.114790 +vt 1.191660 3.114790 +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/22/3 +f 21/23/6 22/24/6 23/25/6 24/28/6 +f 25/29/7 26/30/7 27/31/4 28/34/4 +f 29/35/8 30/36/8 31/37/8 32/40/8 +f 33/41/9 34/44/10 35/46/1 36/49/1 +f 39/53/1 33/41/9 36/49/1 40/55/1 +f 28/33/8 27/32/8 38/52/8 41/57/8 +f 42/59/6 43/61/6 22/24/6 21/23/6 +f 20/21/6 19/20/6 44/62/6 45/63/6 +f 46/64/11 47/66/9 48/69/1 49/71/1 +f 51/75/8 50/74/8 30/36/8 29/35/8 +f 53/78/1 54/81/1 55/83/12 56/86/13 +f 57/88/14 58/90/14 47/66/9 46/64/11 +f 59/92/1 60/95/1 61/97/12 62/100/1 +f 63/103/6 64/105/6 65/107/6 66/109/6 +f 60/95/1 70/113/1 71/116/13 61/97/12 +f 72/118/14 73/120/14 34/44/10 33/41/9 +f 24/27/4 23/26/4 67/110/15 74/122/15 +f 75/123/16 68/111/17 26/30/7 25/29/7 +f 32/39/3 31/38/3 37/51/18 76/124/18 +f 77/125/19 78/128/20 18/18/5 17/17/5 +f 82/133/21 83/137/22 84/138/22 85/140/23 +f 86/141/18 87/143/24 80/130/24 79/129/25 +f 88/145/8 89/147/8 90/149/8 91/151/8 +f 83/136/8 92/153/8 93/155/8 84/139/8 +f 95/157/6 63/103/6 66/109/6 81/132/6 +f 54/81/1 96/158/1 97/161/1 55/83/12 +f 98/164/8 99/165/8 50/74/8 51/75/8 +f 45/63/6 44/62/6 52/77/6 100/167/6 +f 47/66/9 101/169/1 102/171/1 48/69/1 +f 41/57/8 38/52/8 99/165/8 98/164/8 +f 87/142/6 95/157/6 81/132/6 80/131/6 +f 92/153/8 88/145/8 91/151/8 93/155/8 +f 100/167/6 52/77/6 43/61/6 42/59/6 +f 101/169/1 39/53/1 40/55/1 102/171/1 +f 92/152/1 100/166/1 42/58/1 88/144/1 +f 103/173/8 41/57/8 98/164/8 104/174/8 +f 105/175/6 45/63/6 100/167/6 106/177/6 +f 108/180/19 77/125/19 17/17/5 109/183/5 +f 110/185/3 32/39/3 76/124/18 111/186/18 +f 112/187/16 75/123/16 25/29/7 113/188/7 +f 114/190/4 24/27/4 74/122/15 115/191/15 +f 107/178/8 51/75/8 29/35/8 116/192/8 +f 117/194/6 20/21/6 45/63/6 105/175/6 +f 118/196/6 42/59/6 21/23/6 119/197/6 +f 120/199/8 28/33/8 41/57/8 103/173/8 +f 116/192/8 29/35/8 32/40/8 110/184/8 +f 113/188/7 25/29/7 28/34/4 120/198/4 +f 119/197/6 21/23/6 24/28/6 114/189/6 +f 109/183/5 17/17/5 20/22/3 117/193/3 +f 121/201/3 118/195/3 59/93/3 62/101/3 +f 122/203/6 123/204/6 95/157/6 87/142/6 +f 125/208/8 126/210/8 92/153/8 83/136/8 +f 121/200/8 127/212/8 89/147/8 88/145/8 +f 128/213/18 122/202/24 87/143/24 86/141/18 +f 129/214/21 125/207/22 83/137/22 82/133/21 +f 124/205/6 130/218/6 64/105/6 63/103/6 +f 126/209/4 97/162/4 96/159/4 106/176/4 +f 130/217/26 131/219/7 132/222/7 64/106/26 +f 111/186/18 76/124/18 137/229/18 138/232/18 +f 134/226/19 86/141/18 79/129/25 139/235/20 +f 64/106/26 132/222/7 94/156/17 65/108/26 +f 76/124/18 37/51/18 69/112/25 137/229/18 +f 136/228/27 140/236/23 68/111/17 75/123/16 +f 141/237/28 142/239/28 73/120/14 72/118/14 +f 143/241/28 144/243/28 58/90/14 57/88/14 +f 56/86/13 55/83/12 144/243/28 143/241/28 +f 61/97/12 71/116/13 142/239/28 141/237/28 +f 74/122/15 67/110/15 140/236/23 136/228/27 +f 89/148/29 134/226/19 139/235/20 90/150/29 +f 115/191/15 74/122/15 136/228/27 135/227/30 +f 127/211/29 133/225/19 134/226/19 89/148/29 +f 132/222/7 82/133/21 85/140/23 94/156/17 +f 137/229/18 69/112/25 78/128/20 77/125/19 +f 57/89/31 138/232/18 108/180/19 143/242/20 +f 58/91/32 144/244/23 129/214/21 131/219/7 +f 61/98/29 141/238/20 133/225/19 127/211/29 +f 71/117/15 115/191/15 135/227/30 142/240/23 +f 46/65/18 111/186/18 138/232/18 57/89/31 +f 142/240/23 135/227/30 112/187/16 73/121/32 +f 141/238/20 72/119/31 128/213/18 133/225/19 +f 47/67/26 58/91/32 131/219/7 130/217/26 +f 92/154/4 126/209/4 106/176/4 100/168/4 +f 101/170/6 47/68/6 130/218/6 124/205/6 +f 144/244/23 55/84/22 125/207/22 129/214/21 +f 72/119/31 33/42/24 122/202/24 128/213/18 +f 62/102/8 61/99/8 127/212/8 121/200/8 +f 55/85/8 97/163/8 126/210/8 125/208/8 +f 39/54/6 101/170/6 124/205/6 123/204/6 +f 33/43/6 39/54/6 123/204/6 122/203/6 +f 88/146/3 42/60/3 118/195/3 121/201/3 +f 56/87/5 109/183/5 117/193/3 53/79/3 +f 60/96/6 119/197/6 114/189/6 70/114/6 +f 34/45/7 113/188/7 120/198/4 35/47/4 +f 48/70/8 116/192/8 110/184/8 49/72/8 +f 35/48/8 120/199/8 103/173/8 36/50/8 +f 59/94/6 118/196/6 119/197/6 60/96/6 +f 53/80/6 117/194/6 105/175/6 54/82/6 +f 102/172/8 107/178/8 116/192/8 48/70/8 +f 70/115/4 114/190/4 115/191/15 71/117/15 +f 73/121/32 112/187/16 113/188/7 34/45/7 +f 49/73/3 110/185/3 111/186/18 46/65/18 +f 143/242/20 108/180/19 109/183/5 56/87/5 +f 40/56/8 104/174/8 107/178/8 102/172/8 +f 54/82/6 105/175/6 106/177/6 96/160/6 +f 36/50/8 103/173/8 104/174/8 40/56/8 +f 138/233/33 131/220/33 129/215/33 108/181/33 +f 129/216/8 82/134/8 77/126/8 108/182/8 +f 82/135/11 132/223/11 137/230/11 77/127/11 +f 131/221/6 138/234/6 137/231/6 132/224/6 +f 124/206/6 63/104/6 146/246/8 148/248/8 +f 51/76/8 107/179/8 147/247/8 145/245/8 +f 151/251/33 150/250/33 149/249/34 152/252/35 +f 159/256/36 157/254/8 156/253/8 158/255/37 +f 162/259/11 163/260/38 160/257/39 161/258/11 +f 166/263/40 167/264/6 165/262/6 164/261/41 +l 155 153 +l 154 155 diff --git a/cw 9/shaders/shader_9_1.frag b/cw 9/shaders/shader_9_1.frag index 3560d60..18d38a2 100644 --- a/cw 9/shaders/shader_9_1.frag +++ b/cw 9/shaders/shader_9_1.frag @@ -148,8 +148,8 @@ void main() ilumination = ambient+PBRLight(lightDir,attenuatedlightColor,normal,viewDir); //flashlight - //vec3 spotlightDir= normalize(spotlightDirTS); - vec3 spotlightDir= normalize(spotlightPos-worldPos); + vec3 spotlightDir= normalize(spotlightDirTS); + //vec3 spotlightDir= normalize(spotlightPos-worldPos); float angle_atenuation = clamp((dot(-normalize(spotlightPos-worldPos),spotlightConeDir)-0.5)*3,0,1); diff --git a/cw 9/src/room.hpp b/cw 9/src/room.hpp index cd77e0a..7667aa0 100644 --- a/cw 9/src/room.hpp +++ b/cw 9/src/room.hpp @@ -548,8 +548,8 @@ void renderScene(GLFWwindow* window) drawObjectPBR(models::coffeeTableContext, glm::translate(glm::vec3(2.8f, 0, 0.5f)), texture::wood, texture::woodNormal, texture::woodARM); drawObjectPBR(models::doorContext, glm::mat4(), texture::wood, texture::woodNormal, texture::woodARM); drawObjectPBR(models::planeContext, glm::mat4(), texture::floor, texture::floorNormal, texture::floorARM); - drawObjectPBR(models::roomContext, glm::mat4(), texture::brick, texture::brickNormal, texture::brickARM); - drawObjectPBR(models::roofContext, glm::mat4(), texture::roof, texture::roofNormal, texture::roofARM); + drawObjectPBR(models::roomContext, glm::mat4(), texture::wall, texture::wallNorm, texture::wallArm); + //drawObjectPBR(models::roofContext, glm::mat4(), texture::roof, texture::roofNormal, texture::roofARM); drawObjectPBR(models::deskContext, glm::eulerAngleY(3.14f) * glm::translate(glm::vec3(2.8f, 0.0f, 1.9f)), texture::wood, texture::woodNormal, texture::woodARM); 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); @@ -645,13 +645,13 @@ void init(GLFWwindow* window) loadCubemap(faces); initDepthMap(); - 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::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::wall = Core::LoadTexture("textures/walls/wall.jpg"); - //texture::wallNorm = Core::LoadTexture("textures/walls/wall_norm.jpg"); - //texture::wallArm = Core::LoadTexture("textures/walls/wall_arm.jpg"); + texture::wall = Core::LoadTexture("textures/walls/wall.jpg"); + texture::wallNorm = Core::LoadTexture("textures/walls/wall_norm.jpg"); + texture::wallArm = Core::LoadTexture("textures/walls/wall_arm.jpg"); texture::spaceship = Core::LoadTexture("textures/spaceship/spaceship_albedo.png"); @@ -710,8 +710,8 @@ void init(GLFWwindow* window) loadModelToContext("./models/door.obj", models::doorContext); loadModelToContext("./models/drawer.obj", models::drawerContext); loadModelToContext("./models/plane.obj", models::planeContext); - loadModelToContext("./models/room/room_without_roof2.obj", models::roomContext); - loadModelToContext("./models/roof/roof.obj", models::roofContext); + loadModelToContext("./models/room/room_with_roof.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);