sfroitzheim
|
ea587dc26b
|
Added a simple wall to models/textures
|
2014-12-15 14:24:11 +01:00 |
|
sfroitzheim
|
f03274082e
|
Fixed Poles of Marble
|
2014-12-15 13:28:05 +01:00 |
|
Faerbit
|
0979c51ed0
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 13:16:36 +01:00 |
|
Faerbit
|
ad567157c4
|
MVPs are only needed for directional shadows and not for point light shadows.
|
2014-12-15 13:16:27 +01:00 |
|
Steffen Fündgens
|
acdf1b3285
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 13:08:47 +01:00 |
|
Steffen Fündgens
|
f681987358
|
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
|
cc93cf7259
|
Removing commented code.
|
2014-12-15 12:55:48 +01:00 |
|
Faerbit
|
36f7217288
|
Moved calculation of shadowMVP to the CPU side.
|
2014-12-15 12:41:30 +01:00 |
|
Faerbit
|
21009d0032
|
Fixed a parenthesis.
|
2014-12-15 11:53:31 +01:00 |
|
Faerbit
|
50c4b16367
|
Moving MVP calculation to the CPU side.
|
2014-12-15 11:45:31 +01:00 |
|
Faerbit
|
44f2bd953d
|
Replacing buildFrustum with standard glm call.
|
2014-12-15 11:22:32 +01:00 |
|
Faerbit
|
80cbc58f81
|
Implemented cube map depth rendering from lighting positions.
|
2014-12-15 02:09:33 +01:00 |
|
Faerbit
|
7f21f0e872
|
Limited light sources to 32 instead of 128.
|
2014-12-15 01:16:43 +01:00 |
|
Faerbit
|
b2aabe68db
|
Made tinyxml source files not executable.
|
2014-12-15 01:15:08 +01:00 |
|
Faerbit
|
e9a47db962
|
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
|
e531ede144
|
Init graphics with the level instead of passing it to the render function everytime.
|
2014-12-15 01:05:46 +01:00 |
|
Faerbit
|
5b2233e1b3
|
Removing torches for better testing.
|
2014-12-15 01:03:48 +01:00 |
|
Steffen Fündgens
|
bf6d4d69a9
|
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
|
07d11e2bd1
|
Added skeleton for trigger loading. Added comments to identify closing brackets.
|
2014-12-12 18:02:31 +01:00 |
|
Steffen Fündgens
|
330abfcccb
|
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
|
b4e9218e95
|
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
|
8a7f7da0a8
|
Implemented loading of physical objects. Compositions.xml holds mostly Dummy-Values for those.
|
2014-12-12 16:52:05 +01:00 |
|
Steffen Fündgens
|
89d3b48c47
|
Adjusted the name of the marbles texture in Compositions.xml...
|
2014-12-12 16:28:34 +01:00 |
|
Steffen Fündgens
|
45d4b944c4
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-12 16:25:18 +01:00 |
|
Steffen Fündgens
|
b0c371f610
|
Implemented loading of gloabal lighting. Added physics parameters to Compositions.xml.
|
2014-12-12 16:24:47 +01:00 |
|
Steffen Fündgens
|
9764bc9d0b
|
Changed fogColor to fogColour. Moved some global Parameters to the xml.
|
2014-12-12 15:41:17 +01:00 |
|
sfroitzheim
|
cb488035cb
|
Triangulated Faces
|
2014-12-12 15:16:56 +01:00 |
|
sfroitzheim
|
db9b90d089
|
Fixed wrong texture name
|
2014-12-12 15:09:51 +01:00 |
|
sfroitzheim
|
291a0f1899
|
Additional Marbletexture optimizing
|
2014-12-12 15:05:53 +01:00 |
|
sfroitzheim
|
d21569e71b
|
Improved marbletexture and added Blenderfile
|
2014-12-12 14:58:12 +01:00 |
|
Steffen Fündgens
|
8c7648a51e
|
Changed errorChecking in the converter.
|
2014-12-12 12:31:24 +01:00 |
|
Faerbit
|
f3255f1053
|
Removing stencil buffer from depthTextures.
|
2014-12-12 02:19:41 +01:00 |
|
Steffen Fündgens
|
ae0d44c96a
|
changed error checking syntax to make code more compact
|
2014-12-08 15:48:46 +01:00 |
|
Steffen Fündgens
|
5f16738c39
|
Added loading of lights, adjusted Compositions.xml and Level0.png to test it.
|
2014-12-08 15:19:50 +01:00 |
|
Steffen Fündgens
|
3f594ed21f
|
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
|
7f20ef3ec5
|
Converting unsigned ints to regular ints again, undid that while merging.
|
2014-12-08 14:24:26 +01:00 |
|
Steffen Fündgens
|
4ad1f0607d
|
merging
|
2014-12-08 14:19:23 +01:00 |
|
Steffen Fündgens
|
db1092be44
|
Added error checking for all XML Queries, fixed bugs and continued to implement loading from xml.
|
2014-12-08 14:10:08 +01:00 |
|
Faerbit
|
6eb52d2dab
|
Reexporting column, because it had no normals.
|
2014-12-08 13:43:47 +01:00 |
|
Faerbit
|
03e94f0bb0
|
Converting unsinged ints to regular ints, because tinyxml cannot query for unsigned ones and thus negates the purpose of using unsigned ones. This also causes compiler errors.
|
2014-12-08 13:33:38 +01:00 |
|
Faerbit
|
3bb584631c
|
One exclamation mark is enough.
|
2014-12-08 13:28:50 +01:00 |
|
Steffen Fündgens
|
dbaa4f639f
|
Implemented more of the loading from xml
|
2014-12-05 17:14:43 +01:00 |
|
Steffen Fündgens
|
2a501ac047
|
Added objectData to Compositions.xml. It contains texture data as of now.
|
2014-12-05 16:55:17 +01:00 |
|
Steffen Fündgens
|
3339ac208e
|
Changed model and texture names to not start with capital letters.
|
2014-12-05 16:36:31 +01:00 |
|
Steffen Fündgens
|
780897e1ab
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-05 16:19:06 +01:00 |
|
Steffen Fündgens
|
cfe29d2830
|
Fixed the filesytem for the converter.
|
2014-12-05 16:18:48 +01:00 |
|
sfroitzheim
|
0e2f5ac580
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-12-05 15:01:16 +01:00 |
|
Steffen Fündgens
|
ca3b29251e
|
Added Level0.png.
|
2014-12-05 15:00:46 +01:00 |
|
sfroitzheim
|
cb825a6588
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-12-05 14:51:23 +01:00 |
|
sfroitzheim
|
f83bb7ec7d
|
Fixed some display bugs with the column.
|
2014-12-05 14:49:23 +01:00 |
|