 viktorljung
|
96371a08c8
|
Changed Picking colors from vec2 to ivec2. Picking now working for multiple scenes (Solution not perfect in the editor, yet)
|
2016-01-14 15:26:06 +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 |
|
 Jace
|
522679b14c
|
Added BlendEquation and BlendFunc to RenderState, and cleaned it up A LOT
|
2015-12-14 20:23:29 +01:00 |
|
|
viktorljung
|
05b78265be
|
Fixed some transparency bugs and started on component based camera
|
2015-12-14 19:10:00 +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 |
|