Commit Graph

43 Commits

Author SHA1 Message Date
Steffen Fündgens
30320a16ef Tried some stuff(tried doing depth buffer calculation in world space) nothing works. 2015-01-20 13:11:43 +01:00
Steffen Fündgens
094549ce85 Increased height of the fog, because of new Scaling of the heightmap. -- Fabian 2015-01-19 18:21:29 +01:00
Steffen Fündgens
2c8c69a5dc Fixing shader; merge was wrong. 2015-01-19 13:44:38 +01:00
Steffen Fündgens
1206a7b801 Merge branch 'linearized' of github.com:Faerbit/swp 2015-01-19 13:16:08 +01:00
Faerbit
6210d2e35b Removed Cascaded Shadow Mapping because it is not realistic to get it working in the remaining time. 2015-01-19 00:52:57 +01:00
Faerbit
955eee5a60 Linearization of depth buffer. Didn't change graphics in any way. 2015-01-19 00:40:28 +01:00
Faerbit
46a32b8617 Calulating fogEnd by farPlane. 2014-12-19 13:27:05 +01:00
Faerbit
5ad46dd5e9 Revert "Not using pointlight shadows."
This reverts commit e00cb787c8.
2014-12-15 22:00:23 +01:00
Steffen Fündgens
e00cb787c8 Not using pointlight shadows. 2014-12-15 16:48:42 +01:00
Faerbit
05cac9c520 Point light shadows for the first point light does something. Seems pretty broken. 2014-12-15 15:58:55 +01:00
Faerbit
df182abd06 Reducing OpenGL version number to 3.2 again. 2014-12-15 15:10:19 +01:00
Faerbit
ca5618bce2 Now using OpenGL 4.0. 2014-12-15 13:31:31 +01:00
Faerbit
acf7325553 MVPs are only needed for directional shadows and not for point light shadows (forgot one thing. 2014-12-15 13:23:35 +01:00
Faerbit
4d36c9fb97 Moved calculation of shadowMVP to the CPU side. 2014-12-15 12:41:30 +01:00
Faerbit
55cc68a333 Moving MVP calculation to the CPU side. 2014-12-15 11:45:31 +01:00
Faerbit
ed347725e6 Limited light sources to 32 instead of 128. 2014-12-15 01:16:43 +01:00
Faerbit
b9b7a6e7b4 Put some code in a function. 2014-12-05 00:57:17 +01:00
Faerbit
1c687f5759 Implemented cascaded shadow mapping. 2014-12-04 17:19:58 +01:00
Faerbit
0cb741dbc3 Implemented early bailing. 2014-12-04 15:08:08 +01:00
Faerbit
e005c97439 Implemented poisson sampling. 2014-12-04 14:53:07 +01:00
Faerbit
a8ac3c064a Improving bias on slopes. 2014-12-04 13:26:06 +01:00
Faerbit
049819c47a Changing shadow map sampler from sampler2D to sampler2Dshadow and removing now useless colour texture. 2014-12-04 13:21:20 +01:00
Faerbit
f559eced68 Implemented basic shadows for sun light. Also fixed bug with far plane always staying the same. 2014-12-04 01:13:59 +01:00
Faerbit
7431d0d63e Changed fog functions a little bit more. Looks nice enough. 2014-11-25 13:54:00 +01:00
Faerbit
4161ae0ec4 Changed fog function from exp to linear. 2014-11-25 13:24:02 +01:00
Faerbit
1006f1cbc9 Improved fog a little bit. 2014-11-21 02:46:02 +01:00
Faerbit
c47ed4646d Added skybox and refined fog a bit. Fog still needs a lot of work. 2014-11-21 02:38:03 +01:00
Faerbit
b12b917a44 Implemented simple fog. 2014-11-19 01:58:48 +01:00
Faerbit
faf548d3ee Now using built-in exp function. 2014-11-19 01:58:25 +01:00
Faerbit
a8b6463674 Changing how the intensity is calculated. 2014-11-19 00:59:33 +01:00
Faerbit
8968750015 Clamping diffuse color for more realistic lighting. 2014-11-19 00:46:51 +01:00
Fabian Klemp
ca3928e232 Added directional lighting. 2014-11-17 17:51:15 +01:00
Fabian Klemp
3086f98ecd Added alpha shading. 2014-11-17 16:15:56 +01:00
Steffen Fündgens
5cee3e7dd2 added testData to terrain for debugging 2014-11-14 18:32:23 +01:00
Faerbit
2ddf01ede2 Removing hard coded values from graphics and moving it into the properties of object and model. 2014-11-13 01:22:33 +01:00
Faerbit
49acfc4d97 Adding specular part to lighting model. 2014-11-07 11:37:26 +01:00
Faerbit
b74534c62a Only take calculate light contribution with meaningful contributions. 2014-11-04 12:24:19 +01:00
Faerbit
589e0df6ea Shader now respects distance between light source and fragment. 2014-11-04 00:47:35 +01:00
Faerbit
afbf41ea0d Shading now respects colours. 2014-11-03 23:54:35 +01:00
Fabian Klemp
b68a2bb079 Renamed shaders. 2014-10-31 13:06:14 +01:00
Fabian Klemp
769514af88 Got phong shading working. 2014-10-31 12:56:09 +01:00
Faerbit
c505553439 First attempt at Phong shading. Build broken. 2014-10-31 10:38:57 +01:00
Faerbit
6c712579d8 Import of '003-basic-texturing'. 2014-10-20 17:31:26 +02:00