 viktorljung
|
7faed50507
|
Merge remote-tracking branch 'origin/master' into TextRendering
|
2016-01-15 13:24:24 +01:00 |
|
|
viktorljung
|
6fbb962b5e
|
Merge branch 'Rendering' into TextRendering
# Conflicts:
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderQueueFactory.h
# include/Engine/Rendering/Renderer.h
# include/Engine/Rendering/ShaderProgram.h
# include/Game/Game.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
|
2016-01-15 13:23:42 +01:00 |
|
 Jace
|
627108c6ee
|
Fixes for #30
# Conflicts:
# src/Game/Game.cpp
|
2016-01-14 18:15:38 +01:00 |
|
|
viktorljung
|
c99a8685bb
|
Removed Debug scene
|
2016-01-14 15:40:13 +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
|
2450769190
|
some cleanup
|
2016-01-12 11:51:47 +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
|
bd82f75dd0
|
Some merge fixes, needs more work
|
2015-12-18 15:28:44 +01:00 |
|
|
viktorljung
|
0f1b06f74e
|
Fixed camera rotation bug
|
2015-12-17 11:13:34 +01:00 |
|