Skip to content

Project3 done--Xinjie #11

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
XJMa wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Project3 done--Xinjie #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
349473f
finish basic feature
XJMa Oct 10, 2014
32e22cc
still cannot cast shadow
XJMa Oct 11, 2014
d04bf7b
Update README.md
XJMa Oct 12, 2014
dd97311
Update README.md
XJMa Oct 12, 2014
94b694c
add pics
XJMa Oct 12, 2014
1155d41
Update README.md
XJMa Oct 12, 2014
8f9f670
Update README.md
XJMa Oct 12, 2014
38b2c94
readme
XJMa Oct 12, 2014
af621e0
:readme
XJMa Oct 12, 2014
a2738e7
Update README.md
XJMa Oct 12, 2014
530344d
Update README.md
XJMa Oct 12, 2014
bfc7f9c
peformance
XJMa Oct 12, 2014
168b604
super annoying
XJMa Oct 12, 2014
9a424f5
Merge branch 'master' of https://github.com/XJMa/Project3-Pathtracer
XJMa Oct 12, 2014
b76f315
Update README.md
XJMa Oct 12, 2014
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
281 changes: 35 additions & 246 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 18 additions & 11 deletions data/scenes/sampleScene.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 0

MATERIAL 3 //red glossy
RGB .63 .06 .04
MATERIAL 3 //golden
RGB .53 .56 .04
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFL 0.5
REFR 0
REFRIOR 2
SCATTER 0
Expand All @@ -50,7 +50,7 @@ MATERIAL 4 //white glossy
RGB 1 1 1
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFL 0.5
REFR 0
REFRIOR 2
SCATTER 0
Expand All @@ -59,10 +59,10 @@ RSCTCOEFF 0
EMITTANCE 0

MATERIAL 5 //glass
RGB 0 0 0
RGB 1 1 1
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFL 1
REFR 1
REFRIOR 2.2
SCATTER 0
Expand Down Expand Up @@ -158,33 +158,40 @@ SCALE .01 10 10

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

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

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


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

OBJECT 9
cube
material 8
frame 0
TRANS 0 10 0
TRANS 0 10 -4
ROTAT 0 0 90
SCALE .3 3 3
190 changes: 190 additions & 0 deletions data/scenes/sampleScene2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
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.5
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.5
REFR 0
REFRIOR 2
SCATTER 0
ABSCOEFF 0 0 0
RSCTCOEFF 0
EMITTANCE 0

MATERIAL 5 //glass
RGB 1 1 1
SPECEX 0
SPECRGB 1 1 1
REFL 1
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 12
VIEW 0 0 -1
UP 0 1 0

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 1
frame 0
TRANS 0 2 0
ROTAT 0 180 0
SCALE 3 3 3

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

OBJECT 7
sphere
material 2
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
Empty file added performance.docx
View file
Open in desktop
Empty file.
Binary file added performance.pdf
View file
Open in desktop
Binary file not shown.
Binary file added screenShoots/bug.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 screenShoots/diffuse.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 screenShoots/dof.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 screenShoots/fract.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 screenShoots/p.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.
Loading