Commit Graph

996 Commits

Author SHA1 Message Date
Faerbit
813d50ee94 Tried to further improve the rendering of the flame; didn't quite work. 2015-03-01 23:28:36 +01:00
Faerbit
805a5f19b5 Corrected flame normals. 2015-03-01 22:22:48 +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
6e33af8e61 Reducing the number of sample from 8 to 4. 2015-03-01 17:56:30 +01:00
Faerbit
395803109d Should have been in the last commit. 2015-03-01 17:04:13 +01:00
Faerbit
b61e7df089 Made two render calls to circumvent vertex limitation of geometry shader. 2015-03-01 17:01:41 +01:00
Faerbit
8c34df49b7 Enabled multisampling for the window. 2015-03-01 16:52:44 +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
4cc21fd378 Closing flame at the top. 2015-03-01 16:11:43 +01:00
Faerbit
41de72e3a1 Fixed popping of directional shadows. 2015-02-28 15:53:12 +01:00
Faerbit
97b9eeeac6 Mix borders of directional shadow maps. 2015-02-28 15:10:14 +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
0887ff5f46 Removed unused code. 2015-02-28 13:51:22 +01:00
Faerbit
0489fc81fa Moved flame down a little bit to better fit the new flame. 2015-02-28 00:53:23 +01:00
Faerbit
899253b53c Got generation of flame geometry working. 2015-02-28 00:52:58 +01:00
Faerbit
8c1369ad2e Cull front faces of flames(normals are backwards). 2015-02-28 00:51:20 +01:00
Faerbit
1dad2f589f More output from solver. 2015-02-28 00:02:26 +01:00
Faerbit
086713341b Got generation of circular quads working. 2015-02-28 00:00:30 +01:00
Faerbit
b974508683 Merge branch 'master' of github.com:Faerbit/swp 2015-02-27 23:34:33 +01:00
Faerbit
39882d43c3 Fixed solver and improved him. 2015-02-27 23:34:25 +01:00
Steffen Fündgens
7f8150d5ed Integrated Simons Level1.png changes from the .xcf. 2015-02-27 17:21:52 +01:00
Steffen Fündgens
635f6ae546 Merge with the worst possible conflicts: png and xml. Think i didnt yet integrate Simons latest png changes. 2015-02-27 17:11:44 +01:00
Steffen Fündgens
eab9270b94 Turned the heightmap loading around so the level now is like the png. The wall backsides dont seem to have textures... 2015-02-27 16:53:46 +01:00
Steffen Fündgens
87b9634703 Moved the heightmap, so it nearly fits with the graphical one. 2015-02-27 16:20:29 +01:00
Steffen Fündgens
650ad89067 Adjusted variable name i forgot earlier. 2015-02-27 16:01:59 +01:00
Jasper
a64b1dac00 Merge branch 'master' of github.com:Faerbit/swp 2015-02-27 16:01:17 +01:00
Jasper
d49baa2a8c added convextrianglemeshshape 2015-02-27 15:58:21 +01:00
sfroitzheim
23a3730c37 Merge branch 'master' of https://github.com/Faerbit/swp 2015-02-27 15:48:39 +01:00
sfroitzheim
134faaa67e prepared switch room for adding braziers 2015-02-27 15:47:36 +01:00
Faerbit
272dce8900 Merge branch 'master' of github.com:Faerbit/swp 2015-02-27 15:43:52 +01:00
Faerbit
eff6cabd09 Added solver which helps with selecting a fit function for the flames. 2015-02-27 15:43:33 +01:00
sfroitzheim
84a9899516 Completed work on the switch room (for now) 2015-02-27 15:42:16 +01:00
Steffen Fündgens
6c78c93c2b Increased size of directional light shadow map. 2015-02-27 14:37:57 +01:00
Steffen Fündgens
abeab11875 Solved jittering by moving physics update in the level update. 2015-02-27 12:56:02 +01:00
Steffen Fündgens
2d65071887 Not updating old camera twice anymore. 2015-02-27 12:55:06 +01:00
sfroitzheim
9f19d74c2a Added an example of bridges meeting properly to the scene (in the big switch room where are no switches yet) 2015-02-26 17:11:02 +01:00
sfroitzheim
501aa3def9 Added the hidden hint model 2015-02-26 15:50:36 +01:00
sfroitzheim
53b6db98e6 Added a brazier model 2015-02-26 15:49:34 +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
Faerbit
174fafe5bc Removing flame offset from Level.xml because it should be in the Compositions.xml. 2015-02-24 15:28:53 +01:00
Faerbit
2b93aff35d Clarifing which offset is meant. 2015-02-24 14:04:56 +01:00
Faerbit
510001b943 Adding flame. 2015-02-24 12:56:55 +01:00
Faerbit
97a315661f Removing flame class and integrate it into light class because it was unpractical. 2015-02-24 12:56:40 +01:00
Faerbit
b3b215e628 Fixing windows build. Lua now cross compiles. 2015-02-24 11:07:52 +01:00
Faerbit
edd4f53f66 While cleaning also clean lua. 2015-02-24 11:02:24 +01:00
Faerbit
fd21dd0f9f Removing maybe unitiliazed errors. 2015-02-24 10:50:11 +01:00