sfroitzheim
|
4e28d7c21b
|
Version 1.1 of the heightmap
|
2014-12-15 15:45:56 +01:00 |
|
sfroitzheim
|
928898b1ca
|
Added Heightmap prototype(could be garbage)
|
2014-12-15 15:13:29 +01:00 |
|
Faerbit
|
fd0a5386e5
|
Reducing OpenGL version number to 3.2 again.
|
2014-12-15 15:10:19 +01:00 |
|
Steffen Fündgens
|
5c9a1bfb84
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 14:59:09 +01:00 |
|
Steffen Fündgens
|
0a2d0c2f75
|
Implemented half the loading of triggers.
|
2014-12-15 14:59:03 +01:00 |
|
Faerbit
|
2f5887ec0b
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 14:57:50 +01:00 |
|
sfroitzheim
|
aa3ad20ffb
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-12-15 14:25:33 +01:00 |
|
sfroitzheim
|
4c4ac76c4c
|
Added a simple wall to models/textures
|
2014-12-15 14:24:11 +01:00 |
|
Steffen Fündgens
|
0351745376
|
Fixed the trigger skeleton
|
2014-12-15 13:39:24 +01:00 |
|
Steffen Fündgens
|
f0add86f42
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 13:36:13 +01:00 |
|
Steffen Fündgens
|
3450abd970
|
Startet implementing a trigger skeleton.
|
2014-12-15 13:36:04 +01:00 |
|
Faerbit
|
a707c6c2bf
|
Now using OpenGL 4.0.
|
2014-12-15 13:31:31 +01:00 |
|
sfroitzheim
|
762f466f14
|
Fixed Poles of Marble
|
2014-12-15 13:28:05 +01:00 |
|
Faerbit
|
1957f96fc3
|
MVPs are only needed for directional shadows and not for point light shadows (forgot one thing.
|
2014-12-15 13:23:35 +01:00 |
|
Faerbit
|
14ee60fb0a
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 13:16:36 +01:00 |
|
Faerbit
|
e0b69adfa7
|
MVPs are only needed for directional shadows and not for point light shadows.
|
2014-12-15 13:16:27 +01:00 |
|
Steffen Fündgens
|
6563396dc0
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 13:08:47 +01:00 |
|
Steffen Fündgens
|
0a54807ceb
|
Moved mass from objectType to singular objects. Now loading physics from xml, but with a dummy-box instead of meshes.
|
2014-12-15 13:08:35 +01:00 |
|
Faerbit
|
02d62712b9
|
Removing commented code.
|
2014-12-15 12:55:48 +01:00 |
|
Faerbit
|
51ddcffaf0
|
Moved calculation of shadowMVP to the CPU side.
|
2014-12-15 12:41:30 +01:00 |
|
Faerbit
|
8db6e3c6d4
|
Fixed a parenthesis.
|
2014-12-15 11:53:31 +01:00 |
|
Faerbit
|
d8da75e9fb
|
Moving MVP calculation to the CPU side.
|
2014-12-15 11:45:31 +01:00 |
|
Faerbit
|
cad4a95a4e
|
Replacing buildFrustum with standard glm call.
|
2014-12-15 11:22:32 +01:00 |
|
Faerbit
|
b662106e5f
|
Implemented cube map depth rendering from lighting positions.
|
2014-12-15 02:09:33 +01:00 |
|
Faerbit
|
202323f054
|
Limited light sources to 32 instead of 128.
|
2014-12-15 01:16:43 +01:00 |
|
Faerbit
|
226292430f
|
Made tinyxml source files not executable.
|
2014-12-15 01:15:08 +01:00 |
|
Faerbit
|
17b8445a2f
|
Made getLights return a pointer to avoid copying around large amounts of light data every frame.
|
2014-12-15 01:12:51 +01:00 |
|
Faerbit
|
e0404b091d
|
Init graphics with the level instead of passing it to the render function everytime.
|
2014-12-15 01:05:46 +01:00 |
|
Faerbit
|
067e3c1369
|
Removing torches for better testing.
|
2014-12-15 01:03:48 +01:00 |
|
Steffen Fündgens
|
c7e9cc3b07
|
Debugging. Had to comment out the loading of physics because it crashed the programm.
|
2014-12-12 18:38:12 +01:00 |
|
Steffen Fündgens
|
80e2b72a5d
|
Added skeleton for trigger loading. Added comments to identify closing brackets.
|
2014-12-12 18:02:31 +01:00 |
|
Steffen Fündgens
|
f00a5d58a7
|
Added indexing of the created objects for use in triggers. Added some comments to the loading.
|
2014-12-12 17:47:33 +01:00 |
|
Steffen Fündgens
|
94b122d220
|
Converter now adds a Dummy-Trigger to the xml. Copy and customize it in the Levelx.xml to create actual triggers.
|
2014-12-12 17:18:31 +01:00 |
|
Steffen Fündgens
|
f43f866fc4
|
Implemented loading of physical objects. Compositions.xml holds mostly Dummy-Values for those.
|
2014-12-12 16:52:05 +01:00 |
|
Steffen Fündgens
|
f8773134f5
|
Adjusted the name of the marbles texture in Compositions.xml...
|
2014-12-12 16:28:34 +01:00 |
|
Steffen Fündgens
|
c8a9ae2eb9
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-12 16:25:18 +01:00 |
|
Steffen Fündgens
|
8bba52d35d
|
Implemented loading of gloabal lighting. Added physics parameters to Compositions.xml.
|
2014-12-12 16:24:47 +01:00 |
|
Steffen Fündgens
|
80f90175eb
|
Changed fogColor to fogColour. Moved some global Parameters to the xml.
|
2014-12-12 15:41:17 +01:00 |
|
sfroitzheim
|
fbe244c11a
|
Triangulated Faces
|
2014-12-12 15:16:56 +01:00 |
|
sfroitzheim
|
5151a864df
|
Fixed wrong texture name
|
2014-12-12 15:09:51 +01:00 |
|
sfroitzheim
|
4e336fbca4
|
Additional Marbletexture optimizing
|
2014-12-12 15:05:53 +01:00 |
|
sfroitzheim
|
5fa9899af9
|
Improved marbletexture and added Blenderfile
|
2014-12-12 14:58:12 +01:00 |
|
Steffen Fündgens
|
18c374c46a
|
Changed errorChecking in the converter.
|
2014-12-12 12:31:24 +01:00 |
|
Faerbit
|
5ab0897653
|
Removing stencil buffer from depthTextures.
|
2014-12-12 02:19:41 +01:00 |
|
Steffen Fündgens
|
e99ad8bab5
|
changed error checking syntax to make code more compact
|
2014-12-08 15:48:46 +01:00 |
|
Steffen Fündgens
|
d2afede893
|
Added loading of lights, adjusted Compositions.xml and Level0.png to test it.
|
2014-12-08 15:19:50 +01:00 |
|
Steffen Fündgens
|
82dfbff2fb
|
Finished loading of graphical objects, please check if my interpretation of the rotation is corect(copied from entity.cc). No physics loaded yet.
|
2014-12-08 14:54:27 +01:00 |
|
Steffen Fündgens
|
7279dc66bd
|
Converting unsigned ints to regular ints again, undid that while merging.
|
2014-12-08 14:24:26 +01:00 |
|
Steffen Fündgens
|
3e205b4157
|
merging
|
2014-12-08 14:19:23 +01:00 |
|
Steffen Fündgens
|
ff16297a63
|
Added error checking for all XML Queries, fixed bugs and continued to implement loading from xml.
|
2014-12-08 14:10:08 +01:00 |
|