mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-09-03 14:10:33 +03:00
0023243: Adapt OpenGL viewer for using in Cocoa applications on Mac OS X
Cocoa_Window draft OpenGl_Context and OpenGl_Window - added support for Cocoa OpenGL context TKV3d - accept Cocoa_Window Draft version of ViewerInit method for Mac OS X Added ViewerTest_CocoaEventManagerView ViewerTest - attach events to Cocoa window Cocoa_Window - disable autorelease on close Fix for OpenGl_Context::Init method Cocoa_Window - convert top-left coordinates to bottom-left Added selection with rubber band (rubber band drawing still should be implemented) Fixed OpenGl_Display initialization on Mac OS X Fixed OpenGl includes
This commit is contained in:
@@ -100,6 +100,8 @@ public:
|
||||
Standard_EXPORT Standard_Boolean Init (const Aspect_Handle theWindow,
|
||||
const Aspect_Handle theWindowDC,
|
||||
const Aspect_RenderingContext theGContext);
|
||||
#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
|
||||
Standard_EXPORT Standard_Boolean Init (const void* theGContext);
|
||||
#else
|
||||
Standard_EXPORT Standard_Boolean Init (const Aspect_Drawable theWindow,
|
||||
const Aspect_Display theDisplay,
|
||||
@@ -253,6 +255,8 @@ private: // system-dependent fields
|
||||
Aspect_Handle myWindow; //!< window handle (owner of GL context) : HWND
|
||||
Aspect_Handle myWindowDC; //!< Device Descriptor handle : HDC
|
||||
Aspect_RenderingContext myGContext; //!< Rendering Context handle : HGLRC
|
||||
#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
|
||||
void* myGContext; //!< Rendering Context handle : NSOpenGLContext
|
||||
#else
|
||||
Aspect_Drawable myWindow; //!< window handle (owner of GL context) : GLXDrawable
|
||||
Aspect_Display myDisplay; //!< connection to the X-server : Display*
|
||||
|
Reference in New Issue
Block a user