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

0031139: Data Exchange - fix misprint in RWObj_CafReader

Browse Source 
RWObj_CafReader::BindNamedShape(), added missing bind to material map.
XCAFDoc_VisMaterial::ConvertToCommonMaterial()/::ConvertToPbrMaterial(), added copying of base color texture.
XCAFPrs_DocumentExplorer now properly fills XCAFDoc_VisMaterial property of XCAFPrs_Style.
This commit is contained in:
kgv 2019-11-07 00:11:57 +03:00 committed by bugmaster
parent a1a9b24952
commit a14f2b4722
4 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/RWObj/RWObj_CafReader.cxx
View File

@ -70,6 +70,7 @@ void RWObj_CafReader::BindNamedShape (const TopoDS_Shape& theShape,
aMat = new XCAFDoc_VisMaterial(); aMat = new XCAFDoc_VisMaterial();
aMat->SetCommonMaterial (aMatXde); aMat->SetCommonMaterial (aMatXde);
aMat->SetRawName (new TCollection_HAsciiString (theMaterial->Name)); aMat->SetRawName (new TCollection_HAsciiString (theMaterial->Name));
myObjMaterialMap.Bind (theMaterial->Name, aMat);
} }
aShapeAttribs.Style.SetMaterial (aMat); aShapeAttribs.Style.SetMaterial (aMat);
} }

2
src/XCAFDoc/XCAFDoc_VisMaterial.cxx
View File

@ -159,6 +159,7 @@ XCAFDoc_VisMaterialCommon XCAFDoc_VisMaterial::ConvertToCommonMaterial()
// convert metal-roughness into common // convert metal-roughness into common
XCAFDoc_VisMaterialCommon aComMat; XCAFDoc_VisMaterialCommon aComMat;
aComMat.IsDefined = true; aComMat.IsDefined = true;
aComMat.DiffuseTexture = myPbrMat.BaseColorTexture;
aComMat.DiffuseColor = myPbrMat.BaseColor.GetRGB(); aComMat.DiffuseColor = myPbrMat.BaseColor.GetRGB();
aComMat.SpecularColor = Quantity_Color (Graphic3d_Vec3 (myPbrMat.Metallic)); aComMat.SpecularColor = Quantity_Color (Graphic3d_Vec3 (myPbrMat.Metallic));
aComMat.Transparency = 1.0f - myPbrMat.BaseColor.Alpha(); aComMat.Transparency = 1.0f - myPbrMat.BaseColor.Alpha();
@ -183,6 +184,7 @@ XCAFDoc_VisMaterialPBR XCAFDoc_VisMaterial::ConvertToPbrMaterial()
XCAFDoc_VisMaterialPBR aPbrMat; XCAFDoc_VisMaterialPBR aPbrMat;
aPbrMat.IsDefined = true; aPbrMat.IsDefined = true;
aPbrMat.BaseColorTexture = myCommonMat.DiffuseTexture;
aPbrMat.BaseColor.SetRGB (myCommonMat.DiffuseColor); aPbrMat.BaseColor.SetRGB (myCommonMat.DiffuseColor);
aPbrMat.BaseColor.SetAlpha (1.0f - myCommonMat.Transparency); aPbrMat.BaseColor.SetAlpha (1.0f - myCommonMat.Transparency);
aPbrMat.Metallic = Graphic3d_PBRMaterial::MetallicFromSpecular (myCommonMat.SpecularColor); aPbrMat.Metallic = Graphic3d_PBRMaterial::MetallicFromSpecular (myCommonMat.SpecularColor);

20
src/XCAFPrs/XCAFPrs_DocumentExplorer.cxx
View File

@ -19,12 +19,14 @@
#include <XCAFDoc_ColorTool.hxx> #include <XCAFDoc_ColorTool.hxx>
#include <XCAFDoc_DocumentTool.hxx> #include <XCAFDoc_DocumentTool.hxx>
#include <XCAFDoc_ShapeTool.hxx> #include <XCAFDoc_ShapeTool.hxx>
#include <XCAFDoc_VisMaterialTool.hxx>
#include <XCAFPrs_DocumentIdIterator.hxx> #include <XCAFPrs_DocumentIdIterator.hxx>
namespace namespace
{ {
//! Return merged style for the child node. //! Return merged style for the child node.
static XCAFPrs_Style mergedStyle (const Handle(XCAFDoc_ColorTool)& theColorTool, static XCAFPrs_Style mergedStyle (const Handle(XCAFDoc_ColorTool)& theColorTool,
const Handle(XCAFDoc_VisMaterialTool)& theVisMatTool,
const XCAFPrs_Style& theParenStyle, const XCAFPrs_Style& theParenStyle,
const TDF_Label& theLabel, const TDF_Label& theLabel,
const TDF_Label& theRefLabel) const TDF_Label& theRefLabel)
@ -35,6 +37,10 @@ namespace
} }
XCAFPrs_Style aStyle = theParenStyle; XCAFPrs_Style aStyle = theParenStyle;
if (Handle(XCAFDoc_VisMaterial) aVisMat = theVisMatTool->GetShapeMaterial (theRefLabel))
{
aStyle.SetMaterial (aVisMat);
}
Quantity_ColorRGBA aColor; Quantity_ColorRGBA aColor;
if (theColorTool->GetColor (theRefLabel, XCAFDoc_ColorGen, aColor)) if (theColorTool->GetColor (theRefLabel, XCAFDoc_ColorGen, aColor))
{ {
@ -53,6 +59,10 @@ namespace
if (theLabel != theRefLabel) if (theLabel != theRefLabel)
{ {
// override Reference style with Instance style when defined (bad model?) // override Reference style with Instance style when defined (bad model?)
if (Handle(XCAFDoc_VisMaterial) aVisMat = theVisMatTool->GetShapeMaterial (theLabel))
{
aStyle.SetMaterial (aVisMat);
}
if (theColorTool->GetColor (theLabel, XCAFDoc_ColorGen, aColor)) if (theColorTool->GetColor (theLabel, XCAFDoc_ColorGen, aColor))
{ {
aStyle.SetColorCurv (aColor.GetRGB()); aStyle.SetColorCurv (aColor.GetRGB());
@ -224,10 +234,12 @@ void XCAFPrs_DocumentExplorer::Init (const Handle(TDocStd_Document)& theDocument
if ((theFlags & XCAFPrs_DocumentExplorerFlags_NoStyle) == 0) if ((theFlags & XCAFPrs_DocumentExplorerFlags_NoStyle) == 0)
{ {
myColorTool = XCAFDoc_DocumentTool::ColorTool (theDocument->Main()); myColorTool = XCAFDoc_DocumentTool::ColorTool (theDocument->Main());
myVisMatTool = XCAFDoc_DocumentTool::VisMaterialTool (theDocument->Main());
} }
else else
{ {
myColorTool.Nullify(); myColorTool.Nullify();
myVisMatTool.Nullify();
} }
myDefStyle = theDefStyle; myDefStyle = theDefStyle;
@ -309,7 +321,7 @@ void XCAFPrs_DocumentExplorer::initCurrent (Standard_Boolean theIsAssmebly)
XCAFDoc_ShapeTool::GetReferredShape (myCurrent.Label, myCurrent.RefLabel); XCAFDoc_ShapeTool::GetReferredShape (myCurrent.Label, myCurrent.RefLabel);
myCurrent.LocalTrsf= XCAFDoc_ShapeTool::GetLocation (myCurrent.Label); myCurrent.LocalTrsf= XCAFDoc_ShapeTool::GetLocation (myCurrent.Label);
myCurrent.Location = myCurrent.LocalTrsf; myCurrent.Location = myCurrent.LocalTrsf;
myCurrent.Style = mergedStyle (myColorTool, myDefStyle, myCurrent.Label, myCurrent.RefLabel); myCurrent.Style = mergedStyle (myColorTool, myVisMatTool, myDefStyle, myCurrent.Label, myCurrent.RefLabel);
myCurrent.Id = DefineChildId (myCurrent.Label, TCollection_AsciiString()); myCurrent.Id = DefineChildId (myCurrent.Label, TCollection_AsciiString());
} }
else else
@ -320,7 +332,7 @@ void XCAFPrs_DocumentExplorer::initCurrent (Standard_Boolean theIsAssmebly)
XCAFDoc_ShapeTool::GetReferredShape (myCurrent.Label, myCurrent.RefLabel); XCAFDoc_ShapeTool::GetReferredShape (myCurrent.Label, myCurrent.RefLabel);
myCurrent.LocalTrsf= XCAFDoc_ShapeTool::GetLocation (myCurrent.Label); myCurrent.LocalTrsf= XCAFDoc_ShapeTool::GetLocation (myCurrent.Label);
myCurrent.Location = aTopNodeInStack.Location * myCurrent.LocalTrsf; myCurrent.Location = aTopNodeInStack.Location * myCurrent.LocalTrsf;
myCurrent.Style = mergedStyle (myColorTool, aTopNodeInStack.Style, myCurrent.Label, myCurrent.RefLabel); myCurrent.Style = mergedStyle (myColorTool, myVisMatTool, aTopNodeInStack.Style, myCurrent.Label, myCurrent.RefLabel);
myCurrent.Id = DefineChildId (myCurrent.Label, aTopNodeInStack.Id); myCurrent.Id = DefineChildId (myCurrent.Label, aTopNodeInStack.Id);
} }
} }
@ -359,7 +371,7 @@ void XCAFPrs_DocumentExplorer::Next()
aNodeInStack.ChildIter = TDF_ChildIterator (aNodeInStack.RefLabel); aNodeInStack.ChildIter = TDF_ChildIterator (aNodeInStack.RefLabel);
aNodeInStack.LocalTrsf = XCAFDoc_ShapeTool::GetLocation (aNodeInStack.Label); aNodeInStack.LocalTrsf = XCAFDoc_ShapeTool::GetLocation (aNodeInStack.Label);
aNodeInStack.Location = aNodeInStack.LocalTrsf; aNodeInStack.Location = aNodeInStack.LocalTrsf;
aNodeInStack.Style = mergedStyle (myColorTool, myDefStyle, aNodeInStack.Label, aNodeInStack.RefLabel); aNodeInStack.Style = mergedStyle (myColorTool, myVisMatTool, myDefStyle, aNodeInStack.Label, aNodeInStack.RefLabel);
aNodeInStack.Id = DefineChildId (aNodeInStack.Label, TCollection_AsciiString()); aNodeInStack.Id = DefineChildId (aNodeInStack.Label, TCollection_AsciiString());
myNodeStack.SetValue (0, aNodeInStack); myNodeStack.SetValue (0, aNodeInStack);
if ((myFlags & XCAFPrs_DocumentExplorerFlags_OnlyLeafNodes) == 0) if ((myFlags & XCAFPrs_DocumentExplorerFlags_OnlyLeafNodes) == 0)
@ -408,7 +420,7 @@ void XCAFPrs_DocumentExplorer::Next()
aNodeInStack.RefLabel = aRefLabel; aNodeInStack.RefLabel = aRefLabel;
aNodeInStack.LocalTrsf = XCAFDoc_ShapeTool::GetLocation (aNodeInStack.Label); aNodeInStack.LocalTrsf = XCAFDoc_ShapeTool::GetLocation (aNodeInStack.Label);
aNodeInStack.Location = aParent.Location * aNodeInStack.LocalTrsf; aNodeInStack.Location = aParent.Location * aNodeInStack.LocalTrsf;
aNodeInStack.Style = mergedStyle (myColorTool, aParent.Style, aNodeInStack.Label, aNodeInStack.RefLabel); aNodeInStack.Style = mergedStyle (myColorTool, myVisMatTool, aParent.Style, aNodeInStack.Label, aNodeInStack.RefLabel);
aNodeInStack.Id = DefineChildId (aNodeInStack.Label, aParent.Id); aNodeInStack.Id = DefineChildId (aNodeInStack.Label, aParent.Id);
aNodeInStack.ChildIter = TDF_ChildIterator (aNodeInStack.RefLabel); aNodeInStack.ChildIter = TDF_ChildIterator (aNodeInStack.RefLabel);
myNodeStack.SetValue (myTop, aNodeInStack); myNodeStack.SetValue (myTop, aNodeInStack);

26
src/XCAFPrs/XCAFPrs_DocumentExplorer.hxx
View File

@ -24,6 +24,7 @@
class TDocStd_Document; class TDocStd_Document;
class XCAFDoc_ShapeTool; class XCAFDoc_ShapeTool;
class XCAFDoc_ColorTool; class XCAFDoc_ColorTool;
class XCAFDoc_VisMaterialTool;
typedef Standard_Integer XCAFPrs_DocumentExplorerFlags; typedef Standard_Integer XCAFPrs_DocumentExplorerFlags;
@ -148,6 +149,12 @@ public:
//! Go to the next node. //! Go to the next node.
Standard_EXPORT void Next(); Standard_EXPORT void Next();
//! Return color tool.
const Handle(XCAFDoc_ColorTool)& ColorTool() const { return myColorTool; }
//! Return material tool.
const Handle(XCAFDoc_VisMaterialTool)& VisMaterialTool() const { return myVisMatTool; }
protected: protected:
//! Initialize root label. //! Initialize root label.
@ -158,16 +165,17 @@ protected:
protected: protected:
Handle(XCAFDoc_ColorTool) myColorTool; //!< color tool Handle(XCAFDoc_ColorTool) myColorTool; //!< color tool
TDF_LabelSequence myRoots; //!< sequence of root labels Handle(XCAFDoc_VisMaterialTool) myVisMatTool; //!< visual material tool
TDF_LabelSequence::Iterator myRootIter; //!< current root label TDF_LabelSequence myRoots; //!< sequence of root labels
TDF_LabelSequence::Iterator myRootIter; //!< current root label
NCollection_Vector<XCAFPrs_DocumentNode> NCollection_Vector<XCAFPrs_DocumentNode>
myNodeStack; //!< node stack myNodeStack; //!< node stack
Standard_Integer myTop; //!< top position in the node stack Standard_Integer myTop; //!< top position in the node stack
Standard_Boolean myHasMore; //!< global flag indicating that iterator points to the label Standard_Boolean myHasMore; //!< global flag indicating that iterator points to the label
XCAFPrs_Style myDefStyle; //!< default style XCAFPrs_Style myDefStyle; //!< default style
XCAFPrs_DocumentNode myCurrent; //!< current label info XCAFPrs_DocumentNode myCurrent; //!< current label info
XCAFPrs_DocumentExplorerFlags myFlags; //!< iteration flags XCAFPrs_DocumentExplorerFlags myFlags; //!< iteration flags
}; };