FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GraphicsWindowIOS: multithreaded viewer's mode support added; updated for iOS-11 SDK; view rotations fixed; GLES2, GLES3 preprocessors fixed; tested on iPhone4 and upper

Browse Source
This commit is contained in:
Konstantin S. Matveyev
2018-03-26 20:40:14 +03:00
parent 80a2dd924f
commit a846c0160c
2 changed files with 189 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/osgViewer/api/IOS/GraphicsWindowIOS
View File

@@ -28,6 +28,7 @@
@class EAGLContext;
@class UIWindow;
@class UIView;
@class UIViewController;
#else
class GraphicsWindowIOSGLView;
class GraphicsWindowIOSWindow;
@@ -35,6 +36,7 @@ class GraphicsWindowIOSGLViewController;
class EAGLContext;
class UIWindow;
class UIView;
class UIViewController;
#endif
#include <osgViewer/GraphicsWindow>
@@ -88,6 +90,8 @@ class GraphicsWindowIOS : public osgViewer::GraphicsWindow
virtual const char* libraryName() const { return "osgViewer"; }
virtual const char* className() const { return "GraphicsWindowIOS"; }
virtual void runOperations();
virtual bool valid() const { return _valid; }
/** Realise the GraphicsContext.*/
@@ -145,8 +149,9 @@ class GraphicsWindowIOS : public osgViewer::GraphicsWindow
};
typedef unsigned int DeviceOrientationFlags;
WindowData(UIView* window_or_view = NULL, DeviceOrientationFlags orientationFlags = ALL_ORIENTATIONS, float scaleFactor = -1.0f)
WindowData(UIView* window_or_view = NULL, UIViewController* parentController = NULL, DeviceOrientationFlags orientationFlags = ALL_ORIENTATIONS, float scaleFactor = -1.0f)
: _windowOrView(window_or_view),
_parentController(parentController),
_deviceOrientationFlags(orientationFlags),
_viewContentScaleFactor(scaleFactor),
_createTransparentView(false),
@@ -159,6 +164,7 @@ class GraphicsWindowIOS : public osgViewer::GraphicsWindow
void setViewContentScaleFactor(float scaleFactor) { _viewContentScaleFactor = scaleFactor; }
UIView* getWindowOrParentView() const { return _windowOrView; }
UIViewController* getController() const;
bool getCreateTransparentView() { return _createTransparentView; }
void setCreateTransparentView(bool b) { _createTransparentView = b; }
@@ -169,6 +175,7 @@ class GraphicsWindowIOS : public osgViewer::GraphicsWindow
private:
UIView* _windowOrView;
UIViewController* _parentController;
DeviceOrientationFlags _deviceOrientationFlags;
float _viewContentScaleFactor;
bool _createTransparentView;