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: Joanna Fisch #29

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
d5affea
Part 1 Done
pojojojo21 Sep 25, 2024
244cf33
Load OBJs
pojojojo21 Sep 26, 2024
810c1b0
Most of obj loading done (need to fix bump map loading)
pojojojo21 Oct 4, 2024
be0052f
fixed bump mapping
pojojojo21 Oct 5, 2024
4d773e9
refraction
pojojojo21 Oct 6, 2024
bb6266f
depth of field
pojojojo21 Oct 6, 2024
4537324
Update README.md
pojojojo21 Oct 7, 2024
617573b
Update README.md
pojojojo21 Oct 7, 2024
c055317
Update README.md
pojojojo21 Oct 7, 2024
2a0c4a6
added new files
e-chou Oct 8, 2024
2690a84
Revert "added new files"
pojojojo21 Oct 8, 2024
4772db8
Reapply "added new files"
pojojojo21 Oct 8, 2024
5cc5c44
Update README.md
pojojojo21 Oct 9, 2024
689332d
Added more scenes
pojojojo21 Oct 9, 2024
71e8482
more images added
pojojojo21 Oct 9, 2024
35ace46
Update README.md
pojojojo21 Oct 9, 2024
4d8d808
Update README.md
pojojojo21 Oct 9, 2024
f4a4a51
change name
pojojojo21 Oct 9, 2024
8fa2fa9
Merge branch 'main' of https://github.com/pojojojo21/Project3-CUDA-Pa…
pojojojo21 Oct 9, 2024
3cab464
Update README.md
pojojojo21 Oct 9, 2024
a5b19d9
added more images
pojojojo21 Oct 9, 2024
adfeeb8
Merge branch 'main' of https://github.com/pojojojo21/Project3-CUDA-Pa…
pojojojo21 Oct 9, 2024
b24bef3
Update README.md
pojojojo21 Oct 9, 2024
05e0358
Update README.md
pojojojo21 Oct 9, 2024
159a103
Update README.md
pojojojo21 Oct 9, 2024
8cf209b
moved cover image to top
pojojojo21 Oct 9, 2024
b63a93a
Merge remote-tracking branch 'upstream/main'
pojojojo21 Nov 4, 2024
2f5d316
obj files added
pojojojo21 Nov 4, 2024
b0b8e0c
add more objs
pojojojo21 Nov 4, 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
219 changes: 214 additions & 5 deletions README.md

Large diffs are not rendered by default.

Binary file added img/bottle.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.2024-09-25_20-22-59z.44samp.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.2024-09-25_20-22-59z.46samp.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.2024-09-25_20-22-59z.53samp.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.2024-09-25_20-26-26z.24samp.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.2024-09-25_20-29-00z.37samp.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.2024-09-25_20-30-48z.222samp.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.2024-09-25_20-56-09z.3160samp.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.2024-09-25_20-57-14z.582samp.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.2024-09-25_20-59-14z.269samp.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.2024-09-25_21-00-45z.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 img/cornell.2024-09-25_21-14-16z.50samp.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.2024-09-25_21-16-45z.50samp.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.2024-09-25_21-18-38z.50samp.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.2024-09-25_21-21-21z.500samp.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.2024-09-25_21-22-08z.500samp.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.2024-09-25_21-45-00z.150samp.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.2024-09-25_21-45-24z.11samp.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.2024-09-25_21-45-34z.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 img/cornell.2024-09-25_22-06-25z.137samp.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.2024-09-25_22-48-34z.16samp.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.2024-09-25_22-50-50z.8samp.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.2024-09-25_23-18-45z.6samp.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.2024-09-25_23-21-00z.14samp.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.2024-09-26_00-05-52z.13samp.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.2024-09-26_00-07-08z.24samp.png
Binary file added img/cornell.2024-09-26_00-07-52z.10samp.png
Binary file added img/cornell.2024-09-26_00-09-18z.11samp.png
Binary file added img/cornell.2024-09-26_00-11-13z.60samp.png
Binary file added img/cornell.2024-09-26_00-18-57z.15samp.png
Binary file added img/cornell.2024-09-26_00-22-22z.17samp.png
Binary file added img/cornell.2024-09-26_00-32-46z.57samp.png
Binary file added img/cornell.2024-09-26_17-35-19z.5samp.png
Binary file added img/cornell.2024-09-26_19-42-58z.6samp.png
Binary file added img/cornell.2024-09-26_20-39-57z.14samp.png
Binary file added img/cornell.png
Binary file added img/dragon_obj.png
Binary file added img/ninja.png
Binary file added img/ninja_Nor.png
Binary file added img/ninja_diffNor.png
Binary file added img/reflection_icosphere.png
Binary file added img/refraction.2024-10-08_21-38-21z.5000samp.png
Binary file added img/refraction_bottle.png
Binary file added img/specular.png
Binary file added img/texture_bottle.png
Binary file added img/withAA.png
Binary file added img/withAA_ZOOM.png
Binary file added img/withoutAA.png
Binary file added img/withoutAA_ZOOM.png
Binary file added scenes/Textures/Material _25_Height.png
Binary file added scenes/Textures/Material _25_Metallic.png
Binary file added scenes/Textures/Material _25_Mixed_AO.png
Binary file added scenes/Textures/Material _25_Normal_OpenGL.png
Binary file added scenes/Textures/Material _25_Roughness.png
Binary file added scenes/Textures/Spheres_BaseColor.png
Binary file added scenes/Textures/WaterBottle_baseColor.png
Binary file added scenes/Textures/WaterBottle_normal.png
Binary file added scenes/Textures/ninja_d.png
Binary file added scenes/Textures/ninja_n.png
Binary file added scenes/Textures/wood_d.png
Binary file added scenes/Textures/wood_n.png
160 changes: 160 additions & 0 deletions scenes/bottle.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
{
"Materials": {
"light": {
"TYPE": "Emitting",
"RGB": [
0.8,
1.0,
1.0
],
"EMITTANCE": 5.0
},
"diffuse_white": {
"TYPE": "Diffuse",
"RGB": [
0.98,
0.98,
0.98
]
},
"diffuse_red": {
"TYPE": "Diffuse",
"RGB": [
0.85,
0.35,
0.35
]
},
"diffuse_green": {
"TYPE": "Diffuse",
"RGB": [
0.35,
0.85,
0.35
]
},
"specular_white": {
"TYPE": "Specular",
"RGB": [
0.98,
0.98,
0.98
],
"ROUGHNESS": 0.0
},
"model_text": {
"TYPE": "Diffuse",
"RGB": [
1.0,
1.0,
1.0
],
"D_PATH": "/Textures/WaterBottle_baseColor.png",
"N_PATH": "/Textures/WaterBottle_normal.png"
}
},
"Camera": {
"RES": [
800,
800
],
"FOVY": 45.0,
"ITERATIONS": 5000,
"DEPTH": 8,
"FILE": "refraction",
"EYE": [
0.0,
3.0,
5.5
],
"LOOKAT": [
0.0,
3.0,
0.0
],
"UP": [
0.0,
1.0,
0.0
]
},
"Objects": [
{
"TYPE": "cube",
"MATERIAL": "light",
"TRANS": [
0.0,
10.0,
5.0
],
"ROTAT": [
0.0,
0.0,
0.0
],
"SCALE": [
10.0,
0.3,
10.0
]
},
{
"TYPE": "cube",
"MATERIAL": "diffuse_white",
"TRANS": [
0.0,
0.0,
0.0
],
"ROTAT": [
0.0,
0.0,
0.0
],
"SCALE": [
10.0,
0.01,
10.0
]
},
{
"TYPE": "cube",
"MATERIAL": "diffuse_green",
"TRANS": [
0.0,
5.0,
-5.0
],
"ROTAT": [
0.0,
90.0,
0.0
],
"SCALE": [
0.01,
10.0,
10.0
]
},
{
"TYPE": "model",
"MATERIAL": "model_text",
"PATH": "/meshes/waterbottle.obj",
"TRANS": [
0.0,
5.5,
5.0
],
"ROTAT": [
0.0,
0.0,
0.0
],
"SCALE": [
3.0,
3.0,
3.0
]
}
]
}
160 changes: 160 additions & 0 deletions scenes/bottleRefraction.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
{
"Materials": {
"light": {
"TYPE": "Emitting",
"RGB": [
0.8,
1.0,
1.0
],
"EMITTANCE": 5.0
},
"diffuse_white": {
"TYPE": "Diffuse",
"RGB": [
0.98,
0.98,
0.98
]
},
"diffuse_red": {
"TYPE": "Diffuse",
"RGB": [
0.85,
0.35,
0.35
]
},
"diffuse_green": {
"TYPE": "Diffuse",
"RGB": [
0.35,
0.85,
0.35
]
},
"specular_white": {
"TYPE": "Specular",
"RGB": [
0.98,
0.98,
0.98
],
"ROUGHNESS": 0.0
},
"model_text": {
"TYPE": "Diffuse",
"RGB": [
1.0,
1.0,
1.0
],
"D_PATH": "/Textures/WaterBottle_baseColor.png",
"N_PATH": "/Textures/WaterBottle_normal.png"
}
},
"Camera": {
"RES": [
800,
800
],
"FOVY": 45.0,
"ITERATIONS": 5000,
"DEPTH": 8,
"FILE": "refraction",
"EYE": [
0.0,
3.0,
5.5
],
"LOOKAT": [
0.0,
3.0,
0.0
],
"UP": [
0.0,
1.0,
0.0
]
},
"Objects": [
{
"TYPE": "cube",
"MATERIAL": "light",
"TRANS": [
0.0,
10.0,
5.0
],
"ROTAT": [
0.0,
0.0,
0.0
],
"SCALE": [
10.0,
0.3,
10.0
]
},
{
"TYPE": "cube",
"MATERIAL": "diffuse_white",
"TRANS": [
0.0,
0.0,
0.0
],
"ROTAT": [
0.0,
0.0,
0.0
],
"SCALE": [
10.0,
0.01,
10.0
]
},
{
"TYPE": "cube",
"MATERIAL": "diffuse_green",
"TRANS": [
0.0,
5.0,
-5.0
],
"ROTAT": [
0.0,
90.0,
0.0
],
"SCALE": [
0.01,
10.0,
10.0
]
},
{
"TYPE": "model",
"MATERIAL": "model_text",
"PATH": "/meshes/waterbottle.obj",
"TRANS": [
0.0,
5.5,
5.0
],
"ROTAT": [
0.0,
0.0,
0.0
],
"SCALE": [
3.0,
3.0,
3.0
]
}
]
}
Loading