s464965/GRK_Room
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'better cube' (#3) from room_cube into master

Browse Source 
Reviewed-on: #3
This commit is contained in:
Dawid Korzępa 2023-01-16 16:40:41 +01:00
commit 72128eecb1
5 changed files with 338 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cw 9/models/plane.mtl Normal file
View File

@ -0,0 +1,12 @@
# Blender MTL File: 'None'
# Material Count: 1
newmtl Material.001
Ns 225.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

16
cw 9/models/plane.obj
View File

@ -1,16 +1,16 @@
# Blender v3.2.1 OBJ File: 'untitled.blend' # Blender v2.93.2 OBJ File: ''
# www.blender.org # www.blender.org
mtllib Plane.mtl mtllib plane.mtl
o Plane o Plane
v -2.000000 0.000000 2.500000 v -5.190380 -0.000000 2.500000
v 2.000000 0.000000 2.500000 v 5.190380 -0.000000 2.500000
v -2.000000 0.000000 -2.500000 v 5.190380 0.000000 -2.500000
v 2.000000 0.000000 -2.500000 v -5.190380 0.000000 -2.500000
vt 0.000000 0.000000 vt 0.000000 0.000000
vt 1.000000 0.000000 vt 1.000000 0.000000
vt 1.000000 1.000000 vt 1.000000 1.000000
vt 0.000000 1.000000 vt 0.000000 1.000000
vn 0.0000 1.0000 0.0000 vn 0.0000 1.0000 0.0000
usemtl Material.001 usemtl Material.001
s off s 1
f 1/1/1 2/2/1 4/3/1 3/4/1 f 1/1/1 2/2/1 3/3/1 4/4/1

12
cw 9/models/room.mtl Normal file
View File

@ -0,0 +1,12 @@
# Blender MTL File: 'None'
# Material Count: 1
newmtl None
Ns 225.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

602
cw 9/models/room.obj
View File

@ -1,155 +1,155 @@
# Blender v3.2.1 OBJ File: 'untitled.blend' # Blender v2.93.2 OBJ File: ''
# www.blender.org # www.blender.org
mtllib room.mtl mtllib room.mtl
o room_Cube.001 o room_Cube.001
v -2.000000 0.000000 2.500000 v -5.190374 1.970000 -2.300000
v -2.000000 2.500000 2.500000 v -5.190374 2.500000 -2.299999
v -2.000000 0.000000 -2.500000 v -5.190374 2.500000 -2.500000
v -2.000000 2.500000 -2.500000 v -5.190374 1.970000 -2.500000
v 2.000000 0.000000 2.500000 v 4.671336 1.970000 -2.500000
v 2.000000 2.500000 2.500000 v 4.671336 2.500000 -2.500000
v 2.000000 0.000000 -2.500000 v 5.190374 2.500000 -2.500000
v 2.000000 2.500000 -2.500000 v 5.190374 1.970000 -2.500000
v 1.800000 0.000000 -2.500000 v 5.190374 1.970000 2.300000
v 1.800000 2.500000 -2.500000 v 5.190374 2.500000 2.300000
v 1.800000 0.000000 2.500000 v 5.190374 2.500000 2.500000
v 1.800000 2.500000 2.500000 v 5.190374 1.970000 2.500000
v -1.800000 0.000000 -2.500000 v -4.671336 1.970000 2.500000
v -1.800000 2.500000 2.500000 v -4.671336 2.500000 2.500000
v -1.800000 2.500000 -2.500000 v -5.190374 2.500000 2.500000
v -1.800000 0.000000 2.500000 v -5.190374 1.970000 2.500000
v -2.000000 0.000000 -2.300000 v 4.671336 -0.000000 2.300000
v -2.000000 0.000000 2.300000 v 5.190374 -0.000000 2.300000
v -2.000000 2.500000 2.300000 v 5.190374 -0.000000 2.500000
v -2.000000 2.500000 -2.300000 v 4.671336 -0.000000 2.500000
v 2.000000 0.000000 2.300000 v -4.671336 2.500000 2.300000
v 2.000000 0.000000 -2.300000 v -5.190374 2.500000 2.300000
v 2.000000 2.500000 -2.300000 v 4.671336 2.500000 2.300000
v 2.000000 2.500000 2.300000 v 4.671336 2.500000 2.500000
v 1.800000 2.500000 -2.300000 v 1.245690 -0.000000 2.300000
v 1.800000 2.500000 2.300000 v 1.245690 -0.000000 2.500000
v 1.800000 0.000000 -2.300000 v 4.671336 1.970000 2.500000
v 1.800000 0.000000 2.300000 v 1.245690 1.970000 -2.500000
v -1.800000 0.000000 -2.300000 v 1.245690 2.500000 -2.500000
v -1.800000 0.000000 2.300000 v -4.671336 2.500000 -2.500000
v -1.800000 2.500000 -2.300000 v -4.671336 1.970000 -2.500000
v -1.800000 2.500000 2.300000 v -5.190374 -0.000000 2.300000
v 1.800000 2.300000 -2.300000 v -4.671336 -0.000000 2.300000
v 1.800000 2.300000 2.300000 v -4.671336 -0.000000 2.500000
v -1.800000 2.300000 -2.300000 v -5.190374 -0.000000 2.500000
v -1.800000 2.300000 2.300000 v -1.245690 2.500000 2.300000
v -0.480000 2.500000 -2.500000 v -1.245690 2.500000 2.500000
v -0.480000 0.000000 2.500000 v -1.245690 1.970000 2.500000
v -0.480000 0.000000 -2.500000 v -1.245690 2.500000 -2.500000
v -0.480000 2.500000 2.500000 v -4.671336 2.500000 -2.299999
v -0.480000 2.500000 -2.300000 v -1.245690 2.500000 -2.299999
v -0.480000 2.500000 2.300000 v -1.245690 2.500000 0.750000
v -0.480000 0.000000 -2.300000 v -4.671336 2.500000 0.750000
v -0.480000 0.000000 2.300000 v -5.190374 0.000000 -2.500000
v -0.480000 2.300000 -2.300000 v -4.671336 0.000000 -2.500000
v -0.480000 2.300000 2.300000 v -4.671336 0.000000 -2.300000
v 0.480000 2.500000 -2.500000 v -5.190374 0.000000 -2.300000
v 0.480000 0.000000 2.500000 v -5.190374 -0.000000 0.750000
v 0.480000 2.500000 -2.300000 v -4.671336 -0.000000 0.750000
v 0.480000 2.500000 2.300000 v 1.245690 0.000000 -2.500000
v 0.480000 0.000000 -2.500000 v 4.671336 0.000000 -2.500000
v 0.480000 2.500000 2.500000 v 4.671336 0.000000 -2.300000
v 0.480000 0.000000 -2.300000 v 1.245690 0.000000 -2.300000
v 0.480000 0.000000 2.300000 v -1.245690 1.970000 2.300000
v 0.480000 2.300000 -2.300000 v -4.671336 1.970000 2.300000
v 0.480000 2.300000 2.300000 v -4.671336 2.299999 2.300000
v -2.000000 1.970000 2.500000 v -1.245690 2.299999 2.300000
v -2.000000 1.970000 -2.500000 v 4.671336 2.500000 -2.299999
v 2.000000 1.970000 -2.500000 v 5.190374 2.500000 -2.299999
v 2.000000 1.970000 2.500000 v 5.190374 2.500000 0.750000
v 1.800000 1.970000 2.500000 v 4.671336 2.500000 0.750000
v 1.800000 1.970000 -2.500000 v -5.190374 2.500000 0.750000
v -1.800000 1.970000 -2.500000 v 5.190374 0.000000 -2.500000
v -1.800000 1.970000 2.500000 v 5.190374 0.000000 -2.300000
v 2.000000 1.970000 -2.300000 v 4.671336 -0.000000 0.750000
v 2.000000 1.970000 2.300000 v 5.190374 -0.000000 0.750000
v -2.000000 1.970000 2.300000 v 5.190374 1.970000 -2.300000
v -2.000000 1.970000 -2.300000 v 5.190374 1.970000 0.750000
v -0.480000 1.970000 2.500000 v -5.190374 1.970000 2.300000
v -0.480000 1.970000 -2.500000 v -5.190374 1.970000 -0.250000
v 0.480000 1.970000 2.500000 v -5.190374 2.500000 -0.250000
v 0.480000 1.970000 -2.500000 v 1.245690 2.300000 0.750000
v -1.800000 1.970000 2.300000 v 4.671336 2.300000 0.750000
v 1.800000 1.970000 2.300000 v 4.671336 2.299999 2.300000
v -1.800000 1.970000 -2.300000 v 1.245690 2.299999 2.300000
v 1.800000 1.970000 -2.300000 v -4.671336 1.970000 -0.250000
v -0.480000 1.970000 -2.300000 v -4.671336 1.970000 -2.300000
v -0.480000 1.970000 2.300000 v -4.671336 2.300000 -2.299999
v 0.480000 1.970000 2.300000 v -4.671336 2.300000 -0.250000
v 0.480000 1.970000 -2.300000 v 4.671336 1.970000 0.750000
v -2.000000 0.000000 0.750000 v 4.671336 1.970000 2.300000
v -2.000000 2.500000 0.750000 v 1.245690 1.970000 -2.300000
v 2.000000 0.000000 0.750000 v 4.671336 1.970000 -2.300000
v 2.000000 2.500000 0.750000 v 4.671336 2.300000 -2.299999
v 1.800000 2.500000 0.750000 v 1.245690 2.300000 -2.299999
v 1.800000 0.000000 0.750000 v -1.245690 1.970000 -2.300000
v -1.800000 0.000000 0.750000 v -1.245690 2.300000 -2.299999
v -1.800000 2.500000 0.750000 v -4.671336 2.300000 0.750000
v 1.800000 2.300000 0.750000 v -1.245690 2.300000 0.750000
v -1.800000 2.300000 0.750000 v 1.245690 1.970000 2.300000
v -0.480000 2.300000 0.750000 v -1.245690 0.000000 -2.500000
v -0.480000 2.500000 0.750000 v -1.245690 0.000000 -2.300000
v 0.480000 2.500000 0.750000 v 1.245690 2.500000 0.750000
v 0.480000 2.300000 0.750000 v 1.245690 2.500000 2.300000
v -2.000000 1.970000 0.750000 v 1.245690 2.500000 -2.299999
v 2.000000 1.970000 0.750000 v 1.245690 1.970000 2.500000
v 1.800000 1.970000 0.750000 v 1.245690 2.500000 2.500000
v -1.800000 1.970000 0.750000 v -1.245690 1.970000 -2.500000
v -2.000000 2.500000 -0.250000 v -1.245690 -0.000000 2.300000
v 2.000000 0.000000 -0.250000 v -1.245690 -0.000000 2.500000
v -2.000000 1.970000 -0.250000 v 4.671336 1.015374 2.500000
v 1.800000 1.970000 -0.250000 v 1.245690 1.015374 2.500000
v -2.000000 0.000000 -0.250000 v -4.671336 1.015374 -2.500000
v 2.000000 2.500000 -0.250000 v -1.245690 1.015374 -2.500000
v 1.800000 2.500000 -0.250000 v -1.245690 1.015374 2.500000
v 1.800000 0.000000 -0.250000 v -5.190374 1.015374 -0.250000
v -1.800000 0.000000 -0.250000 v -5.190374 1.015374 -2.300000
v -1.800000 2.500000 -0.250000 v -5.190374 1.015374 2.500000
v 1.800000 2.300000 -0.250000 v -5.190374 1.015374 2.300000
v -1.800000 2.300000 -0.250000 v 5.190374 1.015374 0.750000
v -0.480000 2.300000 -0.250000 v 5.190374 1.015374 2.300000
v -0.480000 2.500000 -0.250000 v 5.190374 1.015374 -2.500000
v 0.480000 2.500000 -0.250000 v 5.190374 1.015374 -2.300000
v 0.480000 2.300000 -0.250000 v -4.671336 1.015374 2.500000
v 2.000000 1.970000 -0.250000 v -5.190374 1.015374 -2.500000
v -1.800000 1.970000 -0.250000 v 1.245690 1.015374 -2.500000
v -2.000000 1.015374 -2.500000 v 4.671336 1.015374 -2.500000
v 2.000000 1.015374 -2.500000 v 5.190374 1.015374 2.500000
v 2.000000 1.015374 2.500000 v 1.245690 1.015374 -2.300000
v 1.800000 1.015374 2.500000 v 4.671336 1.015374 2.300000
v 1.800000 1.015374 -2.500000 v 1.245690 1.015374 2.300000
v -1.800000 1.015374 -2.500000 v -1.245690 1.015374 2.300000
v -1.800000 1.015374 2.500000 v -4.671336 1.015374 -2.300000
v 2.000000 1.015374 -2.300000 v -1.245690 1.015374 -2.300000
v 2.000000 1.015374 2.300000 v 4.671336 1.015374 -2.300000
v -2.000000 1.015374 2.300000 v 4.671336 1.015374 0.750000
v -2.000000 1.015374 -2.300000 v -4.671336 1.015374 -0.250000
v 1.800000 1.015374 2.300000 v -4.671336 1.015374 2.300000
v 1.800000 1.015374 -2.300000 v -4.671336 1.015374 0.750000
v -0.480000 1.015374 2.500000 v -4.671336 1.970000 0.750000
v -0.480000 1.015374 -2.500000 v 4.671336 1.015374 -0.250000
v 0.480000 1.015374 2.500000 v 4.671336 1.970000 -0.250000
v 0.480000 1.015374 -2.500000 v 5.190374 1.015374 -0.250000
v -2.000000 1.015374 2.500000 v 5.190374 1.970000 -0.250000
v -1.800000 1.015374 2.300000 v -5.190374 1.970000 0.750000
v -1.800000 1.015374 -2.300000 v -5.190374 1.015374 0.750000
v -0.480000 1.015374 -2.300000 v -1.245690 2.300000 -0.250000
v -0.480000 1.015374 2.300000 v 1.245690 2.300000 -0.250000
v 0.480000 1.015374 2.300000 v 4.671336 2.500000 -0.250000
v 0.480000 1.015374 -2.300000 v 1.245690 2.500000 -0.250000
v -1.800000 1.015374 0.750000 v -1.245690 2.500000 -0.250000
v 1.800000 1.015374 0.750000 v 4.671336 2.300000 -0.250000
v 2.000000 1.015374 0.750000 v 5.190374 2.500000 -0.250000
v -2.000000 1.015374 0.750000 v 4.671336 0.000000 -0.250000
v 2.000000 1.015374 -0.250000 v 5.190374 0.000000 -0.250000
v 1.800000 1.015374 -0.250000 v -4.671336 2.500000 -0.250000
v -1.800000 1.015374 -0.250000 v -5.190374 0.000000 -0.250000
v -2.000000 1.015374 -0.250000 v -4.671336 0.000000 -0.250000
vt 0.571865 0.237945 vt 0.571865 0.237945
vt 0.625000 0.237945 vt 0.625000 0.237945
vt 0.625000 0.250000 vt 0.625000 0.250000
@ -332,159 +332,159 @@ vt 0.375000 0.877288
vt 0.375000 0.000000 vt 0.375000 0.000000
vt 0.375000 0.821414 vt 0.375000 0.821414
vt 0.375000 0.372712 vt 0.375000 0.372712
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
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
vn 0.0000 -1.0000 0.0000 vn 0.0000 -1.0000 -0.0000
vn 0.0000 1.0000 0.0000 vn 0.0000 1.0000 0.0000
usemtl None usemtl None
s off s 1
f 68/1/1 20/2/1 4/3/1 58/4/1 f 1/1/1 2/2/1 3/3/1 4/4/1
f 62/5/2 10/6/2 8/7/2 59/8/2 f 5/5/2 6/6/2 7/7/2 8/8/2
f 66/9/3 24/10/3 6/11/3 60/12/3 f 9/9/3 10/10/3 11/11/3 12/12/3
f 64/13/4 14/14/4 2/15/4 57/16/4 f 13/13/4 14/14/4 15/15/4 16/16/4
f 28/17/5 21/18/5 5/19/5 11/20/5 f 17/17/5 18/18/5 19/19/5 20/20/5
f 32/21/6 19/22/6 2/23/6 14/24/6 f 21/21/6 22/22/6 15/23/6 14/24/6
f 24/10/6 26/25/6 12/26/6 6/11/6 f 10/10/6 23/25/6 24/26/6 11/11/6
f 54/27/5 28/17/5 11/20/5 48/28/5 f 25/27/5 17/17/5 20/20/5 26/28/5
f 60/12/4 6/11/4 12/29/4 61/30/4 f 12/12/4 11/11/4 24/29/4 27/30/4
f 72/31/2 47/32/2 10/6/2 62/5/2 f 28/31/2 29/32/2 6/6/2 5/5/2
f 58/4/2 4/3/2 15/33/2 63/34/2 f 4/4/2 3/3/2 30/33/2 31/34/2
f 18/35/5 30/36/5 16/37/5 1/38/5 f 32/35/5 33/36/5 34/37/5 35/38/5
f 42/39/6 32/21/6 14/24/6 40/40/6 f 36/39/6 21/21/6 14/24/6 37/40/6
f 69/41/4 40/42/4 14/14/4 64/13/4 f 38/41/4 37/42/4 14/14/4 13/13/4
f 37/43/6 15/44/6 31/45/6 41/46/6 f 39/43/6 30/44/6 40/45/6 41/46/6
f 92/47/6 88/48/6 32/21/6 42/39/6 f 42/47/6 43/48/6 21/21/6 36/39/6
f 3/49/5 13/50/5 29/51/5 17/52/5 f 44/49/5 45/50/5 46/51/5 47/52/5
f 81/53/5 87/54/5 30/36/5 18/35/5 f 48/53/5 49/54/5 33/36/5 32/35/5
f 51/55/5 9/56/5 27/57/5 53/58/5 f 50/55/5 51/56/5 52/57/5 53/58/5
f 78/59/2 73/60/2 36/61/2 46/62/2 f 54/59/2 55/60/2 56/61/2 57/62/2
f 8/7/6 10/63/6 25/64/6 23/65/6 f 7/7/6 6/63/6 58/64/6 59/65/6
f 84/66/6 85/67/6 26/25/6 24/10/6 f 60/66/6 61/67/6 23/25/6 10/10/6
f 15/44/6 4/68/6 20/69/6 31/45/6 f 30/44/6 3/68/6 2/69/6 40/45/6
f 88/48/6 82/70/6 19/22/6 32/21/6 f 43/48/6 62/70/6 22/22/6 21/21/6
f 9/56/5 7/71/5 22/72/5 27/57/5 f 51/56/5 63/71/5 64/72/5 52/57/5
f 86/73/5 83/74/5 21/18/5 28/17/5 f 65/73/5 66/74/5 18/18/5 17/17/5
f 59/8/3 8/7/3 23/65/3 65/75/3 f 8/8/3 7/7/3 59/65/3 67/75/3
f 96/76/3 84/66/3 24/10/3 66/9/3 f 68/76/3 60/66/3 10/10/3 9/9/3
f 57/77/1 2/78/1 19/79/1 67/80/1 f 16/77/1 15/78/1 22/79/1 69/80/1
f 101/81/1 99/82/1 20/2/1 68/1/1 f 70/81/1 71/82/1 2/2/1 1/1/1
f 94/83/5 89/84/5 34/85/5 56/86/5 f 72/83/5 73/84/5 74/85/5 75/86/5
f 116/87/3 75/88/3 35/89/3 110/90/3 f 76/87/3 77/88/3 78/89/3 79/90/3
f 97/91/1 74/92/1 34/85/1 89/84/1 f 80/91/1 81/92/1 74/85/1 73/84/1
f 80/93/4 76/94/4 33/95/4 55/96/4 f 82/93/4 83/94/4 84/95/4 85/96/4
f 75/88/4 77/97/4 45/98/4 35/89/4 f 77/88/4 86/97/4 87/98/4 78/89/4
f 90/99/5 91/100/5 46/62/5 36/61/5 f 88/99/5 89/100/5 57/62/5 56/61/5
f 79/101/2 78/59/2 46/62/2 56/86/2 f 90/101/2 54/59/2 57/62/2 75/86/2
f 13/50/5 39/102/5 43/103/5 29/51/5 f 45/50/5 91/102/5 92/103/5 46/51/5
f 93/104/6 92/47/6 42/39/6 50/105/6 f 93/104/6 42/47/6 36/39/6 94/105/6
f 47/106/6 37/43/6 41/46/6 49/107/6 f 29/106/6 39/43/6 41/46/6 95/107/6
f 71/108/4 52/109/4 40/42/4 69/41/4 f 96/108/4 97/109/4 37/42/4 38/41/4
f 50/105/6 42/39/6 40/40/6 52/110/6 f 94/105/6 36/39/6 37/40/6 97/110/6
f 63/34/2 15/33/2 37/111/2 70/112/2 f 31/34/2 30/33/2 39/111/2 98/112/2
f 30/36/5 44/113/5 38/114/5 16/37/5 f 33/36/5 99/113/5 100/114/5 34/37/5
f 26/25/6 50/105/6 52/110/6 12/26/6 f 23/25/6 94/105/6 97/110/6 24/26/6
f 61/30/4 12/29/4 52/109/4 71/108/4 f 27/30/4 24/29/4 97/109/4 96/108/4
f 10/63/6 47/106/6 49/107/6 25/64/6 f 6/63/6 29/106/6 95/107/6 58/64/6
f 85/67/6 93/104/6 50/105/6 26/25/6 f 61/67/6 93/104/6 94/105/6 23/25/6
f 74/92/2 79/101/2 56/86/2 34/85/2 f 81/92/2 90/101/2 75/86/2 74/85/2
f 77/97/4 80/93/4 55/96/4 45/98/4 f 86/97/4 82/93/4 85/96/4 87/98/4
f 91/100/5 94/83/5 56/86/5 46/62/5 f 89/100/5 72/83/5 75/86/5 57/62/5
f 70/112/2 37/111/2 47/32/2 72/31/2 f 98/112/2 39/111/2 29/32/2 28/31/2
f 44/113/5 54/27/5 48/28/5 38/114/5 f 99/113/5 25/27/5 26/28/5 100/114/5
f 77/97/5 70/112/5 72/31/5 80/93/5 f 86/97/5 98/112/5 28/31/5 82/93/5
f 120/115/4 61/30/4 71/108/4 132/116/4 f 101/115/4 27/30/4 96/108/4 102/116/4
f 122/117/2 63/34/2 70/112/2 131/118/2 f 103/117/2 31/34/2 98/112/2 104/118/2
f 132/116/4 71/108/4 69/41/4 130/119/4 f 102/116/4 96/108/4 38/41/4 105/119/4
f 148/120/1 101/81/1 68/1/1 127/121/1 f 106/120/1 70/81/1 1/1/1 107/121/1
f 134/122/1 57/77/1 67/80/1 126/123/1 f 108/122/1 16/77/1 69/80/1 109/123/1
f 143/124/3 96/76/3 66/9/3 125/125/3 f 110/124/3 68/76/3 9/9/3 111/125/3
f 118/126/3 59/8/3 65/75/3 124/127/3 f 112/126/3 8/8/3 67/75/3 113/127/3
f 130/119/4 69/41/4 64/13/4 123/128/4 f 105/119/4 38/41/4 13/13/4 114/128/4
f 117/129/2 58/4/2 63/34/2 122/117/2 f 115/129/2 4/4/2 31/34/2 103/117/2
f 133/130/2 72/31/2 62/5/2 121/131/2 f 116/130/2 28/31/2 5/5/2 117/131/2
f 119/132/4 60/12/4 61/30/4 120/115/4 f 118/132/4 12/12/4 27/30/4 101/115/4
f 123/128/4 64/13/4 57/16/4 134/133/4 f 114/128/4 13/13/4 16/16/4 108/133/4
f 125/125/3 66/9/3 60/12/3 119/132/3 f 111/125/3 9/9/3 12/12/3 118/132/3
f 121/131/2 62/5/2 59/8/2 118/126/2 f 117/131/2 5/5/2 8/8/2 112/126/2
f 127/121/1 68/1/1 58/4/1 117/129/1 f 107/121/1 1/1/1 4/4/1 115/129/1
f 140/134/1 133/135/1 51/55/1 53/58/1 f 119/134/1 116/135/1 50/55/1 53/58/1
f 128/136/2 139/137/2 79/101/2 74/92/2 f 120/136/2 121/137/2 90/101/2 81/92/2
f 139/137/2 138/138/2 78/59/2 79/101/2 f 121/137/2 122/138/2 54/59/2 90/101/2
f 136/139/4 137/140/4 77/97/4 75/88/4 f 123/139/4 124/140/4 86/97/4 77/88/4
f 140/134/4 129/141/4 76/94/4 80/93/4 f 119/134/4 125/141/4 83/94/4 82/93/4
f 142/142/1 128/136/1 74/92/1 97/91/1 f 126/142/1 120/136/1 81/92/1 80/91/1
f 147/143/3 136/139/3 75/88/3 116/87/3 f 127/143/3 123/139/3 77/88/3 76/87/3
f 138/138/2 135/144/2 73/60/2 78/59/2 f 122/138/2 128/144/2 55/60/2 54/59/2
f 137/140/3 43/103/3 39/102/3 131/145/3 f 124/140/3 92/103/3 91/102/3 104/145/3
f 135/144/3 141/146/3 98/147/3 73/60/3 f 128/144/3 129/146/3 130/147/3 55/60/3
f 146/148/1 142/142/1 97/91/1 102/149/1 f 131/148/1 126/142/1 80/91/1 132/149/1
f 145/150/3 115/151/3 96/76/3 143/124/3 f 133/150/3 134/151/3 68/76/3 110/124/3
f 126/123/1 67/80/1 95/152/1 144/153/1 f 109/123/1 69/80/1 135/152/1 136/153/1
f 111/154/5 114/155/5 94/83/5 91/100/5 f 137/154/5 138/155/5 72/83/5 89/100/5
f 105/156/6 113/157/6 93/104/6 85/67/6 f 139/156/6 140/157/6 93/104/6 61/67/6
f 113/157/6 112/158/6 92/47/6 93/104/6 f 140/157/6 141/158/6 42/47/6 93/104/6
f 110/90/5 111/154/5 91/100/5 90/99/5 f 79/90/5 137/154/5 89/100/5 88/99/5
f 102/149/1 97/91/1 89/84/1 109/159/1 f 132/149/1 80/91/1 73/84/1 142/159/1
f 73/60/3 98/147/3 90/99/3 36/61/3 f 55/60/3 130/147/3 88/99/3 56/61/3
f 114/155/5 109/159/5 89/84/5 94/83/5 f 138/155/5 142/159/5 73/84/5 72/83/5
f 67/80/1 19/79/1 82/160/1 95/152/1 f 69/80/1 22/79/1 62/160/1 135/152/1
f 115/151/3 104/161/3 84/66/3 96/76/3 f 134/151/3 143/161/3 60/66/3 68/76/3
f 106/162/5 100/163/5 83/74/5 86/73/5 f 144/162/5 145/163/5 66/74/5 65/73/5
f 108/164/6 99/165/6 82/70/6 88/48/6 f 146/164/6 71/165/6 62/70/6 43/48/6
f 104/161/6 105/156/6 85/67/6 84/66/6 f 143/161/6 139/156/6 61/67/6 60/66/6
f 103/166/5 107/167/5 87/54/5 81/53/5 f 147/166/5 148/167/5 49/54/5 48/53/5
f 112/158/6 108/164/6 88/48/6 92/47/6 f 141/158/6 146/164/6 43/48/6 42/47/6
f 41/46/6 31/45/6 108/164/6 112/158/6 f 41/46/6 40/45/6 146/164/6 141/158/6
f 17/52/5 29/51/5 107/167/5 103/166/5 f 47/52/5 46/51/5 148/167/5 147/166/5
f 23/65/6 25/64/6 105/156/6 104/161/6 f 59/65/6 58/64/6 139/156/6 143/161/6
f 31/45/6 20/69/6 99/165/6 108/164/6 f 40/45/6 2/69/6 71/165/6 146/164/6
f 27/57/5 22/72/5 100/163/5 106/162/5 f 52/57/5 64/72/5 145/163/5 144/162/5
f 65/75/3 23/65/3 104/161/3 115/151/3 f 67/75/3 59/65/3 143/161/3 134/151/3
f 55/96/5 33/95/5 109/159/5 114/155/5 f 85/96/5 84/95/5 142/159/5 138/155/5
f 76/94/1 102/149/1 109/159/1 33/95/1 f 83/94/1 132/149/1 142/159/1 84/95/1
f 35/89/5 45/98/5 111/154/5 110/90/5 f 78/89/5 87/98/5 137/154/5 79/90/5
f 49/107/6 41/46/6 112/158/6 113/157/6 f 95/107/6 41/46/6 141/158/6 140/157/6
f 25/64/6 49/107/6 113/157/6 105/156/6 f 58/64/6 95/107/6 140/157/6 139/156/6
f 45/98/5 55/96/5 114/155/5 111/154/5 f 87/98/5 85/96/5 138/155/5 137/154/5
f 124/127/3 65/75/3 115/151/3 145/150/3 f 113/127/3 67/75/3 134/151/3 133/150/3
f 129/141/1 146/148/1 102/149/1 76/94/1 f 125/141/1 131/148/1 132/149/1 83/94/1
f 98/147/3 116/87/3 110/90/3 90/99/3 f 130/147/3 76/87/3 79/90/3 88/99/3
f 95/152/1 82/160/1 99/82/1 101/81/1 f 135/152/1 62/160/1 71/82/1 70/81/1
f 81/168/1 144/153/1 148/120/1 103/169/1 f 48/168/1 136/153/1 106/120/1 147/169/1
f 87/54/3 107/167/3 147/143/3 141/146/3 f 49/54/3 148/167/3 127/143/3 129/146/3
f 27/57/1 106/162/1 146/148/1 129/141/1 f 52/57/1 144/162/1 131/148/1 125/141/1
f 22/72/3 124/127/3 145/150/3 100/163/3 f 64/72/3 113/127/3 133/150/3 145/163/3
f 18/170/1 126/123/1 144/153/1 81/168/1 f 32/170/1 109/123/1 136/153/1 48/168/1
f 100/163/3 145/150/3 143/124/3 83/74/3 f 145/163/3 133/150/3 110/124/3 66/74/3
f 106/162/1 86/73/1 142/142/1 146/148/1 f 144/162/1 65/73/1 126/142/1 131/148/1
f 30/36/3 87/54/3 141/146/3 135/144/3 f 33/36/3 49/54/3 129/146/3 128/144/3
f 77/97/3 137/140/3 131/145/3 70/112/3 f 86/97/3 124/140/3 104/145/3 98/112/3
f 44/113/2 30/36/2 135/144/2 138/138/2 f 99/113/2 33/36/2 128/144/2 122/138/2
f 107/167/3 29/51/3 136/139/3 147/143/3 f 148/167/3 46/51/3 123/139/3 127/143/3
f 86/73/1 28/17/1 128/136/1 142/142/1 f 65/73/1 17/17/1 120/136/1 126/142/1
f 53/58/4 27/57/4 129/141/4 140/134/4 f 53/58/4 52/57/4 125/141/4 119/134/4
f 29/51/4 43/103/4 137/140/4 136/139/4 f 46/51/4 92/103/4 124/140/4 123/139/4
f 54/27/2 44/113/2 138/138/2 139/137/2 f 25/27/2 99/113/2 122/138/2 121/137/2
f 28/17/2 54/27/2 139/137/2 128/136/2 f 17/17/2 25/27/2 121/137/2 120/136/2
f 80/93/1 72/31/1 133/135/1 140/134/1 f 82/93/1 28/31/1 116/135/1 119/134/1
f 17/171/1 127/121/1 117/129/1 3/172/1 f 47/171/1 107/121/1 115/129/1 44/172/1
f 9/173/2 121/131/2 118/126/2 7/71/2 f 51/173/2 117/131/2 112/126/2 63/71/2
f 21/18/3 125/125/3 119/132/3 5/19/3 f 18/18/3 111/125/3 118/132/3 19/19/3
f 16/174/4 123/128/4 134/133/4 1/175/4 f 34/174/4 114/128/4 108/133/4 35/175/4
f 5/19/4 119/132/4 120/115/4 11/176/4 f 19/19/4 118/132/4 101/115/4 20/176/4
f 51/177/2 133/130/2 121/131/2 9/173/2 f 50/177/2 116/130/2 117/131/2 51/173/2
f 3/172/2 117/129/2 122/117/2 13/178/2 f 44/172/2 115/129/2 103/117/2 45/178/2
f 38/179/4 130/119/4 123/128/4 16/174/4 f 100/179/4 105/119/4 114/128/4 34/174/4
f 7/71/3 118/126/3 124/127/3 22/72/3 f 63/71/3 112/126/3 113/127/3 64/72/3
f 83/74/3 143/124/3 125/125/3 21/18/3 f 66/74/3 110/124/3 111/125/3 18/18/3
f 1/180/1 134/122/1 126/123/1 18/170/1 f 35/180/1 108/122/1 109/123/1 32/170/1
f 103/169/1 148/120/1 127/121/1 17/171/1 f 147/169/1 106/120/1 107/121/1 47/171/1
f 48/181/4 132/116/4 130/119/4 38/179/4 f 26/181/4 102/116/4 105/119/4 100/179/4
f 13/178/2 122/117/2 131/118/2 39/182/2 f 45/178/2 103/117/2 104/118/2 91/182/2
f 11/176/4 120/115/4 132/116/4 48/181/4 f 20/176/4 101/115/4 102/116/4 26/181/4
f 144/153/6 141/146/6 147/143/6 148/120/6 f 136/153/6 129/146/6 127/143/6 106/120/6
f 147/143/4 116/87/4 101/81/4 148/120/4 f 127/143/4 76/87/4 70/81/4 106/120/4
f 116/87/5 98/147/5 95/152/5 101/81/5 f 76/87/5 130/147/5 135/152/5 70/81/5
f 141/146/2 144/153/2 95/152/2 98/147/2 f 129/146/2 136/153/2 135/152/2 130/147/2

17
cw 9/src/room.hpp
View File

@ -92,13 +92,6 @@ float spotlightPhi = 3.14 / 4;
glm::mat4 lightVP = glm::ortho(-10.f, 10.f, -10.f, 10.f, 1.0f, 30.0f) * glm::lookAt(sunPos, sunPos - sunDir, glm::vec3(0, 1, 0)); glm::mat4 lightVP = glm::ortho(-10.f, 10.f, -10.f, 10.f, 1.0f, 30.0f) * glm::lookAt(sunPos, sunPos - sunDir, glm::vec3(0, 1, 0));
glm::mat4 scaleToRoom(glm::mat4 mat)
{
return mat * glm::scale(glm::vec3(2.5f, 1.0f, 1.0f));
}
float lastTime = -1.f; float lastTime = -1.f;
float deltaTime = 0.f; float deltaTime = 0.f;
@ -288,12 +281,12 @@ void renderScene(GLFWwindow* window)
glm::vec3(0.5, 0.5, 0.5), 0.7, 0.0); glm::vec3(0.5, 0.5, 0.5), 0.7, 0.0);
//drawObjectPBR(models::drawerContext, glm::mat4(), glm::vec3(0.428691f, 0.08022f, 0.036889f), 0.2f, 0.0f); //drawObjectPBR(models::drawerContext, glm::mat4(), glm::vec3(0.428691f, 0.08022f, 0.036889f), 0.2f, 0.0f);
drawObjectPBR(models::couchContext, glm::scale(glm::vec3(0.5f)) * glm::translate(glm::vec3(8.f, 0, -0.4f)) * glm::eulerAngleY(3.15f), glm::vec3(0.03f, 0.03f, 0.03f), 0.2f, 0.0f); drawObjectPBR(models::couchContext, glm::scale(glm::vec3(0.5f)) * glm::translate(glm::vec3(8.4f, 0, -0.4f)) * glm::eulerAngleY(3.15f), glm::vec3(0.03f, 0.03f, 0.03f), 0.2f, 0.0f);
drawObjectPBR(models::coffeeTableContext, glm::translate(glm::vec3(2.5f, 0, 0.5f)), glm::vec3(1.f, 1.f, 1.f), 0.4f, 0.0f); drawObjectPBR(models::coffeeTableContext, glm::translate(glm::vec3(2.8f, 0, 0.5f)), glm::vec3(1.f, 1.f, 1.f), 0.4f, 0.0f);
drawObjectPBR(models::doorContext, glm::mat4(), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f); drawObjectPBR(models::doorContext, glm::mat4(), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
drawObjectPBR(models::planeContext, scaleToRoom(glm::mat4()), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f); drawObjectPBR(models::planeContext, glm::mat4(), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
drawObjectPBR(models::roomContext, scaleToRoom(glm::mat4()), glm::vec3(1.0f, 1.0f, 1.0f), 0.8f, 0.0f); drawObjectPBR(models::roomContext, glm::mat4(), glm::vec3(1.0f, 1.0f, 1.0f), 0.8f, 0.0f);
drawObjectPBR(models::windowContext, glm::translate(glm::vec3(-2.9f, 0, 0)), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f); drawObjectPBR(models::windowContext, glm::translate(glm::vec3(-3.35f, 0, 0)), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
glm::vec3 spaceshipSide = glm::normalize(glm::cross(spaceshipDir, glm::vec3(0.f, 1.f, 0.f))); glm::vec3 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));