Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Saverio976 committed May 11, 2023
2 parents 8d575be + fae4490 commit d3cd2a2
Show file tree
Hide file tree
Showing 7 changed files with 2,194 additions and 68 deletions.
67 changes: 0 additions & 67 deletions Scenes/Scene_01.yaax

This file was deleted.

1 change: 1 addition & 0 deletions scenes/generateScreens.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ mkdir -p scenes
find scenes -name '*.yaax' -type f -exec ./raytracer --scene-path {} --output-path {} \;

mkdir -p screenshots
mv ./scenes/**/*.ppm screenshots
mv ./scenes/*.ppm screenshots
46 changes: 46 additions & 0 deletions scenes/obj/cube.obj
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Blender v2.76 (sub 0) OBJ File: ''
# www.blender.org
mtllib cube.mtl
o Cube
v 100.000000 -100.000000 -100.000000
v 100.000000 -100.000000 100.000000
v -100.000000 -100.000000 100.000000
v -100.000000 -100.000000 -100.000000
v 100.000000 100.000000 -99.999999
v 99.999999 100.000000 100.00000100
v -100.000000 100.000000 100.000000
v -100.000000 100.000000 -100.000000
vt 1.000000 0.333333
vt 1.000000 0.666667
vt 0.666667 0.666667
vt 0.666667 0.333333
vt 0.666667 0.000000
vt 0.000000 0.333333
vt 0.000000 0.000000
vt 0.333333 0.000000
vt 0.333333 1.000000
vt 0.000000 1.000000
vt 0.000000 0.666667
vt 0.333333 0.333333
vt 0.333333 0.666667
vt 1.000000 0.000000
vn 0.000000 -1.000000 0.000000
vn 0.000000 1.000000 0.000000
vn 1.000000 0.000000 0.000000
vn -0.000000 0.000000 1.000000
vn -1.000000 -0.000000 -0.000000
vn 0.000000 0.000000 -1.000000
usemtl Material
s off
f 2/1/1 3/2/1 4/3/1
f 8/1/2 7/4/2 6/5/2
f 5/6/3 6/7/3 2/8/3
f 6/8/4 7/5/4 3/4/4
f 3/9/5 7/10/5 8/11/5
f 1/12/6 4/13/6 8/11/6
f 1/4/1 2/1/1 4/3/1
f 5/14/2 8/1/2 6/5/2
f 1/12/3 5/6/3 2/8/3
f 2/12/4 6/8/4 3/4/4
f 4/13/5 3/9/5 8/11/5
f 5/6/6 1/12/6 8/11/6
40 changes: 40 additions & 0 deletions scenes/obj/cube_younes.obj
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Blender v3.5.0 OBJ File: ''
# www.blender.org
mtllib untitled.mtl
o Cube
v 3.049409 3.049409 -3.049409
v 3.049409 -3.049409 -3.049409
v 3.049409 3.049409 3.049409
v 3.049409 -3.049409 3.049409
v -3.049409 3.049409 -3.049409
v -3.049409 -3.049409 -3.049409
v -3.049409 3.049409 3.049409
v -3.049409 -3.049409 3.049409
vt 0.625000 0.500000
vt 0.875000 0.500000
vt 0.875000 0.750000
vt 0.625000 0.750000
vt 0.375000 0.750000
vt 0.625000 1.000000
vt 0.375000 1.000000
vt 0.375000 0.000000
vt 0.625000 0.000000
vt 0.625000 0.250000
vt 0.375000 0.250000
vt 0.125000 0.500000
vt 0.375000 0.500000
vt 0.125000 0.750000
vn 0.0000 1.0000 0.0000
vn 0.0000 0.0000 1.0000
vn -1.0000 0.0000 0.0000
vn 0.0000 -1.0000 0.0000
vn 1.0000 0.0000 0.0000
vn 0.0000 0.0000 -1.0000
usemtl Material
s off
f 1/1/1 5/2/1 7/3/1 3/4/1
f 4/5/2 3/4/2 7/6/2 8/7/2
f 8/8/3 7/9/3 5/10/3 6/11/3
f 6/12/4 2/13/4 4/5/4 8/14/4
f 2/13/5 1/1/5 3/4/5 4/5/5
f 6/11/6 5/10/6 1/1/6 2/13/6
39 changes: 39 additions & 0 deletions scenes/obj/cube_younes_big.obj
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Blender 3.5.0
# www.blender.org
mtllib untitled.mtl
o Cube
v -156.051407 -156.051407 156.051407
v -156.051407 156.051407 156.051407
v -156.051407 -156.051407 -156.051407
v -156.051407 156.051407 -156.051407
v 156.051407 -156.051407 156.051407
v 156.051407 156.051407 156.051407
v 156.051407 -156.051407 -156.051407
v 156.051407 156.051407 -156.051407
vn -0.0000 -1.0000 -0.0000
vn -0.0000 -0.0000 -1.0000
vn 1.0000 -0.0000 -0.0000
vn -0.0000 1.0000 -0.0000
vn -1.0000 -0.0000 -0.0000
vn -0.0000 -0.0000 1.0000
vt 0.625000 0.500000
vt 0.375000 0.500000
vt 0.625000 0.750000
vt 0.375000 0.750000
vt 0.875000 0.500000
vt 0.625000 0.250000
vt 0.125000 0.500000
vt 0.375000 0.250000
vt 0.875000 0.750000
vt 0.625000 1.000000
vt 0.625000 0.000000
vt 0.375000 1.000000
vt 0.375000 0.000000
vt 0.125000 0.750000
s 0
usemtl Material
f 4/4/2 8/12/2 7/10/2 3/3/2
f 8/13/3 6/8/3 5/6/3 7/11/3
f 6/7/4 8/14/4 4/4/4 2/2/4
f 2/2/5 4/4/5 3/3/5 1/1/5
f 6/8/6 2/2/6 1/1/6 5/6/6
Loading

0 comments on commit d3cd2a2

Please sign in to comment.