Commit Graph

27 Commits

Author SHA1 Message Date
Steffen Fündgens
2d872c644e 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
60543a301e Added resetPlayer function to the level. 2015-02-13 17:14:29 +01:00
Steffen Fündgens
47fded52ce Code rework. Basically cleaned up a mess of tabs and whitespaces. 2015-02-13 13:46:41 +01:00
Steffen Fündgens
2bfad25510 Added loading from config.xml, then debuged it for more than three hours... 2015-02-06 18:00:14 +01:00
Steffen Fündgens
a996a09457 Corrected spaces. 2015-01-23 16:41:56 +01:00
sfroitzheim
036a9cb365 Additional changes with the heightmap 2015-01-16 16:37:00 +01:00
Steffen Fündgens
c7dd152dbd changed heightmap scaling 2015-01-16 14:02:36 +01:00
Steffen Fündgens
18047e5704 Doubled heightmap scale. 2014-12-15 16:34:44 +01:00
Steffen Fündgens
8a686dc9a3 changed filePath to levelNum 2014-12-04 15:07:31 +01:00
Steffen Fündgens
f1f3825f07 created skeletal implementation of png to xml converter 2014-11-21 15:43:27 +01:00
Steffen Fündgens
79d4cff49e changed terrain normals to consider 8 vertices, looks the same 2014-11-18 13:09:55 +01:00
Steffen Fündgens
9024d29d12 Reorganizing file structure. 2014-11-17 13:36:05 +01:00
Steffen Fündgens
c0a730f58a Merge branch 'terrain-test'
Conflicts:
	level.cc
	terrain.cc
2014-11-17 12:56:10 +01:00
Steffen Fündgens
64fbceeef8 Rewriting terrain loading with lodepng and fixing a few bugs. 2014-11-17 12:51:30 +01:00
Steffen Fündgens
e2e31e11e4 Merging stuff. 2014-11-17 11:23:47 +01:00
Faerbit
5ca77ae3cc Constructed a simple quad for debugging terrain generation. 2014-11-15 13:46:20 +01:00
Steffen Fündgens
5cee3e7dd2 added testData to terrain for debugging 2014-11-14 18:32:23 +01:00
Steffen Fündgens
4ef7a2597b added a normal and texture coordinate to the terrain, rendering moved to level 2014-11-14 17:36:30 +01:00
Steffen Fündgens
9cb7278eb3 scaled heightmap height to [0,1] tried to give the heightmap a clor 2014-11-11 13:27:11 +01:00
Steffen Fündgens
8eec5fa49e debuged the load function in terrain.cc loading and rendering kind of works (no texture) 2014-11-11 12:22:47 +01:00
Steffen Fündgens
acf537e026 tried to call the load functions, no success this far 2014-11-07 16:55:56 +01:00
Steffen Fündgens
85c7bc8cb5 changed VertexArrayObject to SharedVertexArrayObject + Bugfixes 2014-11-07 14:06:40 +01:00
Steffen Fündgens
2d1328b96b fixed terrain class and removed load from texture 2014-11-07 13:11:06 +01:00
Steffen Fündgens
44d829e564 added most of the functionallity to make a triangle strip from the heightmap 2014-11-06 19:21:24 +01:00
Faerbit
9926ad9252 Proper indentation. 2014-11-05 12:50:25 +01:00
Steffen Fündgens
fa65d01b8b implemented reading the heightmap from png 2014-11-04 19:40:35 +01:00
Faerbit
62d8a83ddb Implemented empty Terrain constructor(compiler was complaining. 2014-10-30 23:32:52 +01:00