Commit Graph

108 Commits

Author SHA1 Message Date
Faerbit
2b2e05f009 Protecting all member functions of entity class with the mutex. 2015-03-24 19:12:33 +01:00
Faerbit
5546abd24a Adding mutex to entity class. 2015-03-24 19:09:39 +01:00
Faerbit
796db123b7 Removing useless assignment. 2015-03-24 19:09:14 +01:00
Faerbit
b39e6702cc Changing default init of camera. 2015-03-24 19:08:49 +01:00
Faerbit
6d167a2d2a Removing commented code. 2015-03-24 18:29:28 +01:00
Faerbit
319b57bf7a Removing useless assignment. 2015-03-22 13:49:25 +01:00
Faerbit
300f14c752 Fixing mismatching deallocation. 2015-03-22 13:25:43 +01:00
Faerbit
3de85042d0 Prettified sun rise. 2015-03-21 21:46:58 +01:00
Faerbit
78972a87bf Fixed water plane not getting rendered after introducing rendering queue. 2015-03-21 19:02:24 +01:00
Faerbit
2a3f976b5e Slight fps increas by reducing the amount the point lights have to render. 2015-03-21 18:57:14 +01:00
Faerbit
1fd6058eaf Finshed work now sorting objects after loading. 2015-03-21 18:44:08 +01:00
Faerbit
a07a4bbb91 Commiting unfinished work. 2015-03-21 15:05:22 +01:00
Faerbit
2a0cb3ca1d Implemented a renderQueue which is sorted by materials. Not feasible. Closes #12. 2015-03-20 23:45:28 +01:00
Faerbit
795801faa6 Sped up the lookup of the texture unit. 2015-03-19 18:26:51 +01:00
Faerbit
3680abfba4 Loaded all textures at the beginning of the application. Closes #7. 2015-03-18 16:26:20 +01:00
Faerbit
09282f51fd Changing where uniform are set minimizing the communication with the gpu. 2015-03-18 09:14:09 +01:00
Faerbit
3a2156492e Removing useless light update. 2015-03-18 08:58:24 +01:00
Faerbit
43b752ee63 Implemented cross chunk objects. This concludes the chunk render implementation and closes #4. 2015-03-18 08:54:38 +01:00
Faerbit
f9212c9938 Increased renderdistance a bit to prevent popping of chunks. 2015-03-18 08:53:31 +01:00
Faerbit
79223b4c02 Do not render behind the skydome. 2015-03-17 19:10:23 +01:00
Faerbit
ac48ab8cc0 Now also using the correct chunks for the objects and rendering only the chunks which are necessary. 2015-03-17 14:54:18 +01:00
Faerbit
d0fed9a321 Now generating seperate terrain meshes for chunks. 2015-03-17 12:08:49 +01:00
Faerbit
a7fb739204 Removing useless variable. 2015-03-17 09:42:51 +01:00
Faerbit
7957b8b555 Reenabling fps display in release build. 2015-03-17 09:41:37 +01:00
Faerbit
498be94102 Added generation of chunks. 2015-03-17 09:39:42 +01:00
Faerbit
7b742e913f Introduced chunk class. 2015-03-16 16:58:50 +01:00
Faerbit
73f7ec6a70 Removing unsafe deleteObject function. 2015-03-16 16:15:12 +01:00
Faerbit
1dde41d5f4 Do not update objects which have a mass of zero and can therefore by definition not change position or rotation. 2015-03-16 16:05:36 +01:00
Faerbit
ab7d1c81df Adding parameters to the makeTrinagleMesh to control the area for which it creates the terrain. Also changing most unsigned ints to ints to make said more roboust in use. 2015-03-16 15:26:30 +01:00
Faerbit
5f0e5cf623 Changing window title and moving fps display to debug build. 2015-03-15 22:32:13 +01:00
Faerbit
0ae43db53e Fixing loading not getting correctly scaled in fullscreen. 2015-03-15 22:11:26 +01:00
Faerbit
22d4ee0769 Fixing lights not getting rotated correctly with compositions. 2015-03-15 21:11:56 +01:00
Faerbit
6bb9624908 Fixing lights not respecting ignoreHeightmap setting. 2015-03-15 20:12:55 +01:00
Faerbit
857fc76c40 Removing debug output from lua scripts for release builds. 2015-03-15 18:46:44 +01:00
Faerbit
e06eea7c5d Adding debug key to print the position. 2015-03-15 18:06:24 +01:00
Faerbit
7b80f34f4f Removing pointless increment. 2015-03-15 17:58:42 +01:00
Faerbit
40da86aad6 Introducing windowed fullscreen. Closes #9. 2015-03-15 17:48:46 +01:00
Faerbit
b19118252f Changing how the loading screen is approximated. Fixes #2. 2015-03-15 15:39:24 +01:00
Faerbit
608c159aa6 Changing how textures are approximated. 2015-03-15 15:38:33 +01:00
Faerbit
33e7baed94 Reenabling debug features for debug builds. 2015-03-15 15:18:16 +01:00
Faerbit
5d52c9cdaf Only register keypresses after loading which are not escape. 2015-03-15 15:02:30 +01:00
Faerbit
dd9997dc82 Removing debug stuff from release build. Fixes #8. 2015-03-15 14:55:12 +01:00
Faerbit
bf9ec726fc Fixing loading of triangle meshes in physics by using the obj loader from ACGL. 2015-03-15 14:19:12 +01:00
Faerbit
2b0be77ac9 Removing code duplication. 2015-03-15 11:20:06 +01:00
Faerbit
f35d35cc94 Do not render waterPlane if it doesn't exist. 2015-03-14 15:01:06 +01:00
Faerbit
e888d7df0e Had to split the level xml path and the level xml name to properly work with the converter. 2015-03-14 14:57:42 +01:00
Faerbit
65552409f0 Removed debug draw memory leak. 2015-03-14 14:52:40 +01:00
Faerbit
8f6c27ae32 Changing in which order stuff is drawn. 2015-03-14 14:34:45 +01:00
Faerbit
63acfef341 Removed hardcoded level file path and moved it into the config.xml. 2015-03-14 13:04:33 +01:00
Faerbit
370135fca8 Made heightmap path configurable from level. 2015-03-14 13:00:47 +01:00
Faerbit
68a355dbe9 Removing useless loop. 2015-03-13 23:53:19 +01:00
Faerbit
a725cf8b43 Added switch for rendering world. 2015-03-13 15:43:10 +01:00
Faerbit
ab6d2e4ffd Implemented debug draw for bullet. 2015-03-13 15:30:21 +01:00
Faerbit
436495f0c7 Decreasing concurrent light count for better fps. 2015-03-12 19:24:50 +01:00
Faerbit
e2e343db1a Adding debug switchtes for flames and shadows. 2015-03-12 19:24:10 +01:00
Faerbit
9a54c033c0 Changed how key states are handled. 2015-03-12 19:14:14 +01:00
Faerbit
89874b8612 Fixing cursor position staying the same introduced by GLFW 3.1. 2015-03-12 15:44:21 +01:00
Faerbit
efa2fb5ef5 Changing name of src to game to better communicate what is in it. 2015-03-12 15:08:30 +01:00