OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0023115: Polygon offset doesn't applied in Viewer3D sample

Browse Source 
Graphic3d_AspectFillArea3d: use Aspect_POM_Fill polygon offset mode by default

Graphic3d_Group: disable texture mapping if invalid texture ID is specified

AIS_InteractiveObject: remove Fill() method, polygon offset parameters
should be applied explicitly in Compute() method or by SetPolygonOffsets()

AIS_TexturedShape: Compute() now takes polygon offsets into account
This commit is contained in:
san
2012-04-20 10:27:13 +04:00
parent 3ddebf9123
commit 6076110592
5 changed files with 19 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/AIS/AIS_InteractiveObject.cxx
View File

@@ -781,6 +781,7 @@ void AIS_InteractiveObject::SetPolygonOffsets(const Standard_Integer aMode,
// TODO: Add methods for retrieving individual aspects from Graphic3d_Group
aGrp->GroupPrimitivesAspect(aLineAsp, aTextAsp, aPntAsp, aFaceAsp);
aFaceAsp->SetPolygonOffsets(aMode, aFactor, aUnits);
// TODO: Issue 23118 - This line kills texture data in the group...
aGrp->SetGroupPrimitivesAspect(aFaceAsp);
}
}
@@ -812,38 +813,4 @@ void AIS_InteractiveObject::PolygonOffsets(Standard_Integer& aMode,
if( HasPolygonOffsets() )
myDrawer->ShadingAspect()->Aspect()->PolygonOffsets( aMode, aFactor, aUnits );
}
void AIS_InteractiveObject::Fill(const Handle(PrsMgr_PresentationManager)& aPresentationManager,
const Handle(PrsMgr_Presentation)& aPresentation,
const Standard_Integer aMode)
{
PrsMgr_PresentableObject::Fill(aPresentationManager, aPresentation, aMode);
// Update polygon offsets for <aPresentation> using <myDrawer> data
if ( !myDrawer->ShadingAspect().IsNull() )
{
Standard_Integer aMode1 = Aspect_POM_Fill;
Standard_Real aFactor = 1., aUnits = 0.;
myDrawer->ShadingAspect()->Aspect()->PolygonOffsets( aMode1, aFactor, aUnits );
// Here we force this object to have default polygon offsets , if they are not
// turned on for this object explicitly
if ( ( aMode1 & Aspect_POM_None ) == Aspect_POM_None )
{
aMode1 = Aspect_POM_Fill;
aFactor = 1.;
aUnits = 0.;
myDrawer->ShadingAspect()->Aspect()->SetPolygonOffsets( aMode1, aFactor, aUnits );
}
}
Handle(PrsMgr_Presentation3d) aPrs3d =
Handle(PrsMgr_Presentation3d)::DownCast( aPresentation );
if ( !aPrs3d.IsNull() ) {
Handle(Graphic3d_Structure) aStruct =
Handle(Graphic3d_Structure)::DownCast( aPrs3d->Presentation() );
if( !aStruct.IsNull() )
aStruct->SetPrimitivesAspect( myDrawer->ShadingAspect()->Aspect() );
}
}
// OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets