Commit Graph

29 Commits

Author SHA1 Message Date
viktorljung e7f02f14a0 Added Transform.h that holds all the AbsoluteTransformation functions. Camera now working better with scenes. Changed Modeljob Matrix to only hold the model matrix instad of all matrix info 2016-01-14 11:12:02 +01:00
viktorljung d469fe6e9a Removed picking event and added a pick function to renderer 2016-01-12 11:45:50 +01:00
viktorljung a7b43b06a2 Camera component and RenderQueue changes 2016-01-08 16:21:59 +01:00
viktorljung bd82f75dd0 Some merge fixes, needs more work 2015-12-18 15:28:44 +01:00
viktorljung fa66e9ff47 Camera Switch event now working, Camera models Rotation still bugged 2015-12-15 15:29:19 +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 7db1feac17 Added basic ImGui implementation 2015-12-14 13:57:45 +01:00
Tleety d406059c79 Small bugfix. 2015-12-11 17:00:06 +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 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 de6e74c0b1 Forward+ Debugging commit, dont try it. 2015-12-09 17:36:03 +01:00
Tleety 393a774140 Framework for Forward+ renderer, Buggy. 2015-12-09 14:50:39 +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 9e1a4b83ae Linked picking to entities 2015-12-07 17:26:42 +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 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
Tleety 1c06c06816 Added a ScreenCoords class with some util functions to clean up the Renderer class. 2015-12-03 18:14:52 +01:00
viktorljung 983ca485f5 Picking now returning world position 2015-12-03 14:50:14 +01:00
viktorljung 18b63c7ef3 Added 3D picking of models to renderer 2015-12-02 18:00:11 +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
viktorljung 1fdf312af4 Set up Renderer base and shader compilation 2015-12-01 10:35:59 +01:00