AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2024-12-15 06:00:12 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'erwin/master'

Browse Source
This commit is contained in:
= 2015-02-12 14:04:13 -08:00
commit 6cbe3a3087
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Extras/HACD/hacdHACD.cpp
View File

@ -24,6 +24,7 @@
#include <algorithm>
#include <iterator>
#include <limits>
#include "assert.h"
bool gCancelRequest=false;
namespace HACD
@ -437,7 +438,8 @@ namespace HACD
for(size_t v = 1; v < nV; ++v)
{
ptIndex = verticesCH.GetHead()->GetData().m_name;
ch->AddPoint(m_points[ptIndex], ptIndex);
if (ptIndex != ICHull::sc_dummyIndex/* && ptIndex < m_nPoints*/)
ch->AddPoint(m_points[ptIndex], ptIndex);
verticesCH.Next();
}
delete gE.m_convexHull;
@ -845,3 +847,5 @@ namespace HACD
}
}
}

11
Extras/HACD/hacdICHull.cpp
View File

@ -265,7 +265,9 @@ namespace HACD
// delete remaining points
while (!vertices.GetData().m_tag)
{
vertices.Delete();
if (vertices.GetHead() == m_dummyVertex)
m_dummyVertex = 0;
vertices.Delete();
}
if (m_isFlat)
{
@ -563,6 +565,8 @@ namespace HACD
// if no faces visible from p then p is inside the hull
if (!visible && markVisibleFaces)
{
if (vertices.GetHead() == m_dummyVertex)
m_dummyVertex = 0;
vertices.Delete();
m_trianglesToDelete.clear();
return false;
@ -741,7 +745,9 @@ namespace HACD
if (v->GetData().m_tag && !v->GetData().m_onHull)
{
CircularListElement<TMMVertex> * tmp = v->GetPrev();
vertices.Delete(v);
if (tmp == m_dummyVertex)
m_dummyVertex = 0;
vertices.Delete(v);
v = tmp;
addedPoints--;
}
@ -1010,3 +1016,4 @@ namespace HACD
}
}