Commit Graph

791 Commits

Author SHA1 Message Date
Jasper
477da05464 implimented a rough version of a physics driven camera 2015-01-29 14:10:28 +01:00
Jasper
b21b9e3636 fixed size ratios of objects 2015-01-29 13:39:37 +01:00
Jasper
ecff8b5cf7 added a scaling factor to triangle meshes to compensate for diffrent scaling (somehow from bullet, idk) and started adding comments to physics.cc 2015-01-29 13:15:45 +01:00
Faerbit
f275733eeb Now mirroring the cube face on their own again. 2015-01-28 17:26:02 +01:00
sfroitzheim
fcbc228438 Fixed some problems with the new bridge (wasn't able to roll onto it) and changed some heightmap heights 2015-01-28 15:49:38 +01:00
sfroitzheim
b957ba27bd Added a model for a gate and added it to the scene with some additional level improvements 2015-01-28 15:19:35 +01:00
Steffen Fündgens
ccc7cbaa9c Deleted a torch that had a duplicate ID and let the converter recreate it. Shadows look weirder now. This might be good for debugging the shadows. 2015-01-27 12:25:16 +01:00
Steffen Fündgens
0ce663a592 Fixed a bug i created in my previous commit. Made output in case of errors more informative. 2015-01-27 12:21:30 +01:00
Steffen Fündgens
01a9126b0a Improved user interaction and a little code rework. 2015-01-27 11:50:51 +01:00
Faerbit
9c8f05e906 Small parameter changes. 2015-01-27 11:14:00 +01:00
Faerbit
cf9e3e2b39 Fixed saving of depthbuffer. 2015-01-26 23:11:04 +01:00
Faerbit
7d21978903 Implemented saving depthbuffer face to png. Doesn't work right now. 2015-01-26 21:48:44 +01:00
Faerbit
00f9091bc3 Updating lights on creation and also using constant. 2015-01-26 00:18:09 +01:00
Faerbit
4cef0b31d3 Updating lights only every half a second now, for performance. 2015-01-26 00:06:31 +01:00
Faerbit
6fa2e4e1b8 Moved all GLFW related stuff to the main files. 2015-01-25 23:29:37 +01:00
Faerbit
9589f70c77 Updated Readme.md. 2015-01-25 23:09:23 +01:00
Faerbit
106ec8b6f6 Changed comment. 2015-01-25 23:07:49 +01:00
Steffen Fündgens
688a4e6114 Rotate parameter for physics.add should now be false if the object has a positionConstraint. 2015-01-23 16:51:09 +01:00
Steffen Fündgens
a996a09457 Corrected spaces. 2015-01-23 16:41:56 +01:00
Steffen Fündgens
3ceaa89b27 Merge branch 'master' of github.com:Faerbit/swp 2015-01-23 16:04:13 +01:00
Steffen Fündgens
2dee196307 Converter can now reuse IDs of deleted compositions. 2015-01-23 16:02:50 +01:00
Steffen Fündgens
f3580555cd Added more exits after errors. 2015-01-23 16:02:10 +01:00
sfroitzheim
c24a7162c6 Merge branch 'master' of https://github.com/Faerbit/swp 2015-01-23 14:56:19 +01:00
sfroitzheim
06002f78b6 Added some walls to the scene properly (weird physics bugs are apparent) 2015-01-23 14:56:02 +01:00
Steffen Fündgens
e9390d860b Fixed a drawing bug for the pointlight shadows. 2015-01-23 14:33:04 +01:00
Steffen Fündgens
e1654ded34 Removed unnecessary bind and clear calls. 2015-01-23 14:22:24 +01:00
sfroitzheim
73704434b1 Fixed merge conflicts. 2015-01-23 14:10:35 +01:00
sfroitzheim
bf0559e1ec Merge branch 'master' of https://github.com/Faerbit/swp 2015-01-23 14:08:38 +01:00
Steffen Fündgens
f0cf0583e1 Forgot one thing. 2015-01-23 14:08:30 +01:00
sfroitzheim
c95430c25e Merge branch 'master' of https://github.com/Faerbit/swp 2015-01-23 14:07:29 +01:00
sfroitzheim
0d185fd924 Merge branch 'master' of https://github.com/Faerbit/swp
Conflicts:
	Levels/ObjectSetups/Compositions.xml
	Levels/ObjectSetups/Level1.png
	Levels/ObjectSetups/Level1.xcf
	Levels/ObjectSetups/Level1.xml
2015-01-23 14:06:20 +01:00
Steffen Fündgens
c92bb70ae5 Merge branch 'master' of github.com:Faerbit/swp 2015-01-23 14:01:06 +01:00
Steffen Fündgens
c7931aed20 Fixed mirroring of shadows by inverting coordinates instead of blitting framebuffers(performance...). 2015-01-23 14:00:26 +01:00
sfroitzheim
16db3fcc72 Merge branch 'master' of https://github.com/Faerbit/swp
Conflicts:
	Levels/ObjectSetups/Level1.xml
2015-01-23 13:56:40 +01:00
Jasper
6536459359 prepare for peoples 2015-01-23 13:31:19 +01:00
Jasper
adf355cc46 constraints work. Why? because i said so! 2015-01-23 12:59:28 +01:00
Jasper
4b63dc0664 Merge branch 'master' of github.com:Faerbit/swp 2015-01-23 12:06:26 +01:00
Jasper
14462ac8df readding button -> box 2015-01-23 12:05:43 +01:00
Faerbit
a5b69a23ca Made progress on point light shadows. Not quite sure what is happening. 2015-01-22 21:21:09 +01:00
Faerbit
6248e2e8ec Increased mininum camera distance because the marble got scaled up. 2015-01-20 08:45:52 +01:00
Faerbit
466ac8305b Added slides for milestone 3. 2015-01-20 00:53:55 +01:00
Jasper
bea8436a8d Merge branch 'master' of github.com:Faerbit/swp 2015-01-19 18:30:12 +01:00
Jasper
bc4b08426b Added physics type button. 2015-01-19 18:30:07 +01:00
Jasper
2f980e678c Added light block and changed physics parameters. 2015-01-19 18:28:28 +01:00
Steffen Fündgens
92a144d8bb Mirrored rendering of pointlight shadows, so that they are at the correct positions now, but occlude everything. -- Fabian 2015-01-19 18:22:25 +01:00
Steffen Fündgens
6bc1a24577 Increased height of the fog, because of new Scaling of the heightmap. -- Fabian 2015-01-19 18:21:29 +01:00
Jasper
6056663dde some quick updates for the camera before working on buttons 2015-01-19 17:12:58 +01:00
Jasper
1a736dd095 prepared camera, level and physics for the new camera 2015-01-19 16:51:35 +01:00
sfroitzheim
1e6942ae37 Added some walls and made some fixes (there are too many walls, I will fix this till tomorrow) 2015-01-19 16:47:17 +01:00
Jasper
393e29c083 prepareing modified camera in physics 2015-01-19 16:30:11 +01:00