Fabian Klemp
|
55434daa24
|
Updated how shadows are applied. Looks nice now.
|
2015-02-13 15:51:49 +01:00 |
|
Jasper
|
9049458ad5
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 15:46:46 +01:00 |
|
Jasper
|
75792a5723
|
added debug Camear (keys L and K to switch)
|
2015-02-13 15:46:00 +01:00 |
|
Steffen Fündgens
|
3fc8e9c11a
|
Undid something i did not want to include in the last commit.
|
2015-02-13 15:38:43 +01:00 |
|
Steffen Fündgens
|
d55bb3465c
|
Reenabled zooming with the mouse wheel.
|
2015-02-13 15:20:32 +01:00 |
|
sfroitzheim
|
38d4ef8125
|
changed heightmap to incorporate the whole vague level layout
|
2015-02-13 14:35:48 +01:00 |
|
Steffen Fündgens
|
e91d045a37
|
Code rework. Basically cleaned up a mess of tabs and whitespaces.
|
2015-02-13 13:46:41 +01:00 |
|
Steffen Fündgens
|
1585195779
|
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
|
6ee8af58e3
|
Made it possible again to move the camera upwards.
|
2015-02-13 12:47:34 +01:00 |
|
Steffen Fündgens
|
d02a7fa02f
|
Changed position constraints to be less bouncy.
|
2015-02-13 12:15:54 +01:00 |
|
Faerbit
|
1ac9e4e270
|
Fixing parameters.
|
2015-02-12 16:28:24 +01:00 |
|
Faerbit
|
84d52fbaf2
|
Another syntax fix.
|
2015-02-12 01:38:18 +01:00 |
|
Faerbit
|
aaadcbe413
|
Syntax fix.
|
2015-02-12 01:28:26 +01:00 |
|
Faerbit
|
de960237a4
|
Fixing CI system.
|
2015-02-12 01:19:34 +01:00 |
|
Faerbit
|
1d8bbba1ca
|
Now only using the 32 closest light sources.
|
2015-02-12 01:13:26 +01:00 |
|
Faerbit
|
ba2cada6dc
|
Completed shadows for now. Lighting model is still a little bit off.
|
2015-02-10 18:19:26 +01:00 |
|
Faerbit
|
9afb3595d0
|
Fixed directional shadows.
|
2015-02-10 00:27:13 +01:00 |
|
Faerbit
|
282eb32267
|
Got multiple shadows working. The really ugly way.
|
2015-02-09 21:29:44 +01:00 |
|
Faerbit
|
c28b35667f
|
Changed cube map shadows sampler to a sampler array.
|
2015-02-09 14:26:04 +01:00 |
|
Steffen
|
8cc467a806
|
Now loading the resolution of the shadow cube maps from config.xml.
|
2015-02-07 20:24:11 +01:00 |
|
Steffen
|
2b4a8885b5
|
Moved loading of the config.xml to the loader class.
|
2015-02-07 20:08:59 +01:00 |
|
Steffen
|
096cf12df0
|
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
|
d132cdd233
|
Made None an available physicsType for objects without physics.
|
2015-02-07 19:23:27 +01:00 |
|
Steffen
|
7647c5f1c0
|
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
|
21d94a420f
|
Merged physics.cc.
|
2015-02-06 18:04:20 +01:00 |
|
Steffen Fündgens
|
d2cf4f0003
|
Added loading from config.xml, then debuged it for more than three hours...
|
2015-02-06 18:00:14 +01:00 |
|
Jasper
|
44153cd554
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-06 17:32:30 +01:00 |
|
Jasper
|
c4bed4c506
|
addede max camera speed
|
2015-02-06 17:31:52 +01:00 |
|
sfroitzheim
|
a669c83943
|
Finally fixed wall and gate physics plus made some heightmap modifications
|
2015-02-06 16:31:21 +01:00 |
|
Jasper
|
017c96bd55
|
got the marble to no longer jitter all over the place
|
2015-02-06 16:26:22 +01:00 |
|
Steffen Fündgens
|
a14d3420d5
|
Implemented loading of config.xml, the loaded values are not used yet.
|
2015-02-06 13:37:42 +01:00 |
|
Steffen Fündgens
|
ea58f2fbce
|
Added config.xml, not using it yet.
|
2015-02-06 13:06:42 +01:00 |
|
Steffen Fündgens
|
320c1cb152
|
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
|
5c2491557b
|
Added terrain parameters to the xml.
|
2015-02-06 12:37:00 +01:00 |
|
Faerbit
|
ed10994ebc
|
Added non-linearization to get rid of fragments.
|
2015-02-05 13:19:51 +01:00 |
|
Faerbit
|
7c8d149e3a
|
Increased precision of depth textures.
|
2015-02-04 23:10:51 +01:00 |
|
Faerbit
|
ac19eac671
|
Additional cleanup.
|
2015-02-04 23:08:23 +01:00 |
|
Faerbit
|
8babafadfd
|
Reintroducing broken assert, because it's important.
|
2015-02-04 22:55:34 +01:00 |
|
Faerbit
|
10082466cf
|
Did a little bit of cleanup.
|
2015-02-04 22:54:40 +01:00 |
|
Faerbit
|
7e8b0d4c58
|
Moved loading functionality to loader class.
|
2015-02-04 17:16:06 +01:00 |
|
Faerbit
|
2e90ac57d8
|
Got Point Light Shadows working. YEEHAW!
|
2015-02-04 14:27:41 +01:00 |
|
Steffen Fündgens
|
bb1cf8dea7
|
Added a comment and changed dampning values that were randomly 1.
|
2015-02-03 13:21:52 +01:00 |
|
Steffen Fündgens
|
c4b01beaa8
|
Adjusted a composition, found out that all TriMeshs fall through the heightmap.
|
2015-02-03 13:10:14 +01:00 |
|
Steffen Fündgens
|
e7ff009482
|
Scaling of the player ball is now possible.
|
2015-02-03 12:36:42 +01:00 |
|
Steffen Fündgens
|
9ffe3cd886
|
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
|
b3e0d5ca47
|
Changed how depth values are written. Works even less than before.
|
2015-02-02 19:58:16 +01:00 |
|
Steffen Fündgens
|
5c1a342cdb
|
Added status prints to the converter.
|
2015-02-02 13:37:58 +01:00 |
|
Steffen Fündgens
|
35a13886c3
|
Added and tested physics boxes for the switchOuter. Graphical object to match them is missing.
|
2015-02-02 13:20:20 +01:00 |
|
Steffen Fündgens
|
08e5492b4f
|
Changed trigger indices to match physicObjects instead of objects, adjusted removeObject function.
|
2015-02-02 12:43:32 +01:00 |
|
Steffen Fündgens
|
2eaf2f7a58
|
Removed unnecessary rotation from a lightsource.
|
2015-02-02 12:40:25 +01:00 |
|