Commit Graph

43 Commits

Author SHA1 Message Date
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 7db1feac17 Added basic ImGui implementation 2015-12-14 13:57:45 +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
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
Jace 30474b70df MouseInputHandler 2015-12-12 13:42:46 +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 bffc97f310 Groundwork for input command proxy 2015-12-12 13:42:33 +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
Tleety 53d5736420 Fixed a bugg with RenderState.
Renderstate now also handles the Frambuffer binding.
2015-12-11 16:07:12 +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 4da33ff4ec Fixed movement on a "player" cube. Very simple system atm 2015-12-11 15:00:57 +01:00
stiffly 094c7fbb44 Added system to CMakeLists.txt. 2015-12-11 14:20:36 +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
viktorljung bb900c5110 Added picking event 2015-12-10 16:33:33 +01:00
sippeangelo 0367826f16 Added RaptorCopter example system 2015-12-10 10:17:18 +01:00
sippeangelo 352074da04 Created base for systems 2015-12-10 10:17:08 +01:00
sippeangelo 90a79c702f Added crude absolute positioning when rendering 2015-12-09 15:26:49 +01:00
sippeangelo 578018607a Moved decision of which map to load to Config.ini 2015-12-09 14:32:34 +01:00
sippeangelo 58d827f7d0 Moved world definition to Schema/Entities/Test.xml and removed HardcodedTestWorld 2015-12-09 14:25:41 +01:00
viktorljung 1df63aecd5 Added a RenderQueueFactory that produces a RenderQueueCollection for the Renderer to use.
Still needs more work
2015-12-07 16:24:34 +01:00
Tleety 45a48bbbe5 Merge remote-tracking branch 'origin/master' into Rendering 2015-12-03 18:15:56 +01:00
sippeangelo 9fb8af8491 Merge branch 'master' into ecs 2015-12-03 16:55:32 +01:00
sippeangelo 032b384f3f Created framework for a hardcoded world for TESTING PURPOSES 2015-12-03 16:45:03 +01:00
viktorljung 0f33089039 Merge remote-tracking branch 'origin/master' into Rendering 2015-12-03 14:59:45 +01:00
sippeangelo 91f8b4359b Fixed Tests not including dependencies properly 2015-12-02 15:25:27 +01:00
sippeangelo f65b7d591c Fixed Tests running the game when it really shouldn't. 2015-12-02 15:03:18 +01:00
sippeangelo 8aa72735e7 Fixed Tests running the game when it really shouldn't. 2015-12-02 15:02:18 +01:00
sippeangelo 24ef915248 Simplified CMake for Game 2015-12-01 17:04:03 +01:00
viktorljung 07d037ae57 Added Fly Camera and Vertex Colors 2015-12-01 15:56:26 +01:00
viktorljung 04d10bf7af Functioning basic renderer for models 2015-12-01 14:07:10 +01:00
sippeangelo cf349870de Simplified CMake for Game 2015-12-01 10:40:33 +01:00
viktorljung 1fdf312af4 Set up Renderer base and shader compilation 2015-12-01 10:35:59 +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
sippeangelo 63674946ca Initial directory structure 2015-11-20 15:01:37 +01:00