Commit graph

56 commits

Author SHA1 Message Date
arvid schröder
d00599ced6 fixed botched merge 2022-11-25 15:09:05 +01:00
arvid schröder
d077b8981c Merge remote-tracking branch 'base/master' 2022-11-25 15:03:11 +01:00
jp
668e73ba36 added ex04 task 2022-11-25 14:58:29 +01:00
jp
a1f7c25ecd added ex03 solution 2022-11-25 14:57:39 +01:00
arvid schröder
31b17da221 added advanced normal calculation 2022-11-25 13:22:14 +01:00
m.gaedke
41ae90b1b5 Spotlight added 2022-11-22 15:17:41 +01:00
arvid schröder
0a905edf0c Moved code to correct files 2022-11-21 17:48:20 +01:00
arvid schröder
3b2bffb3da Added bounds checking 2022-11-21 17:20:15 +01:00
arvid schröder
01c4b95c56 Fixed checking only first intersection 2022-11-21 17:02:21 +01:00
arvid schröder
ed9c300d77 added objects 2022-11-21 15:49:53 +01:00
m.gaedke
7be006ff05 Ambientlight implemented 2022-11-21 13:30:17 +01:00
arvid schröder
e032f1fa03 Merge remote-tracking branch 'base/master' 2022-11-19 16:37:29 +01:00
jp
8453d265e0 added ex03 task 2022-11-18 11:49:36 +01:00
jp
8b8a53dde6 added ex02 solution 2022-11-18 11:43:53 +01:00
arvid schröder
70963aaf71 Fixed some major mathematical errors 2022-11-17 22:27:10 +01:00
arvid schröder
37753f96af Removed superfluous normalizations 2022-11-17 22:26:43 +01:00
arvid schröder
8e14f3ccae Revert accidentally changing the path to file 2022-11-17 20:45:37 +01:00
arvid schröder
55355ad68d Merge refractionshader 2022-11-17 20:34:37 +01:00
arvid schröder
43f44fb418 simple shadow implementation and miscellaneous conversion changes 2022-11-17 20:28:23 +01:00
arvid schröder
1d7e01f424 WIP reflection implementation 2022-11-17 19:22:30 +01:00
Tobias
b2788a2291 refractionshader Snells Law done, Fresnel missing. 2022-11-17 17:45:26 +01:00
e20d852d53 Merge branch 'master' of git.cg.cs.tu-bs.de:CG1_WS2223/group_12 2022-11-17 17:43:14 +01:00
8bd8d4acb0 Adds recursion exit for mirror shader 2022-11-17 17:41:50 +01:00
Tobias
3d1ef91931 Triangle normal calculated. 2022-11-17 17:34:34 +01:00
Tobias
e168bb7b77 Sphere normal indentation fixed. 2022-11-17 17:34:17 +01:00
6674549b18 Adds basic bounce count edit function 2022-11-17 17:22:37 +01:00
8fd79c04ab Implements shadow shader 2022-11-17 17:07:18 +01:00
53966ad869 Fixes box collision condition to fix mirror effect 2022-11-17 16:55:18 +01:00
4458492a42 Fixes return value for box collision 2022-11-17 16:49:04 +01:00
1531a0f2c7 Adds normals for sphere and triangle 2022-11-17 16:16:32 +01:00
arvid schröder
b54fdf4f7c Added infiniteplane normal 2022-11-17 14:40:47 +01:00
arvid schröder
48e027c45d Added experimental mirrorshader 2022-11-17 14:39:11 +01:00
Tobias
29f4d0fe3c Original commit: Maximilian Giller: Implements Box, but might not work 2022-11-15 13:49:33 +01:00
Tobias
48f338dd7c Merge remote-tracking branch 'upstream/master' 2022-11-15 13:25:27 +01:00
c6b0abf712 Implements Box, but might not work 2022-11-11 21:18:24 +01:00
26a8ef7913 Fixes upDirection Vector for camera 2022-11-11 19:02:52 +01:00
da6d2af058 Transfers scaffolding for ex2 2022-11-11 18:53:53 +01:00
jp
d3e64994d4 added ex02 task 2022-11-11 14:39:48 +01:00
jp
69a1566a1a added ex01 solution 2022-11-11 14:27:43 +01:00
f0c11344a4 Adds normals to ray for sphere and triangle 2022-11-11 13:22:41 +01:00
arvid schröder
3d17719e12 readded original ex1 2022-11-10 18:18:55 +01:00
arvid schröder
6d78d8c554 removed testing output 2022-11-10 18:16:13 +01:00
arvid schröder
f5a6e9e119 fixed pixel direction and flipped coordinate system 2022-11-10 18:14:11 +01:00
ef79acef73 Fixes, Changes and Crumbles 2022-11-10 17:31:50 +01:00
c7f6974b58 Fixes wrong formular at one place and reduces duplicates of the discriminant 2022-11-10 12:47:31 +01:00
ArcadeZed
f98e578f94 Added triangle function, not working perfectly but u see something like a triangle 2022-11-09 13:55:13 +01:00
jp
e5891e0c09 changed repo link in readme 2022-11-09 11:52:46 +01:00
arvid schröder
2eb55b9e98 Removed fisheye lense, added image plane and fov calculation 2022-11-06 20:50:33 +01:00
arvid schröder
f37b8bc9c6 Added missing power 2022-11-06 20:30:29 +01:00
48432337c6 Implements plane intersections 2022-11-06 20:27:03 +01:00