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

0029902: Data Exchange, XCAF - provide extended Material definition for visualization purposes

Browse Source 
Introduced new attribute XCAFDoc_VisMaterial storing visualization material definition.

XCAFPrs_Style has been exteneded Material() property.
XCAFPrs_AISObject::DispatchStyles() maps new XCAFPrs_Style::Material() property onto graphics aspects.

RWGltf_GltfJsonParser and RWObj_CafReader now put Material definition into XCAF document instead of a color label.
RWGltf_MaterialMetallicRoughness - added missing properties AlphaMode, AlphaCutOff and IsDoubleSided;
fixed default values in constructor for Metallic and Roughness.

Added commands XGetAllVisMaterials, XGetVisMaterial, XAddVisMaterial,
XRemoveVisMaterial, XSetVisMaterial, XUnsetVisMaterial for working with
new visualization materials table in the document.
This commit is contained in:
kgv
2019-07-03 11:28:26 +03:00
committed by apn
parent ba00aab7a0
commit a4815d5509
49 changed files with 3252 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/XCAFDoc/XCAFDoc_ColorTool.cxx
View File

@@ -33,7 +33,25 @@
IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_ColorTool,TDF_Attribute)
#define AUTONAMING // automatically set names for labels
static Standard_Boolean XCAFDoc_ColorTool_AutoNaming = Standard_True;
//=======================================================================
//function : SetAutoNaming
//purpose :
//=======================================================================
void XCAFDoc_ColorTool::SetAutoNaming (Standard_Boolean theIsAutoNaming)
{
XCAFDoc_ColorTool_AutoNaming = theIsAutoNaming;
}
//=======================================================================
//function : AutoNaming
//purpose :
//=======================================================================
Standard_Boolean XCAFDoc_ColorTool::AutoNaming()
{
return XCAFDoc_ColorTool_AutoNaming;
}
//=======================================================================
//function : BaseLabel
@@ -175,36 +193,32 @@ TDF_Label XCAFDoc_ColorTool::AddColor (const Quantity_Color& col) const
//purpose :
//=======================================================================
TDF_Label XCAFDoc_ColorTool::AddColor(const Quantity_ColorRGBA& col) const
TDF_Label XCAFDoc_ColorTool::AddColor (const Quantity_ColorRGBA& theColor) const
{
TDF_Label L;
if (FindColor(col, L)) return L;
TDF_Label aLab;
if (FindColor (theColor, aLab))
{
return aLab;
}
// create a new color entry
TDF_TagSource aTag;
L = aTag.NewChild(Label());
aLab = aTag.NewChild (Label());
XCAFDoc_Color::Set (aLab, theColor);
XCAFDoc_Color::Set(L, col);
if (XCAFDoc_ColorTool_AutoNaming)
{
// set name according to color value
const NCollection_Vec4<float>& anRgbaF = theColor;
const NCollection_Vec4<unsigned int> anRgba (anRgbaF * 255.0f);
char aColorHex[32];
Sprintf (aColorHex, "%02X%02X%02X%02X", anRgba.r(), anRgba.g(), anRgba.b(), anRgba.a());
const TCollection_AsciiString aName = TCollection_AsciiString (Quantity_Color::StringName (theColor.GetRGB().Name()))
+ " (#" + aColorHex + ")";
TDataStd_Name::Set (aLab, aName);
}
#ifdef AUTONAMING
// set name according to color value
TCollection_AsciiString str;
Quantity_Color aColor = col.GetRGB();
str += aColor.StringName(aColor.Name());
str += " (";
str += TCollection_AsciiString(aColor.Red());
str += ",";
str += TCollection_AsciiString(aColor.Green());
str += ",";
str += TCollection_AsciiString(aColor.Blue());
str += ",";
str += TCollection_AsciiString(col.Alpha());
str += ")";
TDataStd_Name::Set(L, str);
#endif
return L;
return aLab;
}
//=======================================================================