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

Merge remote-tracking branch 'origin/master' into TCPConnections

Browse Source 
# Conflicts:
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/Server.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Game/Systems/PlayerSpawnSystem.cpp
This commit is contained in:
Jocke
2016-02-12 05:16:30 +01:00
parent 3b42f5dbf4 a20707739e
commit 7de76376cf
58 changed files with 8174 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Rendering/PickingPass.cpp
+4 -4
View File
@@ -123,7 +123,7 @@ void PickingPass::Draw(RenderScene& scene)
}
}
for (auto &job : scene.Jobs.TransparentObjects) {
/* for (auto &job : scene.Jobs.TransparentObjects) {
auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
int pickColor[2] = { m_ColorCounter[0], m_ColorCounter[1] };
@@ -176,7 +176,7 @@ void PickingPass::Draw(RenderScene& scene)
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex * sizeof(unsigned int)));
}
}
}*/
for (auto &job : scene.Jobs.OpaqueShieldedObjects) {
auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
@@ -234,7 +234,7 @@ void PickingPass::Draw(RenderScene& scene)
}
}
for (auto &job : scene.Jobs.TransparentShieldedObjects) {
/* for (auto &job : scene.Jobs.TransparentShieldedObjects) {
auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
if (modelJob) {
@@ -298,7 +298,7 @@ void PickingPass::Draw(RenderScene& scene)
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex * sizeof(unsigned int)));
}
}
}*/
m_PickingBuffer.Unbind();
GLERROR("PickingPass Error");