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

Some wierd shader faults and merge error fixe

Browse Source
This commit is contained in:
Tleety
2016-01-27 15:54:36 +01:00
parent 0e70dc6fa3
commit a63ecb8133
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Shaders/Gaussian_horiz.frag.glsl
+1
View File
@@ -1,4 +1,5 @@
#version 430 #version 430
#extension GL_EXT_gpu_shader4 : enable
layout (binding = 0) uniform sampler2D Texture; layout (binding = 0) uniform sampler2D Texture;
resources/Shaders/Gaussian_vert.frag.glsl
+1
View File
@@ -1,4 +1,5 @@
#version 430 #version 430
#extension GL_EXT_gpu_shader4 : enable
layout (binding = 0) uniform sampler2D Texture; layout (binding = 0) uniform sampler2D Texture;
src/Engine/Rendering/RenderSystem.cpp
+5 -8
View File
@@ -35,15 +35,12 @@ bool RenderSystem::isChildOfACamera(EntityWrapper entity)
{ {
return entity.FirstParentWithComponent("Camera").Valid(); return entity.FirstParentWithComponent("Camera").Valid();
} }
void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& opaqueJobs, std::list<std::shared_ptr<RenderJob>>& transparentJobs)
place me somewhere
bool RenderSystem::isChildOfCurrentCamera(EntityWrapper entity) bool RenderSystem::isChildOfCurrentCamera(EntityWrapper entity)
{ {
return entity == m_CurrentCamera || entity.IsChildOf(m_CurrentCamera); return entity == m_CurrentCamera || entity.IsChildOf(m_CurrentCamera);
} }
void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& opaqueJobs, std::list<std::shared_ptr<RenderJob>>& transparentJobs)
{ {
auto models = m_World->GetComponents("Model"); auto models = m_World->GetComponents("Model");
if (models == nullptr) { if (models == nullptr) {
@@ -110,10 +107,10 @@ bool RenderSystem::isChildOfCurrentCamera(EntityWrapper entity)
fillPercentage fillPercentage
)); ));
if(explosionEffectJob->Color.a != 1.f || explosionEffectJob->EndColor.a != 1.f || explosionEffectJob->DiffuseColor.a != 1.f) { if(explosionEffectJob->Color.a != 1.f || explosionEffectJob->EndColor.a != 1.f || explosionEffectJob->DiffuseColor.a != 1.f) {
modelComponent["Transparent"] = true; cModel["Transparent"] = true;
} }
if (modelComponent["Transparent"]) { if (cModel["Transparent"]) {
transparentJobs.push_back(explosionEffectJob); transparentJobs.push_back(explosionEffectJob);
} else { } else {
opaqueJobs.push_back(explosionEffectJob); opaqueJobs.push_back(explosionEffectJob);
@@ -130,9 +127,9 @@ bool RenderSystem::isChildOfCurrentCamera(EntityWrapper entity)
fillPercentage fillPercentage
)); ));
if (modelJob->Color.a != 1.f || modelJob->DiffuseColor.a != 1.f) { if (modelJob->Color.a != 1.f || modelJob->DiffuseColor.a != 1.f) {
modelComponent["Transparent"] = true; cModel["Transparent"] = true;
} }
if (modelComponent["Transparent"]) { if (cModel["Transparent"]) {
transparentJobs.push_back(modelJob); transparentJobs.push_back(modelJob);
} else { } else {
opaqueJobs.push_back(modelJob); opaqueJobs.push_back(modelJob);