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

0025459: Visualization - AIS_ColoredShape::SetMaterial() should not reset custom colors

Browse Source
This commit is contained in:
kgv 2014-11-14 12:55:57 +03:00 committed by bugmaster
parent e83c01bfc0
commit e0608a8d27
7 changed files with 101 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/AIS/AIS_ColoredShape.cxx
View File

@ -269,6 +269,28 @@ void AIS_ColoredShape::SetTransparency (const Standard_Real theValue)
}
}
//=======================================================================
//function : SetMaterial
//purpose :
//=======================================================================
void AIS_ColoredShape::SetMaterial (const Graphic3d_MaterialAspect& theMaterial)
{
setMaterial (myDrawer, theMaterial, HasColor(), IsTransparent());
//myOwnMaterial = theMaterial;
hasOwnMaterial = Standard_True;
LoadRecomputable (AIS_Shaded);
for (DataMapOfShapeColor::Iterator anIter (myShapeColors); anIter.More(); anIter.Next())
{
const Handle(AIS_ColoredDrawer)& aDrawer = anIter.Value();
//if (aDrawer->HasOwnMaterial()) continue;
if (aDrawer->HasShadingAspect())
{
setMaterial (aDrawer, theMaterial, aDrawer->HasOwnColor(), Standard_False); // aDrawer->IsTransparent()
}
}
}
//=======================================================================
//function : Compute
//purpose :

3
src/AIS/AIS_ColoredShape.hxx
View File

@ -104,6 +104,9 @@ public: //! @name global aspects
//! Sets transparency value.
Standard_EXPORT virtual void SetTransparency (const Standard_Real theValue) Standard_OVERRIDE;
//! Sets the material aspect.
Standard_EXPORT virtual void SetMaterial (const Graphic3d_MaterialAspect& theAspect) Standard_OVERRIDE;
protected: //! @name override presentation computation
Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,

7
src/AIS/AIS_Shape.cdl
View File

@ -306,6 +306,13 @@ uses
theValue : Real from Standard)
is protected;
setMaterial (me;
theDrawer : Drawer from AIS;
theMaterial : MaterialAspect from Graphic3d;
theToKeepColor : Boolean from Standard;
theToKeepTransp : Boolean from Standard)
is protected;
fields
myshape : Shape from TopoDS is protected;
myBB : Box from Bnd is protected;

42
src/AIS/AIS_Shape.cxx
View File

@ -710,6 +710,35 @@ void AIS_Shape::UnsetWidth()
LoadRecomputable (AIS_WireFrame);
}
//=======================================================================
//function : setMaterial
//purpose :
//=======================================================================
void AIS_Shape::setMaterial (const Handle(AIS_Drawer)& theDrawer,
const Graphic3d_MaterialAspect& theMaterial,
const Standard_Boolean theToKeepColor,
const Standard_Boolean theToKeepTransp) const
{
const Quantity_Color aColor = theDrawer->ShadingAspect()->Material (myCurrentFacingModel).Color();
const Standard_Real aTransp = theDrawer->ShadingAspect()->Transparency (myCurrentFacingModel);
if (!theDrawer->HasShadingAspect())
{
theDrawer->SetShadingAspect (new Prs3d_ShadingAspect());
*theDrawer->ShadingAspect()->Aspect() = *theDrawer->Link()->ShadingAspect()->Aspect();
}
theDrawer->ShadingAspect()->SetMaterial (theMaterial, myCurrentFacingModel);
if (theToKeepColor)
{
theDrawer->ShadingAspect()->SetColor (aColor, myCurrentFacingModel);
}
if (theToKeepTransp)
{
theDrawer->ShadingAspect()->SetTransparency (aTransp, myCurrentFacingModel);
}
}
//=======================================================================
//function : SetMaterial
//purpose :
@ -727,20 +756,9 @@ void AIS_Shape::SetMaterial(const Graphic3d_NameOfMaterial aMat)
void AIS_Shape::SetMaterial (const Graphic3d_MaterialAspect& theMat)
{
if (!myDrawer->HasShadingAspect())
{
myDrawer->SetShadingAspect (new Prs3d_ShadingAspect());
*myDrawer->ShadingAspect()->Aspect() = *myDrawer->Link()->ShadingAspect()->Aspect();
}
setMaterial (myDrawer, theMat, HasColor(), IsTransparent());
hasOwnMaterial = Standard_True;
myDrawer->ShadingAspect()->SetMaterial (theMat, myCurrentFacingModel);
if (HasColor())
{
myDrawer->ShadingAspect()->SetColor (myOwnColor, myCurrentFacingModel);
}
myDrawer->ShadingAspect()->SetTransparency (myTransparency, myCurrentFacingModel);
// modify shading presentation without re-computation
const PrsMgr_Presentations& aPrsList = Presentations();
Handle(Graphic3d_AspectFillArea3d) anAreaAsp = myDrawer->ShadingAspect()->Aspect();

2
src/Prs3d/Prs3d_ShadingAspect.cdl
View File

@ -74,10 +74,12 @@ is
Color (me; aModel: TypeOfFacingModel from Aspect = Aspect_TOFM_FRONT_SIDE)
returns Color from Quantity is static;
--- Purpose: Returns the polygons color.
---C++: return const &
Material (me; aModel: TypeOfFacingModel from Aspect = Aspect_TOFM_FRONT_SIDE)
returns MaterialAspect from Graphic3d is static;
--- Purpose: Returns the polygons material aspect.
---C++: return const &
Transparency (me; aModel: TypeOfFacingModel from Aspect = Aspect_TOFM_FRONT_SIDE)
returns Real from Standard is static;

82
src/Prs3d/Prs3d_ShadingAspect.cxx
View File

@ -12,15 +12,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define BUC60488 //GG_23/09/99 Updates correctly the Material after
// any change.
#define GER61351 //GG_171199 Enable to set an object RGB color
// instead a restricted object NameOfColor.
// Enable to change separatly the front and back color.
#define OCC1174 //SAV_080103 Added back face interior color management
#include <Prs3d_ShadingAspect.ixx>
//=======================================================================
@ -53,7 +44,6 @@ Prs3d_ShadingAspect::Prs3d_ShadingAspect () {
//purpose :
//=======================================================================
#ifdef GER61351
void Prs3d_ShadingAspect::SetColor(const Quantity_NameOfColor aColor,
const Aspect_TypeOfFacingModel aModel) {
@ -62,10 +52,6 @@ void Prs3d_ShadingAspect::SetColor(const Quantity_NameOfColor aColor,
void Prs3d_ShadingAspect::SetColor(const Quantity_Color &aColor,
const Aspect_TypeOfFacingModel aModel) {
#ifndef OCC1174
myAspect->SetInteriorColor(aColor);
#endif
if( aModel != Aspect_TOFM_BOTH_SIDE ) {
myAspect->SetDistinguishOn();
}
@ -73,77 +59,46 @@ void Prs3d_ShadingAspect::SetColor(const Quantity_Color &aColor,
Graphic3d_MaterialAspect front = myAspect->FrontMaterial();
front.SetColor(aColor);
myAspect->SetFrontMaterial(front);
#ifdef OCC1174
myAspect->SetInteriorColor( aColor );
#endif
}
if( aModel == Aspect_TOFM_BACK_SIDE || aModel == Aspect_TOFM_BOTH_SIDE ) {
Graphic3d_MaterialAspect back = myAspect->BackMaterial();
back.SetColor(aColor);
myAspect->SetBackMaterial(back);
#ifdef OCC1174
myAspect->SetBackInteriorColor( aColor );
#endif
}
}
Quantity_Color Prs3d_ShadingAspect::Color( const Aspect_TypeOfFacingModel aModel ) const {
Quantity_Color myReturn ;
switch (aModel) {
const Quantity_Color& Prs3d_ShadingAspect::Color (const Aspect_TypeOfFacingModel theModel) const
{
switch (theModel)
{
default:
case Aspect_TOFM_BOTH_SIDE:
case Aspect_TOFM_FRONT_SIDE:
myReturn = myAspect->FrontMaterial().Color();
break;
return myAspect->FrontMaterial().Color();
case Aspect_TOFM_BACK_SIDE:
myReturn = myAspect->BackMaterial().Color();
break;
return myAspect->BackMaterial().Color();
}
return myReturn ;
}
#else
void Prs3d_ShadingAspect::SetColor(const Quantity_NameOfColor aColor) {
myAspect->SetInteriorColor(aColor);
#ifdef OCC1174
myAspect->SetBackInteriorColor( aColor );
#endif
myAspect->FrontMaterial().SetAmbientColor(Quantity_Color(aColor));
myAspect->BackMaterial().SetAmbientColor(Quantity_Color(aColor));
// myAspect->FrontMaterial().SetColor(Quantity_Color(aColor));
// myAspect->BackMaterial().SetColor(Quantity_Color(aColor));
}
#endif
//=======================================================================
//function : SetMaterial
//purpose :
//=======================================================================
#ifdef GER61351
void Prs3d_ShadingAspect::SetMaterial(
const Graphic3d_NameOfMaterial aMaterial,
const Aspect_TypeOfFacingModel aModel ) {
SetMaterial(Graphic3d_MaterialAspect(aMaterial),aModel);
}
#else
void Prs3d_ShadingAspect::SetMaterial(
// const Graphic3d_NameOfPhysicalMaterial aMaterial) {
const Graphic3d_NameOfMaterial aMaterial) {
Graphic3d_MaterialAspect TheMaterial(aMaterial);
myAspect->SetFrontMaterial (TheMaterial);
myAspect->SetBackMaterial (TheMaterial);
}
#endif
//=======================================================================
//function : SetMaterial
//purpose :
//=======================================================================
#ifdef GER61351
void Prs3d_ShadingAspect::SetMaterial(
const Graphic3d_MaterialAspect& aMaterial,
const Aspect_TypeOfFacingModel aModel ) {
@ -160,36 +115,24 @@ void Prs3d_ShadingAspect::SetMaterial(
}
}
Graphic3d_MaterialAspect Prs3d_ShadingAspect::Material(
const Aspect_TypeOfFacingModel aModel ) const {
Graphic3d_MaterialAspect myReturn ;
switch (aModel) {
const Graphic3d_MaterialAspect& Prs3d_ShadingAspect::Material (const Aspect_TypeOfFacingModel theModel) const
{
switch (theModel)
{
default:
case Aspect_TOFM_BOTH_SIDE:
case Aspect_TOFM_FRONT_SIDE:
myReturn = myAspect->FrontMaterial();
break;
return myAspect->FrontMaterial();
case Aspect_TOFM_BACK_SIDE:
myReturn = myAspect->BackMaterial();
break;
return myAspect->BackMaterial();
}
return myReturn ;
}
#else
void Prs3d_ShadingAspect::SetMaterial(
const Graphic3d_MaterialAspect& aMaterial)
{
myAspect->SetFrontMaterial (aMaterial);
myAspect->SetBackMaterial (aMaterial);
}
#endif
//=======================================================================
//function : SetTransparency
//purpose :
//=======================================================================
#ifdef GER61351
void Prs3d_ShadingAspect::SetTransparency(const Standard_Real aValue,
const Aspect_TypeOfFacingModel aModel ) {
@ -222,7 +165,6 @@ Standard_Real aValue(0.);
}
return aValue;
}
#endif
//=======================================================================
//function : SetAspect

25
tests/bugs/vis/bug25459_coloredshape Normal file
View File

@ -0,0 +1,25 @@
puts "========"
puts "OCC25459 AIS_ColoredShape::SetMaterial() should not reset custom colors"
puts "========"
box b 0 0 0 1 2 3
# prepare view
vinit View1
vclear
vglinfo
vsetdispmode 1
vaxo
vdisplay b
vfit
# customize object
explode b F
vaspects b -subshapes b_3 -setcolor RED
vaspects b -setmaterial PLASTIC
# validate results
set aFaceColor [vreadpixel 128 256 rgb name]
if {"$aFaceColor" != "RED4"} {
puts "Error: wrong Face color"
}