Skip to content
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.

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

Submission: Ziwei Zong #5

Open
wants to merge 50 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
552e05e
Ray cast & Intersection Test
Sep 16, 2015
158db0e
First try of path tracing.
Sep 18, 2015
2fa54b9
merge with upstream
Sep 18, 2015
13556f8
Correct result image, but a little bit bright.
Sep 18, 2015
4760a48
Stream compaction,currently using thrust::remove_if
Sep 18, 2015
7f92ad0
bright fix
Sep 18, 2015
dbbbe1a
add argument s to turn on/off stream compaction
Sep 18, 2015
1eb4f0d
ray cast fix
Sep 18, 2015
ce6dfb3
specular
Sep 18, 2015
c06e0ea
mirror
Sep 18, 2015
68e7c4c
anitialising
Sep 18, 2015
558cadb
try direct light, but not working...
Sep 18, 2015
047731c
Direct lighting, seems better
Sep 18, 2015
71fbc67
direct, better ,but still...
Sep 19, 2015
185e884
Direct light way better. Yah!
Sep 19, 2015
a0b7cc2
Dircet Illlumiantion:
Sep 19, 2015
91fe28e
first try of brute force subsurface...failed
Sep 20, 2015
a671c21
subsurface second try, well....
Sep 20, 2015
26d1349
Subsurface Scattering seems right for sphere?
Sep 20, 2015
70466cc
Merge remote-tracking branch 'upstream/master'
Sep 20, 2015
5ebe53d
merge(make seed reandom engine)
Sep 20, 2015
182fc54
Merge remote-tracking branch 'upstream/master'
Sep 21, 2015
2afb101
non-perfect specular
Sep 21, 2015
a581abd
start rearranging material classification...
Sep 23, 2015
e4df6f8
using bool outside
Sep 24, 2015
676fa44
pure refraction. no fresnel yet
Sep 24, 2015
5001709
fresnel
Sep 25, 2015
f80d9d7
al mat
Sep 25, 2015
3be488a
try shared mem
Sep 27, 2015
ee57871
try shared mem, reduced ray num == thrust::remove_if
Sep 27, 2015
444424d
shared mem, but slower than before
Sep 27, 2015
a484905
shared mem: weirdly, the blocksize needs to be smaller than 64
Sep 27, 2015
f8c3204
optimize stream compaction;readme outline;
Sep 28, 2015
f436928
update readme
Sep 28, 2015
c4afc7a
update readme
Sep 28, 2015
a692497
update readme
Sep 29, 2015
7c902af
update readme
Sep 29, 2015
d90b2d1
readme
Sep 29, 2015
7fdb9c4
shared mem opt
Sep 29, 2015
8f3b234
load png
Sep 29, 2015
f69c089
png load break...
Sep 29, 2015
c324cec
texture loading in device
Sep 29, 2015
fdc4b32
texture mapping
Sep 29, 2015
c6fe6bf
update readme
Sep 29, 2015
be1f045
readme
Sep 29, 2015
40bfcb6
readme
Sep 29, 2015
8e25b0c
readme
Sep 29, 2015
3c6260b
readme
Sep 29, 2015
2f541f2
readme
Sep 30, 2015
f09e859
readme
Sep 30, 2015
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
391 changes: 109 additions & 282 deletions README.md

Large diffs are not rendered by default.

Binary file added img/01Overview.jpg
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 img/01Overview.png
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 img/02Gobal_off.png
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 img/02Gobal_on.png
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 img/03AntiA_off.png
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 img/03AntiA_on.PNG
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 img/03AntiAl_off.png
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 img/03AntiAl_on.png
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 img/04DiffSpecTrans.png
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 img/05SSS.png
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 img/05SSS01.png
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 img/05SSS02.png
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 img/05SSS03.png
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 img/06TexMap.png
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 img/06TexMap_cube.png
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 img/06TexMap_sphere.png
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 img/Analysis/CloseScene.png
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 img/Analysis/OpenScene.png
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 img/Analysis/SharedMem.PNG
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 img/DirectIllumination_SSS_thrustRemoveIf.PNG
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 img/DirectIllumination_SSS_thrustRemoveIfOn.PNG
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 img/cornell.2015-09-19_02-00-56z.5000samp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 img/cornell.2015-09-21_16-03-04z.3494samp.png
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 img/cornell.2015-09-23_14-49-24z.2728samp.png
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 img/cornell.2015-09-23_14-55-22z.5000samp.png
Binary file added img/cornell.2015-09-25_00-05-55z.1318samp.png
Binary file added img/cornell.2015-09-25_16-02-37z.5000samp.png
Binary file added img/cornell.2015-09-27_16-30-51z.431samp.png
Binary file added img/cornell.2015-09-27_16-32-50z.5000samp.png
Binary file added img/cornell.2015-09-28_21-35-15z.5000samp.png
Binary file added img/cornell.2015-09-28_23-53-06z.5000samp.png
Binary file added img/cornell.2015-09-29_00-21-48z.5000samp.png
Binary file added img/no_anti.png
268 changes: 268 additions & 0 deletions scenes/DiffSpecTrans.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,268 @@
// Emissive material (light)
MATERIAL 0
RGB 1 1 1
SPECEX 0
SPECRGB 0 0 0
REFL 0
REFR 0
REFRIOR 0
EMITTANCE 5
BSSRDF 0
TEX NULL

// Diffuse white
MATERIAL 1
RGB .98 .98 .98
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFR 0
REFRIOR 0
EMITTANCE 0
BSSRDF 0
TEX NULL

// Diffuse pink
MATERIAL 2
RGB .95 .72 .85
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFR 0
REFRIOR 0
EMITTANCE 0
BSSRDF 0
TEX NULL

// Mirror blue
MATERIAL 3
RGB 1 1 1
SPECEX 0
SPECRGB .8 .9 .85
REFL 1
REFR 0
REFRIOR 0
EMITTANCE 0
BSSRDF 0
TEX NULL

// Diffuse Gray
MATERIAL 4
RGB .7 .7 .7
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFR 0
REFRIOR 0
EMITTANCE 0
BSSRDF 0
TEX NULL

// transparent white
MATERIAL 5
RGB .98 .98 .98
SPECEX 0
SPECRGB .98 .98 .98
REFL 0
REFR 1
REFRIOR 1.6
EMITTANCE 0
BSSRDF 0
TEX NULL

// transparent coffe
MATERIAL 6
RGB .7 .6 .5
SPECEX 0
SPECRGB .98 .98 .98
REFL 0
REFR 1
REFRIOR 1.2
EMITTANCE 0
BSSRDF 0
TEX NULL

// transparent mint
MATERIAL 7
RGB .85 .98 .98
SPECEX 0
SPECRGB .98 .98 .98
REFL 0
REFR 1
REFRIOR 1.6
EMITTANCE 0
BSSRDF 0
TEX NULL

// mirror lemon
MATERIAL 8
RGB 1 1 1
SPECEX 0
SPECRGB .97 .95 .7
REFL 1
REFR 0
REFRIOR 0
EMITTANCE 0
BSSRDF 0
TEX NULL

// diffuse mint
MATERIAL 9
RGB .7 .98 .95
SPECEX 0
SPECRGB 1 1 1
REFL 0
REFR 0
REFRIOR 0
EMITTANCE 0
BSSRDF 0
TEX NULL

// spec orange
MATERIAL 10
RGB .98 .8 .7
SPECEX 10
SPECRGB .98 .8 .7
REFL 0
REFR 0
REFRIOR 0
EMITTANCE 0
BSSRDF 0
TEX pp.jpg

// spec violet
MATERIAL 11
RGB .8 .8 .97
SPECEX 30
SPECRGB .9 .7 .97
REFL 0
REFR 0
REFRIOR 0
EMITTANCE 0
BSSRDF 0
TEX pp.jpg

// Camera
CAMERA
RES 800 800
FOVY 30
ITERATIONS 5000
DEPTH 8
FILE cornell
//EYE -0.7 2 3.5
EYE 0 4 12
VIEW 0 -0.1 -1
UP 0 1 0


// Ceiling light
OBJECT 0
cube
material 0
TRANS 0 12 0
ROTAT 0 0 0
SCALE 4 .3 4

// Floor
OBJECT 1
cube
material 1
TRANS 0 0 0
ROTAT 0 0 0
SCALE 28 .01 28

// Ceiling
OBJECT 2
cube
material 1
TRANS 0 12 0
ROTAT 0 0 90
SCALE .01 40 40

// Back wall
OBJECT 3
cube
material 1
TRANS 0 5 -13
ROTAT 0 90 0
SCALE .01 30 30

// Left wall
OBJECT 4
cube
material 2
TRANS -10 5 0
ROTAT 0 0 0
SCALE .01 30 30

// Right wall
OBJECT 5
cube
material 3
TRANS 16 5 0
ROTAT 00 60 0
SCALE .01 30 30

// Front wall
OBJECT 6
cube
material 4
TRANS 7 5 13
ROTAT 0 90 0
SCALE .01 30 30

// Transparent Sphere (white)
OBJECT 7
sphere
material 5
TRANS -2 1.6 1
ROTAT 0 30 0
SCALE 3 3 3

// Transparent Cube (coffee)
OBJECT 8
cube
material 6
TRANS -4 1.5 -5
ROTAT 0 50 0
SCALE 3 3 3

// Transparent Sphere (mint)
OBJECT 9
sphere
material 7
TRANS -4 4.3 -5
ROTAT 0 0 0
SCALE 2.6 2.6 2.6

// Transparent Sphere (lemon)
OBJECT 10
sphere
material 8
TRANS 4 4.3 -3
ROTAT 0 0 0
SCALE 2.6 2.6 2.6

// Diffuse cube(mint)
OBJECT 11
cube
material 9
TRANS 4 1.5 -3
ROTAT 0 10 0
SCALE 2 3 2

// Spec sphere(orange)
OBJECT 12
sphere
material 10
TRANS 2 1 -2.8
ROTAT 0 10 0
SCALE 2 2 2

// Spec sphere(violet)
OBJECT 13
sphere
material 11
TRANS 2.7 .5 -1.5
ROTAT 0 10 0
SCALE 1 1 1
Loading