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: Kangning Li #8

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
29ee75e
raycasting from camera working (debug image looks like 460)
likangning93 Sep 20, 2015
6030cae
moved raycasting to 1D arrays, b/c this seems like it will be less of…
likangning93 Sep 20, 2015
ff0ae9b
debugging intersection testing and normals. seems to work
likangning93 Sep 20, 2015
9713736
preparing to add stream compaction
likangning93 Sep 21, 2015
2eaea01
debug debug debug
likangning93 Sep 21, 2015
aaaa17c
debug debug debug!
likangning93 Sep 21, 2015
24d4d30
fixed a small floating point error, flipped raycasting to match the r…
likangning93 Sep 28, 2015
7068ec2
implemented simple reflection
likangning93 Sep 28, 2015
1ef593b
trying to do non-memory efficient work efficient stream compaction first
likangning93 Sep 28, 2015
7171559
not building?!
likangning93 Sep 28, 2015
35fc5e7
turns out it was cmake, need to generate for vs 64!
likangning93 Sep 28, 2015
6ed8949
working on getting my work efficient memory inefficient stream compac…
likangning93 Sep 28, 2015
0ffbb3d
work efficient memory inefficient kind of works but produces banding …
likangning93 Sep 28, 2015
0de4b0c
added example image
likangning93 Sep 28, 2015
cee338a
attempted to add configurable blocksize to upsweep downsweep. not wor…
likangning93 Sep 28, 2015
5c96c32
unsure what's going on, moving on
likangning93 Sep 28, 2015
3ef5dde
have block_upsweep implemented, but not tested yet
likangning93 Sep 28, 2015
3a520f8
block upsweep and block downsweep both seem to be working. added tests.
likangning93 Sep 28, 2015
3c10e3a
added more test cases, the two scans can now handle non power of two …
likangning93 Sep 28, 2015
d521ebd
turns out shared memory scan needs to treat individual scans as inclu…
likangning93 Sep 28, 2015
5799a74
inclusive shared memory work efficient scan is ready
likangning93 Sep 28, 2015
a9354a6
memory efficient stream compaction now WORKING but needs debugging
likangning93 Sep 28, 2015
f01aace
added first image with shared memory scan
likangning93 Sep 28, 2015
c4d6d9b
minor tweaks
likangning93 Sep 29, 2015
95c4fdf
added simple refraction
likangning93 Sep 29, 2015
8dbdf22
giving up on refraction for now. obj loading
likangning93 Sep 29, 2015
ad5b8a1
obj loading is set up, still needs transformations.
likangning93 Sep 29, 2015
b9419e2
commit before trying transforms again
likangning93 Sep 29, 2015
2c7d3b9
normals intersection seems to be working!
likangning93 Sep 29, 2015
4dcebf3
obj loading is working for real!
likangning93 Sep 29, 2015
ed1ab71
added some more scenes and images
likangning93 Sep 29, 2015
f92394d
preparing to implement motion blur. race against the clock...
likangning93 Sep 29, 2015
4385767
testing motion blur
likangning93 Sep 29, 2015
4efeffe
YEEAAAAAAAHHHHHHH MOTION BLUR!
likangning93 Sep 29, 2015
d086b23
ready to start the writeup
likangning93 Sep 30, 2015
a064505
how do i readme
likangning93 Sep 30, 2015
a8c7780
do gifs work with readmes?
likangning93 Sep 30, 2015
ecdcb20
added materials section in readme
likangning93 Sep 30, 2015
644cfe1
added stream compaction section
likangning93 Sep 30, 2015
83e2217
added section on scene file changes
likangning93 Sep 30, 2015
91fb01c
added mesh loading section
likangning93 Sep 30, 2015
729f5de
more readme updates and renders
likangning93 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
Binary file added 4.1-Path-Tracing-1.pdf
Binary file not shown.
Binary file added 4.2-Path-Tracing-2.pdf
Binary file not shown.
7 changes: 4 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,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) # TODO: uncomment if using your stream compaction
add_subdirectory(src)

cuda_add_executable(${CMAKE_PROJECT_NAME}
Expand All @@ -77,7 +78,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 # TODO: uncomment if using your stream compaction
${CORELIBS}
)

Expand All @@ -87,4 +88,4 @@ add_custom_command(
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_SOURCE_DIR}/shaders
${CMAKE_BINARY_DIR}/shaders
)
)
361 changes: 80 additions & 281 deletions README.md

Large diffs are not rendered by default.

Binary file added images/car.2015-09-29_22-36-43z.2054samp.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 images/car.2015-09-29_22-47-55z.320samp.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 images/car.2015-09-29_23-01-03z.216samp.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 images/car.2015-09-29_23-37-10z.840samp.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 images/car.2015-09-30_00-01-16z.85samp.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 images/car.2015-09-30_00-18-13z.72samp.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 images/car.2015-09-30_00-19-01z.161samp.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 images/car.2015-09-30_00-20-22z.79samp.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 images/cornell.2015-09-21_17-51-20z.5samp.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 images/cornell.2015-09-21_18-26-38z.5samp.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 images/cornell.2015-09-21_19-28-47z.5samp.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 images/cornell.2015-09-21_20-37-49z.5000samp.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 images/cornell.2015-09-28_01-26-01z.5000samp.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 images/cornell.2015-09-28_02-03-35z.2496samp.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 images/cornell.2015-09-28_02-06-59z.3741samp.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 images/cornell.2015-09-28_02-15-17z.5000samp.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 images/cornell.2015-09-28_02-38-37z.5000samp.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 images/cornell.2015-09-28_11-52-56z.2669samp.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 images/cornell.2015-09-28_12-01-33z.1409samp.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 images/cornell.2015-09-28_22-38-33z.5000samp.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 images/cornell.2015-09-29_05-36-47z.5000samp.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 images/cornell.2015-09-29_06-25-17z.1403samp.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 images/cornell.2015-09-29_09-12-53z.357samp.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 images/cornell.2015-09-29_11-22-28z.585samp.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 images/cornell.2015-09-29_11-41-33z.445samp.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 images/cornell.2015-09-29_11-42-38z.1368samp.png
Binary file added images/cornell.2015-09-29_11-44-39z.5000samp.png
Binary file added images/cornell.2015-09-29_12-26-54z.5000samp.png
Binary file added images/cornell.2015-09-29_12-33-04z.5000samp.png
Binary file added images/cornell.2015-09-29_12-37-57z.5000samp.png
Binary file added images/cornell.2015-09-29_12-50-41z.5000samp.png
Binary file added images/cornell.2015-09-30_01-56-56z.5000samp.png
Binary file added images/cornell.2015-09-30_02-04-20z.5000samp.png
Binary file added images/cornell.2015-09-30_02-09-52z.5000samp.png
Binary file added images/cornell.2015-09-30_02-17-23z.5000samp.png
Binary file added images/toBoldlyGo.gif
Loading