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

0030337: Draw Harness, ViewerTest - do not restrict vtexture to AIS_Shape

Browse Source
This commit is contained in:
kgv 2018-11-02 18:40:51 +03:00 committed by bugmaster
parent 3c8287eb0a
commit c84c2ef70c
1 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/ViewerTest/ViewerTest.cxx
View File

@ -3453,7 +3453,8 @@ Standard_Integer VTexture (Draw_Interpretor& theDi, Standard_Integer theArgsNb,
Graphic3d_TypeOfTextureFilter aFilter = Graphic3d_TOTF_NEAREST; Graphic3d_TypeOfTextureFilter aFilter = Graphic3d_TOTF_NEAREST;
Graphic3d_LevelOfTextureAnisotropy anAnisoFilter = Graphic3d_LOTA_OFF; Graphic3d_LevelOfTextureAnisotropy anAnisoFilter = Graphic3d_LOTA_OFF;
Handle(AIS_Shape) aTexturedIO; Handle(AIS_InteractiveObject) aTexturedIO;
Handle(AIS_Shape) aTexturedShape;
Handle(Graphic3d_TextureSet) aTextureSetOld; Handle(Graphic3d_TextureSet) aTextureSetOld;
NCollection_Vector<Handle(Graphic3d_Texture2Dmanual)> aTextureVecNew; NCollection_Vector<Handle(Graphic3d_Texture2Dmanual)> aTextureVecNew;
bool toSetGenRepeat = false; bool toSetGenRepeat = false;
@ -3480,7 +3481,8 @@ Standard_Integer VTexture (Draw_Interpretor& theDi, Standard_Integer theArgsNb,
const ViewerTest_DoubleMapOfInteractiveAndName& aMapOfIO = GetMapOfAIS(); const ViewerTest_DoubleMapOfInteractiveAndName& aMapOfIO = GetMapOfAIS();
if (aMapOfIO.IsBound2 (aName)) if (aMapOfIO.IsBound2 (aName))
{ {
aTexturedIO = Handle(AIS_Shape)::DownCast (aMapOfIO.Find2 (aName)); aTexturedIO = aMapOfIO.Find2 (aName);
aTexturedShape = Handle(AIS_Shape)::DownCast (aTexturedIO);
} }
if (aTexturedIO.IsNull()) if (aTexturedIO.IsNull())
{ {
@ -3493,9 +3495,10 @@ Standard_Integer VTexture (Draw_Interpretor& theDi, Standard_Integer theArgsNb,
aTextureSetOld = aTexturedIO->Attributes()->ShadingAspect()->Aspect()->TextureSet(); aTextureSetOld = aTexturedIO->Attributes()->ShadingAspect()->Aspect()->TextureSet();
} }
} }
else if (aNameCase == "-scale" else if (!aTexturedShape.IsNull()
|| aNameCase == "-setscale" && (aNameCase == "-scale"
|| aCommandName == "vtexscale") || aNameCase == "-setscale"
|| aCommandName == "vtexscale"))
{ {
if (aCommandName != "vtexscale") if (aCommandName != "vtexscale")
{ {
@ -3509,7 +3512,7 @@ Standard_Integer VTexture (Draw_Interpretor& theDi, Standard_Integer theArgsNb,
toSetGenScale = true; toSetGenScale = true;
if (aValUCase == "off") if (aValUCase == "off")
{ {
aTexturedIO->SetTextureScaleUV (gp_Pnt2d (1.0, 1.0)); aTexturedShape->SetTextureScaleUV (gp_Pnt2d (1.0, 1.0));
continue; continue;
} }
else if (anArgIter + 1 < theArgsNb) else if (anArgIter + 1 < theArgsNb)
@ -3518,7 +3521,7 @@ Standard_Integer VTexture (Draw_Interpretor& theDi, Standard_Integer theArgsNb,
if (aValU.IsRealValue() if (aValU.IsRealValue()
&& aValV.IsRealValue()) && aValV.IsRealValue())
{ {
aTexturedIO->SetTextureScaleUV (gp_Pnt2d (aValU.RealValue(), aValV.RealValue())); aTexturedShape->SetTextureScaleUV (gp_Pnt2d (aValU.RealValue(), aValV.RealValue()));
++anArgIter; ++anArgIter;
continue; continue;
} }
@ -3527,9 +3530,10 @@ Standard_Integer VTexture (Draw_Interpretor& theDi, Standard_Integer theArgsNb,
std::cout << "Syntax error: unexpected argument '" << aName << "'\n"; std::cout << "Syntax error: unexpected argument '" << aName << "'\n";
return 1; return 1;
} }
else if (aNameCase == "-origin" else if (!aTexturedShape.IsNull()
|| aNameCase == "-setorigin" && (aNameCase == "-origin"
|| aCommandName == "vtexorigin") || aNameCase == "-setorigin"
|| aCommandName == "vtexorigin"))
{ {
if (aCommandName != "vtexorigin") if (aCommandName != "vtexorigin")
{ {
@ -3543,7 +3547,7 @@ Standard_Integer VTexture (Draw_Interpretor& theDi, Standard_Integer theArgsNb,
toSetGenOrigin = true; toSetGenOrigin = true;
if (aValUCase == "off") if (aValUCase == "off")
{ {
aTexturedIO->SetTextureOriginUV (gp_Pnt2d (0.0, 0.0)); aTexturedShape->SetTextureOriginUV (gp_Pnt2d (0.0, 0.0));
continue; continue;
} }
else if (anArgIter + 1 < theArgsNb) else if (anArgIter + 1 < theArgsNb)
@ -3552,7 +3556,7 @@ Standard_Integer VTexture (Draw_Interpretor& theDi, Standard_Integer theArgsNb,
if (aValU.IsRealValue() if (aValU.IsRealValue()
&& aValV.IsRealValue()) && aValV.IsRealValue())
{ {
aTexturedIO->SetTextureOriginUV (gp_Pnt2d (aValU.RealValue(), aValV.RealValue())); aTexturedShape->SetTextureOriginUV (gp_Pnt2d (aValU.RealValue(), aValV.RealValue()));
++anArgIter; ++anArgIter;
continue; continue;
} }
@ -3561,9 +3565,10 @@ Standard_Integer VTexture (Draw_Interpretor& theDi, Standard_Integer theArgsNb,
std::cout << "Syntax error: unexpected argument '" << aName << "'\n"; std::cout << "Syntax error: unexpected argument '" << aName << "'\n";
return 1; return 1;
} }
else if (aNameCase == "-repeat" else if (!aTexturedShape.IsNull()
|| aNameCase == "-setrepeat" && (aNameCase == "-repeat"
|| aCommandName == "vtexrepeat") || aNameCase == "-setrepeat"
|| aCommandName == "vtexrepeat"))
{ {
if (aCommandName != "vtexrepeat") if (aCommandName != "vtexrepeat")
{ {
@ -3577,7 +3582,7 @@ Standard_Integer VTexture (Draw_Interpretor& theDi, Standard_Integer theArgsNb,
toSetGenRepeat = true; toSetGenRepeat = true;
if (aValUCase == "off") if (aValUCase == "off")
{ {
aTexturedIO->SetTextureRepeatUV (gp_Pnt2d (1.0, 1.0)); aTexturedShape->SetTextureRepeatUV (gp_Pnt2d (1.0, 1.0));
continue; continue;
} }
else if (anArgIter + 1 < theArgsNb) else if (anArgIter + 1 < theArgsNb)
@ -3586,7 +3591,7 @@ Standard_Integer VTexture (Draw_Interpretor& theDi, Standard_Integer theArgsNb,
if (aValU.IsRealValue() if (aValU.IsRealValue()
&& aValV.IsRealValue()) && aValV.IsRealValue())
{ {
aTexturedIO->SetTextureRepeatUV (gp_Pnt2d (aValU.RealValue(), aValV.RealValue())); aTexturedShape->SetTextureRepeatUV (gp_Pnt2d (aValU.RealValue(), aValV.RealValue()));
++anArgIter; ++anArgIter;
continue; continue;
} }
@ -3833,6 +3838,10 @@ Standard_Integer VTexture (Draw_Interpretor& theDi, Standard_Integer theArgsNb,
if (!aTexturedIO->Attributes()->HasOwnShadingAspect()) if (!aTexturedIO->Attributes()->HasOwnShadingAspect())
{ {
if (aTexturedShape.IsNull())
{
aTexturedIO->SetToUpdate();
}
aTexturedIO->Attributes()->SetShadingAspect (new Prs3d_ShadingAspect()); aTexturedIO->Attributes()->SetShadingAspect (new Prs3d_ShadingAspect());
*aTexturedIO->Attributes()->ShadingAspect()->Aspect() = *aCtx->DefaultDrawer()->ShadingAspect()->Aspect(); *aTexturedIO->Attributes()->ShadingAspect()->Aspect() = *aCtx->DefaultDrawer()->ShadingAspect()->Aspect();
} }
@ -3922,33 +3931,45 @@ Standard_Integer VTexture (Draw_Interpretor& theDi, Standard_Integer theArgsNb,
&& (aCommandName == "vtexrepeat" && (aCommandName == "vtexrepeat"
|| toSetDefaults)) || toSetDefaults))
{ {
aTexturedIO->SetTextureRepeatUV (gp_Pnt2d (1.0, 1.0)); if (!aTexturedShape.IsNull())
{
aTexturedShape->SetTextureRepeatUV (gp_Pnt2d (1.0, 1.0));
}
toSetGenRepeat = true; toSetGenRepeat = true;
} }
if (!toSetGenOrigin if (!toSetGenOrigin
&& (aCommandName == "vtexorigin" && (aCommandName == "vtexorigin"
|| toSetDefaults)) || toSetDefaults))
{ {
aTexturedIO->SetTextureOriginUV (gp_Pnt2d (0.0, 0.0)); if (!aTexturedShape.IsNull())
{
aTexturedShape->SetTextureOriginUV (gp_Pnt2d (0.0, 0.0));
}
toSetGenOrigin = true; toSetGenOrigin = true;
} }
if (!toSetGenScale if (!toSetGenScale
&& (aCommandName == "vtexscale" && (aCommandName == "vtexscale"
|| toSetDefaults)) || toSetDefaults))
{ {
aTexturedIO->SetTextureScaleUV (gp_Pnt2d (1.0, 1.0)); if (!aTexturedShape.IsNull())
{
aTexturedShape->SetTextureScaleUV (gp_Pnt2d (1.0, 1.0));
}
toSetGenScale = true; toSetGenScale = true;
} }
if (toSetGenRepeat || toSetGenOrigin || toSetGenScale || toComputeUV) if (toSetGenRepeat || toSetGenOrigin || toSetGenScale || toComputeUV)
{ {
aTexturedIO->SetToUpdate (AIS_Shaded); if (!aTexturedShape.IsNull())
if (toSetImage)
{ {
if ((aTexturedIO->HasDisplayMode() && aTexturedIO->DisplayMode() != AIS_Shaded) aTexturedShape->SetToUpdate (AIS_Shaded);
|| aCtx->DisplayMode() != AIS_Shaded) if (toSetImage)
{ {
aCtx->SetDisplayMode (aTexturedIO, AIS_Shaded, false); if ((aTexturedIO->HasDisplayMode() && aTexturedIO->DisplayMode() != AIS_Shaded)
|| aCtx->DisplayMode() != AIS_Shaded)
{
aCtx->SetDisplayMode (aTexturedIO, AIS_Shaded, false);
}
} }
} }
} }