From Stephan Huber, "* imageio: removed ReaderWriterImageIO_IOS.cpp, refactored ReaderWriterImageIO to work on OS X and IOS

* avfoundation: added support for IOS (CoreVideo-support is still in development, works only for SDK >= 6.0, set IPHONE_SDKVER in cMake accordingly)
* zeroconf: added ZeroConf-device-plugin (Mac/Win only, linux implementation missing) to advertise and discover services via ZeroConf/Bonjour, on windows you'll need the Bonjour SDK from Apple
* osgosc: modified the example to demonstrate the usage of the ZeroConf-plugin (start the example with the command-line-argument --zeroconf)
* SlideShowConstructor: enable/disable CoreVideo via a environment variable (P3D_ENABLE_CORE_VIDEO)
* RestHttp: mouse-motion-events get interpolated
* RestHttp: unhandled http-requests get sent as an user-event to the event-queue, all arguments get attached as user-values to the event
* modified some CMakeModules to work correctly when compiling for IOS
* fixed a compile-error for IOS in GraphicsWindowIOS
* some minor bugfixes"
This commit is contained in:
Robert Osfield
2012-12-05 17:15:53 +00:00
parent ce0f928f6f
commit eed71f647d
26 changed files with 387 additions and 710 deletions

View File

@@ -148,7 +148,8 @@ class GraphicsWindowIOS : public osgViewer::GraphicsWindow
WindowData(UIView* window_or_view = NULL, DeviceOrientationFlags orientationFlags = ALL_ORIENTATIONS, float scaleFactor = -1.0f)
: _windowOrView(window_or_view),
_deviceOrientationFlags(orientationFlags),
_viewContentScaleFactor(scaleFactor)
_viewContentScaleFactor(scaleFactor),
_createTransparentView(false)
{
}
@@ -157,11 +158,15 @@ class GraphicsWindowIOS : public osgViewer::GraphicsWindow
void setViewContentScaleFactor(float scaleFactor) { _viewContentScaleFactor = scaleFactor; }
UIView* getWindowOrParentView() const { return _windowOrView; }
bool getCreateTransparentView() { return _createTransparentView; }
void setCreateTransparentView(bool b) { _createTransparentView = b; }
private:
UIView* _windowOrView;
DeviceOrientationFlags _deviceOrientationFlags;
float _viewContentScaleFactor;
bool _createTransparentView;
friend class GraphicsWindowIOS;