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 |
|
Steffen Fündgens
|
097e1acfbc
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-05 14:45:57 +01:00 |
|
Steffen Fündgens
|
4d1fbc6045
|
Implemented error checking for XML. Fixed loading of OBJ-Files.
|
2014-12-05 14:45:44 +01:00 |
|
sfroitzheim
|
3f9d8a815b
|
Added a movable Block that will be used to be pushed on switches.
|
2014-12-05 14:39:51 +01:00 |
|
sfroitzheim
|
de47c1bdd6
|
Changed Columntexture to something better.
|
2014-12-05 14:39:08 +01:00 |
|
Steffen Fündgens
|
086e13ac8e
|
integrating tinyxml into level, adding lights to compositions
|
2014-12-05 12:47:02 +01:00 |
|
Steffen Fündgens
|
8108003d52
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-05 12:13:45 +01:00 |
|
Faerbit
|
76fd5ade92
|
Put some code in a function.
|
2014-12-05 00:57:17 +01:00 |
|
Faerbit
|
7710520c52
|
Now generating Mipmaps for textures.
|
2014-12-04 18:58:16 +01:00 |
|
Faerbit
|
72a6e7c3c9
|
Setting wrap mode of depthTextures to CLAMP_TO_EDGE to remove seams.
|
2014-12-04 17:39:35 +01:00 |
|
Faerbit
|
0c5dbee654
|
Implemented cascaded shadow mapping.
|
2014-12-04 17:19:58 +01:00 |
|
Faerbit
|
a54752a905
|
Implemented early bailing.
|
2014-12-04 15:08:08 +01:00 |
|
Steffen Fündgens
|
f218a141fa
|
changed filePath to levelNum
|
2014-12-04 15:07:31 +01:00 |
|
Faerbit
|
8c427003cd
|
Implemented poisson sampling.
|
2014-12-04 14:53:07 +01:00 |
|
Faerbit
|
41d8e23c60
|
Disable culling because it seems to give slightly worse FPS.
|
2014-12-04 14:46:39 +01:00 |
|
Faerbit
|
1ab7783d41
|
Improving bias on slopes.
|
2014-12-04 13:26:06 +01:00 |
|
Faerbit
|
ed960eff53
|
Adding culling.
|
2014-12-04 13:23:25 +01:00 |
|
Faerbit
|
aa764cfa39
|
Changing shadow map sampler from sampler2D to sampler2Dshadow and removing now useless colour texture.
|
2014-12-04 13:21:20 +01:00 |
|
Faerbit
|
09fc76d26b
|
Changing directional light vector to match origin of the sun on the skysphere texture.
|
2014-12-04 12:19:39 +01:00 |
|
Faerbit
|
947e9376fb
|
Making framebuffer private again. (Was public for debugging.
|
2014-12-04 01:22:23 +01:00 |
|
Faerbit
|
27c2248117
|
Implemented basic shadows for sun light. Also fixed bug with far plane always staying the same.
|
2014-12-04 01:13:59 +01:00 |
|
Faerbit
|
fca69b547b
|
Always automatically update docker container.
|
2014-12-03 11:17:24 +01:00 |
|
Faerbit
|
af8f85c3c4
|
Exiting converter if no input file is given.
|
2014-12-03 11:09:37 +01:00 |
|
Steffen Fündgens
|
98e78b915e
|
adjusting converter to work with black and white image backgrounds
|
2014-12-02 13:37:31 +01:00 |
|
Steffen Fündgens
|
a8457d9399
|
still merging...
|
2014-12-02 13:19:19 +01:00 |
|
Steffen Fündgens
|
2a9bfbf5da
|
Merged master and converter
|
2014-12-02 13:17:33 +01:00 |
|
Steffen Fündgens
|
37c1006431
|
Compositions.xml makes sense now
|
2014-12-02 13:13:20 +01:00 |
|
Faerbit
|
eb90142e81
|
Moving shader management completely into graphics.
|
2014-12-01 17:49:59 +01:00 |
|
Faerbit
|
b49f93afd4
|
Removing spammy comments.
|
2014-12-01 17:44:58 +01:00 |
|
Faerbit
|
ef8fbb7296
|
Adding namespacing.
|
2014-12-01 17:40:39 +01:00 |
|
Faerbit
|
2d7165da66
|
Removing useless includes.
|
2014-12-01 17:40:06 +01:00 |
|
Steffen Fündgens
|
9f4071cef7
|
implemented all methods of the converter class, needs testing
|
2014-12-01 14:09:55 +01:00 |
|
Faerbit
|
85215a1a95
|
Reexporting Block.obj, because normals were missing.
|
2014-12-01 13:55:47 +01:00 |
|
Faerbit
|
c09b056e84
|
Removing backup blender files.
|
2014-12-01 13:54:10 +01:00 |
|
Faerbit
|
272532bb1f
|
Adding OBJ-file load messages for easier debugging.
|
2014-12-01 13:53:01 +01:00 |
|
Faerbit
|
f0d904a9ff
|
Do not build GLFW examples and tests.
|
2014-12-01 13:16:04 +01:00 |
|