Skip to content

Raytracer submission #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zxyzhu wants to merge 40 commits into
base: master
Choose a base branch
from
Open

Raytracer submission #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
fb1414e
fixed cube intersection bug
zxyzhu Sep 17, 2013
b75931d
basic diffuse
zxyzhu Sep 17, 2013
f4a22c7
changed intersection method param
zxyzhu Sep 18, 2013
119c0c8
shadows
zxyzhu Sep 18, 2013
6e46004
soft shadows
zxyzhu Sep 18, 2013
4f8c3c7
rand numbers
zxyzhu Sep 19, 2013
e4ce3e3
new camera specification with DOF
zxyzhu Sep 20, 2013
40290a8
in progress readme
zxyzhu Sep 20, 2013
240ea46
DOF and antialiasing
zxyzhu Sep 20, 2013
968351d
screen shots
zxyzhu Sep 20, 2013
d283af6
new image
zxyzhu Sep 21, 2013
75de098
new readme stuff
zxyzhu Sep 21, 2013
13b9885
new readme stuff
zxyzhu Sep 21, 2013
628ce6b
new readme stuff
zxyzhu Sep 21, 2013
7cc1645
new readme stuff
zxyzhu Sep 21, 2013
cac1e6b
new readme stuff
zxyzhu Sep 21, 2013
8fe21e1
new readme stuff
zxyzhu Sep 21, 2013
4c0ee68
new readme stuff
zxyzhu Sep 21, 2013
7efd333
new readme stuff
zxyzhu Sep 21, 2013
a3b570a
new readme stuff
zxyzhu Sep 21, 2013
9e63b77
new readme stuff
zxyzhu Sep 21, 2013
9e46b87
new readme stuff
zxyzhu Sep 21, 2013
38df210
friday stuff
zxyzhu Sep 21, 2013
d90859f
new readme stuff
zxyzhu Sep 21, 2013
443f2d0
perf analysis
zxyzhu Sep 21, 2013
c419470
friday submission
zxyzhu Sep 21, 2013
6107166
inserted images
zxyzhu Sep 21, 2013
836cc2c
rotate
zxyzhu Sep 21, 2013
ca8e706
rotate
zxyzhu Sep 21, 2013
7185585
fixed
zxyzhu Sep 21, 2013
a590d34
fixed
zxyzhu Sep 21, 2013
14c5278
fixed
zxyzhu Sep 21, 2013
73c55b5
9 objects
zxyzhu Sep 21, 2013
e8f89c6
added aperture
zxyzhu Sep 21, 2013
da4fb50
new image
zxyzhu Sep 21, 2013
ed30c18
new iamge
zxyzhu Sep 21, 2013
49349af
new title
zxyzhu Sep 21, 2013
51a1e49
changed tilesize
zxyzhu Sep 21, 2013
9570e6c
changed tilesize
zxyzhu Sep 21, 2013
99da6f0
changed tilesize
zxyzhu Sep 21, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
338 changes: 42 additions & 296 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added renders/PerformanceAnalysis.pdf
View file
Open in desktop
Binary file not shown.
Binary file added renders/performanceAnalysis.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added renders/screenCap/DOF.bmp
View file
Open in desktop
Binary file not shown.
Binary file added renders/screenCap/noDOF.bmp
View file
Open in desktop
Binary file not shown.
Binary file added renders/screenCap/sampleSceneDOF.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added renders/screenCap/twoLightDOF.bmp
View file
Open in desktop
Binary file not shown.
Binary file added renders/screenCap/twoLights.bmp
View file
Open in desktop
Binary file not shown.
191 changes: 191 additions & 0 deletions scenes/phongMatScene.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
MATERIAL 0 //white diffuse
RGB 1 1 1
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFR 0
REFRIOR 0
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 0

MATERIAL 1 //red diffuse
RGB .63 .06 .04
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFR 0
REFRIOR 0
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 0

MATERIAL 2 //green diffuse
RGB .15 .48 .09
SPECEX 50
SPECRGB 1 1 1
REFL 0
REFR 0
REFRIOR 0
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 0

MATERIAL 3 //red glossy
RGB .63 .06 .04
SPECEX 20
SPECRGB 1 1 1
REFL 0
REFR 0
REFRIOR 2
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 0

MATERIAL 4 //white glossy
RGB 1 1 1
SPECEX 25
SPECRGB 1 1 1
REFL 0
REFR 0
REFRIOR 2
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 0

MATERIAL 5 //glass
RGB 0 0 0
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFR 1
REFRIOR 2.2
SCATTER 0
ABSCOEFF .02 5.1 5.7
RSCTCOEFF 13
EMITTANCE 0

MATERIAL 6 //green glossy
RGB .15 .48 .09
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFR 0
REFRIOR 2.6
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 0

MATERIAL 7 //light
RGB 1 1 1
SPECEX 0
SPECRGB 0 0 0
REFL 0
REFR 0
REFRIOR 0
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 1

MATERIAL 8 //light
RGB 1 1 1
SPECEX 0
SPECRGB 0 0 0
REFL 0
REFR 0
REFRIOR 0
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 15

CAMERA
RES 800 800
FOVY 25
ITERATIONS 5000
FILE test.bmp
frame 0
EYE 0 4.5 15
VIEW 0 0 -1
UP 0 1 0
FOCAL 12
APERTURE 0.3

OBJECT 0
cube
material 0
frame 0
TRANS 0 0 0
ROTAT 0 0 90
SCALE .01 10 10

OBJECT 1
cube
material 0
frame 0
TRANS 0 5 -5
ROTAT 0 90 0
SCALE .01 10 10

OBJECT 2
cube
material 0
frame 0
TRANS 0 10 0
ROTAT 0 0 90
SCALE .01 10 10

OBJECT 3
cube
material 1
frame 0
TRANS -5 5 0
ROTAT 0 0 0
SCALE .01 10 10

OBJECT 4
cube
material 2
frame 0
TRANS 5 5 0
ROTAT 0 0 0
SCALE .01 10 10

OBJECT 5
sphere
material 4
frame 0
TRANS 0 2 0
ROTAT 0 180 0
SCALE 3 3 3

OBJECT 6
sphere
material 3
frame 0
TRANS 2 5 2
ROTAT 0 180 0
SCALE 2.5 2.5 2.5

OBJECT 7
sphere
material 6
frame 0
TRANS -2 5 -2
ROTAT 0 180 0
SCALE 3 3 3

OBJECT 8
cube
material 8
frame 0
TRANS 0 10 0
ROTAT 0 0 90
SCALE .3 3 3
3 changes: 2 additions & 1 deletion scenes/sampleScene.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ frame 0
EYE 0 4.5 12
VIEW 0 0 -1
UP 0 1 0
FOCAL 12
APERTURE 0.3

OBJECT 0
cube
Expand Down Expand Up @@ -180,7 +182,6 @@ TRANS -2 5 -2
ROTAT 0 180 0
SCALE 3 3 3


OBJECT 8
cube
material 8
Expand Down
128 changes: 128 additions & 0 deletions scenes/sphereScene.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
MATERIAL 0 //white diffuse
RGB 1 1 1
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFR 0
REFRIOR 0
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 0

MATERIAL 1 //red diffuse
RGB .63 .06 .04
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFR 0
REFRIOR 0
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 0

MATERIAL 2 //green diffuse
RGB .15 .48 .09
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFR 0
REFRIOR 0
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 0

MATERIAL 3 //red glossy
RGB .63 .06 .04
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFR 0
REFRIOR 2
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 0

MATERIAL 4 //white glossy
RGB 1 1 1
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFR 0
REFRIOR 2
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 0

MATERIAL 5 //glass
RGB 0 0 0
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFR 1
REFRIOR 2.2
SCATTER 0
ABSCOEFF .02 5.1 5.7
RSCTCOEFF 13
EMITTANCE 0

MATERIAL 6 //green glossy
RGB .15 .48 .09
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFR 0
REFRIOR 2.6
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 0

MATERIAL 7 //light
RGB 1 1 1
SPECEX 0
SPECRGB 0 0 0
REFL 0
REFR 0
REFRIOR 0
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 1

MATERIAL 8 //light
RGB 1 1 1
SPECEX 0
SPECRGB 0 0 0
REFL 0
REFR 0
REFRIOR 0
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 15

CAMERA
RES 800 800
FOVY 25
ITERATIONS 5000
FILE test.bmp
frame 0
EYE 2 1 10
VIEW 0 0 -1
UP 0 1 0
FOCAL 9
APERTURE 0.2

OBJECT 0
cube
material 0
frame 0
TRANS 0 0 0
ROTAT 0 0 0
SCALE 1 1 1

Loading