Commit Graph

124 Commits

Author SHA1 Message Date
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
Jasper
51e9b26379 Merge branch 'master' of github.com:Faerbit/swp 2015-02-13 16:22:06 +01:00
Fabian Klemp
281466ebd5 Added maxShadowRenderCount. Controls how many shadows get rendered. 2015-02-13 16:20:22 +01:00
Fabian Klemp
599c849bb0 Merge branch 'debug-shadows'
Conflicts:
	graphics.cc
	graphics.hh
	object.cc
2015-02-13 16:02:12 +01:00
Fabian Klemp
55434daa24 Updated how shadows are applied. Looks nice now. 2015-02-13 15:51:49 +01:00
Jasper
75792a5723 added debug Camear (keys L and K to switch) 2015-02-13 15:46:00 +01:00
Steffen Fündgens
e91d045a37 Code rework. Basically cleaned up a mess of tabs and whitespaces. 2015-02-13 13:46:41 +01:00
Faerbit
1d8bbba1ca Now only using the 32 closest light sources. 2015-02-12 01:13:26 +01:00
Faerbit
9afb3595d0 Fixed directional shadows. 2015-02-10 00:27:13 +01:00
Faerbit
282eb32267 Got multiple shadows working. The really ugly way. 2015-02-09 21:29:44 +01:00
Faerbit
c28b35667f Changed cube map shadows sampler to a sampler array. 2015-02-09 14:26:04 +01:00
Steffen
8cc467a806 Now loading the resolution of the shadow cube maps from config.xml. 2015-02-07 20:24:11 +01:00
Faerbit
7c8d149e3a Increased precision of depth textures. 2015-02-04 23:10:51 +01:00
Faerbit
ac19eac671 Additional cleanup. 2015-02-04 23:08:23 +01:00
Faerbit
10082466cf Did a little bit of cleanup. 2015-02-04 22:54:40 +01:00
Faerbit
2e90ac57d8 Got Point Light Shadows working. YEEHAW! 2015-02-04 14:27:41 +01:00
Faerbit
b3e0d5ca47 Changed how depth values are written. Works even less than before. 2015-02-02 19:58:16 +01:00
Faerbit
75464e6819 Merge branch 'debug-shadows' of github.com:Faerbit/swp into debug-shadows 2015-01-31 20:02:28 +01:00
Faerbit
b8dc153f10 Tried correcting an error. Unsure if it will work. 2015-01-31 20:02:23 +01:00