Commit Graph

28 Commits

Author SHA1 Message Date
Faerbit
6ca47cbdfe Improved fog a little bit. 2014-11-21 02:46:02 +01:00
Faerbit
235cde0d74 Added skybox and refined fog a bit. Fog still needs a lot of work. 2014-11-21 02:38:03 +01:00
Faerbit
94271dd9dd Implemented simple fog. 2014-11-19 01:58:48 +01:00
Fabian Klemp
c87d62cae9 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
Faerbit
083f4785ae Organizing Code. (Deleted lookAt as it is available as part of GLM.) 2014-10-20 18:16:47 +02:00
Faerbit
81d4b67030 Renaming basic-texturing to graphics. 2014-10-20 18:15:55 +02:00