storytold/LiveScan3D
2
0
Fork 0
mirror of https://github.com/storytold/LiveScan3D.git synced 2026-10-18 07:34:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug that would crash the application if a new marker was added with the live view window open.

Browse Source
This commit is contained in:
MarekKowalski
2017-05-16 09:18:08 +02:00
parent eab7e3c958
commit bd969205c2
1 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LiveScanServer/OpenGLWindow.cs
+40 -37
View File
@@ -325,49 +325,52 @@ namespace KinectServer
lock (vertices) lock (vertices)
{ {
bool bShowSkeletons = settings.bShowSkeletons; lock (settings)
PointCount = vertices.Count / 3;
LineCount = 0;
if (bDrawMarkings)
{ {
//bounding box bool bShowSkeletons = settings.bShowSkeletons;
LineCount += 12;
//markers
LineCount += settings.lMarkerPoses.Count * 3;
//cameras
LineCount += cameraPoses.Count * 3;
if (bShowSkeletons)
LineCount += 24 * bodies.Count;
}
VBO = new VertexC4ubV3f[PointCount + 2 * LineCount]; PointCount = vertices.Count / 3;
LineCount = 0;
for (int i = 0; i < PointCount; i++) if (bDrawMarkings)
{
VBO[i].R = (byte)Math.Max(0, Math.Min(255, (colors[i * 3] + brightnessModifier)));
VBO[i].G = (byte)Math.Max(0, Math.Min(255, (colors[i * 3 + 1] + brightnessModifier)));
VBO[i].B = (byte)Math.Max(0, Math.Min(255, (colors[i * 3 + 2] + brightnessModifier)));
VBO[i].A = 255;
VBO[i].Position.X = vertices[i * 3];
VBO[i].Position.Y = vertices[i * 3 + 1];
VBO[i].Position.Z = vertices[i * 3 + 2];
}
if (bDrawMarkings)
{
int iCurLineCount = 0;
iCurLineCount += AddBoundingBox(PointCount + 2 * iCurLineCount);
for (int i = 0; i < settings.lMarkerPoses.Count; i++)
{ {
iCurLineCount += AddMarker(PointCount + 2 * iCurLineCount, settings.lMarkerPoses[i].pose); //bounding box
LineCount += 12;
//markers
LineCount += settings.lMarkerPoses.Count * 3;
//cameras
LineCount += cameraPoses.Count * 3;
if (bShowSkeletons)
LineCount += 24 * bodies.Count;
} }
for (int i = 0; i < cameraPoses.Count; i++)
VBO = new VertexC4ubV3f[PointCount + 2 * LineCount];
for (int i = 0; i < PointCount; i++)
{ {
iCurLineCount += AddCamera(PointCount + 2 * iCurLineCount, cameraPoses[i]); VBO[i].R = (byte)Math.Max(0, Math.Min(255, (colors[i * 3] + brightnessModifier)));
VBO[i].G = (byte)Math.Max(0, Math.Min(255, (colors[i * 3 + 1] + brightnessModifier)));
VBO[i].B = (byte)Math.Max(0, Math.Min(255, (colors[i * 3 + 2] + brightnessModifier)));
VBO[i].A = 255;
VBO[i].Position.X = vertices[i * 3];
VBO[i].Position.Y = vertices[i * 3 + 1];
VBO[i].Position.Z = vertices[i * 3 + 2];
}
if (bDrawMarkings)
{
int iCurLineCount = 0;
iCurLineCount += AddBoundingBox(PointCount + 2 * iCurLineCount);
for (int i = 0; i < settings.lMarkerPoses.Count; i++)
{
iCurLineCount += AddMarker(PointCount + 2 * iCurLineCount, settings.lMarkerPoses[i].pose);
}
for (int i = 0; i < cameraPoses.Count; i++)
{
iCurLineCount += AddCamera(PointCount + 2 * iCurLineCount, cameraPoses[i]);
}
if (bShowSkeletons)
iCurLineCount += AddBodies(PointCount + 2 * iCurLineCount);
} }
if (bShowSkeletons)
iCurLineCount += AddBodies(PointCount + 2 * iCurLineCount);
} }
} }
} }