Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-27 03:09:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for potential crash due to DebugDraw data race.

Browse source
This commit is contained in:
Anthony J. Thibault 2017-03-07 16:07:30 -08:00
parent b0ad9a8110
commit 1b8a624edb
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/render-utils/src/AnimDebugDraw.cpp
View file

@ -346,7 +346,9 @@ void AnimDebugDraw::update() {
numVerts += (int)markerMap.size() * VERTICES_PER_BONE; numVerts += (int)markerMap.size() * VERTICES_PER_BONE;
auto myAvatarMarkerMap = DebugDraw::getInstance().getMyAvatarMarkerMap(); auto myAvatarMarkerMap = DebugDraw::getInstance().getMyAvatarMarkerMap();
numVerts += (int)myAvatarMarkerMap.size() * VERTICES_PER_BONE; numVerts += (int)myAvatarMarkerMap.size() * VERTICES_PER_BONE;
numVerts += (int)DebugDraw::getInstance().getRays().size() * VERTICES_PER_RAY; auto rays = DebugDraw::getInstance().getRays();
DebugDraw::getInstance().clearRays();
numVerts += (int)rays.size() * VERTICES_PER_RAY;
// allocate verts! // allocate verts!
std::vector<AnimDebugDrawData::Vertex> vertices; std::vector<AnimDebugDrawData::Vertex> vertices;
@ -398,10 +400,9 @@ void AnimDebugDraw::update() {
} }
// draw rays from shared DebugDraw singleton // draw rays from shared DebugDraw singleton
for (auto& iter : DebugDraw::getInstance().getRays()) { for (auto& iter : rays) {
addLine(std::get<0>(iter), std::get<1>(iter), std::get<2>(iter), v); addLine(std::get<0>(iter), std::get<1>(iter), std::get<2>(iter), v);
} }
DebugDraw::getInstance().clearRays();
data._vertexBuffer->resize(sizeof(AnimDebugDrawData::Vertex) * numVerts); data._vertexBuffer->resize(sizeof(AnimDebugDrawData::Vertex) * numVerts);
data._vertexBuffer->setSubData<AnimDebugDrawData::Vertex>(0, vertices); data._vertexBuffer->setSubData<AnimDebugDrawData::Vertex>(0, vertices);