 Jace
|
5e721325a4
|
Merge fixes
|
2016-01-14 18:20:51 +01:00 |
|
 viktorljung
|
143648860b
|
Added world pointer to PickData
|
2016-01-14 15:32:41 +01:00 |
|
|
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
|
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
|
0f17f9a888
|
Merge remote-tracking branch 'origin/master' into Rendering
# Conflicts:
# include/Engine/Editor/EditorSystem.h
# include/Engine/Rendering/EPicking.h
# include/Engine/Rendering/Renderer.h
# include/Game/Game.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/RawModel.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
|
2016-01-12 16:13:20 +01:00 |
|
|
viktorljung
|
d469fe6e9a
|
Removed picking event and added a pick function to renderer
|
2016-01-12 11:45:50 +01:00 |
|
|
viktorljung
|
3feee7fd35
|
Changed the structure of how RenderJobs are handled
|
2016-01-11 17:01:17 +01:00 |
|
|
viktorljung
|
b8db80bc40
|
Added camera to PickingPass and fixed memory leak
|
2016-01-11 10:47:39 +01:00 |
|
|
viktorljung
|
a7b43b06a2
|
Camera component and RenderQueue changes
|
2016-01-08 16:21:59 +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 |
|
|
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 |
|