206 Commits

Author	SHA1	Message	Date
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
Faerbit	686647fe93	Moved torch light up to account for new torch model.	2015-03-03 11:05:34 +01:00
Faerbit	6fe51809a0	Made bias variable to get smaller bias for smaller shadow maps.	2015-03-03 11:04:39 +01:00
Steffen Fündgens	8f0ec319c4	Merge branch 'master' of github.com:Faerbit/swp	2015-03-02 17:20:16 +01:00
Steffen Fündgens	e043fe482a	Added scripts and triggers to open the second door.	2015-03-02 17:20:02 +01:00
sfroitzheim	6140c38813	Merge branch 'master' of https://github.com/Faerbit/swp	2015-03-02 16:47:54 +01:00
sfroitzheim	4d0f2d7be5	Made a new torch model	2015-03-02 16:47:42 +01:00
Steffen Fündgens	48ed278101	Recalculated normals because they were wrong.	2015-03-02 15:09:29 +01:00
Steffen Fündgens	986ed9ea8e	Added lua scripts and triggers for the third door.	2015-03-02 12:58:34 +01:00
Steffen Fündgens	c372a2d652	Moved unused scripts into a subfolder.	2015-03-02 12:42:04 +01:00
Steffen Fündgens	81d5f86db1	Added position constraints for all switch_inner.	2015-03-02 12:22:47 +01:00
Steffen Fündgens	2fecf21509	Adjusted the size of switch_inner so it does not move to the sides.	2015-03-02 12:16:29 +01:00
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	b61e7df089	Made two render calls to circumvent vertex limitation of geometry shader.	2015-03-01 17:01:41 +01:00
Faerbit	4cc21fd378	Closing flame at the top.	2015-03-01 16:11:43 +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	086713341b	Got generation of circular quads working.	2015-02-28 00:00:30 +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
sfroitzheim	134faaa67e	prepared switch room for adding braziers	2015-02-27 15:47:36 +01:00
sfroitzheim	84a9899516	Completed work on the switch room (for now)	2015-02-27 15:42:16 +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	510001b943	Adding flame.	2015-02-24 12:56:55 +01:00
Steffen Fündgens	320b765951	Adjusted the converter to be robust against IDs being overwritten with zeros in the png. Sucessfully ran it.	2015-02-20 15:06:43 +01:00
Steffen Fündgens	087d36aa15	Unified object and texture filenames.	2015-02-20 13:56:40 +01:00
Steffen Fündgens	236067435d	Updated Level0 to be runable.	2015-02-20 13:40:59 +01:00
Steffen Fündgens	8a76ad4133	Updated currently unused scripts.	2015-02-20 13:26:09 +01:00
Steffen Fündgens	563bde0616	Now using xml query functions in the converter. Also adjusted the converter to use config.xml. Running the converter would delete all triggers and position constraints though, because the IDs in the png were manually overwritten with zeros.	2015-02-20 13:11:05 +01:00
Steffen Fündgens	af9f6d6933	Added loading of flames.	2015-02-17 12:54:21 +01:00
Steffen Fündgens	88d31bc68a	Adjusted the mass of switchInner and the force that keeps it in place. The movableBlock can now push the switch down.	2015-02-17 12:25:12 +01:00
Steffen Fündgens	3764bb5c6a	Adjusted the size of the movableBlock.	2015-02-17 12:04:15 +01:00
Faerbit	efa151aa73	Do not implicitly set extensions of script files.	2015-02-15 19:34:15 +01:00
Faerbit	fb028a899f	Moved setting of package.path in lua to init.lua	2015-02-15 19:32:19 +01:00
Steffen	0e550e52c6	Got scripts to work as intended, had to use an ugly hack for it.	2015-02-15 16:11:31 +01:00
Faerbit	431a9e58b1	Unified how pathes are interpreted in config.xml.	2015-02-14 09:55:43 +01:00
Faerbit	97329141bc	Restructured directory tree.	2015-02-14 09:49:29 +01:00
Fabian Klemp	281466ebd5	Added maxShadowRenderCount. Controls how many shadows get rendered.	2015-02-13 16:20:22 +01:00
Steffen	8cc467a806	Now loading the resolution of the shadow cube maps from config.xml.	2015-02-07 20:24:11 +01:00
Steffen Fündgens	d2cf4f0003	Added loading from config.xml, then debuged it for more than three hours...	2015-02-06 18:00:14 +01:00
Steffen Fündgens	ea58f2fbce	Added config.xml, not using it yet.	2015-02-06 13:06:42 +01:00