Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Warnings and memory leaks #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Warnings and memory leaks #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions b2Separator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ void b2Separator::Separate(b2Body* pBody, b2FixtureDef* pFixtureDef, vector<b2Ve
pFixtureDef->shape=polyShape;
pBody->CreateFixture(pFixtureDef);
}
delete polyShape;
}
/**
* Checks whether the vertices in can be properly distributed into the new fixtures (more specifically, it makes sure there are no overlapping segments and the vertices are in clockwise order).
Expand All @@ -52,22 +53,24 @@ int b2Separator::Validate(const vector<b2Vec2> &verticesVec) {
bool fl, fl2=false;

for (i=0; i<n; i++) {
i2=(i<n-1)?i+1:0;
i3=(i>0)?i-1:n-1;
i2 = ( i < n-1 ) ? static_cast< float>( i+1 ) : 0.0f ;
i3 = ( i > 0 ) ? static_cast< float>( i-1 ) : static_cast< float >( n-1 );

fl=false;
for (j=0; j<n; j++) {
if ((j!=i)&&(j!=i2)) {
if (! fl) {
d = det(verticesVec[i].x,verticesVec[i].y,verticesVec[i2].x,verticesVec[i2].y,verticesVec[j].x,verticesVec[j].y);
d = det( verticesVec[ i ].x, verticesVec[ i ].y, verticesVec[ static_cast< int >( i2 ) ].x, verticesVec[ static_cast< int >( i2 ) ].y, verticesVec[ static_cast< int >( j ) ].x, verticesVec[ static_cast< int >( j ) ].y );
if ((d>0)) {
fl=true;
}
}

if ((j!=i3)) {
j2=(j<n-1)?j+1:0;
if (hitSegment(verticesVec[i].x,verticesVec[i].y,verticesVec[i2].x,verticesVec[i2].y,verticesVec[j].x,verticesVec[j].y,verticesVec[j2].x,verticesVec[j2].y)) {
if( hitSegment( verticesVec[ i ].x, verticesVec[ i ].y, verticesVec[ static_cast< int >( i2 ) ].x, verticesVec[ static_cast< int >( i2 ) ].y, verticesVec[ static_cast< int >( j ) ].x,
verticesVec[ static_cast< int >( j ) ].y, verticesVec[ static_cast< int >( j2 ) ].x, verticesVec[ static_cast< int >( j2 ) ].y ) )
{
ret=1; // TODO: This may be wrong!!!
}
}
Expand Down Expand Up @@ -139,6 +142,7 @@ void b2Separator::calcShapes(vector<b2Vec2> &pVerticesVec, vector<vector<b2Vec2>

if (pV) {
b2Vec2 v = *pV;
delete pV;
dx=p2.x-v.x;
dy=p2.y-v.y;
t=dx*dx+dy*dy;
Expand All @@ -147,7 +151,7 @@ void b2Separator::calcShapes(vector<b2Vec2> &pVerticesVec, vector<vector<b2Vec2>
h=j1;
k=j2;
hitV=v;
minLen=t;
minLen = static_cast< int >( t );
}
}
}
Expand Down Expand Up @@ -227,6 +231,8 @@ void b2Separator::calcShapes(vector<b2Vec2> &pVerticesVec, vector<vector<b2Vec2>
queue.push(*vec1);
queue.push(*vec2);
queue.pop();
delete vec1;
delete vec2;

break;
}
Expand Down