BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,558 Commits 116 Branches 0 Tags
EntityFileCaching
Commit Graph

288 Commits

Author SHA1 Message Date
Tleety 3c5966d174 Now sort models according to depth. 2016-01-11 17:57:15 +01:00
Tleety 0cf8d26557 Revert "Revert "Forward+"" 
This reverts commit b908a9f9c6.
 2016-01-11 17:56:58 +01:00
viktorljung 3feee7fd35 Changed the structure of how RenderJobs are handled 2016-01-11 17:01:17 +01:00
Jace 39dd27726d MAJOR BREAKING CHANGE: EntityID 0 is now a valid entity. Use EntityID_Invalid as sentry for checks! 
Also contains inseparable editor changes.
 2016-01-11 14:35:41 +01:00
Jace b908a9f9c6 Revert "Forward+" 2016-01-11 13:48:55 +01:00
viktorljung b8db80bc40 Added camera to PickingPass and fixed memory leak 2016-01-11 10:47:39 +01:00
Ayumiwii 3467315aef Lots of things done 2016-01-08 16:42:59 +01:00
viktorljung a7b43b06a2 Camera component and RenderQueue changes 2016-01-08 16:21:59 +01:00
Tleety dab4ba2164 Pointlights are now using the pointlight component and the Light renderqueue to draw. 2016-01-08 14:12:09 +01:00
Tleety e7bb8954bf Merge remote-tracking branch 'origin/master' into Forward+ 
# Conflicts:
#	include/Engine/Rendering/Renderer.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Test.xml
#	src/Engine/Rendering/Renderer.cpp
 2016-01-06 11:35:55 +01:00
Tleety e510f2b88c Forward plus render pass now removed from Renderer.cpp to it's own class. 2016-01-06 11:32:42 +01:00
Jace 34cbbb3eb1 Fixed exit crash(es) 2016-01-06 11:20:16 +01:00
viktorljung bd82f75dd0 Some merge fixes, needs more work 2015-12-18 15:28:44 +01:00
Tleety d38f58165f Merge remote-tracking branch 'origin/master' into Forward+ 
# Conflicts:
#	include/Engine/Rendering/Renderer.h
#	src/Engine/Rendering/RenderState.cpp
#	src/Engine/Rendering/Renderer.cpp
 2015-12-18 15:27:47 +01:00
Tleety 069a6756b9 LightcullingPass for forward+ is now separate from Renderer.cpp. 2015-12-18 14:31:16 +01:00
Tleety ab6af30a28 Base classes for decoupled forward+ renderer and a fix where if you had to many lights in a tile(200-300+) the list would fill up before the end of frustums. 2015-12-18 12:02:02 +01:00
viktorljung 3636ad45af Changed to correct branch 2015-12-18 11:29:11 +01:00
viktorljung 6cf7c12d34 Forward+ working 2015-12-18 11:09:54 +01:00
viktorljung 4a817613e3 Forward+ semi working 2015-12-17 17:55:44 +01:00
stiffly 50822d09fc Merge remote-tracking branch 'origin/master' into Networking 
# Conflicts:
#	src/Game/Game.cpp
 2015-12-17 14:10:02 +01:00
viktorljung aeca1dec18 Merge remote-tracking branch 'origin/master' into Rendering 
# Conflicts:
#	src/Engine/Editor/EditorSystem.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Game/Game.cpp
 2015-12-17 11:17:58 +01:00
viktorljung 0f1b06f74e Fixed camera rotation bug 2015-12-17 11:13:34 +01:00
viktorljung 6a3c14540d fixes 2015-12-17 10:38:13 +01:00
viktorljung 5602b32507 Forward+ Fixes 2015-12-16 13:36:38 +01:00
Jace 322aedaf72 Basic transformation widgets 2015-12-16 09:47:38 +01:00
viktorljung fa66e9ff47 Camera Switch event now working, Camera models Rotation still bugged 2015-12-15 15:29:19 +01:00
Tleety 1e370bac13 ForwardPlus base debug commit. 2015-12-15 15:28:37 +01:00
stiffly 0a8a9e5099 Merge remote-tracking branch 'origin/master' into Networking 
# Conflicts:
#	src/Engine/Rendering/RenderState.cpp
#	src/Game/Game.cpp
 2015-12-15 11:50:01 +01:00
Jace 422e6f5264 Created a RenderState for ImGuiRenderPass 2015-12-14 20:26:04 +01:00
Jace 522679b14c Added BlendEquation and BlendFunc to RenderState, and cleaned it up A LOT 2015-12-14 20:23:29 +01:00
viktorljung d9ea0192d1 Added RenderSystem and removed RenderQueueFactory 2015-12-14 20:07:02 +01:00
viktorljung ef07a9d536 Merge remote-tracking branch 'origin/master' into Rendering 
# Conflicts:
#	include/Engine/Rendering/RenderQueueFactory.h
 2015-12-14 19:11:00 +01:00
viktorljung 05b78265be Fixed some transparency bugs and started on component based camera 2015-12-14 19:10:00 +01:00
stiffly 3f77da4a07 Merge remote-tracking branch 'origin/master' into Networking 
# Conflicts:
#	include/Game/Game.h
#	resources/DefaultConfig.ini
#	src/Game/Game.cpp
 2015-12-14 17:07:12 +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 b8620eac26 Made debug camera detect UI focus properly 2015-12-14 13:58:27 +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 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 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 30474b70df MouseInputHandler 2015-12-12 13:42:46 +01:00
Tleety d406059c79 Small bugfix. 2015-12-11 17:00:06 +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
viktorljung a8a38716bd Text renderer up and working, needs more work to be compatible with the ResourceManager and the Entity Component system 2015-12-11 16:12:29 +01:00
Tleety 53d5736420 Fixed a bugg with RenderState. 
Renderstate now also handles the Frambuffer binding.
 2015-12-11 16:07:12 +01:00
Tleety 433331e752 DrawPass now moved to it's own class to make renderer cleaner. 2015-12-11 14:22:54 +01:00