Skip to content

Project 3: Linda Zhu #31

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

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
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
228782c
adding bsdf evaluations
LinDadaism Oct 5, 2023
9927e0f
naive pt wo compact working with black lines at default angle
LinDadaism Oct 5, 2023
9afdb51
finish core features, add AA and motion blur, debug extra material types
LinDadaism Oct 8, 2023
d58a718
attempted on tiny_gltf; now switched to objloader bc need a break and…
LinDadaism Oct 8, 2023
6df0bc3
obj loader buggy
LinDadaism Oct 8, 2023
a230e2e
gltf and obj loader working now
LinDadaism Oct 10, 2023
7d8e2b6
fix mesh loader transformation
LinDadaism Oct 10, 2023
45b155b
BVH working but slower than non-bvh lol
LinDadaism Oct 11, 2023
d828a20
bvh working fine for gltf but not still slower for obj
LinDadaism Oct 11, 2023
7cd72f1
finish debugging SAH
LinDadaism Oct 11, 2023
d5cf78f
add camera DOF effect
LinDadaism Oct 11, 2023
2f0e1f3
clean up code
LinDadaism Oct 11, 2023
40d8279
fix bvh for obj loader
LinDadaism Oct 12, 2023
2a901d7
update readme, need graphs
LinDadaism Oct 13, 2023
9a21f1e
update readme, need graphs
LinDadaism Oct 13, 2023
6c42531
Merge branch 'main' of https://github.com/LinDadaism/GPU-Project3-CUD…
LinDadaism Oct 13, 2023
dfd5e17
finish readme
LinDadaism Oct 13, 2023
ca8f48d
format readme
LinDadaism Oct 13, 2023
b93f358
format readme
LinDadaism Oct 13, 2023
ce92916
Merge branch 'main' of https://github.com/LinDadaism/GPU-Project3-CUD…
LinDadaism Oct 13, 2023
84e4598
upload assets
LinDadaism Oct 13, 2023
dc5079a
make bigger images
LinDadaism Oct 13, 2023
b8a0057
finish BVH readme
LinDadaism Oct 14, 2023
a00c29b
fix typo
LinDadaism Oct 14, 2023
d262922
reformat pictures
LinDadaism Oct 14, 2023
d27489d
fix table
LinDadaism Oct 14, 2023
40c56b3
forgot to commit some cleanup work
LinDadaism Oct 18, 2023
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
10 changes: 7 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,12 @@ set(headers
src/ImGui/imgui_internal.h
src/ImGui/imstb_rectpack.h
src/ImGui/imstb_textedit.h
src/ImGui/imstb_truetype.h
)
src/ImGui/imstb_truetype.h
src/tiny_obj_loader.h

src/gltf/json.hpp
src/gltf/tiny_gltf.h
)

set(sources
src/main.cpp
Expand All @@ -103,7 +107,7 @@ set(sources
src/ImGui/imgui_impl_opengl3.cpp
src/ImGui/imgui_tables.cpp
src/ImGui/imgui_widgets.cpp
)
)

list(SORT headers)
list(SORT sources)
Expand Down
281 changes: 275 additions & 6 deletions README.md

Large diffs are not rendered by default.

10,801 changes: 6,242 additions & 4,559 deletions external/include/stb_image.h

Large diffs are not rendered by default.

Loading