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

61 Commits

Author SHA1 Message Date
viktorljung fa66e9ff47 Camera Switch event now working, Camera models Rotation still bugged 2015-12-15 15:29:19 +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
Jace f8d927cd91 Don't render invisible model components 2015-12-14 16:11:37 +01:00
Jace 798c73132e Fixed ScreenCoords::ToPixelData stack corruption 2015-12-14 16:11:08 +01:00
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
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 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 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 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
Tleety d182e6c453 Merge remote-tracking branch 'origin/master' into RendererDecoupling 
# Conflicts:
#	src/Game/Game.cpp
 2015-12-14 13:16:56 +01:00
Jace 30474b70df MouseInputHandler 2015-12-12 13:42:46 +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
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
Tleety 433331e752 DrawPass now moved to it's own class to make renderer cleaner. 2015-12-11 14:22:54 +01:00
Tleety 725a8896ce PickingPass now publishes an event that others can listen to to get pickingdata. 2015-12-11 13:51:08 +01:00
Tleety 8c563a2d76 Merge remote-tracking branch 'origin/Picking' into RendererDecoupling 
# Conflicts:
#	include/Engine/Rendering/Renderer.h
#	src/Engine/Rendering/Renderer.cpp
 2015-12-11 11:21:58 +01:00
Tleety 91edab34bc PickingPass now sets state and clear it when done. 
PickingState now it's own class so renderer is a bit cleaner.
 2015-12-11 11:18:30 +01:00
viktorljung bb900c5110 Added picking event 2015-12-10 16:33:33 +01:00
Tleety cefc4e5257 PickingPassState done. 2015-12-10 16:06:25 +01:00
Tleety 37cf42527b RenderState class structure made. 2015-12-10 16:03:48 +01:00
viktorljung aa805f9a41 Merge remote-tracking branch 'origin/master' into Picking 2015-12-10 11:38:35 +01:00
Tleety 9d3313e3ed Calculate frustrum removed from code untill Nvidia isn't shit. 2015-12-10 10:46:27 +01:00
sippeangelo 53ef749736 Fixed absoute positioning, I think... 2015-12-10 10:16:03 +01:00
Tleety de6e74c0b1 Forward+ Debugging commit, dont try it. 2015-12-09 17:36:03 +01:00
sippeangelo 90a79c702f Added crude absolute positioning when rendering 2015-12-09 15:26:49 +01:00
Tleety 393a774140 Framework for Forward+ renderer, Buggy. 2015-12-09 14:50:39 +01:00
sippeangelo 58d827f7d0 Moved world definition to Schema/Entities/Test.xml and removed HardcodedTestWorld 2015-12-09 14:25:41 +01:00
sippeangelo c9b140bd6b Semi-working entity loading from XML files! 2015-12-09 12:29:32 +01:00
Tleety eb9c217eb4 3D picking float value error fixed. 2015-12-09 10:44:06 +01:00
viktorljung c717dd7049 Removed sprite RenderQueue and moved FrameBuffer to rendering instead of rendering/util 2015-12-08 10:37:24 +01:00
viktorljung d556f964e6 merge fixes 2015-12-08 10:15:12 +01:00
viktorljung 9e1a4b83ae Linked picking to entities 2015-12-07 17:26:42 +01:00
viktorljung 9c589a0dc6 Added support for color tinting 2015-12-07 16:33:03 +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
viktorljung 96a10ada38 fixed so the picking works with the new framebuffer class 2015-12-03 19:20:30 +01:00
viktorljung a82c7c1e3b Merge branch 'Rendering' of github.com:teamfisk/TacticalZ into Rendering 
# Conflicts:
#	include/Engine/Rendering/Renderer.h
#	src/Engine/Rendering/Renderer.cpp
 2015-12-03 19:06:24 +01:00
viktorljung dc8cc92ec2 Added a GenerateTexture function 2015-12-03 19:04:57 +01:00
viktorljung aaa6b6ef20 Added FrameBuffer wrapper class 2015-12-03 18:32:01 +01:00