mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-04 13:13:25 +03:00
0024752: Visualization - inherit OpenGl_Group from Graphic3d_Group
Graphic3d_Group is now abstract class and should be instantiated using Graphic3d_Structure::NewGroup() method. Graphic3d_CGroup has been removed. The groups list is no more duplicated within Graphic3d_Structure and OpenGl_Structure. Removed unused/duplicated fields from Graphic3d_Group. Prs3d_Presentation - remove redundnant field myCurrentGroup. PrsMgr_Presentation3d::Erase(), ::Clear() - avoid possible NULL dereference. OpenGl_GraphicDriver/Graphic3d_GraphicDriver - group management methods have been removed (moved to Graphic3d_CStructure and Graphic3d_Group interfaces). Graphic3d_Group::GroupPrimitivesAspect() - copy IsEmission flag Fix wrong iterator Fix compilation issues
This commit is contained in:
@@ -307,7 +307,7 @@ void StdSelect_ViewerSelector3d::DisplayAreas (const Handle(V3d_View)& theView)
|
||||
|
||||
if (myareagroup.IsNull())
|
||||
{
|
||||
myareagroup = new Graphic3d_Group (mystruct);
|
||||
myareagroup = mystruct->NewGroup();
|
||||
}
|
||||
|
||||
SelectMgr_DataMapIteratorOfDataMapOfIntegerSensitive anIt (myentities);
|
||||
@@ -545,7 +545,7 @@ void StdSelect_ViewerSelector3d::DisplaySensitive (const Handle(V3d_View)& theVi
|
||||
|
||||
if (mysensgroup.IsNull())
|
||||
{
|
||||
mysensgroup = new Graphic3d_Group (mystruct);
|
||||
mysensgroup = mystruct->NewGroup();
|
||||
}
|
||||
|
||||
Quantity_Color aColor (Quantity_NOC_INDIANRED3);
|
||||
@@ -609,7 +609,7 @@ void StdSelect_ViewerSelector3d::DisplaySensitive (const Handle(SelectMgr_Select
|
||||
|
||||
if (mysensgroup.IsNull())
|
||||
{
|
||||
mysensgroup = new Graphic3d_Group (mystruct);
|
||||
mysensgroup = mystruct->NewGroup();
|
||||
Quantity_Color aColor (Quantity_NOC_INDIANRED3);
|
||||
Handle(Graphic3d_AspectMarker3d) aMarkerAspect =
|
||||
new Graphic3d_AspectMarker3d (Aspect_TOM_O_PLUS, aColor, 2.0);
|
||||
@@ -647,9 +647,8 @@ void StdSelect_ViewerSelector3d::DisplayAreas (const Handle(SelectMgr_Selection)
|
||||
|
||||
if (mysensgroup.IsNull())
|
||||
{
|
||||
myareagroup = new Graphic3d_Group (mystruct);
|
||||
myareagroup->SetGroupPrimitivesAspect (
|
||||
new Graphic3d_AspectLine3d (Quantity_NOC_AQUAMARINE1, Aspect_TOL_DASH, 1.0));
|
||||
myareagroup = mystruct->NewGroup();
|
||||
myareagroup->SetGroupPrimitivesAspect (new Graphic3d_AspectLine3d (Quantity_NOC_AQUAMARINE1, Aspect_TOL_DASH, 1.0));
|
||||
}
|
||||
|
||||
if (theToClearOthers)
|
||||
|
Reference in New Issue
Block a user