OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

Fix calculation bounding box for flipped selection

Browse Source
This commit is contained in:
mzernova 2024-08-19 18:18:33 +01:00
parent 1140545f5d
commit c1d8d32346
1 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/SelectMgr/SelectMgr_SelectableObjectSet.cxx
View File

@ -125,7 +125,7 @@ namespace
Bnd_Box aBoundingBox; Bnd_Box aBoundingBox;
anObject->BoundingBox (aBoundingBox); anObject->BoundingBox (aBoundingBox);
// processing presentations with own flipping // processing presentations with own flipping and transform persistence
for (PrsMgr_Presentations::Iterator aPrsIter(anObject->Presentations()); aPrsIter.More(); aPrsIter.Next()) for (PrsMgr_Presentations::Iterator aPrsIter(anObject->Presentations()); aPrsIter.More(); aPrsIter.Next())
{ {
const Handle(PrsMgr_Presentation)& aPrs3d = aPrsIter.Value(); const Handle(PrsMgr_Presentation)& aPrs3d = aPrsIter.Value();
@ -138,7 +138,7 @@ namespace
{ {
const Handle(Graphic3d_Group)& aGroup = aGroupIter.Value(); const Handle(Graphic3d_Group)& aGroup = aGroupIter.Value();
const Graphic3d_BndBox4f& aBndBox = aGroup->BoundingBox(); const Graphic3d_BndBox4f& aBndBox = aGroup->BoundingBox();
if (aGroup->Flipper().IsNull() if ((aGroup->Flipper().IsNull() && aGroup->TransformPersistence().IsNull())
|| !aBndBox.IsValid()) || !aBndBox.IsValid())
{ {
continue; continue;
@ -147,8 +147,19 @@ namespace
Bnd_Box aGroupBox; Bnd_Box aGroupBox;
aGroupBox.Update (aBndBox.CornerMin().x(), aBndBox.CornerMin().y(), aBndBox.CornerMin().z(), aGroupBox.Update (aBndBox.CornerMin().x(), aBndBox.CornerMin().y(), aBndBox.CornerMin().z(),
aBndBox.CornerMax().x(), aBndBox.CornerMax().y(), aBndBox.CornerMax().z()); aBndBox.CornerMax().x(), aBndBox.CornerMax().y(), aBndBox.CornerMax().z());
aGroup->Flipper()->Apply (theWorldViewMat, aGroupBox);
if (!aGroup->Flipper().IsNull())
{
aGroup->Flipper()->Apply (theWorldViewMat, aGroupBox);
}
if (!aGroup->TransformPersistence().IsNull())
{
aGroup->TransformPersistence()->Apply (theCamera,
theProjectionMat, theWorldViewMat,
theWinSize.x(), theWinSize.y(),
aGroupBox);
}
aBoundingBox.Add (aGroupBox); aBoundingBox.Add (aGroupBox);
} }
} }
@ -162,36 +173,6 @@ namespace
aBoundingBox); aBoundingBox);
} }
// processing presentations with own transform persistence
for (PrsMgr_Presentations::Iterator aPrsIter (anObject->Presentations()); aPrsIter.More(); aPrsIter.Next())
{
const Handle(PrsMgr_Presentation)& aPrs3d = aPrsIter.Value();
if (!aPrs3d->CStructure()->HasGroupTransformPersistence())
{
continue;
}
for (Graphic3d_SequenceOfGroup::Iterator aGroupIter (aPrs3d->Groups()); aGroupIter.More(); aGroupIter.Next())
{
const Handle(Graphic3d_Group)& aGroup = aGroupIter.Value();
const Graphic3d_BndBox4f& aBndBox = aGroup->BoundingBox();
if (aGroup->TransformPersistence().IsNull()
|| !aBndBox.IsValid())
{
continue;
}
Bnd_Box aGroupBox;
aGroupBox.Update (aBndBox.CornerMin().x(), aBndBox.CornerMin().y(), aBndBox.CornerMin().z(),
aBndBox.CornerMax().x(), aBndBox.CornerMax().y(), aBndBox.CornerMax().z());
aGroup->TransformPersistence()->Apply (theCamera,
theProjectionMat, theWorldViewMat,
theWinSize.x(), theWinSize.y(),
aGroupBox);
aBoundingBox.Add (aGroupBox);
}
}
if (aBoundingBox.IsVoid()) if (aBoundingBox.IsVoid())
{ {
myBoundings.Add (new Select3D_HBndBox3d()); myBoundings.Add (new Select3D_HBndBox3d());