53e337611a
The mac os sdk version is recognized by the current CMAKE script as 10.1 instead of 10.10 since it cuts the version string from the 4th place. I introduced a more reliable version checking based on splitting the returned version code into MAJOR MINOR and PATCH parts and reassemble the OSG sdk version afterwards.
I replaced the existing CMake code against the following (returning now version 10.10 as expected):
# Determine the canonical name of the selected Platform SDK
EXECUTE_PROCESS(COMMAND "/usr/bin/sw_vers" "-productVersion"
OUTPUT_VARIABLE OSG_OSX_SDK_NAME
OUTPUT_STRIP_TRAILING_WHITESPACE)
STRING(REPLACE "." ";" MACOS_VERSION_LIST ${OSG_OSX_SDK_NAME})
LIST(GET MACOS_VERSION_LIST 0 MACOS_VERSION_MAJOR)
LIST(GET MACOS_VERSION_LIST 1 MACOS_VERSION_MINOR)
LIST(GET MACOS_VERSION_LIST 2 MACOS_VERSION_PATCH)
SET(OSG_OSX_SDK_NAME "macosx${MACOS_VERSION_MAJOR}.${MACOS_VERSION_MINOR}")
Also i added the check for the new Version to some more find scripts.
Additionally the nil object in Objective C now seems to be equivalent with a null_ptr that cannot be passed as GLInt anymore. So i switched this in the PixelBufferCocoa.mm to pass a zero instead of nil.
"
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14527 16af8721-9629-0410-8352-f15c8da7e697
143 lines
3.9 KiB
Plaintext
143 lines
3.9 KiB
Plaintext
/*
|
|
* PixelBufferCocoa.cpp
|
|
* OpenSceneGraph
|
|
*
|
|
* Created by Stephan Huber on 27.06.08.
|
|
* Copyright 2008 Stephan Maximilian Huber, digital mind. All rights reserved.
|
|
*
|
|
*/
|
|
|
|
#include <iostream>
|
|
#include <osgViewer/api/Cocoa/PixelBufferCocoa>
|
|
#include <osgViewer/api/Cocoa/GraphicsWindowCocoa>
|
|
#include <Cocoa/Cocoa.h>
|
|
|
|
namespace osgViewer {
|
|
|
|
|
|
void PixelBufferCocoa::init()
|
|
{
|
|
//std::cout << "PixelBufferCocoa :: init not implemented yet " << std::endl;
|
|
|
|
_valid = _initialized = true;
|
|
|
|
|
|
}
|
|
|
|
bool PixelBufferCocoa::realizeImplementation()
|
|
{
|
|
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
|
|
|
|
NSOpenGLPixelFormatAttribute attr[32];
|
|
int i = 0;
|
|
|
|
attr[i++] = NSOpenGLPFADepthSize;
|
|
attr[i++] = static_cast<NSOpenGLPixelFormatAttribute>(_traits->depth);
|
|
|
|
if (_traits->doubleBuffer) {
|
|
attr[i++] = NSOpenGLPFADoubleBuffer;
|
|
}
|
|
|
|
if (_traits->alpha) {
|
|
attr[i++] = NSOpenGLPFAAlphaSize;
|
|
attr[i++] = static_cast<NSOpenGLPixelFormatAttribute>(_traits->alpha);
|
|
}
|
|
|
|
if (_traits->stencil) {
|
|
attr[i++] = NSOpenGLPFAStencilSize;
|
|
attr[i++] = static_cast<NSOpenGLPixelFormatAttribute>(_traits->stencil);
|
|
}
|
|
|
|
|
|
if (_traits->sampleBuffers) {
|
|
attr[i++] = NSOpenGLPFASampleBuffers;
|
|
attr[i++] = static_cast<NSOpenGLPixelFormatAttribute>(_traits->sampleBuffers);
|
|
attr[i++] = NSOpenGLPFASamples;
|
|
attr[i++] = static_cast<NSOpenGLPixelFormatAttribute>(_traits->samples);
|
|
}
|
|
|
|
attr[i++] = NSOpenGLPFAPixelBuffer; // for pbuffer usage
|
|
attr[i++] = NSOpenGLPFAAccelerated;
|
|
attr[i] = static_cast<NSOpenGLPixelFormatAttribute>(0);
|
|
|
|
// create the context
|
|
NSOpenGLContext* sharedContext = NULL;
|
|
|
|
GraphicsHandleCocoa* graphicsHandleCocoa = dynamic_cast<GraphicsHandleCocoa*>(_traits->sharedContext.get());
|
|
if (graphicsHandleCocoa)
|
|
{
|
|
sharedContext = graphicsHandleCocoa->getNSOpenGLContext();
|
|
}
|
|
|
|
|
|
NSOpenGLPixelFormat* pixelformat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attr ];
|
|
_context = [[NSOpenGLContext alloc] initWithFormat: pixelformat shareContext: sharedContext];
|
|
NSOpenGLPixelBuffer* pbuffer = [[NSOpenGLPixelBuffer alloc] initWithTextureTarget: _traits->target textureInternalFormat: _traits->format textureMaxMipMapLevel: _traits->level pixelsWide: _traits->width pixelsHigh: _traits->height];
|
|
|
|
[_context setPixelBuffer: pbuffer cubeMapFace: _traits->face mipMapLevel:_traits->level currentVirtualScreen: 0];
|
|
|
|
[pool release];
|
|
|
|
_realized = (_context != nil);
|
|
return _realized;
|
|
}
|
|
|
|
|
|
void PixelBufferCocoa::closeImplementation()
|
|
{
|
|
_realized = false;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Make this graphics context current.*/
|
|
bool PixelBufferCocoa::makeCurrentImplementation()
|
|
{
|
|
// OSG_INFO << "PixelBufferCocoa::makeCurrentImplementation" << std::endl;
|
|
|
|
[_context makeCurrentContext];
|
|
return true;
|
|
}
|
|
|
|
|
|
/** Make this graphics context current with specified read context implementation. */
|
|
bool PixelBufferCocoa::makeContextCurrentImplementation(osg::GraphicsContext* readContext)
|
|
{
|
|
return makeCurrentImplementation();
|
|
}
|
|
|
|
/** Release the graphics context.*/
|
|
bool PixelBufferCocoa::releaseContextImplementation()
|
|
{
|
|
// OSG_INFO << "PixelBufferCocoa::releaseContextImplementation" << std::endl;
|
|
|
|
[NSOpenGLContext clearCurrentContext];
|
|
return true;
|
|
}
|
|
|
|
/** Bind the graphics context to associated texture implementation.*/
|
|
void PixelBufferCocoa::bindPBufferToTextureImplementation( GLenum buffer )
|
|
{
|
|
std::cout << "PixelBufferCocoa :: bindPBufferToTextureImplementation not implemented yet " << std::endl;
|
|
}
|
|
|
|
/** Swap the front and back buffers.*/
|
|
void PixelBufferCocoa::swapBuffersImplementation()
|
|
{
|
|
OSG_INFO << "PixelBufferCocoa::swapBuffersImplementation" << std::endl;
|
|
[_context flushBuffer];
|
|
}
|
|
|
|
PixelBufferCocoa::~PixelBufferCocoa()
|
|
{
|
|
[_context release];
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|