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

Test world changes and some other small fixes

Browse Source
This commit is contained in:
Tleety
2016-02-01 19:08:46 +01:00
parent c708f1582c
commit 8299b99e2f
4 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Editor/EditorRenderSystem.cpp
-2
View File
@@ -26,8 +26,6 @@ void EditorRenderSystem::Update(double dt)
auto cSceneLight = m_World->GetComponents("SceneLight");
if (cSceneLight != nullptr) {
//these are hardcoded since they want special light treatment and a component just for widgets is stupid.
m_RenderFrame->Gamma = 2.2;
m_RenderFrame->Exposure = 1.0;
scene.AmbientColor = glm::vec4(0.8, 0.8, 0.8, 1.0);
}
src/Engine/Rendering/DrawFinalPass.cpp
+2 -2
View File
@@ -134,7 +134,7 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
continue;
}
//glDisable(GL_CULL_FACE);
glDisable(GL_CULL_FACE);
//Bind uniforms
BindExplosionUniforms(explosionHandle, explosionEffectJob, scene);
@@ -162,7 +162,7 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
glBindVertexArray(explosionEffectJob->Model->VAO);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, explosionEffectJob->Model->ElementBuffer);
glDrawElements(GL_TRIANGLES, explosionEffectJob->EndIndex - explosionEffectJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(explosionEffectJob->StartIndex*sizeof(unsigned int)));
//glEnable(GL_CULL_FACE);
glEnable(GL_CULL_FACE);
if(GLERROR("explosion effect end")) {
continue;
}