Working on room model
This commit is contained in:
parent
fe694895ff
commit
321861e387
BIN
models2/carpet/1251.jpg
Normal file
BIN
models2/carpet/1251.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.9 MiB |
16
models2/carpet/carpet.obj
Normal file
16
models2/carpet/carpet.obj
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
# Blender 3.4.1
|
||||||
|
# www.blender.org
|
||||||
|
mtllib carpet.mtl
|
||||||
|
o Plane
|
||||||
|
v -1.300000 0.000000 0.700000
|
||||||
|
v 1.300000 0.000000 0.700000
|
||||||
|
v -1.300000 0.000000 -0.700000
|
||||||
|
v 1.300000 0.000000 -0.700000
|
||||||
|
vn -0.0000 1.0000 -0.0000
|
||||||
|
vt 0.000000 0.000000
|
||||||
|
vt 1.000000 0.000000
|
||||||
|
vt 0.000000 1.000000
|
||||||
|
vt 1.000000 1.000000
|
||||||
|
s 0
|
||||||
|
usemtl Material.001
|
||||||
|
f 1/1/1 2/2/1 4/4/1 3/3/1
|
@ -1,4 +1,4 @@
|
|||||||
# Blender 3.4.1 MTL File: 'untitled.blend'
|
# Blender 3.4.1 MTL File: 'None'
|
||||||
# www.blender.org
|
# www.blender.org
|
||||||
|
|
||||||
newmtl Material.001
|
newmtl Material.001
|
||||||
@ -9,4 +9,4 @@ Ke 0.000000 0.000000 0.000000
|
|||||||
Ni 1.450000
|
Ni 1.450000
|
||||||
d 1.000000
|
d 1.000000
|
||||||
illum 2
|
illum 2
|
||||||
map_Kd room.png
|
map_Kd wood.png
|
16
models2/room/floor.obj
Normal file
16
models2/room/floor.obj
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
# Blender 3.4.1
|
||||||
|
# www.blender.org
|
||||||
|
mtllib floor.mtl
|
||||||
|
o Plane
|
||||||
|
v -2.500000 0.000000 2.000000
|
||||||
|
v 2.500000 0.000000 2.000000
|
||||||
|
v -2.500000 0.000000 -2.000000
|
||||||
|
v 2.500000 0.000000 -2.000000
|
||||||
|
vn -0.0000 1.0000 -0.0000
|
||||||
|
vt 0.000000 0.000000
|
||||||
|
vt 1.000000 0.000000
|
||||||
|
vt 0.000000 1.000000
|
||||||
|
vt 1.000000 1.000000
|
||||||
|
s 0
|
||||||
|
usemtl Material.001
|
||||||
|
f 1/1/1 2/2/1 4/4/1 3/3/1
|
12
models2/room/longerWall.mtl
Normal file
12
models2/room/longerWall.mtl
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
# Blender 3.4.1 MTL File: 'None'
|
||||||
|
# www.blender.org
|
||||||
|
|
||||||
|
newmtl Material.001
|
||||||
|
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 longerWall.png
|
16
models2/room/longerWall.obj
Normal file
16
models2/room/longerWall.obj
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
# Blender 3.4.1
|
||||||
|
# www.blender.org
|
||||||
|
mtllib longerWall.mtl
|
||||||
|
o Plane
|
||||||
|
v -2.500000 0.000000 -0.000000
|
||||||
|
v 2.500000 0.000000 -0.000000
|
||||||
|
v -2.500000 2.600000 0.000000
|
||||||
|
v 2.500000 2.600000 0.000000
|
||||||
|
vn -0.0000 -0.0000 1.0000
|
||||||
|
vt 0.000000 0.000000
|
||||||
|
vt 1.000000 0.000000
|
||||||
|
vt 0.000000 1.000000
|
||||||
|
vt 1.000000 1.000000
|
||||||
|
s 0
|
||||||
|
usemtl Material.001
|
||||||
|
f 1/1/1 2/2/1 4/4/1 3/3/1
|
BIN
models2/room/longerWall.png
Normal file
BIN
models2/room/longerWall.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 25 KiB |
BIN
models2/room/roof.png
Normal file
BIN
models2/room/roof.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 28 KiB |
@ -1,493 +0,0 @@
|
|||||||
# Blender 3.4.1
|
|
||||||
# www.blender.org
|
|
||||||
mtllib room.mtl
|
|
||||||
o Plane
|
|
||||||
v -2.000000 0.000000 2.550000
|
|
||||||
v 2.000000 0.000000 2.550000
|
|
||||||
v -2.000000 0.000000 -2.550000
|
|
||||||
v 2.000000 0.000000 -2.550000
|
|
||||||
v -2.000000 2.600094 -2.550000
|
|
||||||
v -2.000000 2.600094 2.550000
|
|
||||||
v 2.000000 2.600094 2.550000
|
|
||||||
v 2.000000 2.600094 -2.550000
|
|
||||||
v -2.000000 0.000000 -1.203367
|
|
||||||
v 2.000000 0.000000 -1.203367
|
|
||||||
v -2.000000 2.600094 -1.203367
|
|
||||||
v 2.000000 2.600094 -1.203367
|
|
||||||
v 2.000000 0.000000 -2.361471
|
|
||||||
v 2.000000 2.600094 -2.361471
|
|
||||||
v -2.000000 0.000000 -2.361471
|
|
||||||
v -2.000000 2.600094 -2.361471
|
|
||||||
v 2.000000 2.328018 -2.550000
|
|
||||||
v 2.000000 2.328018 2.550000
|
|
||||||
v -2.000000 2.328018 2.550000
|
|
||||||
v -2.000000 2.328018 -2.550000
|
|
||||||
v -2.000000 2.328018 -1.203367
|
|
||||||
v 2.000000 2.328018 -1.203367
|
|
||||||
v -2.000000 2.328018 -2.361471
|
|
||||||
v 2.000000 2.328018 -2.361471
|
|
||||||
v 3.854932 0.000000 -2.550000
|
|
||||||
v 3.854932 0.000000 -1.203367
|
|
||||||
v 3.854932 0.000000 -2.361471
|
|
||||||
v 2.000000 0.000000 -0.860954
|
|
||||||
v 3.854932 0.000000 -0.860954
|
|
||||||
v 2.000000 2.594849 -2.550000
|
|
||||||
v 3.854932 2.594849 -2.550000
|
|
||||||
v 3.854932 2.594849 -1.203367
|
|
||||||
v 3.854932 2.594849 -2.361471
|
|
||||||
v 2.000000 2.594849 -0.860954
|
|
||||||
v 3.854932 2.594849 -0.860954
|
|
||||||
v 0.950195 0.000000 2.550000
|
|
||||||
v 0.950195 0.000000 -2.550000
|
|
||||||
v 0.950195 2.600094 2.550000
|
|
||||||
v 0.950195 2.600094 -2.550000
|
|
||||||
v 0.950195 2.600094 -1.203367
|
|
||||||
v 0.950195 0.000000 -1.203367
|
|
||||||
v 0.950195 2.600094 -2.361471
|
|
||||||
v 0.950195 0.000000 -2.361471
|
|
||||||
v 0.950195 2.328018 2.550000
|
|
||||||
v 0.950195 2.328018 -2.550000
|
|
||||||
v 1.847825 0.000000 2.550000
|
|
||||||
v 1.847825 2.600094 2.550000
|
|
||||||
v 1.847825 0.000000 -1.203367
|
|
||||||
v 1.847825 0.000000 -2.361471
|
|
||||||
v 1.847825 2.328018 -2.550000
|
|
||||||
v 1.847825 0.000000 -2.550000
|
|
||||||
v 1.847825 2.600094 -2.550000
|
|
||||||
v 1.847825 2.600094 -1.203367
|
|
||||||
v 1.847825 2.600094 -2.361471
|
|
||||||
v 1.847825 2.328018 2.550000
|
|
||||||
v 2.000000 1.922961 2.550000
|
|
||||||
v -2.000000 1.922961 -2.550000
|
|
||||||
v 2.000000 1.922961 -2.550000
|
|
||||||
v -2.000000 1.922961 2.550000
|
|
||||||
v -2.000000 1.922961 -1.203367
|
|
||||||
v 2.000000 1.922961 -1.203367
|
|
||||||
v -2.000000 1.922961 -2.361471
|
|
||||||
v 2.000000 1.922961 -2.361471
|
|
||||||
v 0.950195 1.922961 -2.550000
|
|
||||||
v 0.950195 1.922961 2.550000
|
|
||||||
v 1.847825 1.922961 -2.550000
|
|
||||||
v 1.847825 1.922961 2.550000
|
|
||||||
v -1.745646 0.000000 -2.550000
|
|
||||||
v -1.745646 2.600094 -2.550000
|
|
||||||
v -1.745646 2.600094 -1.203367
|
|
||||||
v -1.745646 2.600094 -2.361471
|
|
||||||
v -1.745646 2.328018 2.550000
|
|
||||||
v -1.745646 0.000000 2.550000
|
|
||||||
v -1.745646 2.600094 2.550000
|
|
||||||
v -1.745646 0.000000 -1.203367
|
|
||||||
v -1.745646 0.000000 -2.361471
|
|
||||||
v -1.745646 2.328018 -2.550000
|
|
||||||
v -1.745646 1.922961 2.550000
|
|
||||||
v -1.745646 1.922961 -2.550000
|
|
||||||
v 0.677633 0.000000 2.550000
|
|
||||||
v 0.677633 2.600094 2.550000
|
|
||||||
v 0.677633 0.000000 -1.203367
|
|
||||||
v 0.677633 0.000000 -2.361471
|
|
||||||
v 0.677633 2.328018 -2.550000
|
|
||||||
v 0.677633 1.922961 -2.550000
|
|
||||||
v 0.677633 0.000000 -2.550000
|
|
||||||
v 0.677633 2.600094 -2.550000
|
|
||||||
v 0.677633 2.600094 -1.203367
|
|
||||||
v 0.677633 2.600094 -2.361471
|
|
||||||
v 0.677633 2.328018 2.550000
|
|
||||||
v 0.677633 1.922961 2.550000
|
|
||||||
v -2.000000 0.792870 -2.550000
|
|
||||||
v 2.000000 0.792870 -2.550000
|
|
||||||
v -2.000000 0.792870 2.550000
|
|
||||||
v -2.000000 0.792870 -1.203367
|
|
||||||
v -2.000000 0.792870 -2.361471
|
|
||||||
v 2.000000 0.792870 -2.361471
|
|
||||||
v 0.950195 0.792870 -2.550000
|
|
||||||
v 0.950195 0.792870 2.550000
|
|
||||||
v 1.847825 0.792870 -2.550000
|
|
||||||
v -1.745646 0.792870 -2.550000
|
|
||||||
v -1.745646 0.792870 2.550000
|
|
||||||
v 0.677633 0.792870 2.550000
|
|
||||||
v 0.677633 0.792870 -2.550000
|
|
||||||
v 2.000000 2.119410 -2.550000
|
|
||||||
v -2.000000 2.119410 2.550000
|
|
||||||
v -2.000000 2.119410 -1.203367
|
|
||||||
v 2.000000 2.119410 -1.203367
|
|
||||||
v -2.000000 2.119410 -2.361471
|
|
||||||
v 2.000000 2.119410 -2.361471
|
|
||||||
v 0.950195 2.119410 -2.550000
|
|
||||||
v 0.950195 2.119410 2.550000
|
|
||||||
v 1.847825 2.119410 -2.550000
|
|
||||||
v 1.847825 2.119410 2.550000
|
|
||||||
v 2.000000 2.119410 2.550000
|
|
||||||
v -2.000000 2.119410 -2.550000
|
|
||||||
v -1.745646 2.119410 2.550000
|
|
||||||
v -1.745646 2.119410 -2.550000
|
|
||||||
v 0.677633 2.119410 -2.550000
|
|
||||||
v 0.677633 2.119410 2.550000
|
|
||||||
v -2.000000 0.000000 4.095870
|
|
||||||
v 2.000000 0.000000 4.095870
|
|
||||||
v 0.950195 0.000000 4.095870
|
|
||||||
v 1.847825 0.000000 4.095870
|
|
||||||
v -1.745646 0.000000 4.095870
|
|
||||||
v 0.677633 0.000000 4.095870
|
|
||||||
v -2.000000 0.815284 2.550000
|
|
||||||
v 2.000000 0.815284 2.550000
|
|
||||||
v -2.000000 0.815284 4.095870
|
|
||||||
v 2.000000 0.815284 4.095870
|
|
||||||
v 0.950195 0.815284 4.095870
|
|
||||||
v 1.847825 0.815284 4.095870
|
|
||||||
v -1.745646 0.815284 4.095870
|
|
||||||
v 0.677633 0.815284 4.095870
|
|
||||||
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 -0.0000 -0.0000 -1.0000
|
|
||||||
vn -0.0000 -0.0000 1.0000
|
|
||||||
vt 0.088957 0.014411
|
|
||||||
vt 0.363715 0.014411
|
|
||||||
vt 0.260346 0.403217
|
|
||||||
vt 0.567337 0.892900
|
|
||||||
vt 0.088957 0.751767
|
|
||||||
vt 0.088957 0.260346
|
|
||||||
vt 0.609650 0.014411
|
|
||||||
vt 0.363715 0.362961
|
|
||||||
vt 0.913230 0.362961
|
|
||||||
vt 0.117779 0.751767
|
|
||||||
vt 0.334892 0.014411
|
|
||||||
vt 0.014411 0.403217
|
|
||||||
vt 0.884408 0.014411
|
|
||||||
vt 0.334892 0.260346
|
|
||||||
vt 0.605250 0.825559
|
|
||||||
vt 0.638472 0.637719
|
|
||||||
vt 0.609650 0.362961
|
|
||||||
vt 0.638472 0.014411
|
|
||||||
vt 0.884408 0.334139
|
|
||||||
vt 0.014411 0.722944
|
|
||||||
vt 0.884408 0.362961
|
|
||||||
vt 0.260346 0.722944
|
|
||||||
vt 0.363715 0.334139
|
|
||||||
vt 0.884408 0.608896
|
|
||||||
vt 0.609650 0.334139
|
|
||||||
vt 0.363715 0.682688
|
|
||||||
vt 0.638472 0.608896
|
|
||||||
vt 0.638472 0.362961
|
|
||||||
vt 0.609650 0.682688
|
|
||||||
vt 0.638472 0.334139
|
|
||||||
vt 0.269954 0.014411
|
|
||||||
vt 0.079349 0.403217
|
|
||||||
vt 0.269954 0.260346
|
|
||||||
vt 0.544712 0.362961
|
|
||||||
vt 0.079349 0.722944
|
|
||||||
vt 0.884408 0.427899
|
|
||||||
vt 0.544712 0.682688
|
|
||||||
vt 0.638472 0.427899
|
|
||||||
vt 0.325801 0.260346
|
|
||||||
vt 0.596159 0.825559
|
|
||||||
vt 0.600559 0.362961
|
|
||||||
vt 0.600559 0.682688
|
|
||||||
vt 0.638472 0.372052
|
|
||||||
vt 0.325801 0.014411
|
|
||||||
vt 0.023503 0.403217
|
|
||||||
vt 0.023503 0.722944
|
|
||||||
vt 0.884408 0.372052
|
|
||||||
vt 0.609650 0.649232
|
|
||||||
vt 0.638472 0.300682
|
|
||||||
vt 0.363715 0.649232
|
|
||||||
vt 0.609650 0.300682
|
|
||||||
vt 0.260346 0.689488
|
|
||||||
vt 0.363715 0.300682
|
|
||||||
vt 0.014411 0.689488
|
|
||||||
vt 0.884408 0.300682
|
|
||||||
vt 0.079349 0.689488
|
|
||||||
vt 0.544712 0.649232
|
|
||||||
vt 0.023503 0.689488
|
|
||||||
vt 0.600559 0.649232
|
|
||||||
vt 0.605250 0.711511
|
|
||||||
vt 0.752521 0.637719
|
|
||||||
vt 0.289169 0.403217
|
|
||||||
vt 0.269954 0.374395
|
|
||||||
vt 0.929742 0.014411
|
|
||||||
vt 0.325801 0.374395
|
|
||||||
vt 0.596159 0.711511
|
|
||||||
vt 0.985589 0.014411
|
|
||||||
vt 0.298260 0.403217
|
|
||||||
vt 0.253442 0.260346
|
|
||||||
vt 0.781343 0.637719
|
|
||||||
vt 0.253442 0.374395
|
|
||||||
vt 0.913230 0.014411
|
|
||||||
vt 0.895391 0.637719
|
|
||||||
vt 0.638472 0.956801
|
|
||||||
vt 0.752521 0.956801
|
|
||||||
vt 0.289169 0.722299
|
|
||||||
vt 0.929742 0.333494
|
|
||||||
vt 0.985589 0.333494
|
|
||||||
vt 0.298260 0.722299
|
|
||||||
vt 0.781343 0.956801
|
|
||||||
vt 0.913230 0.333494
|
|
||||||
vt 0.895391 0.956801
|
|
||||||
vt 0.545104 0.014411
|
|
||||||
vt 0.567337 0.711511
|
|
||||||
vt 0.088957 0.195800
|
|
||||||
vt 0.334892 0.195800
|
|
||||||
vt 0.703018 0.014411
|
|
||||||
vt 0.703018 0.608896
|
|
||||||
vt 0.545104 0.334139
|
|
||||||
vt 0.703018 0.362961
|
|
||||||
vt 0.703018 0.334139
|
|
||||||
vt 0.703018 0.427899
|
|
||||||
vt 0.269954 0.195800
|
|
||||||
vt 0.703018 0.372052
|
|
||||||
vt 0.325801 0.195800
|
|
||||||
vt 0.545104 0.300682
|
|
||||||
vt 0.703018 0.300682
|
|
||||||
vt 0.600294 0.014411
|
|
||||||
vt 0.922586 0.362961
|
|
||||||
vt 0.088957 0.250990
|
|
||||||
vt 0.647829 0.608896
|
|
||||||
vt 0.600294 0.334139
|
|
||||||
vt 0.269954 0.250990
|
|
||||||
vt 0.325801 0.250990
|
|
||||||
vt 0.647829 0.300682
|
|
||||||
vt 0.334892 0.250990
|
|
||||||
vt 0.647829 0.014411
|
|
||||||
vt 0.647829 0.334139
|
|
||||||
vt 0.647829 0.362961
|
|
||||||
vt 0.647829 0.427899
|
|
||||||
vt 0.647829 0.372052
|
|
||||||
vt 0.600294 0.300682
|
|
||||||
vt 0.609650 0.250873
|
|
||||||
vt 0.363715 0.599423
|
|
||||||
vt 0.884408 0.250873
|
|
||||||
vt 0.014411 0.639679
|
|
||||||
vt 0.638472 0.250873
|
|
||||||
vt 0.609650 0.599423
|
|
||||||
vt 0.363715 0.250873
|
|
||||||
vt 0.260346 0.639679
|
|
||||||
vt 0.079349 0.639679
|
|
||||||
vt 0.544712 0.599423
|
|
||||||
vt 0.023503 0.639679
|
|
||||||
vt 0.600559 0.599423
|
|
||||||
vt 0.703018 0.250873
|
|
||||||
vt 0.545104 0.250873
|
|
||||||
vt 0.647829 0.250873
|
|
||||||
vt 0.600294 0.250873
|
|
||||||
vt 0.334892 0.030050
|
|
||||||
vt 0.868769 0.014411
|
|
||||||
vt 0.868769 0.334139
|
|
||||||
vt 0.868769 0.362961
|
|
||||||
vt 0.868769 0.427899
|
|
||||||
vt 0.868769 0.372052
|
|
||||||
vt 0.379353 0.300682
|
|
||||||
vt 0.088957 0.030050
|
|
||||||
vt 0.379353 0.014411
|
|
||||||
vt 0.567337 0.877261
|
|
||||||
vt 0.379353 0.334139
|
|
||||||
vt 0.868769 0.608896
|
|
||||||
vt 0.269954 0.030050
|
|
||||||
vt 0.325801 0.030050
|
|
||||||
vt 0.868769 0.300682
|
|
||||||
vt 0.379353 0.250873
|
|
||||||
vt 0.868769 0.250873
|
|
||||||
vt 0.088957 0.179042
|
|
||||||
vt 0.528346 0.014411
|
|
||||||
vt 0.567337 0.728269
|
|
||||||
vt 0.528346 0.334139
|
|
||||||
vt 0.719777 0.608896
|
|
||||||
vt 0.269954 0.179042
|
|
||||||
vt 0.325801 0.179042
|
|
||||||
vt 0.719776 0.300682
|
|
||||||
vt 0.719777 0.250873
|
|
||||||
vt 0.334892 0.179042
|
|
||||||
vt 0.719777 0.014411
|
|
||||||
vt 0.719776 0.334139
|
|
||||||
vt 0.719777 0.362961
|
|
||||||
vt 0.719777 0.427899
|
|
||||||
vt 0.719777 0.372052
|
|
||||||
vt 0.528346 0.300682
|
|
||||||
vt 0.528346 0.250873
|
|
||||||
vt 0.014411 0.500714
|
|
||||||
vt 0.884408 0.111909
|
|
||||||
vt 0.609650 0.460458
|
|
||||||
vt 0.638472 0.111909
|
|
||||||
vt 0.363715 0.111909
|
|
||||||
vt 0.260346 0.500714
|
|
||||||
vt 0.079349 0.500714
|
|
||||||
vt 0.023503 0.500714
|
|
||||||
vt 0.600559 0.460458
|
|
||||||
vt 0.703018 0.111909
|
|
||||||
vt 0.545104 0.111909
|
|
||||||
vt 0.647829 0.111909
|
|
||||||
vt 0.868769 0.111909
|
|
||||||
vt 0.379353 0.111909
|
|
||||||
vt 0.528346 0.111909
|
|
||||||
vt 0.719777 0.111909
|
|
||||||
vt 0.638472 0.275030
|
|
||||||
vt 0.609650 0.623580
|
|
||||||
vt 0.363715 0.275030
|
|
||||||
vt 0.260346 0.663836
|
|
||||||
vt 0.079349 0.663836
|
|
||||||
vt 0.544712 0.623580
|
|
||||||
vt 0.023503 0.663836
|
|
||||||
vt 0.600559 0.623580
|
|
||||||
vt 0.703018 0.275030
|
|
||||||
vt 0.545104 0.275030
|
|
||||||
vt 0.647829 0.275030
|
|
||||||
vt 0.600294 0.275030
|
|
||||||
vt 0.609650 0.275030
|
|
||||||
vt 0.363715 0.623580
|
|
||||||
vt 0.884408 0.275030
|
|
||||||
vt 0.014411 0.663836
|
|
||||||
vt 0.379353 0.275030
|
|
||||||
vt 0.868769 0.275030
|
|
||||||
vt 0.719777 0.275030
|
|
||||||
vt 0.528346 0.275030
|
|
||||||
vt 0.492791 0.892900
|
|
||||||
vt 0.463968 0.892900
|
|
||||||
vt 0.014411 0.751767
|
|
||||||
vt 0.913230 0.437507
|
|
||||||
vt 0.305160 0.751767
|
|
||||||
vt 0.192325 0.751767
|
|
||||||
vt 0.492791 0.711511
|
|
||||||
vt 0.014411 0.195800
|
|
||||||
vt 0.463968 0.711511
|
|
||||||
vt 0.221148 0.751767
|
|
||||||
vt 0.922586 0.437507
|
|
||||||
vt 0.014411 0.250990
|
|
||||||
vt 0.314516 0.751767
|
|
||||||
vt 0.276338 0.751767
|
|
||||||
vt 0.492791 0.877261
|
|
||||||
vt 0.463968 0.877261
|
|
||||||
vt 0.492791 0.728269
|
|
||||||
vt 0.463968 0.728269
|
|
||||||
vt 0.088957 0.852020
|
|
||||||
vt 0.117779 0.852020
|
|
||||||
vt 0.363715 0.892900
|
|
||||||
vt 0.014411 0.852020
|
|
||||||
vt 0.305160 0.852020
|
|
||||||
vt 0.192325 0.852020
|
|
||||||
vt 0.363715 0.711511
|
|
||||||
vt 0.221148 0.852020
|
|
||||||
vt 0.314516 0.852020
|
|
||||||
vt 0.276338 0.852020
|
|
||||||
vt 0.363715 0.877261
|
|
||||||
vt 0.363715 0.728269
|
|
||||||
s 0
|
|
||||||
usemtl Material.001
|
|
||||||
f 49/104/1 51/106/1 4/14/1 13/39/1
|
|
||||||
f 54/111/2 14/43/2 8/28/2 52/109/2
|
|
||||||
f 24/59/3 17/48/3 8/29/3 14/42/3
|
|
||||||
f 21/56/4 19/52/4 6/22/4 11/35/4
|
|
||||||
f 77/143/5 20/55/5 5/19/5 69/131/5
|
|
||||||
f 55/112/6 18/51/6 7/25/6 47/102/6
|
|
||||||
f 23/58/4 21/56/4 11/35/4 16/46/4
|
|
||||||
f 18/50/3 22/57/3 12/37/3 7/26/3
|
|
||||||
f 47/101/2 7/27/2 12/38/2 53/110/2
|
|
||||||
f 46/100/1 48/103/1 10/33/1 2/6/1
|
|
||||||
f 20/54/4 23/58/4 16/46/4 5/20/4
|
|
||||||
f 22/57/3 24/59/3 14/42/3 12/37/3
|
|
||||||
f 53/110/2 12/38/2 14/43/2 54/111/2
|
|
||||||
f 48/103/1 49/104/1 13/39/1 10/33/1
|
|
||||||
f 10/33/1 13/39/1 27/65/1 26/63/1
|
|
||||||
f 116/194/4 109/185/4 23/58/4 20/54/4
|
|
||||||
f 115/192/3 108/184/3 22/57/3 18/50/3
|
|
||||||
f 109/185/4 107/183/4 21/56/4 23/58/4
|
|
||||||
f 114/190/6 115/191/6 18/51/6 55/112/6
|
|
||||||
f 118/196/5 116/193/5 20/55/5 77/143/5
|
|
||||||
f 107/183/4 106/182/4 19/52/4 21/56/4
|
|
||||||
f 110/186/3 105/180/3 17/48/3 24/59/3
|
|
||||||
f 4/15/2 13/40/2 27/66/2 25/60/2
|
|
||||||
f 10/33/1 26/63/1 29/71/1 28/69/1
|
|
||||||
f 26/64/3 27/67/3 33/78/3 32/77/3
|
|
||||||
f 4/16/6 25/61/6 31/75/6 30/74/6
|
|
||||||
f 25/62/4 27/68/4 33/79/4 31/76/4
|
|
||||||
f 29/72/3 26/64/3 32/77/3 35/81/3
|
|
||||||
f 28/70/6 29/73/6 35/82/6 34/80/6
|
|
||||||
f 113/189/5 111/187/5 45/97/5 50/105/5
|
|
||||||
f 120/198/6 112/188/6 44/96/6 90/161/6
|
|
||||||
f 82/151/1 83/152/1 43/95/1 41/93/1
|
|
||||||
f 88/159/2 40/92/2 42/94/2 89/160/2
|
|
||||||
f 80/146/1 82/151/1 41/93/1 36/85/1
|
|
||||||
f 81/150/2 38/88/2 40/92/2 88/159/2
|
|
||||||
f 90/161/6 44/96/6 38/89/6 81/149/6
|
|
||||||
f 50/105/5 45/97/5 39/91/5 52/108/5
|
|
||||||
f 89/160/2 42/94/2 39/90/2 87/158/2
|
|
||||||
f 83/152/1 86/155/1 37/86/1 43/95/1
|
|
||||||
f 17/49/5 50/105/5 52/108/5 8/30/5
|
|
||||||
f 105/179/5 113/189/5 50/105/5 17/49/5
|
|
||||||
f 112/188/6 114/190/6 55/112/6 44/96/6
|
|
||||||
f 41/93/1 43/95/1 49/104/1 48/103/1
|
|
||||||
f 40/92/2 53/110/2 54/111/2 42/94/2
|
|
||||||
f 36/85/1 41/93/1 48/103/1 46/100/1
|
|
||||||
f 38/88/2 47/101/2 53/110/2 40/92/2
|
|
||||||
f 44/96/6 55/112/6 47/102/6 38/89/6
|
|
||||||
f 42/94/2 54/111/2 52/109/2 39/90/2
|
|
||||||
f 43/95/1 37/86/1 51/106/1 49/104/1
|
|
||||||
f 104/178/5 101/175/5 79/145/5 85/154/5
|
|
||||||
f 93/166/5 100/174/5 66/127/5 58/117/5
|
|
||||||
f 103/177/6 99/173/6 65/126/6 91/162/6
|
|
||||||
f 100/174/5 98/172/5 64/125/5 66/127/5
|
|
||||||
f 97/171/3 93/165/3 58/118/3 63/124/3
|
|
||||||
f 95/169/4 94/168/4 59/120/4 60/121/4
|
|
||||||
f 101/175/5 92/164/5 57/115/5 79/145/5
|
|
||||||
f 46/98/6 2/7/6 56/113/6 67/128/6
|
|
||||||
f 96/170/4 95/169/4 60/121/4 62/123/4
|
|
||||||
f 2/8/3 10/34/3 61/122/3 56/114/3
|
|
||||||
f 92/163/4 96/170/4 62/123/4 57/116/4
|
|
||||||
f 94/167/6 102/176/6 78/144/6 59/119/6
|
|
||||||
f 15/44/1 3/11/1 68/129/1 76/142/1
|
|
||||||
f 16/47/2 71/134/2 69/132/2 5/21/2
|
|
||||||
f 19/53/6 72/135/6 74/139/6 6/23/6
|
|
||||||
f 6/24/2 74/140/2 70/133/2 11/36/2
|
|
||||||
f 1/1/1 9/31/1 75/141/1 73/136/1
|
|
||||||
f 11/36/2 70/133/2 71/134/2 16/47/2
|
|
||||||
f 9/31/1 15/44/1 76/142/1 75/141/1
|
|
||||||
f 106/181/6 117/195/6 72/135/6 19/53/6
|
|
||||||
f 119/197/5 118/196/5 77/143/5 84/153/5
|
|
||||||
f 84/153/5 77/143/5 69/131/5 87/157/5
|
|
||||||
f 45/97/5 84/153/5 87/157/5 39/91/5
|
|
||||||
f 111/187/5 119/197/5 84/153/5 45/97/5
|
|
||||||
f 98/172/5 104/178/5 85/154/5 64/125/5
|
|
||||||
f 76/142/1 68/129/1 86/155/1 83/152/1
|
|
||||||
f 71/134/2 89/160/2 87/158/2 69/132/2
|
|
||||||
f 72/135/6 90/161/6 81/149/6 74/139/6
|
|
||||||
f 74/140/2 81/150/2 88/159/2 70/133/2
|
|
||||||
f 73/136/1 75/141/1 82/151/1 80/146/1
|
|
||||||
f 70/133/2 88/159/2 89/160/2 71/134/2
|
|
||||||
f 75/141/1 76/142/1 83/152/1 82/151/1
|
|
||||||
f 117/195/6 120/198/6 90/161/6 72/135/6
|
|
||||||
f 37/87/5 86/156/5 104/178/5 98/172/5
|
|
||||||
f 73/137/6 80/147/6 103/177/6 102/176/6
|
|
||||||
f 1/2/6 73/137/6 102/176/6 94/167/6
|
|
||||||
f 3/12/4 15/45/4 96/170/4 92/163/4
|
|
||||||
f 15/45/4 9/32/4 95/169/4 96/170/4
|
|
||||||
f 68/130/5 3/13/5 92/164/5 101/175/5
|
|
||||||
f 9/32/4 1/3/4 94/168/4 95/169/4
|
|
||||||
f 13/41/3 4/17/3 93/165/3 97/171/3
|
|
||||||
f 51/107/5 37/87/5 98/172/5 100/174/5
|
|
||||||
f 80/147/6 36/83/6 99/173/6 103/177/6
|
|
||||||
f 4/18/5 51/107/5 100/174/5 93/166/5
|
|
||||||
f 86/156/5 68/130/5 101/175/5 104/178/5
|
|
||||||
f 64/125/5 85/154/5 119/197/5 111/187/5
|
|
||||||
f 85/154/5 79/145/5 118/196/5 119/197/5
|
|
||||||
f 59/119/6 78/144/6 117/195/6 106/181/6
|
|
||||||
f 58/117/5 66/127/5 113/189/5 105/179/5
|
|
||||||
f 91/162/6 65/126/6 112/188/6 120/198/6
|
|
||||||
f 66/127/5 64/125/5 111/187/5 113/189/5
|
|
||||||
f 63/124/3 58/118/3 105/180/3 110/186/3
|
|
||||||
f 60/121/4 59/120/4 106/182/4 107/183/4
|
|
||||||
f 79/145/5 57/115/5 116/193/5 118/196/5
|
|
||||||
f 67/128/6 56/113/6 115/191/6 114/190/6
|
|
||||||
f 62/123/4 60/121/4 107/183/4 109/185/4
|
|
||||||
f 56/114/3 61/122/3 108/184/3 115/192/3
|
|
||||||
f 57/116/4 62/123/4 109/185/4 116/194/4
|
|
||||||
f 80/148/2 73/138/2 125/213/2 126/215/2
|
|
||||||
f 2/9/2 46/99/2 124/209/2 122/202/2
|
|
||||||
f 36/84/2 80/148/2 126/215/2 123/205/2
|
|
||||||
f 36/85/1 46/100/1 124/210/1 123/206/1
|
|
||||||
f 73/138/2 1/4/2 121/199/2 125/213/2
|
|
||||||
f 122/203/5 124/211/5 132/225/5 130/221/5
|
|
||||||
f 2/10/4 122/204/4 130/222/4 128/218/4
|
|
||||||
f 125/214/5 121/200/5 129/219/5 133/227/5
|
|
||||||
f 123/207/5 126/216/5 134/228/5 131/223/5
|
|
||||||
f 121/201/3 1/5/3 127/217/3 129/220/3
|
|
||||||
f 126/216/5 125/214/5 133/227/5 134/228/5
|
|
||||||
f 123/208/6 124/212/6 132/226/6 131/224/6
|
|
Binary file not shown.
Before Width: | Height: | Size: 34 KiB |
BIN
models2/room/wood.png
Normal file
BIN
models2/room/wood.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.6 MiB |
158
src/ex_9_1.hpp
158
src/ex_9_1.hpp
@ -35,10 +35,13 @@ namespace models {
|
|||||||
Core::RenderContext ceilingLamp;
|
Core::RenderContext ceilingLamp;
|
||||||
Core::RenderContext desk;
|
Core::RenderContext desk;
|
||||||
Core::RenderContext bed;
|
Core::RenderContext bed;
|
||||||
Core::RenderContext room;
|
Core::RenderContext floor;
|
||||||
|
Core::RenderContext carpet;
|
||||||
|
Core::RenderContext roof;
|
||||||
|
Core::RenderContext longerWall;
|
||||||
}
|
}
|
||||||
namespace textures {
|
namespace textures {
|
||||||
GLuint room;
|
GLuint floorTexture;
|
||||||
GLuint sunTexture;
|
GLuint sunTexture;
|
||||||
GLuint windowFrameTexture;
|
GLuint windowFrameTexture;
|
||||||
GLuint bookShelfTexture;
|
GLuint bookShelfTexture;
|
||||||
@ -50,6 +53,9 @@ namespace textures {
|
|||||||
GLuint ceilingLampTexture;
|
GLuint ceilingLampTexture;
|
||||||
GLuint bedTexture;
|
GLuint bedTexture;
|
||||||
GLuint flashlightTexture;
|
GLuint flashlightTexture;
|
||||||
|
GLuint carpetTexture;
|
||||||
|
GLuint roofTexture;
|
||||||
|
GLuint longerWallTexture;
|
||||||
}
|
}
|
||||||
|
|
||||||
GLuint depthMapFBO;
|
GLuint depthMapFBO;
|
||||||
@ -215,13 +221,13 @@ void renderShadowapSun() {
|
|||||||
|
|
||||||
glm::mat4 lightVP = glm::ortho(-3.f, 2.3f, -1.3f, 3.f, -1.0f, 40.0f) * glm::lookAt(sunPos, sunPos - sunDir, glm::vec3(0, 1, 0));
|
glm::mat4 lightVP = glm::ortho(-3.f, 2.3f, -1.3f, 3.f, -1.0f, 40.0f) * glm::lookAt(sunPos, sunPos - sunDir, glm::vec3(0, 1, 0));
|
||||||
|
|
||||||
drawObjectDepth(sphereContext,
|
/* drawObjectDepth(sphereContext,
|
||||||
lightVP,
|
lightVP,
|
||||||
glm::translate(pointlightPos) * glm::scale(glm::vec3(0.1)) * glm::eulerAngleY(time / 3) * glm::translate(glm::vec3(4.f, 0, 0)) * glm::scale(glm::vec3(0.3f)));
|
glm::translate(pointlightPos) * glm::scale(glm::vec3(0.1)) * glm::eulerAngleY(time / 3) * glm::translate(glm::vec3(4.f, 0, 0)) * glm::scale(glm::vec3(0.3f)));
|
||||||
drawObjectDepth(sphereContext,
|
drawObjectDepth(sphereContext,
|
||||||
lightVP,
|
lightVP,
|
||||||
glm::translate(pointlightPos) * glm::scale(glm::vec3(0.1)) * glm::eulerAngleY(time / 3) * glm::translate(glm::vec3(4.f, 0, 0)) * glm::eulerAngleY(time) * glm::translate(glm::vec3(1.f, 0, 0)) * glm::scale(glm::vec3(0.1f)));
|
glm::translate(pointlightPos) * glm::scale(glm::vec3(0.1)) * glm::eulerAngleY(time / 3) * glm::translate(glm::vec3(4.f, 0, 0)) * glm::eulerAngleY(time) * glm::translate(glm::vec3(1.f, 0, 0)) * glm::scale(glm::vec3(0.1f)));
|
||||||
//drawObjectDepth(models::bedContext,
|
*///drawObjectDepth(models::bedContext,
|
||||||
// lightVP,
|
// lightVP,
|
||||||
// glm::mat4());
|
// glm::mat4());
|
||||||
//drawObjectDepth(models::chairContext,
|
//drawObjectDepth(models::chairContext,
|
||||||
@ -269,64 +275,87 @@ void renderScene(GLFWwindow* window)
|
|||||||
renderShadowapSun();
|
renderShadowapSun();
|
||||||
|
|
||||||
//space lamp
|
//space lamp
|
||||||
glUseProgram(programSun);
|
//glUseProgram(programSun);
|
||||||
glm::mat4 viewProjectionMatrix = createPerspectiveMatrix() * createCameraMatrix();
|
//glm::mat4 viewProjectionMatrix = createPerspectiveMatrix() * createCameraMatrix();
|
||||||
glm::mat4 transformation = viewProjectionMatrix * glm::translate(pointlightPos) * glm::scale(glm::vec3(0.1));
|
//glm::mat4 transformation = viewProjectionMatrix * glm::translate(pointlightPos) * glm::scale(glm::vec3(0.1));
|
||||||
glUniformMatrix4fv(glGetUniformLocation(programSun, "transformation"), 1, GL_FALSE, (float*)&transformation);
|
//glUniformMatrix4fv(glGetUniformLocation(programSun, "transformation"), 1, GL_FALSE, (float*)&transformation);
|
||||||
glUniform3f(glGetUniformLocation(programSun, "color"), sunColor.x / 2, sunColor.y / 2, sunColor.z / 2);
|
//glUniform3f(glGetUniformLocation(programSun, "color"), sunColor.x / 2, sunColor.y / 2, sunColor.z / 2);
|
||||||
glUniform1f(glGetUniformLocation(programSun, "exposition"), exposition);
|
//glUniform1f(glGetUniformLocation(programSun, "exposition"), exposition);
|
||||||
Core::DrawContext(sphereContext);
|
//Core::DrawContext(sphereContext);
|
||||||
|
|
||||||
glUseProgram(program);
|
glUseProgram(program);
|
||||||
|
|
||||||
drawObjectPBR(models::window, glm::mat4(),
|
drawObjectPBR(models::floor, glm::mat4(),
|
||||||
textures::windowFrameTexture,
|
textures::floorTexture,
|
||||||
0.2,
|
0,
|
||||||
0.1
|
0);
|
||||||
|
drawObjectPBR(models::roof, glm::mat4() * glm::translate(glm::vec3(0, 2.6, 0)),
|
||||||
|
textures::roofTexture,
|
||||||
|
0,
|
||||||
|
0
|
||||||
);
|
);
|
||||||
drawObjectPBR(models::potPlant, glm::mat4() * glm::scale(glm::vec3(0.2f)) * glm::translate(glm::vec3(-5.0f, 55.0f, -6.0f)),
|
drawObjectPBR(models::longerWall, glm::mat4() * glm::translate(glm::vec3(0,0,-2)),
|
||||||
textures::potPlantTexture,
|
textures::longerWallTexture,
|
||||||
1.0f,
|
0,
|
||||||
0.2f
|
0);
|
||||||
);
|
drawObjectPBR(models::longerWall, glm::mat4() * glm::translate(glm::vec3(0,0,2)),
|
||||||
drawObjectPBR(models::officeChair, glm::mat4(),
|
textures::longerWallTexture,
|
||||||
textures::officeChariTexture,
|
0,
|
||||||
0.2f,
|
0);
|
||||||
0.0f
|
//drawObjectPBR(models::carpet, glm::mat4() * glm::scale(glm::vec3(3)),
|
||||||
);
|
// textures::carpetTexture,
|
||||||
drawObjectPBR(models::lamp, glm::mat4() * glm::scale(glm::vec3(0.001f)),
|
// 0,
|
||||||
textures::lampTexture,
|
// 0
|
||||||
0.3f,
|
//);
|
||||||
0.0f
|
|
||||||
);
|
//drawObjectPBR(models::window, glm::mat4(),
|
||||||
drawObjectPBR(models::door, glm::mat4(),
|
// textures::windowFrameTexture,
|
||||||
textures::doorTexture,
|
// 0.2,
|
||||||
0.4f,
|
// 0.1
|
||||||
0.0f
|
//);
|
||||||
);
|
//drawObjectPBR(models::potPlant, glm::mat4() * glm::scale(glm::vec3(0.2f)) * glm::translate(glm::vec3(-5.0f, 55.0f, -6.0f)),
|
||||||
drawObjectPBR(models::desk, glm::mat4(),
|
// textures::potPlantTexture,
|
||||||
textures::deskTexture,
|
// 1.0f,
|
||||||
0.4f,
|
// 0.2f
|
||||||
0.0f
|
//);
|
||||||
);
|
//drawObjectPBR(models::officeChair, glm::mat4(),
|
||||||
drawObjectPBR(models::ceilingLamp, glm::mat4(),
|
// textures::officeChariTexture,
|
||||||
textures::ceilingLampTexture,
|
// 0.2f,
|
||||||
0.2f,
|
// 0.0f
|
||||||
0.0f
|
//);
|
||||||
);
|
//drawObjectPBR(models::lamp, glm::mat4() * glm::scale(glm::vec3(0.001f)),
|
||||||
drawObjectPBR(models::bed, glm::mat4(),
|
// textures::lampTexture,
|
||||||
textures::bedTexture,
|
// 0.3f,
|
||||||
0.3f,
|
// 0.0f
|
||||||
0.0f
|
//);
|
||||||
);
|
//drawObjectPBR(models::door, glm::mat4(),
|
||||||
drawObjectPBR(models::windowFrame, glm::mat4(),
|
// textures::doorTexture,
|
||||||
textures::windowFrameTexture,
|
// 0.4f,
|
||||||
0.2f,
|
// 0.0f
|
||||||
0.0f);
|
//);
|
||||||
drawObjectPBR(models::bookShelf, glm::mat4() * glm::scale(glm::vec3(0.01)),
|
//drawObjectPBR(models::desk, glm::mat4(),
|
||||||
textures::bookShelfTexture,
|
// textures::deskTexture,
|
||||||
0.4f,
|
// 0.4f,
|
||||||
0.1f);
|
// 0.0f
|
||||||
|
//);
|
||||||
|
//drawObjectPBR(models::ceilingLamp, glm::mat4(),
|
||||||
|
// textures::ceilingLampTexture,
|
||||||
|
// 0.2f,
|
||||||
|
// 0.0f
|
||||||
|
//);
|
||||||
|
//drawObjectPBR(models::bed, glm::mat4(),
|
||||||
|
// textures::bedTexture,
|
||||||
|
// 0.3f,
|
||||||
|
// 0.0f
|
||||||
|
//);
|
||||||
|
//drawObjectPBR(models::windowFrame, glm::mat4(),
|
||||||
|
// textures::windowFrameTexture,
|
||||||
|
// 0.2f,
|
||||||
|
// 0.0f);
|
||||||
|
//drawObjectPBR(models::bookShelf, glm::mat4() * glm::scale(glm::vec3(0.01)),
|
||||||
|
// textures::bookShelfTexture,
|
||||||
|
// 0.4f,
|
||||||
|
// 0.1f);
|
||||||
|
|
||||||
glm::vec3 spaceshipSide = glm::normalize(glm::cross(spaceshipDir, glm::vec3(0.f, 1.f, 0.f)));
|
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));
|
glm::vec3 spaceshipUp = glm::normalize(glm::cross(spaceshipSide, spaceshipDir));
|
||||||
@ -413,7 +442,6 @@ void init(GLFWwindow* window)
|
|||||||
loadModelToContext("./models/spaceship.obj", models::spaceshipContext);
|
loadModelToContext("./models/spaceship.obj", models::spaceshipContext);
|
||||||
loadModelToContext("./models/sphere.obj", models::sphereContext);
|
loadModelToContext("./models/sphere.obj", models::sphereContext);
|
||||||
|
|
||||||
loadModelToContext("./models2/room/room.obj", models::room);
|
|
||||||
loadModelToContext("./models2/bookshelf/shelf.obj", models::bookShelf);
|
loadModelToContext("./models2/bookshelf/shelf.obj", models::bookShelf);
|
||||||
loadModelToContext("./models2/potplant/Pot.obj", models::potPlant);
|
loadModelToContext("./models2/potplant/Pot.obj", models::potPlant);
|
||||||
loadModelToContext("./models2/lamp/Lamp_LOVMANAD_OBJ.obj", models::lamp);
|
loadModelToContext("./models2/lamp/Lamp_LOVMANAD_OBJ.obj", models::lamp);
|
||||||
@ -423,9 +451,12 @@ void init(GLFWwindow* window)
|
|||||||
loadModelToContext("./models2/desk/Desk0.5.obj", models::desk);
|
loadModelToContext("./models2/desk/Desk0.5.obj", models::desk);
|
||||||
loadModelToContext("./models2/chair/chair.obj", models::officeChair);
|
loadModelToContext("./models2/chair/chair.obj", models::officeChair);
|
||||||
loadModelToContext("./models2/window/WindowUK.obj", models::window);
|
loadModelToContext("./models2/window/WindowUK.obj", models::window);
|
||||||
|
loadModelToContext("./models2/carpet/carpet.obj", models::carpet);
|
||||||
|
loadModelToContext("./models2/room/floor.obj", models::floor);
|
||||||
|
loadModelToContext("./models2/room/floor.obj", models::roof);
|
||||||
|
loadModelToContext("./models2/room/longerWall.obj", models::longerWall);
|
||||||
|
|
||||||
|
textures::floorTexture = Core::LoadTexture("./models2/room/wood.png");
|
||||||
textures::room = Core::LoadTexture("./models2/room/room.png");
|
|
||||||
textures::flashlightTexture = Core::LoadTexture("./models/FlashlightTexture.png");
|
textures::flashlightTexture = Core::LoadTexture("./models/FlashlightTexture.png");
|
||||||
textures::sunTexture = Core::LoadTexture("./models/sun.jpeg");
|
textures::sunTexture = Core::LoadTexture("./models/sun.jpeg");
|
||||||
textures::windowFrameTexture = Core::LoadTexture("./models2/Frame/frame.png");
|
textures::windowFrameTexture = Core::LoadTexture("./models2/Frame/frame.png");
|
||||||
@ -437,7 +468,10 @@ void init(GLFWwindow* window)
|
|||||||
textures::ceilingLampTexture = Core::LoadTexture("./models2/ceiling_lamp/ceilingLamp.png");
|
textures::ceilingLampTexture = Core::LoadTexture("./models2/ceiling_lamp/ceilingLamp.png");
|
||||||
textures::deskTexture = Core::LoadTexture("./models2/desk/defsk.png");
|
textures::deskTexture = Core::LoadTexture("./models2/desk/defsk.png");
|
||||||
textures::officeChariTexture = Core::LoadTexture("./models2/chair/chair.png");
|
textures::officeChariTexture = Core::LoadTexture("./models2/chair/chair.png");
|
||||||
textures::windowUkTexture = Core::LoadTexture("./models2/window/windowColor.png");
|
textures::windowFrameTexture = Core::LoadTexture("./models2/window/windowColor.png");
|
||||||
|
textures::carpetTexture = Core::LoadTexture("./models2/carpet/1251.jpg");
|
||||||
|
textures::roofTexture = Core::LoadTexture("./models2/room/roof.png");
|
||||||
|
textures::longerWallTexture = Core::LoadTexture("./models2/room/longerWall.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
void shutdown(GLFWwindow* window)
|
void shutdown(GLFWwindow* window)
|
||||||
|
Loading…
Reference in New Issue
Block a user