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

Project 3: Daniel Gerhardt #19

Open
wants to merge 54 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
1961d9e
Naive rendering, Stream compaction
dgerh Sep 20, 2024
6bb9dd4
Midway through OBJ files
dgerh Sep 23, 2024
89e23f9
OBJs working, basic BVH infrastructure in place
dgerh Sep 24, 2024
1874849
Working on BVH, issue with reading glmvec3s on GPU
dgerh Sep 24, 2024
4935f45
BVH appears more correct on CPU, still not passing to GPU with proper…
dgerh Sep 25, 2024
c4827a2
stashing changes before switching to floats for bbox
dgerh Sep 25, 2024
5c92b58
Working BVH, need to implement multiple mesh support. WIP Refraction
dgerh Sep 26, 2024
f9d48b7
Specular works OK, objects now can scale(watch normals with other tra…
dgerh Sep 26, 2024
e0a63e3
Stashing texture changes before changing to barycentric intersection …
dgerh Sep 27, 2024
9d90206
Texturing works, WIP on multiple textures and varying width/height. I…
dgerh Sep 28, 2024
421bf83
support for multiple textures, bump maps
dgerh Sep 28, 2024
1c90cb7
Problem with texture id not being altered on GPU for second tex
dgerh Sep 29, 2024
094876c
Multiple textures working, WIP on refactoring bumpmaps so they work
dgerh Sep 30, 2024
00bbc0c
fixed bumpmaps
dgerh Sep 30, 2024
ba3ff5c
refactored old naive intersection to work with new features
dgerh Sep 30, 2024
aa9ea28
now bump maps ACTUALLY work
dgerh Oct 1, 2024
6872771
working dielectric, small problems with black edges on mesh
dgerh Oct 1, 2024
75d6bb3
rolled back transform changes due to bugs, still issues with mesh ref…
dgerh Oct 2, 2024
109dfb1
Added OIDN
dgerh Oct 2, 2024
64bc32a
started readme
dgerh Oct 2, 2024
239d47d
updated titles in readme
dgerh Oct 2, 2024
683a652
scene progress, oidn adjustments
dgerh Oct 2, 2024
00ce485
started adding pictures
dgerh Oct 2, 2024
e5f1c73
README and added rotations for OBJs
dgerh Oct 2, 2024
4e231de
now the BVH is FAST
dgerh Oct 2, 2024
deef1e1
aliasing pictures
dgerh Oct 3, 2024
5d9aa14
new images
dgerh Oct 3, 2024
736e9da
new images
dgerh Oct 3, 2024
e4e9c9a
adding performance charts
dgerh Oct 4, 2024
6b2c10a
more readme changes
dgerh Oct 4, 2024
ec6429f
more readme changes
dgerh Oct 4, 2024
959eafe
more readme changes
dgerh Oct 4, 2024
51a0d29
performance descriptions
dgerh Oct 5, 2024
4f469be
performance descriptions
dgerh Oct 5, 2024
b93eb9a
readme changes
dgerh Oct 5, 2024
482fc7b
readme changes
dgerh Oct 5, 2024
07a8eb0
Update README.md
dgerh Oct 5, 2024
24af73a
Update README.md
dgerh Oct 5, 2024
05818c0
readme changes
dgerh Oct 5, 2024
c2adcca
Merge branch 'main' of https://github.com/dgerh/Project3-CUDA-Path-Tr…
dgerh Oct 5, 2024
e7b7ad9
changed procedural tex
dgerh Oct 5, 2024
b04e458
new cover scenes
dgerh Oct 5, 2024
0d1fc42
new attributions
dgerh Oct 5, 2024
f7ba231
new attributions
dgerh Oct 5, 2024
00c700e
new headers
dgerh Oct 5, 2024
aa22787
new headers
dgerh Oct 5, 2024
f0363be
formatting
dgerh Oct 5, 2024
55f7b1d
model attribs
dgerh Oct 5, 2024
aad4883
Update README.md
dgerh Oct 6, 2024
5732380
new oidn vids
dgerh Oct 7, 2024
7492f59
better performance descriptions
dgerh Oct 7, 2024
089588c
refraction addition
dgerh Oct 8, 2024
c39b182
Add files via upload
dgerh Oct 8, 2024
56173c1
adding objs
dgerh Nov 5, 2024
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
16 changes: 14 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ set(GLM_ROOT_DIR "${CMAKE_SOURCE_DIR}/external")
find_package(GLM REQUIRED)
include_directories(${GLM_INCLUDE_DIRS})

include_directories(oidn-2.3.0.x64.windows/include)
link_directories(oidn-2.3.0.x64.windows/lib)

set(headers
src/main.h
src/image.h
Expand Down Expand Up @@ -109,7 +112,7 @@ source_group("ImGui\\Headers" FILES ${imgui_headers})
source_group("ImGui\\Sources" FILES ${imgui_sources})

#add_subdirectory(src/ImGui)
#add_subdirectory(stream_compaction) # TODO: uncomment if using your stream compaction
#add_subdirectory(stream_compaction)

add_executable(${CMAKE_PROJECT_NAME} ${sources} ${headers} ${imgui_sources} ${imgui_headers})
set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
Expand All @@ -123,8 +126,17 @@ endif()
target_link_libraries(${CMAKE_PROJECT_NAME}
${LIBRARIES}
cudadevrt
#stream_compaction # TODO: uncomment if using your stream compaction
OpenImageDenoise
#stream_compaction
)
target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE "$<$<AND:$<CONFIG:Debug,RelWithDebInfo>,$<COMPILE_LANGUAGE:CUDA>>:-G;-src-in-ptx>")
target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE "$<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:CUDA>>:-lineinfo;-src-in-ptx>")
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${CMAKE_PROJECT_NAME})

file(GLOB OIDN_DLLS "${CMAKE_SOURCE_DIR}/oidn-2.3.0.x64.windows/bin/*.dll")
foreach(DLL ${OIDN_DLLS})
add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
"${DLL}"
"$<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>")
endforeach()
382 changes: 377 additions & 5 deletions README.md

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added build/cis565_path_tracer.dir/Debug/image.obj
Binary file not shown.
Binary file added build/cis565_path_tracer.dir/Debug/imgui.obj
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added build/cis565_path_tracer.dir/Debug/main.obj
Binary file not shown.
Binary file added build/cis565_path_tracer.dir/Debug/pathtrace.obj
Binary file not shown.
Binary file added build/cis565_path_tracer.dir/Debug/preview.obj
Binary file not shown.
Binary file added build/cis565_path_tracer.dir/Debug/scene.obj
Binary file not shown.
Binary file added build/cis565_path_tracer.dir/Debug/stb.obj
Binary file not shown.
Binary file added build/cis565_path_tracer.dir/Debug/utilities.obj
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added build/cis565_path_tracer.dir/Release/image.obj
Binary file not shown.
Binary file added build/cis565_path_tracer.dir/Release/imgui.obj
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added build/cis565_path_tracer.dir/Release/main.obj
Binary file not shown.
Binary file not shown.
Binary file added build/cis565_path_tracer.dir/Release/preview.obj
Binary file not shown.
Binary file added build/cis565_path_tracer.dir/Release/scene.obj
Binary file not shown.
Binary file added build/cis565_path_tracer.dir/Release/stb.obj
Binary file not shown.
Binary file not shown.
3,463 changes: 2,516 additions & 947 deletions external/include/stb_image.h

Large diffs are not rendered by default.

6,438 changes: 6,438 additions & 0 deletions external/include/stb_image_old.h

Large diffs are not rendered by default.

Loading