Faerbit
|
8da25e5beb
|
Removing debug output.
|
2014-12-15 22:03:04 +01:00 |
|
Faerbit
|
5ad46dd5e9
|
Revert "Not using pointlight shadows."
This reverts commit e00cb787c8.
|
2014-12-15 22:00:23 +01:00 |
|
Jasper
|
ebb7045753
|
Merge branch 'master' of github.com:Faerbit/swp
Conflicts:
level.cc
|
2014-12-15 19:13:25 +01:00 |
|
Jasper
|
c993bd8f77
|
Tried to adjust box.
|
2014-12-15 19:11:28 +01:00 |
|
Steffen Fündgens
|
689a5f3d1c
|
Adding *.db files to gitignore.
|
2014-12-15 19:00:40 +01:00 |
|
Steffen Fündgens
|
124ae53f59
|
Fixing texture file name of marble.
|
2014-12-15 19:00:07 +01:00 |
|
Steffen Fündgens
|
6d6f798d12
|
Changed to Lvl1.
|
2014-12-15 18:58:32 +01:00 |
|
Steffen Fündgens
|
2a1119da79
|
Implemented simple triggers.
|
2014-12-15 18:43:10 +01:00 |
|
Steffen Fündgens
|
e00cb787c8
|
Not using pointlight shadows.
|
2014-12-15 16:48:42 +01:00 |
|
Steffen Fündgens
|
23abffb3ee
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 16:34:54 +01:00 |
|
Steffen Fündgens
|
b43f37f0a0
|
Doubled heightmap scale.
|
2014-12-15 16:34:44 +01:00 |
|
Fabian Klemp
|
2e75aff5af
|
Adding torch blenderfile.
|
2014-12-15 16:27:04 +01:00 |
|
Jasper
|
9964b9be34
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 16:04:36 +01:00 |
|
Jasper
|
e49e4c2177
|
Composition scales addapted
Physics added trimeshshapes
|
2014-12-15 16:02:04 +01:00 |
|
Faerbit
|
15f91a19b9
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 15:59:12 +01:00 |
|
Faerbit
|
05cac9c520
|
Point light shadows for the first point light does something. Seems pretty broken.
|
2014-12-15 15:58:55 +01:00 |
|
sfroitzheim
|
0eacb96e81
|
Version 1.1 of the heightmap
|
2014-12-15 15:45:56 +01:00 |
|
sfroitzheim
|
6b3db436dc
|
Added Heightmap prototype(could be garbage)
|
2014-12-15 15:13:29 +01:00 |
|
Faerbit
|
df182abd06
|
Reducing OpenGL version number to 3.2 again.
|
2014-12-15 15:10:19 +01:00 |
|
Steffen Fündgens
|
db1de34bce
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 14:59:09 +01:00 |
|
Steffen Fündgens
|
66cf9ef8d6
|
Implemented half the loading of triggers.
|
2014-12-15 14:59:03 +01:00 |
|
Faerbit
|
91567fca78
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 14:57:50 +01:00 |
|
sfroitzheim
|
fdeb783055
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-12-15 14:25:33 +01:00 |
|
sfroitzheim
|
121f357d23
|
Added a simple wall to models/textures
|
2014-12-15 14:24:11 +01:00 |
|
Steffen Fündgens
|
81bead5a97
|
Fixed the trigger skeleton
|
2014-12-15 13:39:24 +01:00 |
|
Steffen Fündgens
|
2e472f8921
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 13:36:13 +01:00 |
|
Steffen Fündgens
|
b744d5b440
|
Startet implementing a trigger skeleton.
|
2014-12-15 13:36:04 +01:00 |
|
Faerbit
|
ca5618bce2
|
Now using OpenGL 4.0.
|
2014-12-15 13:31:31 +01:00 |
|
sfroitzheim
|
9c92954bc0
|
Fixed Poles of Marble
|
2014-12-15 13:28:05 +01:00 |
|
Faerbit
|
acf7325553
|
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
|
7dae5a5e8c
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 13:16:36 +01:00 |
|
Faerbit
|
f306730920
|
MVPs are only needed for directional shadows and not for point light shadows.
|
2014-12-15 13:16:27 +01:00 |
|
Steffen Fündgens
|
ad24191000
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 13:08:47 +01:00 |
|
Steffen Fündgens
|
56be22a460
|
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
|
7a95ddf6bb
|
Removing commented code.
|
2014-12-15 12:55:48 +01:00 |
|
Faerbit
|
4d36c9fb97
|
Moved calculation of shadowMVP to the CPU side.
|
2014-12-15 12:41:30 +01:00 |
|
Faerbit
|
6ff8f33017
|
Fixed a parenthesis.
|
2014-12-15 11:53:31 +01:00 |
|
Faerbit
|
55cc68a333
|
Moving MVP calculation to the CPU side.
|
2014-12-15 11:45:31 +01:00 |
|
Faerbit
|
c2cf71e0e6
|
Replacing buildFrustum with standard glm call.
|
2014-12-15 11:22:32 +01:00 |
|
Faerbit
|
cec0043caf
|
Implemented cube map depth rendering from lighting positions.
|
2014-12-15 02:09:33 +01:00 |
|
Faerbit
|
ed347725e6
|
Limited light sources to 32 instead of 128.
|
2014-12-15 01:16:43 +01:00 |
|
Faerbit
|
b2241a671e
|
Made tinyxml source files not executable.
|
2014-12-15 01:15:08 +01:00 |
|
Faerbit
|
d45ed9060f
|
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
|
01212ba007
|
Init graphics with the level instead of passing it to the render function everytime.
|
2014-12-15 01:05:46 +01:00 |
|
Faerbit
|
b5f7e73c4c
|
Removing torches for better testing.
|
2014-12-15 01:03:48 +01:00 |
|
Steffen Fündgens
|
4ddc21d3c9
|
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
|
3504a2d209
|
Added skeleton for trigger loading. Added comments to identify closing brackets.
|
2014-12-12 18:02:31 +01:00 |
|
Steffen Fündgens
|
85c6132c3e
|
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
|
c406bd4b62
|
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
|
caea9b7181
|
Implemented loading of physical objects. Compositions.xml holds mostly Dummy-Values for those.
|
2014-12-12 16:52:05 +01:00 |
|