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

Directional light now fully added to all lists.

Browse Source
This commit is contained in:
Tleety
2016-01-18 15:15:33 +01:00
parent 794635b6a1
commit 01a164847c
6 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Rendering/LightCullingPass.cpp
+4 -4
View File
@@ -96,19 +96,19 @@ void LightCullingPass::FillLightList(RenderScene& scene)
//p.Padding = 123.f;
p.Type = LightSource::Point;
m_LightSources.push_back(p);
continue;
}
}
for(auto &job : scene.DirectionalLightJobs) {
auto directionalLightJob = std::dynamic_pointer_cast<directionalLightJob>(job);
auto directionalLightJob = std::dynamic_pointer_cast<DirectionalLightJob>(job);
if(directionalLightJob) {
LightSource p;
p.Direction = directionalLightJob->Direction;
p.Color = directionalLightJob->Color;
p.Intensity = directionalLightJob->Intensity;
p.Position = glm::vec4(glm::vec3(directionalLightJob->Position), 1.f);
p.Type = LightSource::Directional;
m_LightSources.push_back(p);
continue;
}
}
}
src/Engine/Rendering/RenderSystem.cpp
+7 -3
View File
@@ -99,7 +99,7 @@ void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& jobs, World
}
void RenderSystem::fillLight(std::list<std::shared_ptr<RenderJob>>& jobs, World* world)
void RenderSystem::fillPointLights(std::list<std::shared_ptr<RenderJob>>& jobs, World* world)
{
auto pointLights = world->GetComponents("PointLight");
if (pointLights != nullptr) {
@@ -117,8 +117,11 @@ void RenderSystem::fillLight(std::list<std::shared_ptr<RenderJob>>& jobs, World*
jobs.push_back(pointLightJob);
}
}
}
void RenderSystem::fillDirectionalLights(std::list<std::shared_ptr<RenderJob>>& jobs, World* world)
{
auto directionalLights = world->GetComponents("DirectionalLight");
if (directionalLights != nullptr) {
for (auto& directionalLightC : *directionalLights) {
@@ -128,7 +131,7 @@ void RenderSystem::fillLight(std::list<std::shared_ptr<RenderJob>>& jobs, World*
}
auto transformC = world->GetComponent(directionalLightC.EntityID, "Transform");
if(&transformC == nullptr) {
if (&transformC == nullptr) {
continue;
}
@@ -162,7 +165,8 @@ void RenderSystem::Update(World* world, double dt)
scene.Camera = m_Camera;
scene.Viewport = Rectangle(1280, 720);
fillModels(scene.ForwardJobs, world);
fillLight(scene.PointLightJobs, world);
fillPointLights(scene.PointLightJobs, world);
fillDirectionalLights(scene.DirectionalLightJobs, world);
m_RenderFrame->Add(scene);
}