Fixed typo.
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14680 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
parent
1debc21bb2
commit
bb637e73f3
@ -76,7 +76,7 @@ class OSGGA_EXPORT EventQueue : public osg::Referenced
|
||||
const osg::GraphicsContext* getGraphicsContext() const { return getCurrentEventState()->getGraphicsContext(); }
|
||||
|
||||
/** Read the window record dimensions from the graphics context. */
|
||||
void syncWindowRectangleWithGraphcisContext();
|
||||
void syncWindowRectangleWithGraphicsContext();
|
||||
|
||||
|
||||
/** Set the mouse input range.*/
|
||||
|
||||
@ -132,7 +132,7 @@ bool EventQueue::copyEvents(Events& events) const
|
||||
}
|
||||
}
|
||||
|
||||
void EventQueue::syncWindowRectangleWithGraphcisContext()
|
||||
void EventQueue::syncWindowRectangleWithGraphicsContext()
|
||||
{
|
||||
const osg::GraphicsContext::Traits* traits = (getGraphicsContext()!=0) ? getGraphicsContext()->getTraits() : 0;
|
||||
if (traits) _accumulateEventState->setWindowRectangle(traits->x, traits->y, traits->width, traits->height, !_useFixedMouseInputRange);
|
||||
|
||||
@ -565,7 +565,7 @@ bool GraphicsWindowQt::init( QWidget* parent, const QGLWidget* shareWidget, Qt::
|
||||
}
|
||||
|
||||
// make sure the event queue has the correct window rectangle size and input range
|
||||
getEventQueue()->syncWindowRectangleWithGraphcisContext();
|
||||
getEventQueue()->syncWindowRectangleWithGraphicsContext();
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -783,7 +783,7 @@ bool GraphicsWindowQt::realizeImplementation()
|
||||
_realized = true;
|
||||
|
||||
// make sure the event queue has the correct window rectangle size and input range
|
||||
getEventQueue()->syncWindowRectangleWithGraphcisContext();
|
||||
getEventQueue()->syncWindowRectangleWithGraphicsContext();
|
||||
|
||||
// make this window's context not current
|
||||
// note: this must be done as we will probably make the context current from another thread
|
||||
|
||||
@ -251,9 +251,9 @@ void GraphicsWindowCarbon::init()
|
||||
}
|
||||
_valid = (_pixelFormat != NULL);
|
||||
_initialized = true;
|
||||
|
||||
|
||||
// make sure the event queue has the correct window rectangle size and input range
|
||||
getEventQueue()->syncWindowRectangleWithGraphcisContext();
|
||||
getEventQueue()->syncWindowRectangleWithGraphicsContext();
|
||||
}
|
||||
|
||||
bool GraphicsWindowCarbon::setWindowDecorationImplementation(bool flag)
|
||||
@ -457,8 +457,8 @@ bool GraphicsWindowCarbon::realizeImplementation()
|
||||
_realized = true;
|
||||
|
||||
// make sure the event queue has the correct window rectangle size and input range
|
||||
getEventQueue()->syncWindowRectangleWithGraphcisContext();
|
||||
|
||||
getEventQueue()->syncWindowRectangleWithGraphicsContext();
|
||||
|
||||
return _realized;
|
||||
}
|
||||
|
||||
|
||||
@ -271,7 +271,7 @@ static NSRect convertToQuartzCoordinates(const NSRect& rect)
|
||||
|
||||
NSMutableDictionary* _touchPoints;
|
||||
unsigned int _lastTouchPointId;
|
||||
|
||||
|
||||
}
|
||||
- (void)setGraphicsWindowCocoa: (osgViewer::GraphicsWindowCocoa*) win;
|
||||
|
||||
@ -440,7 +440,7 @@ static NSRect convertToQuartzCoordinates(const NSRect& rect)
|
||||
// if multitouch is enabled, disable standard event handling
|
||||
if ([self useMultiTouchOnly: theEvent])
|
||||
return;
|
||||
|
||||
|
||||
NSPoint converted_point = [self getLocalPoint: theEvent];
|
||||
DEBUG_OUT("Mouse moved" << converted_point.x << "/" << converted_point.y);
|
||||
_win->getEventQueue()->mouseMotion(converted_point.x, converted_point.y);
|
||||
@ -453,7 +453,7 @@ static NSRect convertToQuartzCoordinates(const NSRect& rect)
|
||||
// if multitouch is enabled, disable standard event handling
|
||||
if ([self useMultiTouchOnly: theEvent])
|
||||
return;
|
||||
|
||||
|
||||
DEBUG_OUT("Mouse down");
|
||||
// Because many Mac users have only a 1-button mouse, we should provide ways
|
||||
// to access the button 2 and 3 actions of osgViewer.
|
||||
@ -486,7 +486,7 @@ static NSRect convertToQuartzCoordinates(const NSRect& rect)
|
||||
// if multitouch is enabled, disable standard event handling
|
||||
if ([self useMultiTouchOnly: theEvent])
|
||||
return;
|
||||
|
||||
|
||||
if (!_win) return;
|
||||
|
||||
NSPoint converted_point = [self getLocalPoint: theEvent];
|
||||
@ -502,7 +502,7 @@ static NSRect convertToQuartzCoordinates(const NSRect& rect)
|
||||
// if multitouch is enabled, disable standard event handling
|
||||
if ([self useMultiTouchOnly: theEvent])
|
||||
return;
|
||||
|
||||
|
||||
// Because many Mac users have only a 1-button mouse, we should provide ways
|
||||
// to access the button 2 and 3 actions of osgViewer.
|
||||
// I will use the Ctrl modifer to represent right-clicking
|
||||
@ -787,10 +787,10 @@ static NSRect convertToQuartzCoordinates(const NSRect& rect)
|
||||
|
||||
#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6)
|
||||
|
||||
- (osgGA::GUIEventAdapter::TouchPhase) convertTouchPhase: (NSTouchPhase) phase
|
||||
- (osgGA::GUIEventAdapter::TouchPhase) convertTouchPhase: (NSTouchPhase) phase
|
||||
{
|
||||
switch(phase) {
|
||||
|
||||
|
||||
case NSTouchPhaseBegan:
|
||||
return osgGA::GUIEventAdapter::TOUCH_BEGAN;
|
||||
break;
|
||||
@ -807,7 +807,7 @@ static NSRect convertToQuartzCoordinates(const NSRect& rect)
|
||||
return osgGA::GUIEventAdapter::TOUCH_ENDED;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
return osgGA::GUIEventAdapter::TOUCH_ENDED;
|
||||
|
||||
}
|
||||
@ -816,24 +816,24 @@ static NSRect convertToQuartzCoordinates(const NSRect& rect)
|
||||
- (unsigned int)computeTouchId: (NSTouch*) touch mayCleanup: (BOOL) may_cleanup
|
||||
{
|
||||
unsigned int result(0);
|
||||
|
||||
|
||||
if(!_touchPoints) {
|
||||
_touchPoints = [[NSMutableDictionary alloc] init];
|
||||
_lastTouchPointId = 0;
|
||||
}
|
||||
|
||||
|
||||
switch([touch phase])
|
||||
{
|
||||
|
||||
|
||||
case NSTouchPhaseBegan:
|
||||
if ([_touchPoints objectForKey: [touch identity]] == nil)
|
||||
if ([_touchPoints objectForKey: [touch identity]] == nil)
|
||||
{
|
||||
[_touchPoints setObject: [NSNumber numberWithInt: _lastTouchPointId] forKey: [touch identity]];
|
||||
result = _lastTouchPointId++;
|
||||
break;
|
||||
}
|
||||
// missing "break" by intention!
|
||||
|
||||
|
||||
case NSTouchPhaseMoved:
|
||||
case NSTouchPhaseStationary:
|
||||
{
|
||||
@ -841,7 +841,7 @@ static NSRect convertToQuartzCoordinates(const NSRect& rect)
|
||||
result = [n intValue];
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case NSTouchPhaseEnded:
|
||||
case NSTouchPhaseCancelled:
|
||||
{
|
||||
@ -854,11 +854,11 @@ static NSRect convertToQuartzCoordinates(const NSRect& rect)
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -867,13 +867,13 @@ static NSRect convertToQuartzCoordinates(const NSRect& rect)
|
||||
- (void)touchesBeganWithEvent:(NSEvent *)event
|
||||
{
|
||||
NSSet *allTouches = [event touchesMatchingPhase: NSTouchPhaseAny inView: self];
|
||||
|
||||
|
||||
osg::ref_ptr<osgGA::GUIEventAdapter> osg_event(NULL);
|
||||
NSRect bounds = [self bounds];
|
||||
|
||||
for(unsigned int i=0; i<[allTouches count]; i++)
|
||||
{
|
||||
|
||||
|
||||
NSTouch *touch = [[allTouches allObjects] objectAtIndex:i];
|
||||
NSPoint pos = [touch normalizedPosition];
|
||||
pos.x *= bounds.size.width;
|
||||
@ -895,10 +895,10 @@ static NSRect convertToQuartzCoordinates(const NSRect& rect)
|
||||
- (void)touchesMovedWithEvent:(NSEvent *)event
|
||||
{
|
||||
NSSet *allTouches = [event touchesMatchingPhase: NSTouchPhaseAny inView: self];
|
||||
|
||||
|
||||
osg::ref_ptr<osgGA::GUIEventAdapter> osg_event(NULL);
|
||||
NSRect bounds = [self bounds];
|
||||
|
||||
|
||||
for(unsigned int i=0; i<[allTouches count]; i++)
|
||||
{
|
||||
NSTouch *touch = [[allTouches allObjects] objectAtIndex:i];
|
||||
@ -923,11 +923,11 @@ static NSRect convertToQuartzCoordinates(const NSRect& rect)
|
||||
- (void)touchesEndedWithEvent:(NSEvent *)event
|
||||
{
|
||||
NSSet *allTouches = [event touchesMatchingPhase: NSTouchPhaseAny inView: self];
|
||||
|
||||
|
||||
osg::ref_ptr<osgGA::GUIEventAdapter> osg_event(NULL);
|
||||
NSRect bounds = [self bounds];
|
||||
|
||||
|
||||
|
||||
for(unsigned int i=0; i<[allTouches count]; i++)
|
||||
{
|
||||
NSTouch *touch = [[allTouches allObjects] objectAtIndex:i];
|
||||
@ -1094,9 +1094,9 @@ void GraphicsWindowCocoa::init()
|
||||
|
||||
_updateContext = false;
|
||||
_valid = _initialized = true;
|
||||
|
||||
|
||||
// make sure the event queue has the correct window rectangle size and input range
|
||||
getEventQueue()->syncWindowRectangleWithGraphcisContext();
|
||||
getEventQueue()->syncWindowRectangleWithGraphicsContext();
|
||||
}
|
||||
|
||||
|
||||
@ -1226,25 +1226,25 @@ bool GraphicsWindowCocoa::realizeImplementation()
|
||||
// set graphics handle for shared usage
|
||||
setNSOpenGLContext(_context);
|
||||
|
||||
|
||||
|
||||
_view = [[ GraphicsWindowCocoaGLView alloc ] initWithFrame:[ _window frame ] ];
|
||||
[_view setAutoresizingMask: (NSViewWidthSizable | NSViewHeightSizable) ];
|
||||
[_view setGraphicsWindowCocoa: this];
|
||||
[_view setOpenGLContext:_context];
|
||||
|
||||
|
||||
// enable multitouch
|
||||
if (_multiTouchEnabled || (windowData && windowData->isMultiTouchEnabled()))
|
||||
{
|
||||
setMultiTouchEnabled(true);
|
||||
}
|
||||
|
||||
|
||||
OSG_DEBUG << "GraphicsWindowCocoa::realizeImplementation / view: " << _view << std::endl;
|
||||
|
||||
if (_ownsWindow) {
|
||||
[_window setContentView: _view];
|
||||
setupNSWindow(_window);
|
||||
[_view release];
|
||||
|
||||
|
||||
MenubarController::instance()->attachWindow( new CocoaWindowAdapter(this) );
|
||||
}
|
||||
else
|
||||
@ -1265,7 +1265,7 @@ bool GraphicsWindowCocoa::realizeImplementation()
|
||||
getEventQueue()->getCurrentEventState()->setMouseYOrientation(osgGA::GUIEventAdapter::Y_INCREASING_UPWARDS);
|
||||
|
||||
// make sure the event queue has the correct window rectangle size and input range
|
||||
getEventQueue()->syncWindowRectangleWithGraphcisContext();
|
||||
getEventQueue()->syncWindowRectangleWithGraphicsContext();
|
||||
|
||||
_valid = _initialized = _realized = true;
|
||||
return _valid;
|
||||
@ -1382,7 +1382,7 @@ bool GraphicsWindowCocoa::checkEvents()
|
||||
}
|
||||
|
||||
[pool release];
|
||||
|
||||
|
||||
return !(getEventQueue()->empty());
|
||||
}
|
||||
|
||||
@ -1546,29 +1546,29 @@ void GraphicsWindowCocoa::setWindowName (const std::string & name)
|
||||
// requestWarpPointer
|
||||
// ----------------------------------------------------------------------------------------------------------
|
||||
void GraphicsWindowCocoa::requestWarpPointer(float x,float y)
|
||||
{
|
||||
{
|
||||
CGPoint point;
|
||||
point.x = x + _traits->x;
|
||||
point.y = y + _traits->y;
|
||||
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
|
||||
CGEventRef warpEvent = CGEventCreateMouseEvent(NULL, kCGEventMouseMoved, point, kCGMouseButtonLeft);
|
||||
CGEventPost(kCGHIDEventTap, warpEvent);
|
||||
CFRelease(warpEvent);
|
||||
|
||||
|
||||
#else
|
||||
DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
|
||||
|
||||
|
||||
if (wsi == NULL) {
|
||||
osg::notify(osg::WARN) << "GraphicsWindowCocoa::useCursor :: could not get OSXCocoaWindowingSystemInterface" << std::endl;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
CGDirectDisplayID displayId = wsi->getDisplayID((*_traits));
|
||||
CGSetLocalEventsSuppressionInterval(0);
|
||||
CGDisplayMoveCursorToPoint(displayId, point);
|
||||
#endif
|
||||
|
||||
|
||||
getEventQueue()->mouseWarped(x,y);
|
||||
}
|
||||
|
||||
@ -1666,7 +1666,7 @@ bool GraphicsWindowCocoa::isMultiTouchEnabled()
|
||||
void GraphicsWindowCocoa::setMultiTouchEnabled(bool b)
|
||||
{
|
||||
_multiTouchEnabled = b;
|
||||
|
||||
|
||||
#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6)
|
||||
if (_view) [_view setAcceptsTouchEvents: b];
|
||||
#else
|
||||
@ -1748,7 +1748,7 @@ struct CocoaWindowingSystemInterface : public DarwinWindowingSystemInterface
|
||||
|
||||
return createGraphicsContextImplementation<PixelBufferCocoa, GraphicsWindowCocoa>(traits);
|
||||
}
|
||||
|
||||
|
||||
|
||||
virtual ~CocoaWindowingSystemInterface()
|
||||
{
|
||||
|
||||
@ -10,31 +10,31 @@
|
||||
#import <OpenGLES/ES1/glext.h>
|
||||
#else
|
||||
#import <OpenGLES/ES2/glext.h>
|
||||
// in GLES2, the OES suffix if dropped from function names (from rti)
|
||||
#define glGenFramebuffersOES glGenFramebuffers
|
||||
#define glGenRenderbuffersOES glGenRenderbuffers
|
||||
#define glBindFramebufferOES glBindFramebuffer
|
||||
#define glBindRenderbufferOES glBindRenderbuffer
|
||||
#define glFramebufferRenderbufferOES glFramebufferRenderbuffer
|
||||
#define glGetRenderbufferParameterivOES glGetRenderbufferParameteriv
|
||||
#define glRenderbufferStorageOES glRenderbufferStorage
|
||||
#define glDeleteRenderbuffersOES glDeleteRenderbuffers
|
||||
#define glDeleteFramebuffersOES glDeleteFramebuffers
|
||||
#define glCheckFramebufferStatusOES glCheckFramebufferStatus
|
||||
// in GLES2, the OES suffix if dropped from function names (from rti)
|
||||
#define glGenFramebuffersOES glGenFramebuffers
|
||||
#define glGenRenderbuffersOES glGenRenderbuffers
|
||||
#define glBindFramebufferOES glBindFramebuffer
|
||||
#define glBindRenderbufferOES glBindRenderbuffer
|
||||
#define glFramebufferRenderbufferOES glFramebufferRenderbuffer
|
||||
#define glGetRenderbufferParameterivOES glGetRenderbufferParameteriv
|
||||
#define glRenderbufferStorageOES glRenderbufferStorage
|
||||
#define glDeleteRenderbuffersOES glDeleteRenderbuffers
|
||||
#define glDeleteFramebuffersOES glDeleteFramebuffers
|
||||
#define glCheckFramebufferStatusOES glCheckFramebufferStatus
|
||||
|
||||
#define GL_FRAMEBUFFER_OES GL_FRAMEBUFFER
|
||||
#define GL_RENDERBUFFER_OES GL_RENDERBUFFER
|
||||
#define GL_RENDERBUFFER_WIDTH_OES GL_RENDERBUFFER_WIDTH
|
||||
#define GL_RENDERBUFFER_HEIGHT_OES GL_RENDERBUFFER_HEIGHT
|
||||
#define GL_COLOR_ATTACHMENT0_OES GL_COLOR_ATTACHMENT0
|
||||
#define GL_DEPTH_ATTACHMENT_OES GL_DEPTH_ATTACHMENT
|
||||
#define GL_DEPTH_COMPONENT16_OES GL_DEPTH_COMPONENT16
|
||||
#define GL_STENCIL_INDEX8_OES GL_STENCIL_INDEX8
|
||||
#define GL_FRAMEBUFFER_COMPLETE_OES GL_FRAMEBUFFER_COMPLETE
|
||||
#define GL_STENCIL_ATTACHMENT_OES GL_STENCIL_ATTACHMENT
|
||||
#define GL_FRAMEBUFFER_OES GL_FRAMEBUFFER
|
||||
#define GL_RENDERBUFFER_OES GL_RENDERBUFFER
|
||||
#define GL_RENDERBUFFER_WIDTH_OES GL_RENDERBUFFER_WIDTH
|
||||
#define GL_RENDERBUFFER_HEIGHT_OES GL_RENDERBUFFER_HEIGHT
|
||||
#define GL_COLOR_ATTACHMENT0_OES GL_COLOR_ATTACHMENT0
|
||||
#define GL_DEPTH_ATTACHMENT_OES GL_DEPTH_ATTACHMENT
|
||||
#define GL_DEPTH_COMPONENT16_OES GL_DEPTH_COMPONENT16
|
||||
#define GL_STENCIL_INDEX8_OES GL_STENCIL_INDEX8
|
||||
#define GL_FRAMEBUFFER_COMPLETE_OES GL_FRAMEBUFFER_COMPLETE
|
||||
#define GL_STENCIL_ATTACHMENT_OES GL_STENCIL_ATTACHMENT
|
||||
|
||||
#define GL_RGB5_A1_OES GL_RGB5_A1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include "IOSUtils.h"
|
||||
|
||||
@ -59,7 +59,7 @@
|
||||
@implementation GraphicsWindowIOSWindow
|
||||
|
||||
//
|
||||
//Implement dealloc
|
||||
//Implement dealloc
|
||||
//
|
||||
- (void) dealloc
|
||||
{
|
||||
@ -92,29 +92,29 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
@private
|
||||
osgViewer::GraphicsWindowIOS* _win;
|
||||
EAGLContext* _context;
|
||||
|
||||
|
||||
/* The pixel dimensions of the backbuffer */
|
||||
GLint _backingWidth;
|
||||
GLint _backingHeight;
|
||||
|
||||
|
||||
//the pixel buffers for the video
|
||||
/* OpenGL names for the renderbuffer and framebuffers used to render to this view */
|
||||
GLuint _viewRenderbuffer, _viewFramebuffer;
|
||||
|
||||
|
||||
/* OpenGL name for the depth buffer that is attached to viewFramebuffer, if it exists (0 if it does not exist) */
|
||||
GLuint _depthRenderbuffer;
|
||||
|
||||
|
||||
/* OpenGL name for the stencil buffer that is attached to viewFramebuffer, if it exists (0 if it does not exist) */
|
||||
GLuint _stencilBuffer;
|
||||
|
||||
|
||||
// for multisampled antialiased rendering
|
||||
GLuint _msaaFramebuffer, _msaaRenderBuffer, _msaaDepthBuffer;
|
||||
|
||||
|
||||
TouchPointsIdMapping* _touchPointsIdMapping;
|
||||
unsigned int _lastTouchPointId;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
- (void)setGraphicsWindow: (osgViewer::GraphicsWindowIOS*) win;
|
||||
@ -135,12 +135,12 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
- (void) dealloc;
|
||||
@end
|
||||
|
||||
@implementation GraphicsWindowIOSGLView
|
||||
@implementation GraphicsWindowIOSGLView
|
||||
|
||||
- (osgGA::GUIEventAdapter::TouchPhase) convertTouchPhase: (UITouchPhase) phase
|
||||
- (osgGA::GUIEventAdapter::TouchPhase) convertTouchPhase: (UITouchPhase) phase
|
||||
{
|
||||
switch(phase) {
|
||||
|
||||
|
||||
case UITouchPhaseBegan:
|
||||
return osgGA::GUIEventAdapter::TOUCH_BEGAN;
|
||||
break;
|
||||
@ -157,7 +157,7 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
return osgGA::GUIEventAdapter::TOUCH_ENDED;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
return osgGA::GUIEventAdapter::TOUCH_ENDED;
|
||||
|
||||
}
|
||||
@ -166,37 +166,37 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
- (unsigned int)computeTouchId: (UITouch*) touch mayCleanup: (bool)may_cleanup
|
||||
{
|
||||
unsigned int result(0);
|
||||
|
||||
|
||||
if (!_touchPointsIdMapping) {
|
||||
_lastTouchPointId = 0;
|
||||
_touchPointsIdMapping = new TouchPointsIdMapping();
|
||||
}
|
||||
|
||||
|
||||
switch([touch phase])
|
||||
{
|
||||
|
||||
|
||||
case UITouchPhaseBegan:
|
||||
{
|
||||
TouchPointsIdMapping::iterator itr = _touchPointsIdMapping->find(touch);
|
||||
// std::cout << "new: " << touch << " num: " << _touchPointsIdMapping->size() << " found: " << (itr != _touchPointsIdMapping->end()) << std::endl;
|
||||
|
||||
if (itr == _touchPointsIdMapping->end())
|
||||
|
||||
if (itr == _touchPointsIdMapping->end())
|
||||
{
|
||||
(*_touchPointsIdMapping)[touch] = result = _lastTouchPointId;
|
||||
_lastTouchPointId++;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
// missing "break" by intention!
|
||||
|
||||
|
||||
case UITouchPhaseMoved:
|
||||
case UITouchPhaseStationary:
|
||||
{
|
||||
result = (*_touchPointsIdMapping)[touch];
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case UITouchPhaseEnded:
|
||||
case UITouchPhaseCancelled:
|
||||
{
|
||||
@ -213,11 +213,11 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
// std::cout<< "remove: " << touch << " num: " << _touchPointsIdMapping->size() << std::endl;
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -226,12 +226,12 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
{
|
||||
//get the views contentscale factor and multiply the point by it
|
||||
float scale = 1.0f;
|
||||
|
||||
|
||||
#if defined(__IPHONE_4_0) && (__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_4_0)
|
||||
scale = self.contentScaleFactor;
|
||||
#endif
|
||||
return osg::Vec2(point.x()*scale, point.y()*scale);
|
||||
|
||||
|
||||
}
|
||||
|
||||
-(void) setGraphicsWindow: (osgViewer::GraphicsWindowIOS*) win
|
||||
@ -260,17 +260,17 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
//Called when the view is created using a frame for dimensions
|
||||
//
|
||||
- (id)initWithFrame:(CGRect)frame : (osgViewer::GraphicsWindowIOS*)win{
|
||||
|
||||
|
||||
_win = win;
|
||||
|
||||
if ((self = [super initWithFrame:frame])) {
|
||||
// Get the layer
|
||||
CAEAGLLayer *eaglLayer = (CAEAGLLayer *)self.layer;
|
||||
|
||||
|
||||
osgViewer::GraphicsWindowIOS::WindowData* win_data(NULL);
|
||||
if (_win->getTraits()->inheritedWindowData.valid())
|
||||
win_data = dynamic_cast<osgViewer::GraphicsWindowIOS::WindowData*>(_win->getTraits()->inheritedWindowData.get());
|
||||
|
||||
|
||||
eaglLayer.opaque = win_data ? !win_data->getCreateTransparentView() : YES;
|
||||
bool retained_backing = win_data ? win_data->getUseRetainedBacking() : NO;
|
||||
|
||||
@ -287,7 +287,7 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
}
|
||||
}
|
||||
self.multipleTouchEnabled = YES;
|
||||
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
@ -297,7 +297,7 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
- (void) dealloc
|
||||
{
|
||||
OSG_INFO << "GraphicsWindowIOSGLView::dealloc" << std::endl;
|
||||
if(_touchPointsIdMapping)
|
||||
if(_touchPointsIdMapping)
|
||||
delete _touchPointsIdMapping;
|
||||
_touchPointsIdMapping = NULL;
|
||||
[super dealloc];
|
||||
@ -325,10 +325,10 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
osg::Vec2 pointSize = osg::Vec2(frame.size.width,frame.size.height);
|
||||
osg::Vec2 pixelOrigin = [(GraphicsWindowIOSGLView*)(self) convertPointToPixel:pointOrigin];
|
||||
osg::Vec2 pixelSize = [(GraphicsWindowIOSGLView*)(self) convertPointToPixel:pointSize];
|
||||
|
||||
|
||||
OSG_INFO << "updateDimensions, resize to "
|
||||
<< pixelOrigin.x() << " " << pixelOrigin.y() << " "
|
||||
<< pixelSize.x() << " " << pixelSize.y()
|
||||
<< pixelOrigin.x() << " " << pixelOrigin.y() << " "
|
||||
<< pixelSize.x() << " " << pixelSize.y()
|
||||
<< std::endl;
|
||||
_win->resized(pixelOrigin.x(), pixelOrigin.y(), pixelSize.x(), pixelSize.y());
|
||||
}
|
||||
@ -337,21 +337,21 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
- (BOOL)createFramebuffer {
|
||||
|
||||
_msaaFramebuffer = _msaaRenderBuffer = 0;
|
||||
|
||||
|
||||
glGenFramebuffersOES(1, &_viewFramebuffer);
|
||||
glGenRenderbuffersOES(1, &_viewRenderbuffer);
|
||||
|
||||
|
||||
// set the default id for osg to switch back after using fbos.
|
||||
_win->setDefaultFboId(_viewFramebuffer);
|
||||
|
||||
|
||||
glBindFramebufferOES(GL_FRAMEBUFFER_OES, _viewFramebuffer);
|
||||
glBindRenderbufferOES(GL_RENDERBUFFER_OES, _viewRenderbuffer);
|
||||
[_context renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:(CAEAGLLayer*)self.layer];
|
||||
glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, _viewRenderbuffer);
|
||||
|
||||
|
||||
glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_WIDTH_OES, &_backingWidth);
|
||||
glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_HEIGHT_OES, &_backingHeight);
|
||||
|
||||
|
||||
osg::notify(osg::DEBUG_INFO) << "GraphicsWindowIOS::createFramebuffer INFO: Created GL RenderBuffer of size " << _backingWidth << ", " << _backingHeight << " ." << std::endl;
|
||||
|
||||
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 50000
|
||||
@ -362,9 +362,9 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
// Create a packed depth stencil buffer.
|
||||
glGenRenderbuffersOES(1, &_depthRenderbuffer);
|
||||
glBindRenderbufferOES(GL_RENDERBUFFER_OES, _depthRenderbuffer);
|
||||
|
||||
|
||||
glRenderbufferStorageOES(GL_RENDERBUFFER_OES, GL_DEPTH24_STENCIL8_OES, _backingWidth, _backingHeight);
|
||||
|
||||
|
||||
glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_DEPTH_ATTACHMENT_OES,
|
||||
GL_RENDERBUFFER_OES, _depthRenderbuffer);
|
||||
glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_STENCIL_ATTACHMENT_OES,
|
||||
@ -383,7 +383,7 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_DEPTH_ATTACHMENT_OES, GL_RENDERBUFFER_OES, _depthRenderbuffer);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#else
|
||||
//add depth if requested
|
||||
if(_win->getTraits()->depth > 0) {
|
||||
@ -404,61 +404,61 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
|
||||
glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_DEPTH_ATTACHMENT_OES, GL_RENDERBUFFER_OES, _depthRenderbuffer);
|
||||
}
|
||||
|
||||
|
||||
//add stencil if requested
|
||||
if(_win->getTraits()->stencil > 0) {
|
||||
glGenRenderbuffersOES(1, &_stencilBuffer);
|
||||
glBindRenderbufferOES(GL_RENDERBUFFER_OES, _stencilBuffer);
|
||||
glRenderbufferStorageOES(GL_RENDERBUFFER_OES, GL_STENCIL_INDEX8_OES, _backingWidth, _backingHeight);
|
||||
glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_STENCIL_ATTACHMENT_OES, GL_RENDERBUFFER_OES, _stencilBuffer);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
//MSAA only available for >= 4.0 sdk
|
||||
|
||||
|
||||
#if defined(__IPHONE_4_0) && (__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_4_0)
|
||||
|
||||
if(_win->getTraits()->sampleBuffers > 0)
|
||||
|
||||
if(_win->getTraits()->sampleBuffers > 0)
|
||||
{
|
||||
glGenFramebuffersOES(1, &_msaaFramebuffer);
|
||||
glGenFramebuffersOES(1, &_msaaFramebuffer);
|
||||
glGenRenderbuffersOES(1, &_msaaRenderBuffer);
|
||||
|
||||
|
||||
_win->setDefaultFboId(_msaaFramebuffer);
|
||||
|
||||
glBindFramebufferOES(GL_FRAMEBUFFER_OES, _msaaFramebuffer);
|
||||
|
||||
glBindFramebufferOES(GL_FRAMEBUFFER_OES, _msaaFramebuffer);
|
||||
glBindRenderbufferOES(GL_RENDERBUFFER_OES, _msaaRenderBuffer);
|
||||
|
||||
|
||||
// Samples is the amount of pixels the MSAA buffer uses to make one pixel on the render // buffer. Use a small number like 2 for the 3G and below and 4 or more for newer models
|
||||
|
||||
|
||||
glRenderbufferStorageMultisampleAPPLE(GL_RENDERBUFFER_OES, _win->getTraits()->samples, GL_RGB5_A1_OES, _backingWidth, _backingHeight);
|
||||
|
||||
|
||||
glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, _msaaRenderBuffer);
|
||||
glGenRenderbuffersOES(1, &_msaaDepthBuffer);
|
||||
glGenRenderbuffersOES(1, &_msaaDepthBuffer);
|
||||
glBindRenderbufferOES(GL_RENDERBUFFER_OES, _msaaDepthBuffer);
|
||||
|
||||
|
||||
GLuint attachmentType = (_win->getTraits()->stencil > 0) ? GL_DEPTH24_STENCIL8_OES : ((_win->getTraits()->depth == 16) ? GL_DEPTH_COMPONENT16_OES : GL_DEPTH_COMPONENT24_OES);
|
||||
glRenderbufferStorageMultisampleAPPLE(GL_RENDERBUFFER_OES, _win->getTraits()->samples, attachmentType, _backingWidth , _backingHeight);
|
||||
|
||||
|
||||
glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_DEPTH_ATTACHMENT_OES, GL_RENDERBUFFER_OES, _msaaDepthBuffer);
|
||||
if (_win->getTraits()->stencil > 0)
|
||||
if (_win->getTraits()->stencil > 0)
|
||||
{
|
||||
glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_STENCIL_ATTACHMENT_OES, GL_RENDERBUFFER_OES, _msaaDepthBuffer);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
if(glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES) != GL_FRAMEBUFFER_COMPLETE_OES) {
|
||||
OSG_FATAL << "GraphicsWindowIOS::createFramebuffer ERROR: Failed to create a GL RenderBuffer, glCheckFramebufferStatusOES returned '"
|
||||
OSG_FATAL << "GraphicsWindowIOS::createFramebuffer ERROR: Failed to create a GL RenderBuffer, glCheckFramebufferStatusOES returned '"
|
||||
<< glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES) << "'." << std::endl;
|
||||
return NO;
|
||||
}
|
||||
|
||||
|
||||
return YES;
|
||||
}
|
||||
|
||||
|
||||
- (void)destroyFramebuffer {
|
||||
|
||||
|
||||
if(_viewFramebuffer)
|
||||
{
|
||||
glDeleteFramebuffersOES(1, &_viewFramebuffer);
|
||||
@ -469,22 +469,22 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
glDeleteRenderbuffersOES(1, &_viewRenderbuffer);
|
||||
_viewRenderbuffer = 0;
|
||||
}
|
||||
|
||||
|
||||
if(_depthRenderbuffer) {
|
||||
glDeleteRenderbuffersOES(1, &_depthRenderbuffer);
|
||||
_depthRenderbuffer = 0;
|
||||
}
|
||||
|
||||
|
||||
if(_stencilBuffer) {
|
||||
glDeleteRenderbuffersOES(1, &_stencilBuffer);
|
||||
_stencilBuffer = 0;
|
||||
}
|
||||
|
||||
|
||||
if(_msaaRenderBuffer) {
|
||||
glDeleteRenderbuffersOES(1, &_msaaRenderBuffer);
|
||||
_msaaRenderBuffer = 0;
|
||||
}
|
||||
|
||||
|
||||
if(_msaaDepthBuffer) {
|
||||
glDeleteRenderbuffersOES(1, &_msaaDepthBuffer);
|
||||
_msaaDepthBuffer = 0;
|
||||
@ -502,17 +502,17 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
- (void)swapBuffers {
|
||||
|
||||
|
||||
#if defined(__IPHONE_4_0) && (__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_4_0)
|
||||
if(_msaaFramebuffer)
|
||||
#if defined(__IPHONE_4_0) && (__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_4_0)
|
||||
if(_msaaFramebuffer)
|
||||
{
|
||||
glBindFramebufferOES(GL_FRAMEBUFFER_OES, _msaaFramebuffer);
|
||||
|
||||
glBindFramebufferOES(GL_READ_FRAMEBUFFER_APPLE, _msaaFramebuffer);
|
||||
|
||||
glBindFramebufferOES(GL_READ_FRAMEBUFFER_APPLE, _msaaFramebuffer);
|
||||
glBindFramebufferOES(GL_DRAW_FRAMEBUFFER_APPLE, _viewFramebuffer);
|
||||
|
||||
|
||||
glResolveMultisampleFramebufferAPPLE();
|
||||
|
||||
GLenum attachments[] = {GL_DEPTH_ATTACHMENT_OES, GL_COLOR_ATTACHMENT0_OES};
|
||||
|
||||
GLenum attachments[] = {GL_DEPTH_ATTACHMENT_OES, GL_COLOR_ATTACHMENT0_OES};
|
||||
glDiscardFramebufferEXT(GL_READ_FRAMEBUFFER_APPLE, 2, attachments);
|
||||
}
|
||||
#endif
|
||||
@ -520,13 +520,13 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
|
||||
//swap buffers (sort of i think?)
|
||||
glBindRenderbufferOES(GL_RENDERBUFFER_OES, _viewRenderbuffer);
|
||||
|
||||
|
||||
//display render in context
|
||||
[_context presentRenderbuffer:GL_RENDERBUFFER_OES];
|
||||
|
||||
|
||||
//re bind the frame buffer for next frames renders
|
||||
glBindFramebufferOES(GL_FRAMEBUFFER_OES, _viewFramebuffer);
|
||||
|
||||
|
||||
#if defined(__IPHONE_4_0) && (__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_4_0)
|
||||
if (_msaaFramebuffer)
|
||||
glBindFramebufferOES(GL_FRAMEBUFFER_OES, _msaaFramebuffer);;
|
||||
@ -540,7 +540,7 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
|
||||
//bind the frame buffer
|
||||
glBindFramebufferOES(GL_FRAMEBUFFER_OES, _viewFramebuffer);
|
||||
|
||||
|
||||
#if defined(__IPHONE_4_0) && (__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_4_0)
|
||||
if (_msaaFramebuffer)
|
||||
glBindFramebufferOES(GL_READ_FRAMEBUFFER_APPLE, _msaaFramebuffer);
|
||||
@ -567,19 +567,19 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
//Touch input callbacks
|
||||
//
|
||||
- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
|
||||
|
||||
|
||||
NSSet *allTouches = [event allTouches];
|
||||
|
||||
|
||||
osg::ref_ptr<osgGA::GUIEventAdapter> osg_event(NULL);
|
||||
|
||||
for(int i=0; i<[allTouches count]; i++)
|
||||
{
|
||||
|
||||
|
||||
UITouch *touch = [[allTouches allObjects] objectAtIndex:i];
|
||||
CGPoint pos = [touch locationInView:self];
|
||||
osg::Vec2 pixelPos = [self convertPointToPixel: osg::Vec2(pos.x,pos.y)];
|
||||
unsigned int touch_id = [self computeTouchId: touch mayCleanup: FALSE];
|
||||
|
||||
|
||||
if (!osg_event)
|
||||
{
|
||||
osg_event = _win->getEventQueue()->touchBegan(touch_id, [self convertTouchPhase: [touch phase]], pixelPos.x(), pixelPos.y());
|
||||
@ -592,14 +592,14 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
[super touchesBegan:touches withEvent:event];
|
||||
}
|
||||
|
||||
- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
|
||||
|
||||
|
||||
NSSet *allTouches = [event allTouches];
|
||||
|
||||
|
||||
osg::ref_ptr<osgGA::GUIEventAdapter> osg_event(NULL);
|
||||
|
||||
for(int i=0; i<[allTouches count]; i++)
|
||||
@ -621,17 +621,17 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
[super touchesMoved:touches withEvent:event];
|
||||
|
||||
[super touchesMoved:touches withEvent:event];
|
||||
}
|
||||
|
||||
- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
|
||||
|
||||
{
|
||||
{
|
||||
NSSet *allTouches = [event allTouches];
|
||||
|
||||
|
||||
osg::ref_ptr<osgGA::GUIEventAdapter> osg_event(NULL);
|
||||
|
||||
|
||||
for(int i=0; i<[allTouches count]; i++)
|
||||
{
|
||||
UITouch *touch = [[allTouches allObjects] objectAtIndex:i];
|
||||
@ -650,11 +650,11 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
[super touchesEnded:touches withEvent:event];
|
||||
|
||||
[super touchesEnded:touches withEvent:event];
|
||||
}
|
||||
|
||||
-(void) touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
|
||||
-(void) touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
|
||||
{
|
||||
[self touchesEnded: touches withEvent:event];
|
||||
}
|
||||
@ -679,12 +679,12 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
{
|
||||
osgViewer::GraphicsWindowIOS* win = [(GraphicsWindowIOSGLView*)(self.view) getGraphicsWindow];
|
||||
if(!win){return NO;}
|
||||
|
||||
|
||||
osgViewer::GraphicsWindowIOS::WindowData::DeviceOrientationFlags flags = win->getDeviceOrientationFlags();
|
||||
|
||||
|
||||
|
||||
|
||||
BOOL result(NO);
|
||||
|
||||
|
||||
switch (interfaceOrientation) {
|
||||
case UIDeviceOrientationPortrait:
|
||||
if(flags & osgViewer::GraphicsWindowIOS::WindowData::PORTRAIT_ORIENTATION){
|
||||
@ -714,7 +714,7 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
}
|
||||
|
||||
|
||||
- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration
|
||||
- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration
|
||||
{
|
||||
[(GraphicsWindowIOSGLView*)(self.view) updateDimensions];
|
||||
}
|
||||
@ -725,11 +725,11 @@ typedef std::map<void*, unsigned int> TouchPointsIdMapping;
|
||||
|
||||
|
||||
|
||||
using namespace osgIOS;
|
||||
using namespace osgIOS;
|
||||
namespace osgViewer {
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#pragma mark GraphicsWindowIOS
|
||||
|
||||
|
||||
@ -747,14 +747,14 @@ void GraphicsWindowIOS::init()
|
||||
_window = NULL;
|
||||
_view = NULL;
|
||||
_viewController = NULL;
|
||||
|
||||
|
||||
_updateContext = true;
|
||||
//if -1.0 we use the screens scale factor
|
||||
_viewContentScaleFactor = -1.0f;
|
||||
_valid = _initialized = true;
|
||||
|
||||
// make sure the event queue has the correct window rectangle size and input range
|
||||
getEventQueue()->syncWindowRectangleWithGraphcisContext();
|
||||
getEventQueue()->syncWindowRectangleWithGraphicsContext();
|
||||
}
|
||||
|
||||
|
||||
@ -765,9 +765,9 @@ void GraphicsWindowIOS::init()
|
||||
bool GraphicsWindowIOS::realizeImplementation()
|
||||
{
|
||||
if (_realized) return true;
|
||||
|
||||
|
||||
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
|
||||
|
||||
|
||||
BOOL bar_hidden = (_traits->windowDecoration) ? NO: YES;
|
||||
#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
|
||||
#if __IPHONE_OS_VERSION_MIN_REQUIRED > 30100
|
||||
@ -776,7 +776,7 @@ bool GraphicsWindowIOS::realizeImplementation()
|
||||
[[UIApplication sharedApplication] setStatusBarHidden: bar_hidden animated:NO];
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
//Get info about the requested screen
|
||||
IOSWindowingSystemInterface* wsi = dynamic_cast<IOSWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
|
||||
osg::Vec2 screenSizePoints;
|
||||
@ -786,7 +786,7 @@ bool GraphicsWindowIOS::realizeImplementation()
|
||||
osg::GraphicsContext::ScreenSettings screenSettings;
|
||||
if (wsi) {
|
||||
wsi->getScreenContentScaleFactor((*_traits), screenScaleFactor);
|
||||
wsi->getScreenSizeInPoints((*_traits), screenSizePoints);
|
||||
wsi->getScreenSizeInPoints((*_traits), screenSizePoints);
|
||||
screenSizePixels = osg::Vec2(screenSettings.width, screenSettings.height);
|
||||
wsi->getScreenSettings((*_traits), screenSettings);
|
||||
screen = wsi->getUIScreen((*_traits));
|
||||
@ -794,32 +794,32 @@ bool GraphicsWindowIOS::realizeImplementation()
|
||||
OSG_FATAL << "GraphicsWindowIOS::realizeImplementation: ERROR: Failed to create IOS windowing system, OSG will be unable to create a vaild gl context and will not be able to render." << std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
_ownsWindow = true;
|
||||
|
||||
|
||||
// see if an existing inherited window was passed in
|
||||
WindowData* windowData = _traits->inheritedWindowData ? dynamic_cast<WindowData*>(_traits->inheritedWindowData.get()) : NULL;
|
||||
if (windowData)
|
||||
if (windowData)
|
||||
{
|
||||
if (windowData->getWindowOrParentView())
|
||||
{
|
||||
_ownsWindow = false;
|
||||
_ownsWindow = false;
|
||||
_window = windowData->getWindowOrParentView();
|
||||
}
|
||||
|
||||
|
||||
_deviceOrientationFlags = windowData->_deviceOrientationFlags;
|
||||
_viewContentScaleFactor = windowData->_viewContentScaleFactor;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//if the user hasn't specified a viewScaleFactor we will use the screens scale factor
|
||||
//so we get a full res buffer
|
||||
if(_viewContentScaleFactor < 0.0f)
|
||||
{_viewContentScaleFactor = screenScaleFactor;}
|
||||
|
||||
|
||||
|
||||
OSG_DEBUG << "GraphicsWindowIOS::realizeImplementation / ownsWindow: " << _ownsWindow << std::endl;
|
||||
|
||||
|
||||
|
||||
//Here's the confusing bit, the default traits use the screen res which is in pixels and the user will want to use pixels also
|
||||
//but we need to create our views and windows in points. By default we create a full res buffer across all devices. This
|
||||
//means that for backward compatibility you need to set the windowData _viewContentScaleFactor to 1.0f and set the screen res to the
|
||||
@ -828,25 +828,25 @@ bool GraphicsWindowIOS::realizeImplementation()
|
||||
osg::Vec2 pointsOrigin = this->pixelToPoint(osg::Vec2(_traits->x, _traits->y));
|
||||
osg::Vec2 pointsSize = this->pixelToPoint(osg::Vec2(_traits->width, _traits->height));
|
||||
|
||||
window_bounds.origin.x = pointsOrigin.x();
|
||||
window_bounds.origin.x = pointsOrigin.x();
|
||||
window_bounds.origin.y = pointsOrigin.y();
|
||||
window_bounds.size.width = pointsSize.x();
|
||||
window_bounds.size.width = pointsSize.x();
|
||||
window_bounds.size.height = pointsSize.y();
|
||||
|
||||
|
||||
|
||||
|
||||
//if we own the window we need to create one
|
||||
if (_ownsWindow)
|
||||
if (_ownsWindow)
|
||||
{
|
||||
//create the IOS window object using the viewbounds (in points) required for our context size
|
||||
_window = [[GraphicsWindowIOSWindow alloc] initWithFrame: window_bounds];// styleMask: style backing: NSBackingStoreBuffered defer: NO];
|
||||
|
||||
|
||||
if (!_window) {
|
||||
OSG_WARN << "GraphicsWindowIOS::realizeImplementation: ERROR: Failed to create GraphicsWindowIOSWindow can not display gl view" << std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
OSG_DEBUG << "GraphicsWindowIOS::realizeImplementation: INFO: Created UIWindow with bounds '" << window_bounds.size.width << ", " << window_bounds.size.height << "' (points)." << std::endl;
|
||||
|
||||
|
||||
//if the user has requested a differnet screenNum from default 0 get the UIScreen object and
|
||||
//apply to our window (this is for IPad external screens, I don't have one, so I've no idea if it works)
|
||||
//I'm also not sure if we should apply this to external windows also?
|
||||
@ -854,17 +854,17 @@ bool GraphicsWindowIOS::realizeImplementation()
|
||||
{
|
||||
_window.screen = screen;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//create the desired OpenGLES context type
|
||||
#if OSG_GLES1_FEATURES
|
||||
_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES1];
|
||||
#elif OSG_GLES2_FEATURES
|
||||
_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
|
||||
#endif
|
||||
|
||||
|
||||
if (!_context || ![EAGLContext setCurrentContext:_context]) {
|
||||
|
||||
|
||||
#if OSG_GLES1_FEATURES
|
||||
OSG_FATAL << "GraphicsWindowIOS::realizeImplementation: ERROR: Failed to create a valid OpenGLES1 context" << std::endl;
|
||||
#elif OSG_GLES2_FEATURES
|
||||
@ -881,48 +881,48 @@ bool GraphicsWindowIOS::realizeImplementation()
|
||||
OSG_FATAL << "GraphicsWindowIOS::realizeImplementation: ERROR: Failed to create GraphicsWindowIOSGLView, can not create frame buffers." << std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
[theView setAutoresizingMask: ( UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight) ];
|
||||
|
||||
|
||||
//Apply our content scale factor to our view, this is what converts the views points
|
||||
//size to our desired context size.
|
||||
#if defined(__IPHONE_4_0) && (__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_4_0)
|
||||
theView.contentScaleFactor = _viewContentScaleFactor;
|
||||
#endif
|
||||
#endif
|
||||
[theView setGraphicsWindow: this];
|
||||
[theView setOpenGLContext:_context];
|
||||
_view = theView;
|
||||
|
||||
|
||||
OSG_DEBUG << "GraphicsWindowIOS::realizeImplementation / view: " << theView << std::endl;
|
||||
|
||||
if (getDeviceOrientationFlags() != WindowData::IGNORE_ORIENTATION)
|
||||
if (getDeviceOrientationFlags() != WindowData::IGNORE_ORIENTATION)
|
||||
{
|
||||
_viewController = [[GraphicsWindowIOSGLViewController alloc] init];
|
||||
_viewController.view = _view;
|
||||
}
|
||||
|
||||
|
||||
// Attach view to window
|
||||
[_window addSubview: _view];
|
||||
if ([_window isKindOfClass:[UIWindow class]])
|
||||
_window.rootViewController = _viewController;
|
||||
[theView release];
|
||||
|
||||
|
||||
//if we own the window also make it visible
|
||||
if (_ownsWindow)
|
||||
if (_ownsWindow)
|
||||
{
|
||||
|
||||
|
||||
//show window
|
||||
[_window makeKeyAndVisible];
|
||||
}
|
||||
|
||||
[pool release];
|
||||
|
||||
|
||||
// IOSs origin is top/left:
|
||||
getEventQueue()->getCurrentEventState()->setMouseYOrientation(osgGA::GUIEventAdapter::Y_INCREASING_DOWNWARDS);
|
||||
|
||||
// make sure the event queue has the correct window rectangle size and input range
|
||||
getEventQueue()->syncWindowRectangleWithGraphcisContext();
|
||||
|
||||
getEventQueue()->syncWindowRectangleWithGraphicsContext();
|
||||
|
||||
_valid = _initialized = _realized = true;
|
||||
return _valid;
|
||||
}
|
||||
@ -938,32 +938,32 @@ void GraphicsWindowIOS::closeImplementation()
|
||||
OSG_INFO << "close IOS window" << std::endl;
|
||||
_valid = false;
|
||||
_realized = false;
|
||||
|
||||
|
||||
if (_view)
|
||||
|
||||
|
||||
if (_view)
|
||||
{
|
||||
[_view setOpenGLContext: NULL];
|
||||
[_context release];
|
||||
[_view removeFromSuperview];
|
||||
[_view setGraphicsWindow: NULL];
|
||||
}
|
||||
|
||||
if (_viewController)
|
||||
|
||||
if (_viewController)
|
||||
{
|
||||
[_viewController release];
|
||||
_viewController = NULL;
|
||||
}
|
||||
|
||||
if (_window && _ownsWindow)
|
||||
{
|
||||
|
||||
if (_window && _ownsWindow)
|
||||
{
|
||||
[_window release];
|
||||
//[glView release];
|
||||
}
|
||||
|
||||
|
||||
|
||||
_window = NULL;
|
||||
_view = NULL;
|
||||
_context = NULL;
|
||||
_view = NULL;
|
||||
_context = NULL;
|
||||
}
|
||||
|
||||
|
||||
@ -973,17 +973,17 @@ void GraphicsWindowIOS::closeImplementation()
|
||||
|
||||
bool GraphicsWindowIOS:: makeCurrentImplementation()
|
||||
{
|
||||
|
||||
|
||||
|
||||
|
||||
//bind the context
|
||||
[EAGLContext setCurrentContext:_context];
|
||||
|
||||
|
||||
if (_updateContext)
|
||||
{
|
||||
[_view destroyFramebuffer];
|
||||
[_view createFramebuffer];
|
||||
|
||||
_updateContext = false;
|
||||
_updateContext = false;
|
||||
}
|
||||
//i think we also want to bind the frame buffer here
|
||||
//[_view bindFrameBuffer];
|
||||
@ -1035,7 +1035,7 @@ bool GraphicsWindowIOS::setWindowDecorationImplementation(bool flag)
|
||||
[[UIApplication sharedApplication] setStatusBarHidden: bar_hidden animated:NO];
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1045,7 +1045,7 @@ bool GraphicsWindowIOS::setWindowDecorationImplementation(bool flag)
|
||||
// ----------------------------------------------------------------------------------------------------------
|
||||
void GraphicsWindowIOS::grabFocus()
|
||||
{
|
||||
//i think make key is the equivalent of focus on iphone
|
||||
//i think make key is the equivalent of focus on iphone
|
||||
[_window makeKeyWindow];
|
||||
}
|
||||
|
||||
@ -1074,9 +1074,9 @@ void GraphicsWindowIOS::raiseWindow()
|
||||
void GraphicsWindowIOS::resizedImplementation(int x, int y, int width, int height)
|
||||
{
|
||||
GraphicsContext::resizedImplementation(x, y, width, height);
|
||||
|
||||
|
||||
_updateContext = true;
|
||||
|
||||
|
||||
getEventQueue()->windowResize(x,y,width, height, getEventQueue()->getTime());
|
||||
}
|
||||
|
||||
@ -1091,11 +1091,11 @@ bool GraphicsWindowIOS::setWindowRectangleImplementation(int x, int y, int width
|
||||
OSG_INFO << "GraphicsWindowIOS :: setWindowRectangleImplementation not implemented yet " << std::endl;
|
||||
if (!_ownsWindow)
|
||||
return false;
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
bool GraphicsWindowIOS::checkEvents()
|
||||
{
|
||||
|
||||
@ -1138,12 +1138,12 @@ void GraphicsWindowIOS::setCursor(MouseCursor mouseCursor)
|
||||
// setVSync, no vsync on IOS
|
||||
// ----------------------------------------------------------------------------------------------------------
|
||||
|
||||
void GraphicsWindowIOS::setVSync(bool f)
|
||||
void GraphicsWindowIOS::setVSync(bool f)
|
||||
{
|
||||
OSG_INFO << "GraphicsWindowIOS :: setVSync not implemented yet " << std::endl;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------------------------------------
|
||||
// helper funcs for converting points to pixels taking into account the views contents scale factor
|
||||
// ----------------------------------------------------------------------------------------------------------
|
||||
@ -1152,7 +1152,7 @@ osg::Vec2 GraphicsWindowIOS::pointToPixel(const osg::Vec2& point)
|
||||
{
|
||||
return point * _viewContentScaleFactor;
|
||||
}
|
||||
|
||||
|
||||
osg::Vec2 GraphicsWindowIOS::pixelToPoint(const osg::Vec2& pixel)
|
||||
{
|
||||
float scaler = 1.0f / _viewContentScaleFactor;
|
||||
@ -1164,7 +1164,7 @@ osg::Vec2 GraphicsWindowIOS::pixelToPoint(const osg::Vec2& pixel)
|
||||
// d'tor
|
||||
// ----------------------------------------------------------------------------------------------------------
|
||||
|
||||
GraphicsWindowIOS::~GraphicsWindowIOS()
|
||||
GraphicsWindowIOS::~GraphicsWindowIOS()
|
||||
{
|
||||
close();
|
||||
}
|
||||
@ -1177,8 +1177,8 @@ public:
|
||||
: IOSWindowingSystemInterface()
|
||||
{
|
||||
}
|
||||
|
||||
virtual osg::GraphicsContext* createGraphicsContext(osg::GraphicsContext::Traits* traits)
|
||||
|
||||
virtual osg::GraphicsContext* createGraphicsContext(osg::GraphicsContext::Traits* traits)
|
||||
{
|
||||
if (traits->pbuffer)
|
||||
{
|
||||
|
||||
@ -1186,9 +1186,9 @@ void GraphicsWindowWin32::init()
|
||||
|
||||
_initialized = _ownsWindow ? createWindow() : setWindow(windowHandle);
|
||||
_valid = _initialized;
|
||||
|
||||
|
||||
// make sure the event queue has the correct window rectangle size and input range
|
||||
getEventQueue()->syncWindowRectangleWithGraphcisContext();
|
||||
getEventQueue()->syncWindowRectangleWithGraphicsContext();
|
||||
|
||||
// 2008/10/03
|
||||
// Few days ago NVidia released WHQL certified drivers ver 178.13.
|
||||
@ -1992,7 +1992,7 @@ bool GraphicsWindowWin32::realizeImplementation()
|
||||
_realized = true;
|
||||
|
||||
// make sure the event queue has the correct window rectangle size and input range
|
||||
getEventQueue()->syncWindowRectangleWithGraphcisContext();
|
||||
getEventQueue()->syncWindowRectangleWithGraphicsContext();
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -2078,7 +2078,7 @@ bool GraphicsWindowWin32::checkEvents()
|
||||
_destroyWindow = false;
|
||||
destroyWindow(false);
|
||||
}
|
||||
|
||||
|
||||
return !(getEventQueue()->empty());
|
||||
}
|
||||
|
||||
|
||||
@ -841,7 +841,7 @@ void GraphicsWindowX11::init()
|
||||
}
|
||||
}
|
||||
|
||||
getEventQueue()->syncWindowRectangleWithGraphcisContext();
|
||||
getEventQueue()->syncWindowRectangleWithGraphicsContext();
|
||||
}
|
||||
|
||||
bool GraphicsWindowX11::createWindow()
|
||||
@ -1055,7 +1055,7 @@ bool GraphicsWindowX11::realizeImplementation()
|
||||
|
||||
XMapWindow( _display, _window );
|
||||
|
||||
getEventQueue()->syncWindowRectangleWithGraphcisContext();
|
||||
getEventQueue()->syncWindowRectangleWithGraphicsContext();
|
||||
|
||||
// Window temp = _window;
|
||||
// XSetWMColormapWindows( _display, _window, &temp, 1);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user