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

0032567: Coding Rules - rename Graphic3d_TypeOfShadingModel values to include full enumeration name

Browse Source
This commit is contained in:
kgv
2021-09-13 22:19:54 +03:00
committed by smoskvin
parent e2421df543
commit 13b36bb14f
37 changed files with 159 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ViewerTest/ViewerTest.cxx
View File

@@ -340,43 +340,43 @@ Standard_Boolean ViewerTest::ParseShadingModel (Standard_CString th
|| aTypeStr == "color"
|| aTypeStr == "none")
{
theModel = Graphic3d_TOSM_UNLIT;
theModel = Graphic3d_TypeOfShadingModel_Unlit;
}
else if (aTypeStr == "flat"
|| aTypeStr == "facet")
{
theModel = Graphic3d_TOSM_FACET;
theModel = Graphic3d_TypeOfShadingModel_PhongFacet;
}
else if (aTypeStr == "gouraud"
|| aTypeStr == "vertex"
|| aTypeStr == "vert")
{
theModel = Graphic3d_TOSM_VERTEX;
theModel = Graphic3d_TypeOfShadingModel_Gouraud;
}
else if (aTypeStr == "phong"
|| aTypeStr == "fragment"
|| aTypeStr == "frag"
|| aTypeStr == "pixel")
{
theModel = Graphic3d_TOSM_FRAGMENT;
theModel = Graphic3d_TypeOfShadingModel_Phong;
}
else if (aTypeStr == "pbr")
{
theModel = Graphic3d_TOSM_PBR;
theModel = Graphic3d_TypeOfShadingModel_Pbr;
}
else if (aTypeStr == "pbr_facet")
{
theModel = Graphic3d_TOSM_PBR_FACET;
theModel = Graphic3d_TypeOfShadingModel_PbrFacet;
}
else if (aTypeStr == "default"
|| aTypeStr == "def")
{
theModel = Graphic3d_TOSM_DEFAULT;
theModel = Graphic3d_TypeOfShadingModel_DEFAULT;
}
else if (aTypeStr.IsIntegerValue())
{
const int aTypeInt = aTypeStr.IntegerValue();
if (aTypeInt <= Graphic3d_TOSM_DEFAULT || aTypeInt >= Graphic3d_TypeOfShadingModel_NB)
if (aTypeInt <= Graphic3d_TypeOfShadingModel_DEFAULT || aTypeInt >= Graphic3d_TypeOfShadingModel_NB)
{
return Standard_False;
}
@@ -1815,7 +1815,7 @@ struct ViewerTest_AspectsChangeSet
ToSetHatch (0),
StdHatchStyle (-1),
ToSetShadingModel (0),
ShadingModel (Graphic3d_TOSM_DEFAULT),
ShadingModel (Graphic3d_TypeOfShadingModel_DEFAULT),
ToSetInterior (0),
InteriorStyle (Aspect_IS_SOLID),
ToSetDrawSilhouette (0),
@@ -1909,7 +1909,7 @@ struct ViewerTest_AspectsChangeSet
isOk = Standard_False;
}
if (ToSetShadingModel == 1
&& (ShadingModel < Graphic3d_TOSM_DEFAULT || ShadingModel > Graphic3d_TOSM_PBR_FACET))
&& (ShadingModel < Graphic3d_TypeOfShadingModel_DEFAULT || ShadingModel > Graphic3d_TypeOfShadingModel_PbrFacet))
{
Message::SendFail() << "Error: unknown shading model " << ShadingModelName << ".";
isOk = Standard_False;
@@ -3114,7 +3114,7 @@ static Standard_Integer VAspects (Draw_Interpretor& theDI,
else if (anArg == "-unsetshadingmodel")
{
aChangeSet->ToSetShadingModel = -1;
aChangeSet->ShadingModel = Graphic3d_TOSM_DEFAULT;
aChangeSet->ShadingModel = Graphic3d_TypeOfShadingModel_DEFAULT;
}
else if (anArg == "-setinterior"
|| anArg == "-setinteriorstyle"
@@ -3243,7 +3243,7 @@ static Standard_Integer VAspects (Draw_Interpretor& theDI,
aChangeSet->StdHatchStyle = -1;
aChangeSet->PathToHatchPattern.Clear();
aChangeSet->ToSetShadingModel = -1;
aChangeSet->ShadingModel = Graphic3d_TOSM_DEFAULT;
aChangeSet->ShadingModel = Graphic3d_TypeOfShadingModel_DEFAULT;
aChangeSet->ToSetInterior = -1;
aChangeSet->InteriorStyle = Aspect_IS_SOLID;
aChangeSet->ToSetDrawSilhouette = -1;

32
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@@ -11333,13 +11333,13 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
theDI << "shadingModel: ";
switch (aView->ShadingModel())
{
case Graphic3d_TOSM_DEFAULT: theDI << "default"; break;
case Graphic3d_TOSM_UNLIT: theDI << "unlit"; break;
case Graphic3d_TOSM_FACET: theDI << "flat"; break;
case Graphic3d_TOSM_VERTEX: theDI << "gouraud"; break;
case Graphic3d_TOSM_FRAGMENT: theDI << "phong"; break;
case Graphic3d_TOSM_PBR: theDI << "pbr"; break;
case Graphic3d_TOSM_PBR_FACET: theDI << "pbr_facet"; break;
case Graphic3d_TypeOfShadingModel_DEFAULT: theDI << "default"; break;
case Graphic3d_TypeOfShadingModel_Unlit: theDI << "unlit"; break;
case Graphic3d_TypeOfShadingModel_PhongFacet: theDI << "flat"; break;
case Graphic3d_TypeOfShadingModel_Gouraud: theDI << "gouraud"; break;
case Graphic3d_TypeOfShadingModel_Phong: theDI << "phong"; break;
case Graphic3d_TypeOfShadingModel_Pbr: theDI << "pbr"; break;
case Graphic3d_TypeOfShadingModel_PbrFacet: theDI << "pbr_facet"; break;
}
theDI << "\n";
{
@@ -12130,13 +12130,13 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
{
switch (aView->ShadingModel())
{
case Graphic3d_TOSM_DEFAULT: theDI << "default"; break;
case Graphic3d_TOSM_UNLIT: theDI << "unlit "; break;
case Graphic3d_TOSM_FACET: theDI << "flat "; break;
case Graphic3d_TOSM_VERTEX: theDI << "gouraud "; break;
case Graphic3d_TOSM_FRAGMENT: theDI << "phong "; break;
case Graphic3d_TOSM_PBR: theDI << "pbr"; break;
case Graphic3d_TOSM_PBR_FACET: theDI << "pbr_facet"; break;
case Graphic3d_TypeOfShadingModel_DEFAULT: theDI << "default"; break;
case Graphic3d_TypeOfShadingModel_Unlit: theDI << "unlit "; break;
case Graphic3d_TypeOfShadingModel_PhongFacet: theDI << "flat "; break;
case Graphic3d_TypeOfShadingModel_Gouraud: theDI << "gouraud "; break;
case Graphic3d_TypeOfShadingModel_Phong: theDI << "phong "; break;
case Graphic3d_TypeOfShadingModel_Pbr: theDI << "pbr"; break;
case Graphic3d_TypeOfShadingModel_PbrFacet: theDI << "pbr_facet"; break;
}
continue;
}
@@ -12146,9 +12146,9 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Message::SendFail() << "Syntax error at argument '" << anArg << "'";
}
Graphic3d_TypeOfShadingModel aModel = Graphic3d_TOSM_DEFAULT;
Graphic3d_TypeOfShadingModel aModel = Graphic3d_TypeOfShadingModel_DEFAULT;
if (ViewerTest::ParseShadingModel (theArgVec[anArgIter], aModel)
&& aModel != Graphic3d_TOSM_DEFAULT)
&& aModel != Graphic3d_TypeOfShadingModel_DEFAULT)
{
aView->SetShadingModel (aModel);
}