Commit Graph

1470 Commits

Author SHA1 Message Date
Jace bc6a211276 Removed RenderState log spam 2015-12-14 14:54:19 +01:00
Jace 7719274a37 Correct asset reference for fonts 2015-12-14 14:54:03 +01:00
viktorljung 123c198e19 Text component added and Text render queue 2015-12-14 14:48:24 +01:00
Jace 797036c204 Fixed picking event 2015-12-14 14:24:11 +01:00
Jace 3a9577c9fb fixup! Enabled rendering "transparency" 2015-12-14 14:08:37 +01:00
Jace 545869e342 Added scene graph UI to Editor 2015-12-14 13:58:28 +01:00
Jace 07c4744436 Added World DeleteEntity, HasComponent and GetEntityChildren 2015-12-14 13:58:27 +01:00
Jace 7bc492134d Enabled rendering "transparency" 2015-12-14 13:58:24 +01:00
Jace 7c1182c28f Fixed absolute positions once and for all (maybe?) 2015-12-14 13:57:56 +01:00
Jace 2f3843e595 Editor version 1 2015-12-14 13:57:55 +01:00
Jace 5f3c234819 Added DeleteComponent function to world 2015-12-14 13:57:54 +01:00
Jace 524af211e0 Made resource loading fail gracefully when a resource can't be loaded. Resources should now throw exceptions in their constuctor if the resource can't be loaded. This will result in ResourceManager::Load returning null. 2015-12-14 13:57:53 +01:00
Jace 91ace0d2a0 Fixed bug in ComponentPool::Delete. Wasn't taking EntityID into account when freeing memory. 2015-12-14 13:57:53 +01:00
Jace 2018ba27ae Added KnowsEntity function to ComponentPool to query whether an entity has a component attached 2015-12-14 13:57:52 +01:00
Jace b66cf47ff0 Revert "Clearing raw input events from event broker to encourage use of input commands instead"
This reverts commit 2e7e8d3546.
2015-12-14 13:57:52 +01:00
Jace e5084e13ec Added EditorSystem 2015-12-14 13:57:51 +01:00
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 2e321e15a5 Cleaned up ImGuiRenderPass 2015-12-14 13:57:50 +01:00
Jace c81a054601 Subscribed ImGui to MouseScroll event 2015-12-14 13:57:50 +01:00
Jace af14d60493 Added MouseScroll event to input manager 2015-12-14 13:57:49 +01:00
Jace 0465fdb16d Added ImGui for compilation 2015-12-14 13:57:49 +01:00
Jace 7db1feac17 Added basic ImGui implementation 2015-12-14 13:57:45 +01:00
Jace 653b4689b5 Added KeyboardChar event for keyboard text input 2015-12-14 13:56:24 +01:00
Jace d16cbe84f0 Merge remote-tracking branch 'origin/master' into Input
# Conflicts:
#	src/Engine/Rendering/Renderer.cpp
2015-12-14 13:40:22 +01:00
Jace a7ed455766 Merge branch 'master' into Input 2015-12-14 13:19:38 +01:00
Tleety d182e6c453 Merge remote-tracking branch 'origin/master' into RendererDecoupling
# Conflicts:
#	src/Game/Game.cpp
2015-12-14 13:16:56 +01:00
verysecrethero 5fce7490a9 MergeFix OctTree williambranch and andersbranch 2015-12-14 11:57:18 +01:00
Jace e76a6b74a3 Merge branch 'master' of github.com:teamfisk/TacticalZ
# Conflicts:
#	src/Game/Game.cpp
2015-12-14 11:41:59 +01:00
Jace e82911cb8b Renderer FOV setting in Config.ini 2015-12-14 11:39:13 +01:00
verysecrethero 8abef7024d Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
# Conflicts:
#	src/Tests/OctTreeTest.cpp
2015-12-14 11:14:09 +01:00
verysecrethero bf08ffe392 Added InputManagerTest 2015-12-14 11:02:23 +01:00
verysecrethero 5f5cab1171 Added Tests for ResourceManager 2015-12-14 10:55:49 +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 30474b70df MouseInputHandler 2015-12-12 13:42:46 +01:00
Jace 03e226ffea Refactored InputProxy to gracefully handle cases where multiple origins send the same command 2015-12-12 13:42:35 +01:00
Jace 2e7e8d3546 Clearing raw input events from event broker to encourage use of input commands instead 2015-12-12 13:42:35 +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 35624008e7 InputProxy with a KeyboardInputHandler to translate keyboard keys to input commands. Input origins are bound to commands through the BindOrigin event, or through loading them from a config file. 2015-12-12 13:42:34 +01:00
Jace 784a04b8ad Fixed bug in config file overriding. Previously it was silently overwriting the whole default config and relied on hardcoded values for defaults. 2015-12-12 13:42:33 +01:00
Jace bffc97f310 Groundwork for input command proxy 2015-12-12 13:42:33 +01:00
Jace 7464facab9 Next generation raptor copter 2015-12-12 03:38:17 +01:00
Tleety d406059c79 Small bugfix. 2015-12-11 17:00:06 +01:00
Tleety 59b261534a Cleaned some comments and random annoyances in Renderer 2015-12-11 16:57:02 +01:00
viktorljung 9bd3da409d Added Font to ResourceManager 2015-12-11 16:53:51 +01:00
Tleety 45b87ed6b1 ShaderProgram is now a Resource.
All shaderprograms are now pointers and loaded with Resourcemanager.
2015-12-11 16:53:46 +01:00
William Moberg 55aad493ff Fixed warnings in OctTree. Cleaned unit tests. 2015-12-11 16:45:38 +01:00
William Moberg 9a7d77f29d Removed notes in OldOctTree. 2015-12-11 16:44:49 +01:00
stiffly 36ae451ea6 Indentation 2015-12-11 16:22:14 +01:00
verysecrethero b3bb0e543f Added EventBroker Test from the other project 2015-12-11 16:17:23 +01:00