Commit Graph

8 Commits

Author SHA1 Message Date
Tleety a8ffb24040 latest commit fix 2016-01-19 16:08:09 +01:00
Tleety 893ef38237 Removed world from renderer and moved depth-calculation code to modeljob 2016-01-19 15:41:17 +01:00
Jace ce8dcd3022 Merge pull request #33 from teamfisk/Forward+
Forward+
2016-01-15 16:20:53 +01:00
William Moberg 76f90ab031 The main thread is not mutex blocked while child threads load anymore. 2016-01-15 11:29:46 +01:00
Tleety ecf524eb4e Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
#	include/Engine/Rendering/PickingPass.h
#	include/Engine/Rendering/Renderer.h
#	resources/Schema/Entities/Test.xml
#	src/Engine/Rendering/DrawScenePass.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Engine/Rendering/RenderQueueFactory.cpp
#	src/Engine/Rendering/Renderer.cpp
2016-01-15 11:01:58 +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 2450769190 some cleanup 2016-01-12 11:51:47 +01:00
viktorljung 3feee7fd35 Changed the structure of how RenderJobs are handled 2016-01-11 17:01:17 +01:00