0025973: Visualization, TKOpenGl - support EAGLContext as alternative to NSOpenGLContext

OpenGl_FrameBuffer::InitWithRB() - add method to initialize FBO with Render Buffer Objects.
OpenGl_FrameBuffer::InitWrapper() - add new method to initialize FBO from currently bound in context.

Aspect_RenderingContext - define type explicitly to EAGLContext* / NSOpenGLContext* for ARC.
OpenGl_Window - allow initialization from alien context for OS X / iOS.

src/Cocoa/Cocoa_LocalPool.hxx

@@ -14,7 +14,19 @@
 #ifndef __Cocoa_LocalPool_h_
 #define __Cocoa_LocalPool_h_
 
-//! Auxiliary class to create
+#if defined(__clang__) && (__clang_major__ >= 4) && __has_feature(objc_arc)
+
+// @autoreleasepool should be used within ARC
+
+#else
+
+#ifdef __OBJC__
+  @class NSAutoreleasePool;
+#else
+  struct NSAutoreleasePool;
+#endif
+
+//! Auxiliary class to create local pool.
 class Cocoa_LocalPool
 {
 
@@ -25,8 +37,10 @@ public:
 
 private:
 
-  void* myPoolObj;
+  NSAutoreleasePool* myPoolObj;
 
 };
 
+#endif // ARC
+
 #endif // __Cocoa_LocalPool_h_

src/Cocoa/Cocoa_LocalPool.mm

@@ -15,7 +15,17 @@
 
 #include <Cocoa_LocalPool.hxx>
 
-#import <Cocoa/Cocoa.h>
+#import <TargetConditionals.h>
+
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+  #import <UIKit/UIKit.h>
+#else
+  #import <Cocoa/Cocoa.h>
+#endif
+
+#if defined(__clang__) && (__clang_major__ >= 4) && __has_feature(objc_arc)
+  // ARC
+#else
 
 // =======================================================================
 // function : Cocoa_LocalPool
@@ -33,9 +43,10 @@ Cocoa_LocalPool::Cocoa_LocalPool()
 // =======================================================================
 Cocoa_LocalPool::~Cocoa_LocalPool()
 {
-  NSAutoreleasePool* aPool = (NSAutoreleasePool* )myPoolObj;
-  //[aPool drain];
-  [aPool release];
+  //[myPoolObj drain];
+  [myPoolObj release];
 }
 
+#endif
+
 #endif // __APPLE__

src/Cocoa/Cocoa_Window.hxx

@@ -16,12 +16,26 @@
 #ifndef _Cocoa_Window_H__
 #define _Cocoa_Window_H__
 
-#ifdef __OBJC__
-  @class NSView;
-  @class NSWindow;
+#if defined(__APPLE__)
+  #import <TargetConditionals.h>
+#endif
+
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+  #ifdef __OBJC__
+    @class UIView;
+    @class UIWindow;
+  #else
+    struct UIView;
+    struct UIWindow;
+  #endif
 #else
-  struct NSView;
-  struct NSWindow;
+  #ifdef __OBJC__
+    @class NSView;
+    @class NSWindow;
+  #else
+    struct NSView;
+    struct NSWindow;
+  #endif
 #endif
 
 #include <Aspect_Window.hxx>
@@ -56,8 +70,13 @@ public:
                                 const Standard_Integer thePxWidth,
                                 const Standard_Integer thePxHeight);
 
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+  //! Creates a wrapper over existing UIView handle
+  Standard_EXPORT Cocoa_Window (UIView* theViewUI);
+#else
   //! Creates a wrapper over existing NSView handle
   Standard_EXPORT Cocoa_Window (NSView* theViewNS);
+#endif
 
   //! Destroies the Window and all resourses attached to it
   Standard_EXPORT virtual  void Destroy();
@@ -95,11 +114,19 @@ public:
   Standard_EXPORT virtual void Size (Standard_Integer& theWidth,
                                      Standard_Integer& theHeight) const;
 
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+  //! @return associated UIView
+  UIView* HView() const { return myHView; }
+
+  //! Setup new UIView.
+  Standard_EXPORT void SetHView (UIView* theView);
+#else
   //! @return associated NSView
-  Standard_EXPORT NSView* HView() const;
+  NSView* HView() const { return myHView; }
 
   //! Setup new NSView.
   Standard_EXPORT void SetHView (NSView* theView);
+#endif
 
   //! @return native Window handle
   virtual Aspect_Drawable NativeHandle() const
@@ -115,8 +142,12 @@ public:
 
 protected:
 
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+  UIView*          myHView;
+#else
   NSWindow*        myHWindow;
   NSView*          myHView;
+#endif
   Standard_Integer myXLeft;
   Standard_Integer myYTop;
   Standard_Integer myXRight;

src/Cocoa/Cocoa_Window.mm

@@ -13,7 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#import <Cocoa/Cocoa.h>
+#import <TargetConditionals.h>
+
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+  #import <UIKit/UIKit.h>
+#else
+  #import <Cocoa/Cocoa.h>
+#endif
 
 #include <Cocoa_Window.hxx>
 
@@ -26,6 +32,13 @@
 IMPLEMENT_STANDARD_HANDLE (Cocoa_Window, Aspect_Window)
 IMPLEMENT_STANDARD_RTTIEXT(Cocoa_Window, Aspect_Window)
 
+#if defined(__clang__) && (__clang_major__ >= 4) && __has_feature(objc_arc)
+  #define HAVE_OBJC_ARC
+#endif
+
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+  //
+#else
 static Standard_Integer getScreenBottom()
 {
   Cocoa_LocalPool aLocalPool;
@@ -48,6 +61,7 @@ static Standard_Integer getScreenBottom()
   CGRect aRect = CGDisplayBounds(aDispId);
   return Standard_Integer(aRect.origin.y + aRect.size.height);
 }
+#endif
 
 // =======================================================================
 // function : Cocoa_Window
@@ -59,13 +73,18 @@ Cocoa_Window::Cocoa_Window (const Standard_CString theTitle,
                             const Standard_Integer thePxWidth,
                             const Standard_Integer thePxHeight)
 : Aspect_Window (),
+#if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
   myHWindow (NULL),
+#endif
   myHView   (NULL),
   myXLeft   (thePxLeft),
   myYTop    (thePxTop),
   myXRight  (thePxLeft + thePxWidth),
   myYBottom (thePxTop + thePxHeight)
 {
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+  //
+#else
   if (thePxWidth <= 0 || thePxHeight <= 0)
   {
     Aspect_WindowDefinitionError::Raise ("Coordinate(s) out of range");
@@ -99,21 +118,32 @@ Cocoa_Window::Cocoa_Window (const Standard_CString theTitle,
 
   // do not destroy NSWindow on close - we didn't handle it!
   [myHWindow setReleasedWhenClosed: NO];
+#endif
 }
 
 // =======================================================================
 // function : Cocoa_Window
 // purpose  :
 // =======================================================================
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+Cocoa_Window::Cocoa_Window (UIView* theViewNS)
+: Aspect_Window(),
+#else
 Cocoa_Window::Cocoa_Window (NSView* theViewNS)
-: Aspect_Window (),
+: Aspect_Window(),
   myHWindow (NULL),
-  myHView   ([theViewNS retain]),
+#endif
+  myHView   (NULL),
   myXLeft   (0),
   myYTop    (0),
   myXRight  (512),
   myYBottom (512)
 {
+#if defined(HAVE_OBJC_ARC)
+  myHView = theViewNS;
+#else
+  myHView = [theViewNS retain];
+#endif
   DoResize();
 }
 
@@ -123,45 +153,54 @@ Cocoa_Window::Cocoa_Window (NSView* theViewNS)
 // =======================================================================
 void Cocoa_Window::Destroy()
 {
+#if !defined(HAVE_OBJC_ARC)
   Cocoa_LocalPool aLocalPool;
+#endif
+#if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
   if (myHWindow != NULL)
   {
+  #if !defined(HAVE_OBJC_ARC)
     //[myHWindow close];
     [myHWindow release];
+  #endif
     myHWindow = NULL;
   }
+#endif
   if (myHView != NULL)
   {
+  #if !defined(HAVE_OBJC_ARC)
     [myHView release];
+  #endif
     myHView = NULL;
   }
 }
 
-// =======================================================================
-// function : HView
-// purpose  :
-// =======================================================================
-NSView* Cocoa_Window::HView() const
-{
-  return myHView;
-}
-
 // =======================================================================
 // function : SetHView
 // purpose  :
 // =======================================================================
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+void Cocoa_Window::SetHView (UIView* theView)
+{
+#else
 void Cocoa_Window::SetHView (NSView* theView)
 {
   if (myHWindow != NULL)
   {
     [myHWindow setContentView: theView];
   }
+#endif
+
+#if defined(HAVE_OBJC_ARC)
+  myHView = theView;
+#else
   if (myHView != NULL)
   {
     [myHView release];
     myHView = NULL;
   }
   myHView = [theView retain];
+#endif
 }
 
 // =======================================================================
@@ -175,7 +214,12 @@ Standard_Boolean Cocoa_Window::IsMapped() const
     return Standard_True;
   }
 
-  return (myHView != NULL) &&  [[myHView window] isVisible];
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+  return myHView != NULL;
+#else
+  return myHView != NULL
+   &&  [[myHView window] isVisible];
+#endif
 }
 
 // =======================================================================
@@ -191,7 +235,11 @@ void Cocoa_Window::Map() const
 
   if (myHView != NULL)
   {
+  #if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+    //
+  #else
     [[myHView window] orderFront: NULL];
+  #endif
   }
 }
 
@@ -203,7 +251,11 @@ void Cocoa_Window::Unmap() const
 {
   if (myHView != NULL)
   {
+  #if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+    //
+  #else
     [[myHView window] orderOut: NULL];
+  #endif
   }
 }
 
@@ -218,7 +270,11 @@ Aspect_TypeOfResize Cocoa_Window::DoResize() const
     return Aspect_TOR_UNKNOWN;
   }
 
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+  CGRect aBounds = [myHView bounds];
+#else
   NSRect aBounds = [myHView bounds];
+#endif
   Standard_Integer aMask = 0;
   Aspect_TypeOfResize aMode = Aspect_TOR_UNKNOWN;
 
@@ -267,7 +323,11 @@ Quantity_Ratio Cocoa_Window::Ratio() const
     return 1.0;
   }
 
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+  CGRect aBounds = [myHView bounds];
+#else
   NSRect aBounds = [myHView bounds];
+#endif
   return Quantity_Ratio (aBounds.size.width / aBounds.size.height);
 }
 
@@ -278,12 +338,20 @@ Quantity_Ratio Cocoa_Window::Ratio() const
 void Cocoa_Window::Position (Standard_Integer& X1, Standard_Integer& Y1,
                              Standard_Integer& X2, Standard_Integer& Y2) const
 {
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+  CGRect aBounds = [myHView bounds];
+  X1 = 0;
+  Y1 = 0;
+  X2 = (Standard_Integer )aBounds.size.width;
+  Y2 = (Standard_Integer )aBounds.size.height;
+#else
   NSWindow* aWindow = [myHView window];
   NSRect aWindowRect = [aWindow frame];
   X1 = (Standard_Integer) aWindowRect.origin.x;
   Y1 = getScreenBottom() - (Standard_Integer) aWindowRect.origin.y - (Standard_Integer) aWindowRect.size.height;
   X2 = X1 + (Standard_Integer) aWindowRect.size.width;
   Y2 = Y1 + (Standard_Integer) aWindowRect.size.height;
+#endif
 }
 
 // =======================================================================
@@ -298,7 +366,11 @@ void Cocoa_Window::Size (Standard_Integer& theWidth,
     return;
   }
 
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+  CGRect aBounds = [myHView bounds];
+#else
   NSRect aBounds = [myHView bounds];
+#endif
   theWidth  = (Standard_Integer )aBounds.size.width;
   theHeight = (Standard_Integer )aBounds.size.height;
 }