Skip to content

Commit 9abb730

Browse files
author
Brandon Smith
committed
New obj's and a new scene
1 parent 504e843 commit 9abb730

File tree

3 files changed

+273
-0
lines changed

3 files changed

+273
-0
lines changed

‎Geometric.obj

+151
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
# Blender v2.81 (sub 16) OBJ File: 'Geometric.blend'
2+
# www.blender.org
3+
mtllib Geometric.mtl
4+
o Cube
5+
v 1.000000 1.000000 -1.000000
6+
v 1.000000 -1.000000 -1.000000
7+
v 1.000000 1.000000 1.000000
8+
v 1.000000 -1.000000 1.000000
9+
v 2.000000 0.000000 -1.000000
10+
v 2.000000 0.000000 1.000000
11+
v -1.000000 1.000000 0.000000
12+
v 0.000000 0.000000 0.000000
13+
v 2.000000 1.000000 0.000000
14+
v 0.000000 1.000000 -1.000000
15+
v 2.000000 -1.000000 0.000000
16+
v 2.000000 0.000000 0.000000
17+
v 0.000000 -1.000000 1.000000
18+
v 0.000000 1.000000 1.000000
19+
v 0.000000 0.000000 -1.000000
20+
v 0.000000 0.000000 2.000000
21+
v 0.000000 -1.000000 0.000000
22+
v 0.000000 1.000000 0.000000
23+
v 1.000000 0.000000 1.000000
24+
v 1.000000 1.000000 0.000000
25+
v 1.000000 0.000000 -1.000000
26+
v 1.000000 -1.000000 0.000000
27+
v -1.000000 0.000000 1.000000
28+
v 0.000000 1.500000 0.000000
29+
v 1.000000 1.500000 0.000000
30+
v 1.500000 -1.000000 0.500000
31+
v 0.500000 -1.000000 -0.500000
32+
v 1.500000 -1.500000 0.500000
33+
v 1.000000 -1.500000 0.000000
34+
v 0.500000 -1.500000 -0.500000
35+
vt 0.250000 0.625000
36+
vt 0.375000 0.750000
37+
vt 0.250000 0.750000
38+
vt 0.500000 0.625000
39+
vt 0.625000 0.625000
40+
vt 0.500000 0.750000
41+
vt 0.625000 0.375000
42+
vt 0.500000 0.437500
43+
vt 0.500000 0.375000
44+
vt 0.375000 0.375000
45+
vt 0.375000 0.625000
46+
vt 0.500000 0.875000
47+
vt 0.500000 0.625000
48+
vt 0.375000 0.875000
49+
vt 0.750000 0.625000
50+
vt 0.750000 0.625000
51+
vt 0.750000 0.750000
52+
vt 0.375000 0.500000
53+
vt 0.500000 0.500000
54+
vt 0.625000 0.500000
55+
vt 0.250000 0.562500
56+
vt 0.250000 0.562500
57+
vt 0.750000 0.500000
58+
vt 0.687500 0.625000
59+
vt 0.250000 0.500000
60+
vt 0.500000 0.812500
61+
vt 0.625000 0.750000
62+
vt 0.375000 0.687500
63+
vt 0.625000 0.875000
64+
vt 0.750000 0.625000
65+
vt 0.312500 0.625000
66+
vt 0.375000 0.687500
67+
vt 0.500000 0.875000
68+
vt 0.687500 0.625000
69+
vt 0.312500 0.625000
70+
vt 0.312500 0.562500
71+
vn 0.0000 -1.0000 0.0000
72+
vn 1.0000 0.0000 0.0000
73+
vn 0.0000 0.0000 -1.0000
74+
vn -0.5774 -0.5774 -0.5774
75+
vn 0.0000 1.0000 0.0000
76+
vn 0.5774 -0.5774 -0.5774
77+
vn 0.5774 0.5774 -0.5774
78+
vn -0.7071 0.0000 -0.7071
79+
vn -1.0000 0.0000 0.0000
80+
vn 0.0000 0.0000 1.0000
81+
vn -0.5774 -0.5774 0.5774
82+
vn 0.5774 0.5774 0.5774
83+
vn 0.5774 -0.5774 0.5774
84+
vn 0.7071 0.0000 0.7071
85+
vn -0.5774 0.5774 0.5774
86+
vn -0.5774 0.5774 -0.5774
87+
vn 0.0000 0.8944 -0.4472
88+
vn 0.0000 0.8944 0.4472
89+
vn 0.4082 -0.8165 -0.4082
90+
vn -0.4082 -0.8165 0.4082
91+
vn -0.8944 -0.4472 0.0000
92+
usemtl Material
93+
s off
94+
f 17/1/1 4/2/1 13/3/1
95+
f 12/4/2 9/5/2 6/6/2
96+
f 10/7/3 21/8/3 15/9/3
97+
f 2/10/3 15/9/3 21/8/3
98+
f 11/11/2 12/4/2 6/6/2
99+
f 23/12/4 8/13/4 13/14/4
100+
f 18/15/5 7/16/5 14/17/5
101+
f 2/18/6 5/19/6 11/11/6
102+
f 5/19/7 1/20/7 9/5/7
103+
f 17/1/8 27/21/8 30/22/8
104+
f 18/15/5 10/23/5 7/16/5
105+
f 8/13/9 10/7/9 15/9/9
106+
f 1/20/5 20/24/5 9/5/5
107+
f 15/9/4 2/25/4 27/21/4
108+
f 4/2/10 19/26/10 13/14/10
109+
f 10/7/4 8/13/4 7/16/4
110+
f 8/13/11 14/17/11 7/16/11
111+
f 6/6/10 3/27/10 19/26/10
112+
f 9/5/5 20/24/5 3/27/5
113+
f 6/6/12 9/5/12 3/27/12
114+
f 11/11/2 5/19/2 12/4/2
115+
f 9/5/2 12/4/2 5/19/2
116+
f 6/6/13 26/28/13 11/11/13
117+
f 19/26/10 4/2/10 6/6/10
118+
f 19/26/10 3/27/10 14/29/10
119+
f 18/15/9 14/17/9 24/30/9
120+
f 3/27/5 20/24/5 14/17/5
121+
f 2/18/3 21/8/3 5/19/3
122+
f 21/8/3 1/20/3 5/19/3
123+
f 22/31/1 2/18/1 11/11/1
124+
f 26/28/14 4/2/14 28/32/14
125+
f 13/14/9 8/13/9 17/1/9
126+
f 23/12/15 16/33/15 14/17/15
127+
f 13/14/11 16/33/11 23/12/11
128+
f 14/17/16 8/13/16 23/12/16
129+
f 1/20/8 18/15/8 24/30/8
130+
f 18/15/5 1/20/5 10/23/5
131+
f 25/34/17 1/20/17 24/30/17
132+
f 14/17/18 25/34/18 24/30/18
133+
f 14/17/14 20/24/14 25/34/14
134+
f 20/24/2 1/20/2 25/34/2
135+
f 2/18/19 29/35/19 30/36/19
136+
f 2/18/2 22/31/2 29/35/2
137+
f 22/31/10 17/1/10 29/35/10
138+
f 4/2/20 29/35/20 28/32/20
139+
f 30/36/20 29/35/20 17/1/20
140+
f 28/32/19 29/35/19 11/11/19
141+
f 4/2/9 22/31/9 29/35/9
142+
f 11/11/14 26/28/14 28/32/14
143+
f 27/21/8 2/25/8 30/22/8
144+
f 22/31/3 11/11/3 29/35/3
145+
f 14/29/12 16/33/12 19/26/12
146+
f 13/14/13 19/26/13 16/33/13
147+
f 17/1/1 22/31/1 4/2/1
148+
f 10/7/3 1/20/3 21/8/3
149+
f 27/21/8 17/1/8 8/13/8
150+
f 8/13/21 15/9/21 27/21/21
151+
f 6/6/13 4/2/13 26/28/13

‎Room.obj

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Blender v2.81 (sub 16) OBJ File: 'Room.blend'
2+
# www.blender.org
3+
mtllib Room.mtl
4+
o Plane
5+
v -4.970529 0.000000 4.970529
6+
v 4.970529 0.000000 4.970529
7+
v -4.970529 0.000000 -4.970529
8+
v 4.970529 0.000000 -4.970529
9+
v -4.970529 -0.172907 4.339009
10+
v 4.970529 -0.172907 4.339009
11+
v -4.970529 4.970529 4.339009
12+
v 4.970529 4.970529 4.339009
13+
v -4.970529 -0.172907 -4.339009
14+
v 4.970529 -0.172907 -4.339009
15+
v -4.970529 4.970529 -4.339009
16+
v 4.970529 4.970529 -4.339009
17+
v -4.339009 -0.172906 -4.970528
18+
v -4.339008 -0.172906 4.970529
19+
v -4.339009 4.970529 -4.970528
20+
v -4.339008 4.970529 4.970529
21+
v 4.339009 -0.172906 -4.970528
22+
v 4.339008 -0.172906 4.970529
23+
v 4.339009 4.970529 -4.970528
24+
v 4.339008 4.970529 4.970529
25+
vt 1.000000 0.000000
26+
vt 0.000000 1.000000
27+
vt 0.000000 0.000000
28+
vt 1.000000 0.000000
29+
vt 0.000000 1.000000
30+
vt 0.000000 0.000000
31+
vt 1.000000 0.000000
32+
vt 0.000000 1.000000
33+
vt 0.000000 0.000000
34+
vt 1.000000 0.000000
35+
vt 0.000000 1.000000
36+
vt 0.000000 0.000000
37+
vt 1.000000 0.000000
38+
vt 0.000000 1.000000
39+
vt 0.000000 0.000000
40+
vt 1.000000 1.000000
41+
vt 1.000000 1.000000
42+
vt 1.000000 1.000000
43+
vt 1.000000 1.000000
44+
vt 1.000000 1.000000
45+
vn 0.0000 1.0000 0.0000
46+
vn 0.0000 0.0000 1.0000
47+
vn -1.0000 0.0000 0.0000
48+
usemtl None
49+
s off
50+
f 2/1/1 3/2/1 1/3/1
51+
f 6/4/2 7/5/2 5/6/2
52+
f 10/7/2 11/8/2 9/9/2
53+
f 14/10/3 15/11/3 13/12/3
54+
f 18/13/3 19/14/3 17/15/3
55+
f 2/1/1 4/16/1 3/2/1
56+
f 6/4/2 8/17/2 7/5/2
57+
f 10/7/2 12/18/2 11/8/2
58+
f 14/10/3 16/19/3 15/11/3
59+
f 18/13/3 20/20/3 19/14/3

‎src/scenes.rs

+63
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,69 @@ pub fn construct_wallpaper_scene_2() -> Vec<ObjectEnum> {
481481
return objs;
482482
}
483483

484+
pub fn construct_wallpaper_scene_3() -> Vec<ObjectEnum> {
485+
let mut objs: Vec<ObjectEnum> = Vec::new();
486+
487+
// sky
488+
/*
489+
objs.push(ObjectEnum::Sphere(Sphere::new(
490+
Vec3 { x: 0.0, y: -3.0, z: -5.0 },
491+
1000.0,
492+
Material {
493+
texture_albedo: None,
494+
texture_specular: None,
495+
texture_normal: None,
496+
texture_emission_color: Some(Texture::Solid(Color(0.8470588235294118, 0.9529411764705882, 1.0))),
497+
texture_emission_intensity: Some(Texture::Solid(Color::gray(1.0))),
498+
}
499+
)));*/
500+
501+
// sun
502+
/*
503+
objs.push(ObjectEnum::Sphere(Sphere::new(
504+
Vec3 { x: 10.0, y: 10.0, z: 10.0 },
505+
5.0,
506+
Material {
507+
texture_albedo: None,
508+
texture_specular: None,
509+
texture_normal: None,
510+
texture_emission_color: Some(Texture::Solid(Color(1.0, 0.95, 0.8))),
511+
texture_emission_intensity: Some(Texture::Solid(Color::gray(10.0))),
512+
}
513+
)));*/
514+
515+
516+
// ceiling
517+
518+
objs.push(ObjectEnum::Plane(Plane::new(
519+
Vec3 { x: 0.0, y: 5.0, z: 0.0, },
520+
Vec3 { x: 0.0, y: -1.0, z: 0.0 },
521+
Vec3 { x: 0.0, y: 0.0, z: -1.0 },
522+
Material {
523+
texture_albedo: None,
524+
texture_specular: None,
525+
texture_normal: None,
526+
texture_emission_color: Some(Texture::Solid(Color(0.8470588235294118, 0.9529411764705882, 1.0))),
527+
texture_emission_intensity: Some(Texture::Solid(Color::gray(1.0))),
528+
}
529+
)));
530+
531+
// room
532+
objs.push(ObjectEnum::Mesh(Mesh::from_obj(
533+
"/Users/brundolf/git/raytracer/Room.obj",
534+
&Matrix::translation(&Vec3 { x: 0.0, y: -3.0, z: -5.0 }),
535+
Some(Material {
536+
texture_albedo: Some(Texture::Solid(Color::gray(1.0))),
537+
texture_specular: None,
538+
texture_normal: None,
539+
texture_emission_color: None,
540+
texture_emission_intensity: None,
541+
})
542+
)));
543+
544+
return objs;
545+
}
546+
484547
const COUNT_X: usize = 8;
485548
const COUNT_Z: usize = 4;
486549
const SPACING: f32 = 2.0;

0 commit comments

Comments
 (0)