BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into FrustumCulling

Browse Source
This commit is contained in:
William Moberg
2016-02-10 11:04:31 +01:00
parent d65ce805a5 067780c93f
commit 0bbb627790
33 changed files with 1141 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Rendering/RenderSystem.h
+1 -1
View File
@@ -43,7 +43,7 @@ private:
EventRelay<RenderSystem, Events::PlayerSpawned> m_EPlayerSpawned;
bool OnPlayerSpawned(Events::PlayerSpawned& e);
void fillModels(std::list<std::shared_ptr<RenderJob>>& opaqueJobs, std::list<std::shared_ptr<RenderJob>>& transparentJobs);
void fillModels(RenderScene::Queues &jobs);
void fillText(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
void fillPointLights(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
void fillDirectionalLights(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);