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

0028668: Point Cloud Rendering - standard selection API returns invalid values

Browse Source 
Added an argument to OpenGl_GraphicDriver::GetSharedContext() for returning only currently bound OpenGL context.
SelectMgr_SelectingVolumeManager::GetMousePosition() - added getter returning mouse coordinates.
This commit is contained in:
kgv 2019-05-30 10:02:25 +03:00 committed by bugmaster
parent edc4ba21c4
commit b30b2c1381
5 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/OpenGl/OpenGl_GraphicDriver.cxx
View File

@ -447,24 +447,27 @@ void OpenGl_GraphicDriver::EnableVBO (const Standard_Boolean theToTurnOn)
// function : GetSharedContext
// purpose :
// =======================================================================
const Handle(OpenGl_Context)& OpenGl_GraphicDriver::GetSharedContext() const
const Handle(OpenGl_Context)& OpenGl_GraphicDriver::GetSharedContext (bool theBound) const
{
if (myMapOfView.IsEmpty())
{
return TheNullGlCtx;
}
NCollection_Map<Handle(OpenGl_View)>::Iterator anIter (myMapOfView);
for (; anIter.More(); anIter.Next())
for (NCollection_Map<Handle(OpenGl_View)>::Iterator aViewIter (myMapOfView); aViewIter.More(); aViewIter.Next())
{
Handle(OpenGl_Window) aWindow = anIter.Value()->GlWindow();
if (aWindow.IsNull())
if (const Handle(OpenGl_Window)& aWindow = aViewIter.Value()->GlWindow())
{
if (!theBound)
{
continue;
}
return aWindow->GetGlContext();
}
else if (aWindow->GetGlContext()->IsCurrent())
{
return aWindow->GetGlContext();
}
}
}
return TheNullGlCtx;
}

4
src/OpenGl/OpenGl_GraphicDriver.hxx
View File

@ -153,7 +153,9 @@ public:
//! Method to retrieve valid GL context.
//! Could return NULL-handle if no window created by this driver.
Standard_EXPORT const Handle(OpenGl_Context)& GetSharedContext() const;
//! @param theBound if TRUE then currently bound context will be returned,
//! any context will be returned otherwise
Standard_EXPORT const Handle(OpenGl_Context)& GetSharedContext (bool theBound = false) const;
#if defined(HAVE_EGL) || defined(HAVE_GLES2) || defined(OCCT_UWP) || defined(__ANDROID__) || defined(__QNX__)
Aspect_Display getRawGlDisplay() const { return myEglDisplay; }

3
src/SelectBasics/SelectBasics_SelectingVolumeManager.hxx
View File

@ -109,6 +109,9 @@ public:
//! correspondingly) onto far view frustum plane
virtual gp_Pnt GetFarPickedPnt() const = 0;
//! Return mouse coordinates for Point selection mode.
virtual gp_Pnt2d GetMousePosition() const = 0;
//! Stores plane equation coefficients (in the following form:
//! Ax + By + Cz + D = 0) to the given vector
virtual void GetPlanes (NCollection_Vector<NCollection_Vec4<Standard_Real> >& thePlaneEquations) const = 0;

3
src/SelectMgr/SelectMgr_RectangularFrustum.hxx
View File

@ -133,6 +133,9 @@ public:
//! correspondingly) onto far view frustum plane
inline const gp_Pnt& GetFarPnt() const { return myFarPickedPnt; }
//! Return mouse coordinates.
const gp_Pnt2d& GetMousePosition() const { return myMousePos; }
//! Stores plane equation coefficients (in the following form:
//! Ax + By + Cz + D = 0) to the given vector
Standard_EXPORT virtual void GetPlanes (NCollection_Vector<SelectMgr_Vec4>& thePlaneEquations) const Standard_OVERRIDE;

11
src/SelectMgr/SelectMgr_SelectingVolumeManager.hxx
View File

@ -196,6 +196,17 @@ public:
//! correspondingly) onto far view frustum plane
Standard_EXPORT virtual gp_Pnt GetFarPickedPnt() const Standard_OVERRIDE;
//! Return mouse coordinates for Point selection mode.
virtual gp_Pnt2d GetMousePosition() const Standard_OVERRIDE
{
if (myActiveSelectionType != Point)
{
return gp_Pnt2d (RealLast(), RealLast());
}
const SelectMgr_RectangularFrustum* aFr = reinterpret_cast<const SelectMgr_RectangularFrustum*> (mySelectingVolumes[myActiveSelectionType / 2].get());
return aFr->GetMousePosition();
}
//! Returns active selecting volume that was built during last
//! run of OCCT selection mechanism
Handle(SelectMgr_BaseFrustum) ActiveVolume() const