Fabian Klemp
|
d7d45682a0
|
Added maxShadowRenderCount. Controls how many shadows get rendered.
|
2015-02-13 16:20:22 +01:00 |
|
Jasper
|
8a273777a1
|
Fixed non rotating objects
|
2015-02-13 16:09:18 +01:00 |
|
Fabian Klemp
|
30284977da
|
Merge branch 'debug-shadows'
Conflicts:
graphics.cc
graphics.hh
object.cc
|
2015-02-13 16:02:12 +01:00 |
|
Fabian Klemp
|
0c6c06fe00
|
Updated how shadows are applied. Looks nice now.
|
2015-02-13 15:51:49 +01:00 |
|
Jasper
|
818af2769b
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 15:46:46 +01:00 |
|
Jasper
|
dc628f3fc8
|
added debug Camear (keys L and K to switch)
|
2015-02-13 15:46:00 +01:00 |
|
Steffen Fündgens
|
22232ff7dc
|
Undid something i did not want to include in the last commit.
|
2015-02-13 15:38:43 +01:00 |
|
Steffen Fündgens
|
7a7b8d07c6
|
Reenabled zooming with the mouse wheel.
|
2015-02-13 15:20:32 +01:00 |
|
sfroitzheim
|
c50e1b2547
|
changed heightmap to incorporate the whole vague level layout
|
2015-02-13 14:35:48 +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
|
b2398ba643
|
Reduced camera mass so the camera can practically not move objects anymore. Fixed the scaling of forces on the camera with the (no more inverted) mass.
|
2015-02-13 13:00:47 +01:00 |
|
Steffen Fündgens
|
cb6f535382
|
Made it possible again to move the camera upwards.
|
2015-02-13 12:47:34 +01:00 |
|
Steffen Fündgens
|
012d117c7e
|
Changed position constraints to be less bouncy.
|
2015-02-13 12:15:54 +01:00 |
|
Faerbit
|
f41c286504
|
Fixing parameters.
|
2015-02-12 16:28:24 +01:00 |
|
Faerbit
|
91048e09f8
|
Another syntax fix.
|
2015-02-12 01:38:18 +01:00 |
|
Faerbit
|
294a8544f9
|
Syntax fix.
|
2015-02-12 01:28:26 +01:00 |
|
Faerbit
|
e1bc49b41e
|
Fixing CI system.
|
2015-02-12 01:19:34 +01:00 |
|
Faerbit
|
d6d934277f
|
Now only using the 32 closest light sources.
|
2015-02-12 01:13:26 +01:00 |
|
Faerbit
|
91dbc280e0
|
Completed shadows for now. Lighting model is still a little bit off.
|
2015-02-10 18:19:26 +01:00 |
|
Faerbit
|
3d51da73f9
|
Fixed directional shadows.
|
2015-02-10 00:27:13 +01:00 |
|
Faerbit
|
0664ae9760
|
Got multiple shadows working. The really ugly way.
|
2015-02-09 21:29:44 +01:00 |
|
Faerbit
|
b4419b88d2
|
Changed cube map shadows sampler to a sampler array.
|
2015-02-09 14:26:04 +01:00 |
|
Steffen
|
9297aa69a4
|
Now loading the resolution of the shadow cube maps from config.xml.
|
2015-02-07 20:24:11 +01:00 |
|
Steffen
|
dbf5a88ddb
|
Moved loading of the config.xml to the loader class.
|
2015-02-07 20:08:59 +01:00 |
|
Steffen
|
b6a9e2f180
|
Changed the switch object, its graphics and physics should work now(untested). Objects without physics also do not need damping values anymore.
|
2015-02-07 19:34:40 +01:00 |
|
Steffen
|
3e8689aae2
|
Made None an available physicsType for objects without physics.
|
2015-02-07 19:23:27 +01:00 |
|
Steffen
|
e39adf56ed
|
objectData now has a new value called renderable, if it is false the object will not get rendered.
|
2015-02-07 19:09:49 +01:00 |
|
Steffen Fündgens
|
ff5bd0dae1
|
Merged physics.cc.
|
2015-02-06 18:04:20 +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 |
|
Jasper
|
bcc798ad79
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-06 17:32:30 +01:00 |
|
Jasper
|
644a4a3571
|
addede max camera speed
|
2015-02-06 17:31:52 +01:00 |
|
sfroitzheim
|
4978869f82
|
Finally fixed wall and gate physics plus made some heightmap modifications
|
2015-02-06 16:31:21 +01:00 |
|
Jasper
|
72e3fdea69
|
got the marble to no longer jitter all over the place
|
2015-02-06 16:26:22 +01:00 |
|
Steffen Fündgens
|
f29678867f
|
Implemented loading of config.xml, the loaded values are not used yet.
|
2015-02-06 13:37:42 +01:00 |
|
Steffen Fündgens
|
bffbe8250f
|
Added config.xml, not using it yet.
|
2015-02-06 13:06:42 +01:00 |
|
Steffen Fündgens
|
df7c5ffe3d
|
Moved loading of the terrain to the loader, now also reading parameters for it from xml.
|
2015-02-06 12:51:53 +01:00 |
|
Steffen Fündgens
|
8be350c713
|
Added terrain parameters to the xml.
|
2015-02-06 12:37:00 +01:00 |
|
Faerbit
|
486713683d
|
Added non-linearization to get rid of fragments.
|
2015-02-05 13:19:51 +01:00 |
|
Faerbit
|
febb1dbab3
|
Increased precision of depth textures.
|
2015-02-04 23:10:51 +01:00 |
|
Faerbit
|
78f4e30f8f
|
Additional cleanup.
|
2015-02-04 23:08:23 +01:00 |
|
Faerbit
|
4f8b90f441
|
Reintroducing broken assert, because it's important.
|
2015-02-04 22:55:34 +01:00 |
|
Faerbit
|
f45603fe4c
|
Did a little bit of cleanup.
|
2015-02-04 22:54:40 +01:00 |
|
Faerbit
|
d50f624004
|
Moved loading functionality to loader class.
|
2015-02-04 17:16:06 +01:00 |
|
Faerbit
|
1f817a7ecd
|
Got Point Light Shadows working. YEEHAW!
|
2015-02-04 14:27:41 +01:00 |
|
Steffen Fündgens
|
ecca21754b
|
Added a comment and changed dampning values that were randomly 1.
|
2015-02-03 13:21:52 +01:00 |
|
Steffen Fündgens
|
8f3875a1c0
|
Adjusted a composition, found out that all TriMeshs fall through the heightmap.
|
2015-02-03 13:10:14 +01:00 |
|
Steffen Fündgens
|
df884666b5
|
Scaling of the player ball is now possible.
|
2015-02-03 12:36:42 +01:00 |
|
Steffen Fündgens
|
c57d73317c
|
Added scaling to the physic of Box and Button. Adjusted the objectData for block.obj perfectly.
|
2015-02-03 12:29:35 +01:00 |
|
Faerbit
|
d82a8d96bd
|
Changed how depth values are written. Works even less than before.
|
2015-02-02 19:58:16 +01:00 |
|
Steffen Fündgens
|
bb57eb2263
|
Added status prints to the converter.
|
2015-02-02 13:37:58 +01:00 |
|