Skip to content

wip: memory leak fix #5

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

Merged
merged 1 commit into from
Feb 2, 2025
Merged

wip: memory leak fix #5

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
34 changes: 16 additions & 18 deletions Source/tmModel/tmTreeClasses/tmPath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,13 @@ tmVertex* tmPath::MakeVertex(const tmPoint& p, tmNode* aTreeNode)
tmFloat dist_p = Mag(p - p1);
tmFloat x = dist_p / Mag(p2 - p1);
tmFloat elevation = (1 - x) * mNodes.front()->mElevation + x * mNodes.back()->mElevation;
tmVertex* theVertex;
theVertex = new tmVertex(mTree, this, p, elevation, mIsBorderPath, aTreeNode);

// Create vertex and store it in a vector to track ownership
std::vector<tmVertex*> newVertices;
std::unique_ptr<tmVertex> theVertex = std::make_unique<tmVertex>(mTree, this, p, elevation, mIsBorderPath, aTreeNode);
newVertices.push_back(theVertex);

// Insert vertex at correct position
for (size_t i = 0; i < mOwnedVertices.size() - 1; ++i) {
tmVertex* testVertex = mOwnedVertices[i];
tmFloat dist_t = Mag(testVertex->mLoc - p1);
Expand All @@ -432,36 +437,30 @@ tmVertex* tmPath::MakeVertex(const tmPoint& p, tmNode* aTreeNode)
break;
}
}

// TBD: Maybe no longer need to do following crease check,
// since we now create all vertices first.
// For debugging, if we needed it, write the result to the log window.

// If this path owns any creases that overlap the vertex, split the
// crease into two new ones.
// Handle crease splitting
for (size_t i = 0; i < mOwnedCreases.size(); ++i) {
tmCrease* theCrease = mOwnedCreases[i];
tmVertex* frontVertex = theCrease->mVertices.front();
tmVertex* backVertex = theCrease->mVertices.back();
// For each crease we'll check to see if the new vertex falls in the
// interior of the crease. If it does, then we split the crease, creating
// new ones and deleting the old ones.

const tmPoint& pc1 = frontVertex->mLoc;
const tmPoint& pc2 = backVertex->mLoc;
const tmPoint pc21 = pc2 - pc1;
tmFloat x = Inner(p - pc1, pc21) / Mag2(pc21);

if (x > 0 && x < 1) {
TMLOG("tmPath::MakeVertex(..) -- crease split during vertex creation");
new tmCrease(mTree, this, frontVertex, theVertex, theCrease->mKind);
new tmCrease(mTree, this, theVertex, backVertex, theCrease->mKind);
std::make_unique<tmCrease>(mTree, this, frontVertex, theVertex, theCrease->mKind);
auto newCrease2 = std::make_unique<tmCrease>(mTree, this, theVertex, backVertex, theCrease->mKind);
delete theCrease;
return theVertex;
break;
}
}

return theVertex;
}


/*****
Return front vertex in the path, i.e., the vertex corresponding to the front
node. Note: this is NOT the front vertex in mOwnedVertices. Return 0 if the
Expand Down Expand Up @@ -540,15 +539,14 @@ void tmPath::ConnectSelfVertices(tmCrease::Kind aKind)
TMASSERT(frontVertex);
for (size_t i = 0; i < mOwnedVertices.size(); ++i) {
tmVertex* backVertex = mOwnedVertices[i];
GetOrMakeCrease(frontVertex, backVertex, aKind);
std::unique_ptr<tmCrease> crease(GetOrMakeCrease(frontVertex, backVertex, aKind));
frontVertex = backVertex;
}
tmVertex* backVertex = GetBackVertex();
TMASSERT(backVertex);
GetOrMakeCrease(frontVertex, backVertex, aKind);
std::unique_ptr<tmCrease> finalCrease(GetOrMakeCrease(frontVertex, backVertex, aKind));
}


/*****
Set the depth of the given vertex relative to the coordinate system established
for this path.
Expand Down