OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0024497: TKOpenGl, OpenGl_Context - Add getter for window field

Browse Source
This commit is contained in:
kgv
2014-01-08 12:21:29 +04:00
committed by bugmaster
parent b3a7aa39a1
commit 7e7c2f0b6f
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenGl/OpenGl_Context.cxx
View File

@@ -363,7 +363,7 @@ Standard_Boolean OpenGl_Context::CheckExtension (const char* theExtName) const
const char* anExtString = (const char* )glGetString (GL_EXTENSIONS); const char* anExtString = (const char* )glGetString (GL_EXTENSIONS);
if (anExtString == NULL) if (anExtString == NULL)
{ {
Messanger()->Send ("TKOpenGL: glGetString (GL_EXTENSIONS) has returned NULL! No GL context?", Message_Warning); Messenger()->Send ("TKOpenGL: glGetString (GL_EXTENSIONS) has returned NULL! No GL context?", Message_Warning);
return Standard_False; return Standard_False;
} }
return CheckExtension (anExtString, theExtName); return CheckExtension (anExtString, theExtName);
@@ -636,7 +636,7 @@ void OpenGl_Context::PushMessage (const unsigned int theSource,
aMsg += " | Message:\n "; aMsg += " | Message:\n ";
aMsg += theMessage; aMsg += theMessage;
Messanger()->Send (aMsg, aGrav); Messenger()->Send (aMsg, aGrav);
} }
// ======================================================================= // =======================================================================

30
src/OpenGl/OpenGl_Context.hxx
View File

@@ -113,8 +113,8 @@ public:
//! theShareCtx - handle to context to retrieve handles to shared resources. //! theShareCtx - handle to context to retrieve handles to shared resources.
Standard_EXPORT void Share (const Handle(OpenGl_Context)& theShareCtx); Standard_EXPORT void Share (const Handle(OpenGl_Context)& theShareCtx);
//! Initialize available extensions. //! Initialize class from currently bound OpenGL context. Method should be called only once.
//! GL context should be active! //! @return false if no GL context is bound to the current thread
Standard_EXPORT Standard_Boolean Init(); Standard_EXPORT Standard_Boolean Init();
//! @return true if this context is valid (has been initialized) //! @return true if this context is valid (has been initialized)
@@ -124,15 +124,33 @@ public:
} }
#if defined(_WIN32) #if defined(_WIN32)
//! Initialize class from specified window and rendering context. Method should be called only once.
//! @return false if OpenGL context can not be bound to specified window
Standard_EXPORT Standard_Boolean Init (const Aspect_Handle theWindow, Standard_EXPORT Standard_Boolean Init (const Aspect_Handle theWindow,
const Aspect_Handle theWindowDC, const Aspect_Handle theWindowDC,
const Aspect_RenderingContext theGContext); const Aspect_RenderingContext theGContext);
//! @return the window handle (HWND) currently bound to this OpenGL context
inline Aspect_Handle Window() const
{
return myWindow;
}
#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX) #elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
//! Initialize class from specified OpenGL context (NSOpenGLContext). Method should be called only once.
Standard_EXPORT Standard_Boolean Init (const void* theGContext); Standard_EXPORT Standard_Boolean Init (const void* theGContext);
#else #else
//! Initialize class from specified window and rendering context. Method should be called only once.
//! @return false if OpenGL context can not be bound to specified window
Standard_EXPORT Standard_Boolean Init (const Aspect_Drawable theWindow, Standard_EXPORT Standard_Boolean Init (const Aspect_Drawable theWindow,
const Aspect_Display theDisplay, const Aspect_Display theDisplay,
const Aspect_RenderingContext theGContext); const Aspect_RenderingContext theGContext);
//! @return the window handle (GLXDrawable) currently bound to this OpenGL context
inline Aspect_Drawable Window() const
{
return myWindow;
}
#endif #endif
//! Check if theExtName extension is supported by active GL context. //! Check if theExtName extension is supported by active GL context.
@@ -156,7 +174,7 @@ public:
//! @return true if detected GL version is greater or equal to requested one. //! @return true if detected GL version is greater or equal to requested one.
inline Standard_Boolean IsGlGreaterEqual (const Standard_Integer theVerMajor, inline Standard_Boolean IsGlGreaterEqual (const Standard_Integer theVerMajor,
const Standard_Integer theVerMinor) const Standard_Integer theVerMinor) const
{ {
return (myGlVerMajor > theVerMajor) return (myGlVerMajor > theVerMajor)
|| (myGlVerMajor == theVerMajor && myGlVerMinor >= theVerMinor); || (myGlVerMajor == theVerMajor && myGlVerMinor >= theVerMinor);
@@ -262,15 +280,15 @@ public:
Standard_EXPORT Standard_Integer MaxTextureSize() const; Standard_EXPORT Standard_Integer MaxTextureSize() const;
//! Get maximum number of clip planes supported by OpenGl. //! Get maximum number of clip planes supported by OpenGl.
//! This value is implementation dependant. At least 6 //! This value is implementation dependent. At least 6
//! planes should be supported by OpenGl (see specs). //! planes should be supported by OpenGl (see specs).
//! @return value for GL_MAX_CLIP_PLANES //! @return value for GL_MAX_CLIP_PLANES
Standard_EXPORT Standard_Integer MaxClipPlanes() const; Standard_EXPORT Standard_Integer MaxClipPlanes() const;
public: public:
//! @return messanger instance //! @return messenger instance
inline const Handle_Message_Messenger& Messanger() const inline const Handle_Message_Messenger& Messenger() const
{ {
return ::Message::DefaultMessenger(); return ::Message::DefaultMessenger();
} }