Commit Graph

52 Commits

Author SHA1 Message Date
Faerbit
ffcfaf9a2c Commiting broken shit, because stuff. 2014-12-15 14:57:18 +01:00
Faerbit
7a95ddf6bb Removing commented code. 2014-12-15 12:55:48 +01:00
Faerbit
4d36c9fb97 Moved calculation of shadowMVP to the CPU side. 2014-12-15 12:41:30 +01:00
Faerbit
6ff8f33017 Fixed a parenthesis. 2014-12-15 11:53:31 +01:00
Faerbit
55cc68a333 Moving MVP calculation to the CPU side. 2014-12-15 11:45:31 +01:00
Faerbit
c2cf71e0e6 Replacing buildFrustum with standard glm call. 2014-12-15 11:22:32 +01:00
Faerbit
cec0043caf Implemented cube map depth rendering from lighting positions. 2014-12-15 02:09:33 +01:00
Faerbit
d45ed9060f Made getLights return a pointer to avoid copying around large amounts of light data every frame. 2014-12-15 01:12:51 +01:00
Faerbit
01212ba007 Init graphics with the level instead of passing it to the render function everytime. 2014-12-15 01:05:46 +01:00
Steffen Fündgens
a1981ecbca Changed fogColor to fogColour. Moved some global Parameters to the xml. 2014-12-12 15:41:17 +01:00
Faerbit
bd1cedcc23 Removing stencil buffer from depthTextures. 2014-12-12 02:19:41 +01:00
Faerbit
9e4cc5e4f7 Setting wrap mode of depthTextures to CLAMP_TO_EDGE to remove seams. 2014-12-04 17:39:35 +01:00
Faerbit
1c687f5759 Implemented cascaded shadow mapping. 2014-12-04 17:19:58 +01:00
Faerbit
b38e24c3db Disable culling because it seems to give slightly worse FPS. 2014-12-04 14:46:39 +01:00
Faerbit
3b0881f9c1 Adding culling. 2014-12-04 13:23:25 +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
f38ced6603 Moving shader management completely into graphics. 2014-12-01 17:49:59 +01:00
Faerbit
64aeae8143 Removing spammy comments. 2014-12-01 17:44:58 +01:00
Faerbit
8b21495faa Adding namespacing. 2014-12-01 17:40:39 +01:00
Faerbit
be1abf584f Removing useless includes. 2014-12-01 17:40:06 +01:00
Faerbit
d58147a935 You can render objects with multiple shaders now. 2014-11-28 00:17:56 +01:00
Faerbit
7431d0d63e Changed fog functions a little bit more. Looks nice enough. 2014-11-25 13:54:00 +01:00
Faerbit
3a9a04d4d6 Changed skybox to skydome. 2014-11-22 00:39:58 +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
Fabian Klemp
ca3928e232 Added directional lighting. 2014-11-17 17:51:15 +01:00
Fabian Klemp
0a0dcd90f8 Merge branch 'master' of github.com:Faerbit/swp
Conflicts:
	camera.cc
	graphics.cc
2014-11-17 13:31:01 +01:00
Fabian Klemp
a19039426c Camera now returns a viewing vector. 2014-11-17 13:29:41 +01:00
Faerbit
3ddcb72d5a Reenabling resizeCallback. 2014-11-15 15:19:48 +01:00
Faerbit
4686f94082 Changing code to work with getCamera using pointers now. 2014-11-15 14:55:11 +01:00
Fabian Klemp
04234b1f1c Made mouse control camera. (Stupid init of camera...) 2014-11-14 18:33:42 +01:00
Fabian Klemp
7b331edff9 Reorganized code quite a bit. Resizing is deactivated currently. 2014-11-14 16:47:47 +01:00
Faerbit
4231866d40 Adapting graphics to new camera model. 2014-11-13 18:17:58 +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
16f4890458 Added a update function to the level which rotates the bunny. 2014-11-13 00:40:28 +01:00
Faerbit
c38629823d Removed own Shader wrapper, because it does nothing useful. 2014-11-08 02:45:32 +01:00
Faerbit
34d925cdfe Moving material paramters from graphics to material class. 2014-11-08 01:44:24 +01:00
Faerbit
31447458aa Removing unnecessary includes. 2014-11-08 01:15:50 +01:00
Faerbit
fdf0201f4d Changing a few lighting parameters. 2014-11-08 01:15:09 +01:00
Faerbit
49acfc4d97 Adding specular part to lighting model. 2014-11-07 11:37:26 +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
5c4b125e4d Restructured some elements from the graphis into the level. Now using a vector for all objects. 2014-10-30 23:54:19 +01:00
Fabian Klemp
752ee67481 Rewrote graphics to use new classes. 2014-10-24 10:57:28 +02:00
Faerbit
7f7398e295 Moving included to header. 2014-10-20 18:49:10 +02:00