Commit Graph

140 Commits

Author SHA1 Message Date
Fabian Klemp
330ce60564 Changed a few parameters corresponding with the sunrise. 2015-03-09 15:43:12 +01:00
Steffen Fündgens
4b6de27ade Merge branch 'loading-screen' 2015-03-09 14:36:17 +01:00
Fabian Klemp
53636d1182 Added wind simulation. 2015-03-09 14:14:17 +01:00
Steffen Fündgens
c9c7d6e0e3 Fixed loading screen resizing. 2015-03-09 13:41:34 +01:00
Faerbit
428c327f06 Reenabling multisampling. 2015-03-09 08:21:44 +01:00
Faerbit
dd914a555c Gave sun rise more different colors. 2015-03-09 00:39:59 +01:00
Faerbit
3403f9778d 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
bcc7767978 Made attempt at scaling loading screen. 2015-03-08 17:05:52 +01:00
Faerbit
172237f214 Fixed shadow flickering. 2015-03-08 15:59:35 +01:00
Faerbit
8064725f3d Only rendering sun shadows when the sun is actually shining. 2015-03-08 10:36:45 +01:00
Faerbit
b953ae878b Added flickering to lighting shader. 2015-03-08 01:59:38 +01:00
Faerbit
09f4e3655a Flames can now be skewed. 2015-03-08 01:28:34 +01:00
Faerbit
25f7800c86 Gave flames their own class again. The size of the flames are now respected. 2015-03-07 22:48:44 +01:00
Faerbit
7d0062f270 Added loading screen. Had to restructure quite a bit of the program. 2015-03-07 19:59:52 +01:00
Faerbit
d835dbe010 Reintroduced night texture. Throw a bunch of stuff out. 2015-03-07 18:25:14 +01:00
Faerbit
da761b2e72 Added movement to water texture. Movement speed currently hard coded. 2015-03-07 14:56:16 +01:00
Faerbit
4d100fd290 Changed night texture to procedual night sky generation. 2015-03-07 14:39:01 +01:00
Faerbit
eac0031b0a Added shader which could manipulate the color of the flames. 2015-03-06 09:21:38 +01:00
Faerbit
a82ecad52f Gave the flames it's own framebuffer to be able to manipulate it's color. 2015-03-06 09:16:29 +01:00
Faerbit
4eb328d09d Disabled multisampling because we draw to an offscreen fbo anyway. 2015-03-04 23:37:10 +01:00
Faerbit
074132b49d 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
e922780e71 Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 17:47:41 +01:00
Fabian Klemp
b6c1d94cc3 Added sun to skydome. 2015-03-04 17:09:46 +01:00
sfroitzheim
2568a2a69f Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-04 17:09:25 +01:00
sfroitzheim
2c0073eb9f Added torches for the switches plus added the hint to the scene 2015-03-04 17:08:53 +01:00
Fabian Klemp
1ec7f05eca Gave skydome it's own shader. 2015-03-04 16:08:03 +01:00
Faerbit
f4b9d4dc38 Now also blurring the edges of the flames. 2015-03-04 12:13:58 +01:00
Faerbit
bb3267c72a Fixed blurring of flames with stencil buffer. 2015-03-04 11:25:02 +01:00
Faerbit
38292e335d Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 00:55:11 +01:00
Faerbit
2a82f9f2e2 Made first attempt at blurring flames. Conceptually bad, looks very bad. 2015-03-04 00:55:01 +01:00
Faerbit
e54ee77557 Removed now useless stuff from the flame shader. 2015-03-03 23:32:43 +01:00
Faerbit
35b77c9c01 Introduced flame post processing shader. 2015-03-03 23:27:41 +01:00
Steffen
99d77a0e9e Changed array initialization because it did not compile under windows. 2015-03-03 17:37:03 +01:00
Faerbit
40e7dda14a Tried adding normals for color calculation seems wrong. 2015-03-01 19:40:39 +01:00
Faerbit
51d78583d7 Fixed normals. 2015-03-01 18:56:56 +01:00
Faerbit
53557b80c4 Using the color of the lights for the flame color. 2015-03-01 18:45:31 +01:00
Faerbit
f5fd73fd1d Added another two render calls to further increase the number of vertices of the flame. 2015-03-01 18:19:19 +01:00
Faerbit
47db474d4a Should have been in the last commit. 2015-03-01 17:04:13 +01:00
Faerbit
f46d665e17 Enabled multisampling for the window. 2015-03-01 16:43:03 +01:00
Faerbit
ca2ac08a82 Moved glEnables to graphics.init(). 2015-03-01 16:41:46 +01:00
Faerbit
81d2de5344 Fixed popping of directional shadows. 2015-02-28 15:53:12 +01:00
Faerbit
2da70f156d 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
5fc86f8914 Cull front faces of flames(normals are backwards). 2015-02-28 00:51:20 +01:00
Steffen Fündgens
4870357789 Increased size of directional light shadow map. 2015-02-27 14:37:57 +01:00
Faerbit
b0b2c71139 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
18bd1bda49 Fixed updating of lights. 2015-02-13 17:35:56 +01:00
Fabian Klemp
deb691a6c0 maxShadowRenderCount now works correctly. 2015-02-13 17:09:25 +01:00
Jasper
02aea1f297 corrected camera position for specular lighting 2015-02-13 16:35:35 +01:00
Jasper
6ffc1809ff Merge branch 'master' of github.com:Faerbit/swp 2015-02-13 16:22:06 +01:00
Fabian Klemp
d7d45682a0 Added maxShadowRenderCount. Controls how many shadows get rendered. 2015-02-13 16:20:22 +01:00