Commit Graph

142 Commits

Author SHA1 Message Date
Faerbit
3a0ec498ae Only using the lodepng files in extern. 2015-03-12 11:41:19 +01:00
Faerbit
1b3fa3eed3 Changed on what sun angle shadows get rendered. 2015-03-09 22:31:45 +01:00
Fabian Klemp
abb8c981bc Changed a few parameters corresponding with the sunrise. 2015-03-09 15:43:12 +01:00
Steffen Fündgens
4992292563 Merge branch 'loading-screen' 2015-03-09 14:36:17 +01:00
Fabian Klemp
2fce9296a7 Added wind simulation. 2015-03-09 14:14:17 +01:00
Steffen Fündgens
bfd8b25a7d Fixed loading screen resizing. 2015-03-09 13:41:34 +01:00
Faerbit
5599a39eff Reenabling multisampling. 2015-03-09 08:21:44 +01:00
Faerbit
6e8d3c36df Gave sun rise more different colors. 2015-03-09 00:39:59 +01:00
Faerbit
eda952df70 Changed flame function to cosine to be able to rotate it properly. Also changed corresponding parameters. 2015-03-08 23:13:16 +01:00
Faerbit
371cccb273 Made attempt at scaling loading screen. 2015-03-08 17:05:52 +01:00
Faerbit
3ee8cfdbad Fixed shadow flickering. 2015-03-08 15:59:35 +01:00
Faerbit
185371d78c Only rendering sun shadows when the sun is actually shining. 2015-03-08 10:36:45 +01:00
Faerbit
93f87cc9c5 Added flickering to lighting shader. 2015-03-08 01:59:38 +01:00
Faerbit
bd584c3ce4 Flames can now be skewed. 2015-03-08 01:28:34 +01:00
Faerbit
3eeea52f5e Gave flames their own class again. The size of the flames are now respected. 2015-03-07 22:48:44 +01:00
Faerbit
d3c812bba3 Added loading screen. Had to restructure quite a bit of the program. 2015-03-07 19:59:52 +01:00
Faerbit
e02d223574 Reintroduced night texture. Throw a bunch of stuff out. 2015-03-07 18:25:14 +01:00
Faerbit
d24e70dbdd Added movement to water texture. Movement speed currently hard coded. 2015-03-07 14:56:16 +01:00
Faerbit
86619fd2dd Changed night texture to procedual night sky generation. 2015-03-07 14:39:01 +01:00
Faerbit
1b8b8125f4 Added shader which could manipulate the color of the flames. 2015-03-06 09:21:38 +01:00
Faerbit
e4c9418d4a Gave the flames it's own framebuffer to be able to manipulate it's color. 2015-03-06 09:16:29 +01:00
Faerbit
d9f0950463 Disabled multisampling because we draw to an offscreen fbo anyway. 2015-03-04 23:37:10 +01:00
Faerbit
fa8ba1335e Made use of the night texture. Now blends to night texture if the sun vector is pointing down. 2015-03-04 21:50:47 +01:00
Fabian Klemp
bed9f09539 Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 17:47:41 +01:00
Fabian Klemp
b7f95ebb40 Added sun to skydome. 2015-03-04 17:09:46 +01:00
sfroitzheim
4b0c875504 Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-04 17:09:25 +01:00
sfroitzheim
d17ed99d96 Added torches for the switches plus added the hint to the scene 2015-03-04 17:08:53 +01:00
Fabian Klemp
01a61f43ac Gave skydome it's own shader. 2015-03-04 16:08:03 +01:00
Faerbit
a811ed57be Now also blurring the edges of the flames. 2015-03-04 12:13:58 +01:00
Faerbit
fa47c93b46 Fixed blurring of flames with stencil buffer. 2015-03-04 11:25:02 +01:00
Faerbit
a88112d639 Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 00:55:11 +01:00
Faerbit
2930a86959 Made first attempt at blurring flames. Conceptually bad, looks very bad. 2015-03-04 00:55:01 +01:00
Faerbit
f34dbf891c Removed now useless stuff from the flame shader. 2015-03-03 23:32:43 +01:00
Faerbit
916c26cda1 Introduced flame post processing shader. 2015-03-03 23:27:41 +01:00
Steffen
dd0afd1978 Changed array initialization because it did not compile under windows. 2015-03-03 17:37:03 +01:00
Faerbit
2125243a31 Tried adding normals for color calculation seems wrong. 2015-03-01 19:40:39 +01:00
Faerbit
7dd4122d44 Fixed normals. 2015-03-01 18:56:56 +01:00
Faerbit
7ecb76dffa Using the color of the lights for the flame color. 2015-03-01 18:45:31 +01:00
Faerbit
bb090fcf91 Added another two render calls to further increase the number of vertices of the flame. 2015-03-01 18:19:19 +01:00
Faerbit
395803109d Should have been in the last commit. 2015-03-01 17:04:13 +01:00
Faerbit
b9bdb594f0 Enabled multisampling for the window. 2015-03-01 16:43:03 +01:00
Faerbit
47bcf0bf1c Moved glEnables to graphics.init(). 2015-03-01 16:41:46 +01:00
Faerbit
41de72e3a1 Fixed popping of directional shadows. 2015-02-28 15:53:12 +01:00
Faerbit
585e40bb8b Reintroduced cascaded shadow mapping while also fixing it. The old bug with popping shadows should be fixed now. 2015-02-28 14:40:54 +01:00
Faerbit
8c1369ad2e Cull front faces of flames(normals are backwards). 2015-02-28 00:51:20 +01:00
Steffen Fündgens
6c78c93c2b Increased size of directional light shadow map. 2015-02-27 14:37:57 +01:00
Faerbit
a77e06f8c8 Added simple geometry shader which draws a red triangle which changes it's height over time. 2015-02-24 23:30:59 +01:00
Fabian Klemp
df230ea677 Fixed updating of lights. 2015-02-13 17:35:56 +01:00
Fabian Klemp
fd1f32be6a maxShadowRenderCount now works correctly. 2015-02-13 17:09:25 +01:00
Jasper
3f1616adf1 corrected camera position for specular lighting 2015-02-13 16:35:35 +01:00