Commit Graph

156 Commits

Author SHA1 Message Date
Jace 8a6030bf57 Added support for "Impure" systems, which only update once per frame and contain their own logic for manipulating the world, instead of relying on a single list of components. 2015-12-14 13:57:51 +01:00
Jace af14d60493 Added MouseScroll event to input manager 2015-12-14 13:57:49 +01:00
Jace 653b4689b5 Added KeyboardChar event for keyboard text input 2015-12-14 13:56:24 +01:00
William Moberg 8d87841691 Merge branch 'master' into OctTree 2015-12-14 10:51:23 +01:00
William Moberg 11e37ca898 Added functions to test ray vs triangle- and model-intersections. 2015-12-14 10:42:45 +01:00
Jace 013f911ae2 Added MouseInputHandler and firstPersonInputController to aid in creation of first person movement. 2015-12-12 13:42:34 +01:00
Jace 5d46a10a4e Added GetAll function to config file that returns a list of all top level keys in a config file 2015-12-12 13:42:33 +01:00
stiffly 3da69c8a1b Fixed indentation 2015-12-11 15:29:57 +01:00
stiffly 16d636a87c Removed Initialize function for systems. 2015-12-11 15:23:56 +01:00
stiffly 0b60979c7b Added a Initialize function for systems. 2015-12-11 14:03:00 +01:00
stiffly 80f028edf2 Added a very basic PlayerSystem, and a PlayerComponent. 2015-12-11 13:45:19 +01:00
William Moberg 4195baa5dc ContainedObject in OctTree made private. 2015-12-10 17:57:09 +01:00
William Moberg ce7b26ccac Merge branch 'master' into OctTree
# Conflicts:
#	include/Game/Game.h
#	include/Game/HardcodedTestWorld.h
#	src/Game/Game.cpp
2015-12-10 16:37:55 +01:00
William Moberg 0d8f7acb7e OctTree doesn't check the same object multiple times if it exists in multiple places in the tree. 2015-12-10 16:04:55 +01:00
sippeangelo 352074da04 Created base for systems 2015-12-10 10:17:08 +01:00
William Moberg e580540143 Made some optimizations in OctTree and added a unit test for BoxesInSameRegion. 2015-12-09 17:16:11 +01:00
sippeangelo 90a79c702f Added crude absolute positioning when rendering 2015-12-09 15:26:49 +01:00
sippeangelo 58d827f7d0 Moved world definition to Schema/Entities/Test.xml and removed HardcodedTestWorld 2015-12-09 14:25:41 +01:00
sippeangelo 3085ccdfbf Added temporary Release function to resource manager to be able to reload a resource 2015-12-09 14:23:49 +01:00
William Moberg 14bcb7ea0d Added Update call in Game to test OctTree by using collision. 2015-12-09 13:52:17 +01:00
William Moberg bad42fae1c OctTree differentiates between static/dynamic objects now. Added a general BoxesInSameRegion method. 2015-12-09 13:27:00 +01:00
sippeangelo c9b140bd6b Semi-working entity loading from XML files! 2015-12-09 12:29:32 +01:00
sippeangelo c9d1ba6cae EntityIDs should start at 1, because 0 is world 2015-12-09 11:07:46 +01:00
Jace d597c7e60e Cleaned up custom type conversion code 2015-12-08 22:51:35 +01:00
sippeangelo d7de4fc694 Component definitions now loaded from schema. No default values yet. 2015-12-08 18:07:32 +01:00
William Moberg a7fb77d998 OctTree can check if a box collides with a box in the OctTree. 2015-12-08 17:12:58 +01:00
William Moberg 32d2aa6a93 AABB can also be created with center position and its size. 2015-12-08 17:01:50 +01:00
William Moberg b87e543420 Merge branch 'master' into OctTree 2015-12-08 10:47:27 +01:00
William Moberg 648ba502bb Added small test for OctTree. 2015-12-07 17:27:57 +01:00
William Moberg 04a8eeebe8 Added test get methods and some comments. 2015-12-07 16:25:01 +01:00
William Moberg 955c9ce534 Removed superfluous function declaration. 2015-12-07 16:00:34 +01:00
William Moberg e8d23f3b3f Added AABBVsAABB function. 2015-12-07 15:59:41 +01:00
sippeangelo aeb6c39603 Created ComponentWrapperFactory to make test mocking easier and manual component registration a little less painful 2015-12-03 19:31:55 +01:00
William Moberg 8e21b1fe35 Added ray collision detection in leaf nodes. Fixed possible bug in OctTree::AddBox 2015-12-03 19:25:40 +01:00
William Moberg af5b3a9302 Fixed wrong paths and added an outDistance to RayVsAABB. 2015-12-03 17:24:53 +01:00
William Moberg abb61d2cd6 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
# Conflicts:
#	include/Engine/Core/Collision.h
#	src/Engine/Core/Collision.cpp
2015-12-03 17:11:35 +01:00
William Moberg 2f13f5da7a Relocated AABB and Ray in Collision.h to their own files. Started implementation on OctTree. 2015-12-03 17:03:27 +01:00
sippeangelo d3d2e594fe Basic and working entity system with a really ugly test case 2015-12-03 15:07:35 +01:00
sippeangelo c7430a9338 Fixed ComponentWrapper string scope error 2015-12-02 15:37:20 +01:00
sippeangelo 61b7aa6b3d Merge branch 'master' into ecs 2015-12-02 15:07:55 +01:00
sippeangelo b3e68c6c34 Implemented ComponentPool and initial tests for it 2015-12-02 15:07:48 +01:00
verysecrethero fd99562c7a yrryr567yry567 2015-12-02 15:03:55 +01:00
William Moberg c698149bdd Added Ray, AABB structs, and basic rayVsAABB test function. 2015-12-02 14:24:21 +01:00
William Moberg fa0ace8c68 Added empty OctTree files. 2015-12-02 11:32:56 +01:00
William Moberg 1d19c6901e Added collision files. 2015-12-02 11:18:52 +01:00
William Moberg 75dcea40f2 Log warning when memory is exceeded in MemoryPool. 2015-12-01 17:29:26 +01:00
sippeangelo a5affd2dc2 Added barebones ECS prototype 2015-12-01 17:04:03 +01:00
William Moberg c147f17c11 Added MemoryPool and ObjectPool to project. 2015-12-01 16:03:07 +01:00
sippeangelo 872879c013 Engine puzzle completed 2015-11-30 17:02:24 +01:00
sippeangelo 52278d7bc2 More CMake bullshit 2015-11-30 11:16:43 +01:00