Commit Graph

1062 Commits

Author SHA1 Message Date
Faerbit
b74534c62a Only take calculate light contribution with meaningful contributions. 2014-11-04 12:24:19 +01:00
Steffen Fündgens
5d2acc0e53 Fixed a bug in loading the heightmap and added comments 2014-11-04 12:08:47 +01:00
Faerbit
589e0df6ea Shader now respects distance between light source and fragment. 2014-11-04 00:47:35 +01:00
Faerbit
ae949e814f Changed lighting parameters to make the scene more interesting. 2014-11-04 00:46:49 +01:00
Faerbit
0f64538d1e Removed outdated commentary. 2014-11-04 00:45:59 +01:00
Faerbit
e4ba456345 Another update to the Readme.md. 2014-11-03 23:56:34 +01:00
Faerbit
022317b4ad Updated Readme.md. 2014-11-03 23:56:05 +01:00
Faerbit
afbf41ea0d Shading now respects colours. 2014-11-03 23:54:35 +01:00
Faerbit
129866d0d7 Adding two getters. 2014-11-03 23:28:06 +01:00
Steffen Fündgens
925eb62831 implemented loading of the heightmap from a png to unsigned int** 2014-11-03 17:19:22 +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
911c8ebfcc Made Entity inheritence public. 2014-10-31 10:38:06 +01:00
Faerbit
a88490b622 Implemented getter. 2014-10-31 10:36:23 +01:00
Faerbit
8f6ab075b5 Implemented two getters. 2014-10-30 23:59:03 +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
Faerbit
62d8a83ddb Implemented empty Terrain constructor(compiler was complaining. 2014-10-30 23:32:52 +01:00
Faerbit
2ea0f52d5e Implemented Light Constructor. 2014-10-30 23:32:21 +01:00
Faerbit
22e734593e Implemented Entity constructor. 2014-10-30 23:30:56 +01:00
Fabian Klemp
54108868d7 Fixing typo and wrong path in build script. 2014-10-26 01:05:21 +02:00
Fabian Klemp
7490a3d805 Merge branch 'master' of renault.informatik.rwth-aachen.de:/data/git-repository/students/swpp-ws-14-15/swpp-ws-14-15-c 2014-10-26 01:03:02 +02:00
Faerbit
2ae938a557 Deleting bullet demos: 1) We don't need them. 2) They prolong the compilation process. 3) They produce weird errors on linking with the libs. 2014-10-26 01:02:43 +02:00
Faerbit
e8fe6286a4 Fixing bullet lib paths. 2014-10-26 01:01:24 +02:00
Fabian Klemp
f96d5dd8a2 Adding build script. 2014-10-24 12:02:24 +02:00
Fabian Klemp
af9a2591a8 Adding Bullet physics. 2014-10-24 11:57:06 +02:00
Fabian Klemp
aeb6218d2d Renaming. 2014-10-24 11:49:46 +02:00
Jasper Manousek
c9eb7612d7 Adding Bullet Library 2014-10-24 11:42:47 +02:00
Fabian Klemp
752ee67481 Rewrote graphics to use new classes. 2014-10-24 10:57:28 +02:00
Fabian Klemp
11229430cb Added empty constructors to be able to define objects without instanciating them. 2014-10-24 10:48:45 +02:00
Faerbit
c747968b91 Chaging object implementation to new shader class. 2014-10-23 00:53:00 +02:00
Faerbit
1d924bd2b0 Adding shader class. 2014-10-23 00:52:04 +02:00
Faerbit
a807e1369a Adding empty constructor(compiler complained. 2014-10-23 00:51:41 +02:00
Faerbit
bc3bd908b3 Fixing typo. 2014-10-23 00:51:12 +02:00
Faerbit
606533b74b Implemented object.cc 2014-10-23 00:13:09 +02:00
Faerbit
2d3a17b6c0 Implemented texture.cc 2014-10-22 23:17:18 +02:00
Faerbit
613cfefbe6 Implemented model.cc 2014-10-22 22:53:46 +02:00
Faerbit
8091793b81 Added terrain.hh 2014-10-20 19:09:45 +02:00
Faerbit
ca0648b42a Added texture.hh 2014-10-20 19:09:34 +02:00
Faerbit
80db1456d6 Added object.hh 2014-10-20 19:09:19 +02:00
Faerbit
69e5b0073e Added model.hh 2014-10-20 19:09:03 +02:00
Faerbit
1ad0a13ce0 Added light.hh 2014-10-20 19:08:51 +02:00
Faerbit
5adc9ae0cc Added Terrain to Level. 2014-10-20 19:07:45 +02:00
Faerbit
7f7398e295 Moving included to header. 2014-10-20 18:49:10 +02:00
Faerbit
663ecbbe7d Fixing include guards. 2014-10-20 18:48:20 +02:00
Faerbit
eefe7e78c9 Fixing minor bugs. 2014-10-20 18:44:23 +02:00
Faerbit
342dd9cbd6 Adding entity.hh 2014-10-20 18:43:46 +02:00
Faerbit
5d3936c7f9 Adding physics.hh (Currently empty...) 2014-10-20 18:39:16 +02:00
Faerbit
08e44a14f6 Adding level.hh 2014-10-20 18:38:29 +02:00
Faerbit
70662679c1 Adding define guards. 2014-10-20 18:23:25 +02:00