Skip to content

Submission: Terry Sun #17

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

Submission: Terry Sun #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5953e5c
Shoot camera rays + print debug image.
terryxsun Sep 17, 2015
04cb9cb
Debugging intersections image.
terryxsun Sep 17, 2015
f2eb862
generateStatic -> generateNoise
kainino0x Sep 17, 2015
911bfce
Remove erroneous hardcoded window dimensions
kainino0x Sep 17, 2015
d08951a
Add struct Pixel to keep track of rays and assoc. indices.
terryxsun Sep 18, 2015
4447f5d
Find material color.
terryxsun Sep 18, 2015
aea447b
Kinda tracing some paths.
terryxsun Sep 19, 2015
e66e8b3
Add in emittance and proper ray termination.
terryxsun Sep 21, 2015
c37db5b
Update config
terryxsun Sep 25, 2015
8f2675a
Specular reflection.
terryxsun Sep 25, 2015
868caa3
Stream compaction (WIP)
terryxsun Sep 21, 2015
0f74c15
Antialiasing, FOV.
terryxsun Sep 25, 2015
9e47a67
Refraction.
terryxsun Sep 29, 2015
9266810
Blend by intensity, compute schlick.
terryxsun Sep 29, 2015
12c6e6a
Depth of field.
terryxsun Sep 29, 2015
bd09a4e
Add stream_compaction library as subproject.
terryxsun Sep 29, 2015
4b87fbe
Stream Compaction
terryxsun Sep 30, 2015
8924fe1
Add working stream compaction by indexing properly.
terryxsun Oct 3, 2015
de21f39
Reorg
terryxsun Oct 3, 2015
dda710f
Move less memory when doing intersections (if that matters...)
terryxsun Oct 4, 2015
1d5ed75
README
terryxsun Sep 30, 2015
b430037
Add texture loading, clean up scene file.
terryxsun Oct 4, 2015
e2b3879
Texture and normal mapping.
terryxsun Oct 5, 2015
588269c
README
terryxsun Oct 5, 2015
fcfde74
README + config stuff + scenes
terryxsun Oct 5, 2015
91f21c6
Add UV mapping for cubes for textures, normals
terryxsun Oct 5, 2015
20b0814
Render images, README.
terryxsun Oct 5, 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
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ endif()
link_directories(${EXTERNAL_LIB_PATH})
list(APPEND CMAKE_LIBRARY_PATH "${EXTERNAL_LIB_PATH}")


# Find up and set up core dependency libs

set(GLFW_INCLUDE_DIR "${EXTERNAL}/include")
Expand Down Expand Up @@ -67,7 +66,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(CUDA_PROPAGATE_HOST_FLAGS OFF)
endif()

#add_subdirectory(stream_compaction) # TODO: uncomment if using your stream compaction
include_directories(.)
add_subdirectory(stream_compaction)
add_subdirectory(src)

cuda_add_executable(${CMAKE_PROJECT_NAME}
Expand All @@ -77,7 +77,7 @@ cuda_add_executable(${CMAKE_PROJECT_NAME}

target_link_libraries(${CMAKE_PROJECT_NAME}
src
#stream_compaction # TODO: uncomment if using your stream compaction
stream_compaction
${CORELIBS}
)

Expand Down
2 changes: 1 addition & 1 deletion GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RelWithDebugInfo: build


run:
build/cis565_path_tracer scenes/sphere.txt
build/cis565_path_tracer scenes/cornell.txt

build:
mkdir -p build
Expand Down
389 changes: 144 additions & 245 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions data/closed_large_light.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
depth, intersect time, compact time, live rays
0, 345.800403, 189.747829, 19897834.300000
1, 529.565765, 152.956438, 16707276.450000
2, 609.487291, 129.201187, 14613067.300000
3, 549.965330, 114.281574, 12999635.500000
4, 490.922901, 102.845467, 11703350.400000
5, 442.483781, 95.139066, 10599731.200000
6, 400.311603, 86.168085, 9632819.550000
7, 363.525166, 79.759112, 8802539.850000
8, 331.648603, 73.327230, 8089032.300000
9, 304.331611, 68.235384, 7476352.100000
10, 280.627125, 64.967070, 6950144.350000
11, 259.992184, 60.099235, 6497065.800000
12, 242.463538, 56.711714, 6106920.000000
13, 226.842378, 54.055035, 5771159.800000
14, 213.753557, 51.672931, 5481962.900000
15, 201.839717, 49.385086, 5232776.700000
16, 191.812510, 48.190931, 5018265.850000
17, 182.690216, 46.272653, 4833342.300000
18, 174.978714, 44.708288, 4674002.200000
19, 167.555973, 43.778882, 4536869.200000
Loading