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

0027039: Draw Harness, ViewerTest - Fix rubber-band blinking

Browse Source 
ViewerTest - eliminate redundant redraw calls.
Configure AIS_RubberBand to use filled style.

AIS_RubberBand - define vertex normals to workaround transparency issue in TKOpenGl.
This commit is contained in:
kgv 2015-12-25 15:53:27 +03:00 committed by bugmaster
parent 80dcde2ef3
commit 69adb9ce17
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/AIS/AIS_RubberBand.cxx
View File

@ -42,6 +42,7 @@ AIS_RubberBand::AIS_RubberBand()
{ {
myDrawer->SetLineAspect (new Prs3d_LineAspect (Quantity_NOC_WHITE, Aspect_TOL_SOLID, 1.0)); myDrawer->SetLineAspect (new Prs3d_LineAspect (Quantity_NOC_WHITE, Aspect_TOL_SOLID, 1.0));
myDrawer->SetShadingAspect (new Prs3d_ShadingAspect()); myDrawer->SetShadingAspect (new Prs3d_ShadingAspect());
myDrawer->ShadingAspect()->SetMaterial (Graphic3d_NOM_PLASTIC);
myDrawer->ShadingAspect()->Aspect()->SetInteriorStyle (Aspect_IS_EMPTY); myDrawer->ShadingAspect()->Aspect()->SetInteriorStyle (Aspect_IS_EMPTY);
myDrawer->ShadingAspect()->SetTransparency (1.0); myDrawer->ShadingAspect()->SetTransparency (1.0);
myDrawer->ShadingAspect()->SetColor (Quantity_NOC_WHITE); myDrawer->ShadingAspect()->SetColor (Quantity_NOC_WHITE);
@ -60,6 +61,7 @@ AIS_RubberBand::AIS_RubberBand (const Quantity_Color& theLineColor,
{ {
myDrawer->SetLineAspect (new Prs3d_LineAspect (theLineColor, theLineType, theWidth)); myDrawer->SetLineAspect (new Prs3d_LineAspect (theLineColor, theLineType, theWidth));
myDrawer->SetShadingAspect (new Prs3d_ShadingAspect()); myDrawer->SetShadingAspect (new Prs3d_ShadingAspect());
myDrawer->ShadingAspect()->SetMaterial (Graphic3d_NOM_PLASTIC);
myDrawer->ShadingAspect()->Aspect()->SetInteriorStyle (Aspect_IS_EMPTY); myDrawer->ShadingAspect()->Aspect()->SetInteriorStyle (Aspect_IS_EMPTY);
myDrawer->ShadingAspect()->SetTransparency (1.0); myDrawer->ShadingAspect()->SetTransparency (1.0);
myDrawer->ShadingAspect()->SetColor (Quantity_NOC_WHITE); myDrawer->ShadingAspect()->SetColor (Quantity_NOC_WHITE);
@ -80,6 +82,7 @@ AIS_RubberBand::AIS_RubberBand (const Quantity_Color& theLineColor,
{ {
myDrawer->SetLineAspect (new Prs3d_LineAspect (theLineColor, theLineType, theLineWidth)); myDrawer->SetLineAspect (new Prs3d_LineAspect (theLineColor, theLineType, theLineWidth));
myDrawer->SetShadingAspect (new Prs3d_ShadingAspect()); myDrawer->SetShadingAspect (new Prs3d_ShadingAspect());
myDrawer->ShadingAspect()->SetMaterial (Graphic3d_NOM_PLASTIC);
myDrawer->ShadingAspect()->SetColor (theFillColor); myDrawer->ShadingAspect()->SetColor (theFillColor);
myDrawer->ShadingAspect()->Aspect()->SetInteriorStyle (Aspect_IS_SOLID); myDrawer->ShadingAspect()->Aspect()->SetInteriorStyle (Aspect_IS_SOLID);
myDrawer->ShadingAspect()->SetTransparency (theTransparency); myDrawer->ShadingAspect()->SetTransparency (theTransparency);
@ -324,7 +327,7 @@ Standard_Boolean AIS_RubberBand::fillTriangles()
if (myTriangles.IsNull() || myTriangles->VertexNumber() != myPoints.Length() + 1) if (myTriangles.IsNull() || myTriangles->VertexNumber() != myPoints.Length() + 1)
{ {
toFill = Standard_True; toFill = Standard_True;
myTriangles = new Graphic3d_ArrayOfTriangles (aTriangles.Extent() * 3); myTriangles = new Graphic3d_ArrayOfTriangles (aTriangles.Extent() * 3, 0, Standard_True);
} }
Standard_Integer aVertexIndex = 1; Standard_Integer aVertexIndex = 1;
@ -349,9 +352,11 @@ Standard_Boolean AIS_RubberBand::fillTriangles()
if (toFill) if (toFill)
{ {
gp_Dir aNorm = gp::DZ();
for (Standard_Integer anIt = 0; anIt < 3; ++anIt) for (Standard_Integer anIt = 0; anIt < 3; ++anIt)
{ {
myTriangles->AddVertex (aPts[anIt].X(), aPts[anIt].Y(), 0.0); myTriangles->AddVertex (aPts[anIt].X(), aPts[anIt].Y(), 0.0,
aNorm.X(), aNorm.Y(), aNorm.Z());
} }
} }
else else

15
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@ -201,7 +201,8 @@ Standard_EXPORT const Handle(AIS_RubberBand)& GetRubberBand()
static Handle(AIS_RubberBand) aBand; static Handle(AIS_RubberBand) aBand;
if (aBand.IsNull()) if (aBand.IsNull())
{ {
aBand = new AIS_RubberBand(); aBand = new AIS_RubberBand (Quantity_NOC_LIGHTBLUE, Aspect_TOL_SOLID, Quantity_NOC_LIGHTBLUE, 0.4, 1.0);
aBand->SetDisplayMode (0);
} }
return aBand; return aBand;
} }
@ -1940,10 +1941,11 @@ static LRESULT WINAPI AdvViewerWindowProc( HWND hwnd,
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
if (IsDragged) if (IsDragged)
{ {
bool toRedraw = false;
if (!DragFirst && ViewerTest::GetAISContext()->IsDisplayed (GetRubberBand())) if (!DragFirst && ViewerTest::GetAISContext()->IsDisplayed (GetRubberBand()))
{ {
ViewerTest::GetAISContext()->Remove (GetRubberBand(), Standard_False); ViewerTest::GetAISContext()->Remove (GetRubberBand(), Standard_False);
ViewerTest::GetAISContext()->CurrentViewer()->RedrawImmediate(); toRedraw = true;
} }
DragFirst = Standard_False; DragFirst = Standard_False;
@ -1955,7 +1957,11 @@ static LRESULT WINAPI AdvViewerWindowProc( HWND hwnd,
{ {
int aHeight = aRect.bottom - aRect.top; int aHeight = aRect.bottom - aRect.top;
GetRubberBand()->SetRectangle (X_ButtonPress, aHeight - Y_ButtonPress, X_Motion, aHeight - Y_Motion); GetRubberBand()->SetRectangle (X_ButtonPress, aHeight - Y_ButtonPress, X_Motion, aHeight - Y_Motion);
ViewerTest::GetAISContext()->Display (GetRubberBand(), Standard_False); ViewerTest::GetAISContext()->Display (GetRubberBand(), 0, -1, Standard_False, Standard_True, AIS_DS_Displayed);
toRedraw = true;
}
if (toRedraw)
{
ViewerTest::GetAISContext()->CurrentViewer()->RedrawImmediate(); ViewerTest::GetAISContext()->CurrentViewer()->RedrawImmediate();
} }
} }
@ -2370,7 +2376,6 @@ int ViewerMainLoop(Standard_Integer argc, const char** argv)
if (ViewerTest::GetAISContext()->IsDisplayed (GetRubberBand())) if (ViewerTest::GetAISContext()->IsDisplayed (GetRubberBand()))
{ {
ViewerTest::GetAISContext()->Remove (GetRubberBand(), Standard_False); ViewerTest::GetAISContext()->Remove (GetRubberBand(), Standard_False);
ViewerTest::GetAISContext()->CurrentViewer()->RedrawImmediate();
} }
} }
@ -2384,7 +2389,7 @@ int ViewerMainLoop(Standard_Integer argc, const char** argv)
unsigned int aWidth, aHeight, aBorderWidth, aDepth; unsigned int aWidth, aHeight, aBorderWidth, aDepth;
XGetGeometry (aDisplay, aWindow, &aRoot, &anX, &anY, &aWidth, &aHeight, &aBorderWidth, &aDepth); XGetGeometry (aDisplay, aWindow, &aRoot, &anX, &anY, &aWidth, &aHeight, &aBorderWidth, &aDepth);
GetRubberBand()->SetRectangle (X_ButtonPress, aHeight - Y_ButtonPress, X_Motion, aHeight - Y_Motion); GetRubberBand()->SetRectangle (X_ButtonPress, aHeight - Y_ButtonPress, X_Motion, aHeight - Y_Motion);
ViewerTest::GetAISContext()->Display (GetRubberBand(), Standard_False); ViewerTest::GetAISContext()->Display (GetRubberBand(), 0, -1, Standard_False, Standard_True, AIS_DS_Displayed);
ViewerTest::GetAISContext()->CurrentViewer()->RedrawImmediate(); ViewerTest::GetAISContext()->CurrentViewer()->RedrawImmediate();
} }
else else