 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
|
fa66e9ff47
|
Camera Switch event now working, Camera models Rotation still bugged
|
2015-12-15 15:29:19 +01:00 |
|
 Jace
|
c296c4eb3b
|
Fixed picking pass... again...
|
2015-12-15 09:49:38 +01:00 |
|
|
Jace
|
797036c204
|
Fixed picking event
|
2015-12-14 14:24:11 +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
|
725a8896ce
|
PickingPass now publishes an event that others can listen to to get pickingdata.
|
2015-12-11 13:51:08 +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 |
|