 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 |
|
|
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 |
|
 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 |
|
|
viktorljung
|
6a3c14540d
|
fixes
|
2015-12-17 10:38:13 +01:00 |
|
|
viktorljung
|
5602b32507
|
Forward+ Fixes
|
2015-12-16 13:36:38 +01:00 |
|
|
Tleety
|
1e370bac13
|
ForwardPlus base debug commit.
|
2015-12-15 15:28:37 +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 |
|