X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_SymbolPrs.cpp;h=2d42f57a568f39160cb31d29760ed9d5137c4458;hb=8476d5e088f7b1b5a414fa5e33ce99d6131929eb;hp=699bbab1f55e350c8c65f1dc6435a91ea40f3538;hpb=a24b7e6f4d112d5e7889fd76f030298fc428cd01;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp index 699bbab1f..2d42f57a5 100644 --- a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp +++ b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp @@ -6,8 +6,13 @@ #include "SketcherPrs_SymbolPrs.h" #include "SketcherPrs_Tools.h" +#include "SketcherPrs_PositionMgr.h" #include +#include +#include + +#include #include #include @@ -18,6 +23,11 @@ #include #include #include +#include +#include +#include +#include +#include #include #include @@ -26,8 +36,6 @@ #include #include #include -#include -#include #ifdef WIN32 # define FSEP "\\" @@ -36,7 +44,7 @@ #endif /// Step between icons -static const double MyDist = 0.03; +static const double MyDist = 0.02; /// Function to convert opengl data type GLenum toGlDataType (const Graphic3d_TypeOfData theType, GLint& theNbComp) @@ -74,6 +82,8 @@ class SketcherPrs_VertexBuffer : public OpenGl_VertexBuffer public: //! Create uninitialized VBO.. + //! \param theAttribs attributes + //! \param theStride a flag SketcherPrs_VertexBuffer (const Graphic3d_Attribute* theAttribs, const Standard_Integer theStride) : Stride (theStride), NbAttributes(1) @@ -89,6 +99,7 @@ public: memcpy (Attribs, theAttribs.AttributesArray(), sizeof(Graphic3d_Attribute) * NbAttributes); } + /// Returns True if color attribute is defined virtual bool HasColorAttribute() const { for (Standard_Integer anAttribIter = 0; anAttribIter < NbAttributes; ++anAttribIter) { @@ -100,6 +111,7 @@ public: return false; } + /// Returns True if normal attribute is defined virtual bool HasNormalAttribute() const { for (Standard_Integer anAttribIter = 0; anAttribIter < NbAttributes; ++anAttribIter) { @@ -111,6 +123,8 @@ public: return false; } + /// Bind position of the attribute + /// \param theGlCtx OpenGl context virtual void BindPositionAttribute (const Handle(OpenGl_Context)& theGlCtx) const { if (!OpenGl_VertexBuffer::IsValid()) { @@ -134,6 +148,8 @@ public: } } + /// Bind all attributes + /// \param theGlCtx OpenGl context virtual void BindAllAttributes (const Handle(OpenGl_Context)& theGlCtx) const { if (!OpenGl_VertexBuffer::IsValid()) @@ -154,6 +170,8 @@ public: } } + /// Unbind all attributes + /// \param theGlCtx OpenGl context virtual void UnbindAllAttributes (const Handle(OpenGl_Context)& theGlCtx) const { if (!OpenGl_VertexBuffer::IsValid()) @@ -168,8 +186,13 @@ public: public: + /// Array of attributes Graphic3d_Attribute Attribs[1]; + + /// A flag Standard_Integer Stride; + + /// Number of attributes Standard_Integer NbAttributes; }; @@ -178,15 +201,21 @@ public: class SketcherPrs_Element: public OpenGl_Element { public: + /// Constructor + /// \param theObj a presentation SketcherPrs_Element(const Handle(SketcherPrs_SymbolPrs)& theObj) : OpenGl_Element(), myObj(theObj) {} + /// Render the current presentation + /// \param theWorkspace OpenGL workspace virtual void Render (const Handle(OpenGl_Workspace)& theWorkspace) const { if (!myObj.IsNull()) myObj->Render(theWorkspace); } + /// Releases OpenGL resources + /// \param theContext OpenGL context virtual void Release (OpenGl_Context* theContext) { if (!myObj.IsNull()) @@ -218,42 +247,58 @@ IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_SymbolPrs, AIS_InteractiveObject); std::map SketcherPrs_SymbolPrs::myIconsMap; -SketcherPrs_SymbolPrs::SketcherPrs_SymbolPrs(SketchPlugin_Constraint* theConstraint, +SketcherPrs_SymbolPrs::SketcherPrs_SymbolPrs(ModelAPI_Feature* theConstraint, const std::shared_ptr& thePlane) - : AIS_InteractiveObject(), myConstraint(theConstraint), myPlane(thePlane) + : AIS_InteractiveObject(), myConstraint(theConstraint), myPlane(thePlane), myIsConflicting(false) { SetAutoHilight(Standard_False); } +SketcherPrs_SymbolPrs::~SketcherPrs_SymbolPrs() +{ + SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get(); + // Empty memory in position manager + aMgr->deleteConstraint(this); +} + +#ifdef _WINDOWS +#pragma warning( disable : 4996 ) +#endif Handle(Image_AlienPixMap) SketcherPrs_SymbolPrs::icon() { if (myIconsMap.count(iconName()) == 1) { return myIconsMap[iconName()]; } - TCollection_AsciiString aFile(getenv("NewGeomResources")); - aFile += FSEP; - aFile += iconName(); - Handle(Image_AlienPixMap) aPixMap = new Image_AlienPixMap(); - if (aPixMap->Load(aFile)) { - myIconsMap[iconName()] = aPixMap; - return aPixMap; + // Load icon for the presentation + char* aEnv = getenv("SHAPERResources"); + if (aEnv != NULL) { + TCollection_AsciiString aFile(aEnv); + aFile += FSEP; + aFile += iconName(); + Handle(Image_AlienPixMap) aPixMap = new Image_AlienPixMap(); + if (aPixMap->Load(aFile)) { + myIconsMap[iconName()] = aPixMap; + return aPixMap; + } } + // The icon for constraint is not found + static const char aMsg[] = "Error! constraint images are not found"; + cout<Clear(); - } -} - void SketcherPrs_SymbolPrs::prepareAspect() { + // Create an aspect with the icon if (myAspect.IsNull()) { - myAspect = new Graphic3d_AspectMarker3d(icon()); + Handle(Image_AlienPixMap) aIcon = icon(); + if (aIcon.IsNull()) + myAspect = new Graphic3d_AspectMarker3d(); + else + myAspect = new Graphic3d_AspectMarker3d(aIcon); } } @@ -268,6 +313,7 @@ void SketcherPrs_SymbolPrs::addLine(const Handle(Graphic3d_Group)& theGroup, std std::shared_ptr aPnt1 = aEdge->firstPoint(); std::shared_ptr aPnt2 = aEdge->lastPoint(); + // Draw line by two points Handle(Graphic3d_ArrayOfSegments) aLines = new Graphic3d_ArrayOfSegments(2, 1); aLines->AddVertex(aPnt1->impl()); aLines->AddVertex(aPnt2->impl()); @@ -288,7 +334,8 @@ void SketcherPrs_SymbolPrs::HilightSelected(const Handle(PrsMgr_PresentationMana } void SketcherPrs_SymbolPrs::HilightOwnerWithColor(const Handle(PrsMgr_PresentationManager3d)& thePM, - const Quantity_NameOfColor theColor, const Handle(SelectMgr_EntityOwner)& theOwner) + const Quantity_NameOfColor theColor, + const Handle(SelectMgr_EntityOwner)& theOwner) { thePM->Color(this, theColor); @@ -304,6 +351,7 @@ void SketcherPrs_SymbolPrs::Compute(const Handle(PrsMgr_PresentationManager3d)& const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode) { + // Create an icon prepareAspect(); Handle(AIS_InteractiveContext) aCtx = GetContext(); @@ -313,21 +361,28 @@ void SketcherPrs_SymbolPrs::Compute(const Handle(PrsMgr_PresentationManager3d)& aDriver->UserDrawCallback() = SymbolPrsCallBack; } - if (!updatePoints(20)) + // Update points with default shift value + if (!updatePoints(20)) { + Events_Error::throwException("An empty AIS presentation: SketcherPrs_SymbolPrs"); return; + } int aNbVertex = myPntArray->VertexNumber(); if (myOwner.IsNull()) { myOwner = new SelectMgr_EntityOwner(this); - for (int i = 1; i <= aNbVertex; i++) { - Handle(SketcherPrs_SensitivePoint) aSP = new SketcherPrs_SensitivePoint(myOwner, myPntArray, i); - mySPoints.Append(aSP); - } + } + + // Create sensitive point for each symbol + mySPoints.Clear(); + for (int i = 1; i <= aNbVertex; i++) { + Handle(SketcherPrs_SensitivePoint) aSP = new SketcherPrs_SensitivePoint(myOwner, i); + mySPoints.Append(aSP); } Handle(Graphic3d_Group) aGroup = Prs3d_Root::NewGroup(thePresentation); aGroup->SetPrimitivesAspect(myAspect); + // Recompute boundary box of the group Graphic3d_BndBox4f& aBnd = aGroup->ChangeBoundingBox(); gp_Pnt aVert; aBnd.Clear(); @@ -336,30 +391,66 @@ void SketcherPrs_SymbolPrs::Compute(const Handle(PrsMgr_PresentationManager3d)& aBnd.Add (Graphic3d_Vec4((float)aVert.X(), (float)aVert.Y(), (float)aVert.Z(), 1.0f)); } + // Pint the group with custom procedure (see Render) aGroup->UserDraw(this, true); + + // Disable frustum culling for this object by marking it as mutable + aGroup->Structure()->SetMutable(true); //aGroup->AddPrimitiveArray(myPntArray); } void SketcherPrs_SymbolPrs::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection, - const Standard_Integer aMode) + const Standard_Integer aMode) { ClearSelected(); - for (int i = 1; i <= mySPoints.Length(); i++) - aSelection->Add(mySPoints.Value(i)); + if ((aMode == 0) || (aMode == SketcherPrs_Tools::Sel_Constraint)) { + for (int i = 1; i <= mySPoints.Length(); i++) + aSelection->Add(mySPoints.Value(i)); + } } +void SketcherPrs_SymbolPrs::SetConflictingConstraint(const bool& theConflicting, + const std::vector& theColor) +{ + if (theConflicting) + { + if (!myAspect.IsNull()) + myAspect->SetColor (Quantity_Color (theColor[0] / 255., theColor[1] / 255., theColor[2] / 255., + Quantity_TOC_RGB)); + myIsConflicting = true; + } + else + { + if (!myAspect.IsNull()) + myAspect->SetColor (Quantity_Color (1.0, 1.0, 0.0, Quantity_TOC_RGB)); + myIsConflicting = false; + } +} void SketcherPrs_SymbolPrs::Render(const Handle(OpenGl_Workspace)& theWorkspace) const { + // this method is a combination of OCCT OpenGL functions. The main purpose is to have + // equal distance from the source object to symbol indpendently of zoom. + // It is base on OCCT 6.9.1 and might need changes when using later OCCT versions. + // The specific SHAPER modifications are marked by ShaperModification:start/end, other is OCCT code + + // do not update presentation for invalid or already removed objects: the presentation + // should be removed soon + if (!myConstraint->data().get() || !myConstraint->data()->isValid()) + return; + const OpenGl_AspectMarker* anAspectMarker = theWorkspace->AspectMarker(Standard_True); const Handle(OpenGl_Context)& aCtx = theWorkspace->GetGlContext(); Handle(OpenGl_View) aView = theWorkspace->ActiveView(); + // ShaperModification:start double aScale = aView->Camera()->Scale(); + // Update points coordinate taking the viewer scale into account if (!updatePoints(MyDist * aScale)) return; + // ShaperModification:end Handle(Graphic3d_Buffer) aAttribs = myPntArray->Attributes(); @@ -367,6 +458,7 @@ void SketcherPrs_SymbolPrs::Render(const Handle(OpenGl_Workspace)& theWorkspace) myVboAttribs = new SketcherPrs_VertexBuffer(*aAttribs); } + // Update drawing attributes if (!myVboAttribs->init(aCtx, 0, aAttribs->NbElements, aAttribs->Data(), GL_NONE, aAttribs->Stride)) { myVboAttribs->Release (aCtx.operator->()); myVboAttribs.Nullify(); @@ -378,7 +470,10 @@ void SketcherPrs_SymbolPrs::Render(const Handle(OpenGl_Workspace)& theWorkspace) const Handle(OpenGl_PointSprite)& aSpriteNorm = anAspectMarker->SpriteRes(aCtx); if (!aSpriteNorm.IsNull() && !aSpriteNorm->IsDisplayList()) { - const bool toHilight = (theWorkspace->NamedStatus & OPENGL_NS_HIGHLIGHT) != 0; + // ShaperModification:start : filling the presentation with color if there is a conflict + const bool toHilight = (theWorkspace->NamedStatus & OPENGL_NS_HIGHLIGHT) != 0 || myIsConflicting; + // ShaperModification:end + const Handle(OpenGl_PointSprite)& aSprite = (toHilight && anAspectMarker->SpriteHighlightRes(aCtx)->IsValid()) ? anAspectMarker->SpriteHighlightRes(aCtx) : aSpriteNorm; @@ -388,6 +483,12 @@ void SketcherPrs_SymbolPrs::Render(const Handle(OpenGl_Workspace)& theWorkspace) if (theWorkspace->NamedStatus & OPENGL_NS_HIGHLIGHT) aLineColor = theWorkspace->HighlightColor; + // Set lighting of the symbol + if (toHilight) + aCtx->core11fwd->glDisable (GL_LIGHTING); + else + aCtx->core11fwd->glEnable (GL_LIGHTING); + aCtx->SetColor4fv(*(const OpenGl_Vec4* )(aLineColor->rgb)); @@ -409,13 +510,19 @@ void SketcherPrs_SymbolPrs::Render(const Handle(OpenGl_Workspace)& theWorkspace) theWorkspace->EnableTexture (aTextureBack); aCtx->BindProgram (NULL); - // Update selection position - GetContext()->RecomputeSelectionOnly(this); + // Update selection position only if there is no selected object + // because it can corrupt selection of other objects + if ((GetContext()->NbCurrents() == 0) && (GetContext()->NbSelected() == 0)) + { + GetContext()->MainSelector()->RebuildSensitivesTree (this); + GetContext()->MainSelector()->RebuildObjectsTree (false); + } } void SketcherPrs_SymbolPrs::Release (OpenGl_Context* theContext) { + // Release OpenGl resources if (!myVboAttribs.IsNull()) { if (theContext) { theContext->DelayedRelease (myVboAttribs); @@ -424,3 +531,57 @@ void SketcherPrs_SymbolPrs::Release (OpenGl_Context* theContext) } } +void SketcherPrs_SymbolPrs::drawShape(const std::shared_ptr& theShape, + const Handle(Prs3d_Presentation)& thePrs) const +{ + if (theShape->isEdge()) { + // The shape is edge + std::shared_ptr aCurve = + std::shared_ptr(new GeomAPI_Curve(theShape)); + if (aCurve->isLine()) { + // The shape is line + GeomAdaptor_Curve aCurv(aCurve->impl(), aCurve->startParam(), aCurve->endParam()); + StdPrs_Curve::Add(thePrs, aCurv, myDrawer); + } else { + // The shape is circle or arc + GeomAdaptor_Curve aAdaptor(aCurve->impl(), aCurve->startParam(), aCurve->endParam()); + StdPrs_DeflectionCurve::Add(thePrs,aAdaptor,myDrawer); + } + } else if (theShape->isVertex()) { + // draw vertex + std::shared_ptr aVertex = + std::shared_ptr(new GeomAPI_Vertex(theShape)); + std::shared_ptr aPnt = aVertex->point(); + Handle(Geom_CartesianPoint) aPoint = new Geom_CartesianPoint(aPnt->impl()); + StdPrs_Point::Add(thePrs, aPoint, myDrawer); + } +} + +void SketcherPrs_SymbolPrs::drawListOfShapes(const std::shared_ptr& theListAttr, + const Handle(Prs3d_Presentation)& thePrs) const +{ + int aNb = theListAttr->size(); + if (aNb == 0) + return; + int i; + ObjectPtr aObj; + for (i = 0; i < aNb; i++) { + aObj = theListAttr->object(i); + std::shared_ptr aShape = SketcherPrs_Tools::getShape(aObj); + if (aShape.get() != NULL) + drawShape(aShape, thePrs); + } +} + +void SketcherPrs_SymbolPrs::BoundingBox (Bnd_Box& theBndBox) +{ + Select3D_BndBox3d aTmpBox; + for (Select3D_EntitySequenceIter aPntIter (mySPoints); aPntIter.More(); aPntIter.Next()) { + const Handle(Select3D_SensitiveEntity)& anEnt = aPntIter.Value(); + aTmpBox.Combine (anEnt->BoundingBox()); + } + + theBndBox.Update (aTmpBox.CornerMin().x(), aTmpBox.CornerMin().y(), aTmpBox.CornerMin().z(), + aTmpBox.CornerMax().x(), aTmpBox.CornerMax().y(), aTmpBox.CornerMax().z()); +} +