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

0028263: Coding Rules - clean up definition of the class Graphic3d_MaterialAspect

Browse Source 
Fixed uninitialized fields in several classes.
Body of trivial methods have been moved to class definition (header file).
Ensure that non-primitive types are returned by reference, when possible.
Removed unused class Prs3d_PlaneSet.
This commit is contained in:
kgv
2016-12-29 20:39:28 +03:00
committed by apv
parent 2b73a1d19f
commit 4e1bc39a81
39 changed files with 1297 additions and 2703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/AIS/AIS_InteractiveObject.cxx
View File

@@ -300,9 +300,9 @@ void AIS_InteractiveObject::UnsetMaterial()
//=======================================================================
//function : SetTransparency
//purpose :
//purpose :
//=======================================================================
void AIS_InteractiveObject::SetTransparency(const Standard_Real aValue)
void AIS_InteractiveObject::SetTransparency (const Standard_Real theValue)
{
if (!myDrawer->HasOwnShadingAspect())
{
@@ -310,12 +310,10 @@ void AIS_InteractiveObject::SetTransparency(const Standard_Real aValue)
if(myDrawer->HasLink())
myDrawer->ShadingAspect()->SetMaterial(AIS_GraphicTool::GetMaterial(myDrawer->Link()));
}
Graphic3d_MaterialAspect FMat = myDrawer->ShadingAspect()->Aspect()->FrontMaterial();
Graphic3d_MaterialAspect BMat = myDrawer->ShadingAspect()->Aspect()->BackMaterial();
FMat.SetTransparency(aValue); BMat.SetTransparency(aValue);
myDrawer->ShadingAspect()->Aspect()->SetFrontMaterial(FMat);
myDrawer->ShadingAspect()->Aspect()->SetBackMaterial(BMat);
myDrawer->SetTransparency ((Standard_ShortReal )aValue);
myDrawer->ShadingAspect()->Aspect()->ChangeFrontMaterial().SetTransparency (Standard_ShortReal(theValue));
myDrawer->ShadingAspect()->Aspect()->ChangeBackMaterial() .SetTransparency (Standard_ShortReal(theValue));
myDrawer->SetTransparency (Standard_ShortReal(theValue));
}
//=======================================================================
@@ -326,11 +324,8 @@ void AIS_InteractiveObject::UnsetTransparency()
{
if(HasColor() || HasMaterial() )
{
Graphic3d_MaterialAspect FMat = myDrawer->ShadingAspect()->Aspect()->FrontMaterial();
Graphic3d_MaterialAspect BMat = myDrawer->ShadingAspect()->Aspect()->BackMaterial();
FMat.SetTransparency(0.); BMat.SetTransparency(0.);
myDrawer->ShadingAspect()->Aspect()->SetFrontMaterial(FMat);
myDrawer->ShadingAspect()->Aspect()->SetBackMaterial(BMat);
myDrawer->ShadingAspect()->Aspect()->ChangeFrontMaterial().SetTransparency (0.0f);
myDrawer->ShadingAspect()->Aspect()->ChangeBackMaterial() .SetTransparency (0.0f);
}
else{
Handle (Prs3d_ShadingAspect) SA;