From 3c7ce34ac4f1e253f823155b382289a0e3320d0e Mon Sep 17 00:00:00 2001 From: Aleksander Burkowski Date: Tue, 31 Jan 2023 18:57:55 +0100 Subject: [PATCH] added and placed cabinet --- models2/cabinet/cabinet.mtl | 12 + models2/cabinet/cabinet.obj | 514 ++++++++++++++++++++++++++++++++++++ src/ex_9_1.hpp | 11 +- 3 files changed, 536 insertions(+), 1 deletion(-) create mode 100644 models2/cabinet/cabinet.mtl create mode 100644 models2/cabinet/cabinet.obj diff --git a/models2/cabinet/cabinet.mtl b/models2/cabinet/cabinet.mtl new file mode 100644 index 0000000..be2f57b --- /dev/null +++ b/models2/cabinet/cabinet.mtl @@ -0,0 +1,12 @@ +# Blender 3.4.1 MTL File: 'None' +# www.blender.org + +newmtl Material +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 diff --git a/models2/cabinet/cabinet.obj b/models2/cabinet/cabinet.obj new file mode 100644 index 0000000..cb8786a --- /dev/null +++ b/models2/cabinet/cabinet.obj @@ -0,0 +1,514 @@ +# Blender 3.4.1 +# www.blender.org +mtllib cabinet.mtl +o Cube +v 0.500000 1.494044 -0.500000 +v 0.500000 -0.005956 -0.500000 +v 0.500000 1.494044 0.500000 +v 0.500000 -0.005956 0.500000 +v -0.500000 1.494044 -0.500000 +v -0.500000 0.079550 -0.442996 +v -0.500000 1.494044 0.500000 +v -0.500000 0.079550 0.442996 +v 0.500000 1.030494 -0.500000 +v -0.500000 0.944987 0.442996 +v 0.500000 1.030494 0.500000 +v -0.500000 0.944987 -0.442996 +v -0.500000 -0.005956 -0.500000 +v -0.500000 -0.005956 0.500000 +v -0.500000 1.030494 -0.500000 +v -0.500000 1.030494 0.500000 +v -0.448431 0.125662 -0.412255 +v -0.448431 0.125662 0.412255 +v -0.448431 0.898876 -0.412255 +v -0.448431 0.898876 0.412255 +v -0.448431 0.079550 -0.442996 +v -0.448431 0.079550 0.442996 +v -0.448431 0.944987 -0.442996 +v -0.448431 0.944987 0.442996 +v -0.500000 1.072258 0.472158 +v -0.500000 1.452280 0.472158 +v -0.500000 1.452280 -0.472158 +v -0.500000 1.072258 -0.472158 +v -0.500000 1.030494 0.500000 +v -0.500000 1.494044 0.500000 +v -0.500000 1.494044 -0.500000 +v -0.500000 1.030494 -0.500000 +v -0.379871 1.105910 0.449723 +v -0.379871 1.418628 0.449723 +v -0.379871 1.418628 -0.449723 +v -0.379871 1.105910 -0.449723 +v -0.379871 1.072258 0.472158 +v -0.379871 1.452280 0.472158 +v -0.379871 1.452280 -0.472158 +v -0.379871 1.072258 -0.472158 +v -0.478172 1.116874 0.442413 +v -0.470862 1.105910 0.449723 +v -0.478109 1.115443 0.443367 +v -0.477922 1.114036 0.444305 +v -0.477615 1.112678 0.445210 +v -0.477192 1.111392 0.446068 +v -0.476661 1.110199 0.446863 +v -0.476031 1.109121 0.447582 +v -0.475312 1.108176 0.448212 +v -0.474517 1.107379 0.448743 +v -0.473659 1.106744 0.449166 +v -0.472754 1.106283 0.449474 +v -0.471816 1.106004 0.449660 +v -0.470862 1.418628 0.449723 +v -0.478172 1.407663 0.442413 +v -0.471816 1.418534 0.449660 +v -0.472754 1.418254 0.449474 +v -0.473659 1.417793 0.449166 +v -0.474517 1.417159 0.448743 +v -0.475312 1.416362 0.448212 +v -0.476031 1.415416 0.447582 +v -0.476661 1.414338 0.446863 +v -0.477192 1.413146 0.446068 +v -0.477615 1.411859 0.445210 +v -0.477922 1.410501 0.444305 +v -0.478109 1.409094 0.443367 +v -0.470862 1.418628 -0.449723 +v -0.478172 1.407663 -0.442413 +v -0.471816 1.418534 -0.449660 +v -0.472754 1.418254 -0.449474 +v -0.473659 1.417793 -0.449166 +v -0.474517 1.417159 -0.448743 +v -0.475312 1.416362 -0.448212 +v -0.476031 1.415416 -0.447582 +v -0.476661 1.414338 -0.446863 +v -0.477192 1.413146 -0.446068 +v -0.477615 1.411859 -0.445210 +v -0.477922 1.410501 -0.444305 +v -0.478109 1.409094 -0.443367 +v -0.470862 1.105910 -0.449723 +v -0.478172 1.116874 -0.442413 +v -0.471816 1.106004 -0.449660 +v -0.472754 1.106283 -0.449474 +v -0.473659 1.106744 -0.449166 +v -0.474517 1.107379 -0.448743 +v -0.475312 1.108176 -0.448212 +v -0.476031 1.109121 -0.447582 +v -0.476661 1.110199 -0.446863 +v -0.477192 1.111392 -0.446068 +v -0.477615 1.112678 -0.445210 +v -0.477922 1.114036 -0.444305 +v -0.478109 1.115443 -0.443367 +v -0.498372 0.149361 -0.396455 +v -0.482572 0.125662 -0.412255 +v -0.498237 0.146268 -0.398517 +v -0.497833 0.143228 -0.400544 +v -0.497169 0.140292 -0.402501 +v -0.496255 0.137512 -0.404355 +v -0.495107 0.134934 -0.406073 +v -0.493744 0.132603 -0.407627 +v -0.492190 0.130559 -0.408990 +v -0.490472 0.128837 -0.410138 +v -0.488618 0.127466 -0.411052 +v -0.486661 0.126469 -0.411716 +v -0.484634 0.125865 -0.412119 +v -0.482572 0.125662 0.412255 +v -0.498372 0.149361 0.396455 +v -0.484634 0.125865 0.412119 +v -0.486661 0.126469 0.411716 +v -0.488618 0.127466 0.411052 +v -0.490472 0.128837 0.410138 +v -0.492190 0.130559 0.408990 +v -0.493744 0.132603 0.407627 +v -0.495107 0.134934 0.406073 +v -0.496255 0.137512 0.404355 +v -0.497169 0.140292 0.402501 +v -0.497833 0.143228 0.400544 +v -0.498237 0.146268 0.398517 +v -0.498372 0.875176 -0.396455 +v -0.482572 0.898876 -0.412255 +v -0.498237 0.878270 -0.398517 +v -0.497833 0.881310 -0.400544 +v -0.497169 0.884246 -0.402501 +v -0.496255 0.887026 -0.404355 +v -0.495107 0.889603 -0.406073 +v -0.493744 0.891934 -0.407627 +v -0.492190 0.893978 -0.408990 +v -0.490472 0.895701 -0.410138 +v -0.488618 0.897072 -0.411052 +v -0.486661 0.898068 -0.411716 +v -0.484634 0.898673 -0.412119 +v -0.482572 0.898876 0.412255 +v -0.498372 0.875176 0.396455 +v -0.484634 0.898673 0.412119 +v -0.486661 0.898068 0.411716 +v -0.488618 0.897072 0.411052 +v -0.490472 0.895701 0.410138 +v -0.492190 0.893978 0.408990 +v -0.493744 0.891934 0.407627 +v -0.495107 0.889603 0.406073 +v -0.496255 0.887026 0.404355 +v -0.497169 0.884246 0.402501 +v -0.497833 0.881310 0.400544 +v -0.498237 0.878270 0.398517 +vn -0.0000 1.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 -1.0000 -0.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0654 -0.0000 0.9979 +vn -0.1951 -0.0000 0.9808 +vn -0.3214 -0.0000 0.9469 +vn -0.4423 -0.0000 0.8969 +vn -0.5556 -0.0000 0.8315 +vn -0.6594 -0.0000 0.7518 +vn -0.7518 -0.0000 0.6594 +vn -0.8315 -0.0000 0.5556 +vn -0.8969 -0.0000 0.4423 +vn -0.9469 -0.0000 0.3214 +vn -0.9808 -0.0000 0.1951 +vn -0.9979 -0.0000 0.0654 +vn -0.0979 0.9952 -0.0000 +vn -0.2859 0.9583 -0.0000 +vn -0.4538 0.8911 -0.0000 +vn -0.5947 0.8040 -0.0000 +vn -0.7079 0.7063 -0.0000 +vn -0.7961 0.6052 -0.0000 +vn -0.8633 0.5047 -0.0000 +vn -0.9135 0.4069 -0.0000 +vn -0.9500 0.3123 -0.0000 +vn -0.9753 0.2207 -0.0000 +vn -0.9913 0.1315 -0.0000 +vn -0.9990 0.0436 -0.0000 +vn -0.0654 -0.0000 -0.9979 +vn -0.1951 -0.0000 -0.9808 +vn -0.3214 -0.0000 -0.9469 +vn -0.4423 -0.0000 -0.8969 +vn -0.5556 -0.0000 -0.8315 +vn -0.6594 -0.0000 -0.7518 +vn -0.7518 -0.0000 -0.6594 +vn -0.8315 -0.0000 -0.5556 +vn -0.8969 -0.0000 -0.4423 +vn -0.9469 -0.0000 -0.3214 +vn -0.9808 -0.0000 -0.1951 +vn -0.9979 -0.0000 -0.0654 +vn -0.9990 -0.0436 -0.0000 +vn -0.9913 -0.1315 -0.0000 +vn -0.9753 -0.2207 -0.0000 +vn -0.9500 -0.3123 -0.0000 +vn -0.9135 -0.4069 -0.0000 +vn -0.8633 -0.5047 -0.0000 +vn -0.7961 -0.6052 -0.0000 +vn -0.7079 -0.7063 -0.0000 +vn -0.5947 -0.8040 -0.0000 +vn -0.4537 -0.8911 -0.0000 +vn -0.2859 -0.9583 -0.0000 +vn -0.0978 -0.9952 -0.0000 +vn -0.5947 -0.8039 -0.0000 +vn -0.3215 -0.0000 -0.9469 +vn -0.6593 -0.0000 -0.7519 +vn -0.7518 -0.0000 -0.6593 +vn -0.3215 -0.0000 0.9469 +vn -0.6593 -0.0000 0.7519 +vn -0.7518 -0.0000 0.6593 +vn -0.0978 0.9952 -0.0000 +vt 0.625000 0.500000 +vt 0.375000 0.500000 +vt 0.625000 0.750000 +vt 0.375000 0.750000 +vt 0.000000 0.000000 +vt 0.625000 0.250000 +vt 0.875000 0.500000 +vt 0.389251 0.235749 +vt 0.625000 1.000000 +vt 0.875000 0.750000 +vt 0.000000 0.000000 +vt 0.389251 0.014251 +vt 0.547742 0.500000 +vt 0.533490 0.014251 +vt 0.547742 0.750000 +vt 0.533491 0.235749 +vt 0.125000 0.500000 +vt 0.375000 0.250000 +vt 0.125000 0.750000 +vt 0.375000 1.000000 +vt 0.375000 0.000000 +vt 0.000000 0.000000 +vt 0.547742 0.250000 +vt 0.547742 1.000000 +vt 0.547742 0.000000 +vt 0.000000 0.000000 +vt 0.396936 0.228064 +vt 0.396936 0.021936 +vt 0.525805 0.228064 +vt 0.525805 0.021936 +vt 0.389251 0.235749 +vt 0.389251 0.014251 +vt 0.533491 0.235749 +vt 0.533490 0.014251 +vt 0.554702 0.006961 +vt 0.618039 0.006961 +vt 0.618039 0.243039 +vt 0.554702 0.243039 +vt 0.000000 0.000000 +vt 0.547742 0.000000 +vt 0.875000 0.750000 +vt 0.000000 0.000000 +vt 0.625000 0.000000 +vt 0.000000 0.000000 +vt 0.875000 0.500000 +vt 0.625000 0.250000 +vt 0.000000 0.000000 +vt 0.547742 0.250000 +vt 0.560311 0.012569 +vt 0.612431 0.012569 +vt 0.612431 0.237431 +vt 0.560311 0.237431 +vt 0.554702 0.006961 +vt 0.618039 0.006961 +vt 0.618039 0.243039 +vt 0.554702 0.243039 +vt 0.562138 0.014397 +vt 0.560311 0.012569 +vt 0.561900 0.014158 +vt 0.561665 0.013924 +vt 0.561439 0.013697 +vt 0.561225 0.013483 +vt 0.561026 0.013284 +vt 0.560579 0.012837 +vt 0.560500 0.012758 +vt 0.560433 0.012692 +vt 0.560380 0.012639 +vt 0.560342 0.012600 +vt 0.560319 0.012577 +vt 0.612431 0.012569 +vt 0.610603 0.014397 +vt 0.612423 0.012577 +vt 0.612400 0.012600 +vt 0.612361 0.012639 +vt 0.612308 0.012692 +vt 0.612242 0.012758 +vt 0.612163 0.012837 +vt 0.611716 0.013284 +vt 0.611517 0.013483 +vt 0.611303 0.013697 +vt 0.611076 0.013924 +vt 0.610842 0.014158 +vt 0.612431 0.237431 +vt 0.610603 0.235603 +vt 0.612423 0.237423 +vt 0.612399 0.237400 +vt 0.612361 0.237361 +vt 0.612308 0.237308 +vt 0.612242 0.237242 +vt 0.612163 0.237163 +vt 0.611716 0.236716 +vt 0.611517 0.236517 +vt 0.611302 0.236303 +vt 0.611076 0.236076 +vt 0.610842 0.235842 +vt 0.560311 0.237431 +vt 0.562138 0.235603 +vt 0.560319 0.237423 +vt 0.560342 0.237400 +vt 0.560381 0.237361 +vt 0.560433 0.237308 +vt 0.560500 0.237242 +vt 0.560579 0.237163 +vt 0.561026 0.236716 +vt 0.561225 0.236517 +vt 0.561439 0.236303 +vt 0.561665 0.236076 +vt 0.561900 0.235842 +vt 0.400886 0.224114 +vt 0.396936 0.228064 +vt 0.400371 0.224629 +vt 0.399864 0.225136 +vt 0.399375 0.225625 +vt 0.398911 0.226089 +vt 0.398482 0.226518 +vt 0.397515 0.227485 +vt 0.397344 0.227656 +vt 0.397201 0.227799 +vt 0.397087 0.227913 +vt 0.397004 0.227996 +vt 0.396953 0.228047 +vt 0.396936 0.021936 +vt 0.400886 0.025886 +vt 0.396953 0.021953 +vt 0.397004 0.022004 +vt 0.397087 0.022087 +vt 0.397201 0.022201 +vt 0.397344 0.022344 +vt 0.397515 0.022515 +vt 0.398482 0.023482 +vt 0.398911 0.023911 +vt 0.399375 0.024375 +vt 0.399864 0.024864 +vt 0.400371 0.025371 +vt 0.521855 0.224114 +vt 0.525805 0.228064 +vt 0.522371 0.224629 +vt 0.522878 0.225136 +vt 0.523367 0.225625 +vt 0.523830 0.226089 +vt 0.524260 0.226518 +vt 0.525227 0.227485 +vt 0.525397 0.227656 +vt 0.525541 0.227799 +vt 0.525655 0.227913 +vt 0.525738 0.227996 +vt 0.525788 0.228047 +vt 0.525805 0.021936 +vt 0.521855 0.025886 +vt 0.525788 0.021953 +vt 0.525738 0.022004 +vt 0.525655 0.022087 +vt 0.525541 0.022201 +vt 0.525397 0.022344 +vt 0.525227 0.022515 +vt 0.524260 0.023482 +vt 0.523830 0.023911 +vt 0.523367 0.024375 +vt 0.522878 0.024864 +vt 0.522371 0.025371 +s 0 +usemtl Material +f 1/1/1 5/7/1 7/10/1 3/3/1 +f 11/15/2 3/3/2 7/9/2 16/24/2 +f 5/5/1 15/22/1 32/47/1 31/44/1 +f 13/17/3 2/2/3 4/4/3 14/19/3 +f 9/13/4 1/1/4 3/3/4 11/15/4 +f 15/23/5 5/6/5 1/1/5 9/13/5 +f 13/18/5 15/23/5 9/13/5 2/2/5 +f 2/2/4 9/13/4 11/15/4 4/4/4 +f 10/14/3 12/16/3 23/33/3 24/34/3 +f 4/4/2 11/15/2 16/24/2 14/20/2 +f 8/12/6 6/8/6 13/18/6 14/21/6 +f 6/8/6 12/16/6 15/23/6 13/18/6 +f 10/14/6 8/12/6 14/21/6 16/25/6 +f 12/16/6 10/14/6 16/25/6 15/23/6 +f 18/28/2 20/30/2 132/148/2 106/122/2 +f 12/16/2 6/8/2 21/31/2 23/33/2 +f 8/12/5 10/14/5 24/34/5 22/32/5 +f 6/8/1 8/12/1 22/32/1 21/31/1 +f 18/28/6 17/27/6 21/31/6 22/32/6 +f 17/27/6 19/29/6 23/33/6 21/31/6 +f 20/30/6 18/28/6 22/32/6 24/34/6 +f 19/29/6 20/30/6 24/34/6 23/33/6 +f 19/29/5 17/27/5 94/110/5 120/136/5 +f 17/27/3 18/28/3 106/122/3 94/110/3 +f 20/30/1 19/29/1 120/136/1 132/148/1 +f 28/38/1 25/35/1 37/53/1 40/56/1 +f 7/10/1 5/7/1 31/45/1 30/41/1 +f 15/23/1 16/25/1 29/40/1 32/48/1 +f 16/26/1 7/11/1 30/42/1 29/39/1 +f 26/36/6 25/35/6 29/40/6 30/43/6 +f 27/37/6 26/36/6 30/43/6 31/46/6 +f 28/38/6 27/37/6 31/46/6 32/48/6 +f 25/35/6 28/38/6 32/48/6 29/40/6 +f 26/36/3 27/37/3 39/55/3 38/54/3 +f 27/37/2 28/38/2 40/56/2 39/55/2 +f 25/35/5 26/36/5 38/54/5 37/53/5 +f 34/50/6 33/49/6 37/53/6 38/54/6 +f 35/51/6 34/50/6 38/54/6 39/55/6 +f 36/52/6 35/51/6 39/55/6 40/56/6 +f 33/49/6 36/52/6 40/56/6 37/53/6 +f 36/52/3 33/49/3 42/58/3 80/96/3 +f 41/57/6 55/71/6 68/84/6 81/97/6 +f 34/50/1 35/51/1 67/83/1 54/70/1 +f 35/51/5 36/52/5 80/96/5 67/83/5 +f 42/58/7 54/70/7 56/72/7 53/69/7 +f 53/69/8 56/72/8 57/73/8 52/68/8 +f 52/68/9 57/73/9 58/74/9 51/67/9 +f 51/67/10 58/74/10 59/75/10 50/66/10 +f 50/66/11 59/75/11 60/76/11 49/65/11 +f 49/65/12 60/76/12 61/77/12 48/64/12 +f 48/64/13 61/77/13 62/78/13 47/63/13 +f 47/63/14 62/78/14 63/79/14 46/62/14 +f 46/62/15 63/79/15 64/80/15 45/61/15 +f 45/61/16 64/80/16 65/81/16 44/60/16 +f 44/60/17 65/81/17 66/82/17 43/59/17 +f 43/59/18 66/82/18 55/71/18 41/57/18 +f 54/70/19 67/83/19 69/85/19 56/72/19 +f 56/72/20 69/85/20 70/86/20 57/73/20 +f 57/73/21 70/86/21 71/87/21 58/74/21 +f 58/74/22 71/87/22 72/88/22 59/75/22 +f 59/75/23 72/88/23 73/89/23 60/76/23 +f 60/76/24 73/89/24 74/90/24 61/77/24 +f 61/77/25 74/90/25 75/91/25 62/78/25 +f 62/78/26 75/91/26 76/92/26 63/79/26 +f 63/79/27 76/92/27 77/93/27 64/80/27 +f 64/80/28 77/93/28 78/94/28 65/81/28 +f 65/81/29 78/94/29 79/95/29 66/82/29 +f 66/82/30 79/95/30 68/84/30 55/71/30 +f 67/83/31 80/96/31 82/98/31 69/85/31 +f 69/85/32 82/98/32 83/99/32 70/86/32 +f 70/86/33 83/99/33 84/100/33 71/87/33 +f 71/87/34 84/100/34 85/101/34 72/88/34 +f 72/88/35 85/101/35 86/102/35 73/89/35 +f 73/89/36 86/102/36 87/103/36 74/90/36 +f 74/90/37 87/103/37 88/104/37 75/91/37 +f 75/91/38 88/104/38 89/105/38 76/92/38 +f 76/92/39 89/105/39 90/106/39 77/93/39 +f 77/93/40 90/106/40 91/107/40 78/94/40 +f 78/94/41 91/107/41 92/108/41 79/95/41 +f 79/95/42 92/108/42 81/97/42 68/84/42 +f 41/57/43 81/97/43 92/108/43 43/59/43 +f 43/59/44 92/108/44 91/107/44 44/60/44 +f 44/60/45 91/107/45 90/106/45 45/61/45 +f 45/61/46 90/106/46 89/105/46 46/62/46 +f 46/62/47 89/105/47 88/104/47 47/63/47 +f 47/63/48 88/104/48 87/103/48 48/64/48 +f 48/64/49 87/103/49 86/102/49 49/65/49 +f 49/65/50 86/102/50 85/101/50 50/66/50 +f 50/66/51 85/101/51 84/100/51 51/67/51 +f 51/67/52 84/100/52 83/99/52 52/68/52 +f 52/68/53 83/99/53 82/98/53 53/69/53 +f 53/69/54 82/98/54 80/96/54 42/58/54 +f 33/49/2 34/50/2 54/70/2 42/58/2 +f 94/110/54 106/122/54 108/124/54 105/121/54 +f 105/121/53 108/124/53 109/125/53 104/120/53 +f 104/120/52 109/125/52 110/126/52 103/119/52 +f 103/119/55 110/126/55 111/127/55 102/118/55 +f 102/118/50 111/127/50 112/128/50 101/117/50 +f 101/117/49 112/128/49 113/129/49 100/116/49 +f 100/116/48 113/129/48 114/130/48 99/115/48 +f 99/115/47 114/130/47 115/131/47 98/114/47 +f 98/114/46 115/131/46 116/132/46 97/113/46 +f 97/113/45 116/132/45 117/133/45 96/112/45 +f 96/112/44 117/133/44 118/134/44 95/111/44 +f 95/111/43 118/134/43 107/123/43 93/109/43 +f 120/136/31 94/110/31 105/121/31 131/147/31 +f 131/147/32 105/121/32 104/120/32 130/146/32 +f 130/146/56 104/120/56 103/119/56 129/145/56 +f 129/145/34 103/119/34 102/118/34 128/144/34 +f 128/144/35 102/118/35 101/117/35 127/143/35 +f 127/143/57 101/117/57 100/116/57 126/142/57 +f 126/142/58 100/116/58 99/115/58 125/141/58 +f 125/141/38 99/115/38 98/114/38 124/140/38 +f 124/140/39 98/114/39 97/113/39 123/139/39 +f 123/139/40 97/113/40 96/112/40 122/138/40 +f 122/138/41 96/112/41 95/111/41 121/137/41 +f 121/137/42 95/111/42 93/109/42 119/135/42 +f 106/122/7 132/148/7 134/150/7 108/124/7 +f 108/124/8 134/150/8 135/151/8 109/125/8 +f 109/125/59 135/151/59 136/152/59 110/126/59 +f 110/126/10 136/152/10 137/153/10 111/127/10 +f 111/127/11 137/153/11 138/154/11 112/128/11 +f 112/128/60 138/154/60 139/155/60 113/129/60 +f 113/129/61 139/155/61 140/156/61 114/130/61 +f 114/130/14 140/156/14 141/157/14 115/131/14 +f 115/131/15 141/157/15 142/158/15 116/132/15 +f 116/132/16 142/158/16 143/159/16 117/133/16 +f 117/133/17 143/159/17 144/160/17 118/134/17 +f 118/134/18 144/160/18 133/149/18 107/123/18 +f 132/148/62 120/136/62 131/147/62 134/150/62 +f 134/150/20 131/147/20 130/146/20 135/151/20 +f 135/151/21 130/146/21 129/145/21 136/152/21 +f 136/152/22 129/145/22 128/144/22 137/153/22 +f 137/153/23 128/144/23 127/143/23 138/154/23 +f 138/154/24 127/143/24 126/142/24 139/155/24 +f 139/155/25 126/142/25 125/141/25 140/156/25 +f 140/156/26 125/141/26 124/140/26 141/157/26 +f 141/157/27 124/140/27 123/139/27 142/158/27 +f 142/158/28 123/139/28 122/138/28 143/159/28 +f 143/159/29 122/138/29 121/137/29 144/160/29 +f 144/160/30 121/137/30 119/135/30 133/149/30 +f 107/123/6 133/149/6 119/135/6 93/109/6 diff --git a/src/ex_9_1.hpp b/src/ex_9_1.hpp index 4216fad..d3c9123 100644 --- a/src/ex_9_1.hpp +++ b/src/ex_9_1.hpp @@ -41,6 +41,7 @@ namespace models { Core::RenderContext bed; Core::RenderContext floor; Core::RenderContext carpet; + Core::RenderContext cabinet; Core::RenderContext roof; Core::RenderContext longerWall; Core::RenderContext longerWall_d; @@ -330,6 +331,7 @@ void renderScene(GLFWwindow* window) glUseProgram(program); + drawObjectPBR(models::floor, glm::mat4(), textures::floorTexture, 0, @@ -375,6 +377,13 @@ void renderScene(GLFWwindow* window) 0.2, 0.1 ); + model = glm::mat4(); + model = glm::scale(glm::vec3(0.5f)) * translate(glm::vec3(0.8f, 0.0f, -3.0f)); + model = glm::rotate(model, glm::radians(90.0f), glm::vec3(0, 1, 0)); + drawObjectPBR(models::cabinet, model, + textures::floorTexture, + 0, + 0); //drawObjectPBR(models::potPlant, glm::mat4() * glm::scale(glm::vec3(0.2f)) * glm::translate(glm::vec3(-5.0f, 55.0f, -6.0f)), // textures::potPlantTexture, // 1.0f, @@ -438,7 +447,6 @@ void renderScene(GLFWwindow* window) 0.,0.,0.,1., }); - //drawObjectColor(shipContext, // glm::translate(cameraPos + 1.5 * cameraDir + cameraUp * -0.5f) * inveseCameraRotrationMatrix * glm::eulerAngleY(glm::pi()), // glm::vec3(0.3, 0.3, 0.5) @@ -623,6 +631,7 @@ void init(GLFWwindow* window) loadModelToContext("./models2/room/smallerWall.obj", models::smallerWall); loadModelToContext("./models2/room/smallerWall_ww.obj", models::smallerWall_ww); loadModelToContext("./models2/room/longerWall_d.obj", models::longerWall_d); + loadModelToContext("./models2/cabinet/cabinet.obj", models::cabinet); textures::floorTexture = Core::LoadTexture("./models2/room/wood.png"); textures::flashlightTexture = Core::LoadTexture("./models/FlashlightTexture.png");