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

From Stephan Huber, files were are missed by Robert in check in of changes to GraphicsWindowCarbon.cpp

Browse Source
This commit is contained in:
Robert Osfield 2009-03-11 12:55:20 +00:00
parent d040b9f9d6
commit 771f3a3238
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/osgViewer/api/Carbon/GraphicsWindowCarbon
View File

@ -19,7 +19,7 @@
#ifndef OSGVIEWER_GRAPHICSWINDOWCARBON #ifndef OSGVIEWER_GRAPHICSWINDOWCARBON
#define OSGVIEWER_GRAPHICSWINDOWCARBON 1 #define OSGVIEWER_GRAPHICSWINDOWCARBON 1
#ifdef __APPLE__ #if defined (__APPLE__) && (!__LP64__)
#include <osgViewer/GraphicsWindow> #include <osgViewer/GraphicsWindow>
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
@ -142,15 +142,14 @@ class GraphicsWindowCarbon : public osgViewer::GraphicsWindow
// get the pixelformat // get the pixelformat
AGLPixelFormat getAGLPixelFormat() { return _pixelFormat; } AGLPixelFormat getAGLPixelFormat() { return _pixelFormat; }
void adaptResize(int x, int y, int w, int h);
protected: protected:
void init(); void init();
void transformMouseXY(float& x, float& y); void transformMouseXY(float& x, float& y);
bool _valid; bool _valid;

26
include/osgViewer/api/Carbon/PixelBufferCarbon
View File

@ -16,7 +16,7 @@
#ifndef OSGVIEWER_PIXELBUFFERCARBON #ifndef OSGVIEWER_PIXELBUFFERCARBON
#define OSGVIEWER_PIXELBUFFERCARBON 1 #define OSGVIEWER_PIXELBUFFERCARBON 1
#ifdef __APPLE__ #if defined (__APPLE__) && (!__LP64__)
#include <osg/GraphicsContext> #include <osg/GraphicsContext>
#include <osgViewer/Export> #include <osgViewer/Export>
@ -34,12 +34,12 @@ class OSGVIEWER_EXPORT PixelBufferCarbon : public osg::GraphicsContext
PixelBufferCarbon(osg::GraphicsContext::Traits* traits): PixelBufferCarbon(osg::GraphicsContext::Traits* traits):
_valid(false), _valid(false),
_initialized(false), _initialized(false),
_realized(false), _realized(false),
_pixelformat(0), _pixelformat(0),
_pbuffer(0), _pbuffer(0),
_context(0) _context(0)
{ {
_traits = traits; _traits = traits;
init(); init();
@ -91,16 +91,16 @@ class OSGVIEWER_EXPORT PixelBufferCarbon : public osg::GraphicsContext
/** Swap the front and back buffers.*/ /** Swap the front and back buffers.*/
virtual void swapBuffersImplementation(); virtual void swapBuffersImplementation();
static AGLPixelFormat createPixelFormat(osg::GraphicsContext::Traits* traits); static AGLPixelFormat createPixelFormat(osg::GraphicsContext::Traits* traits);
AGLContext getAGLContext() { return _context; } AGLContext getAGLContext() { return _context; }
public: public:
protected: protected:
~PixelBufferCarbon(); ~PixelBufferCarbon();
@ -110,10 +110,10 @@ class OSGVIEWER_EXPORT PixelBufferCarbon : public osg::GraphicsContext
bool _valid; bool _valid;
bool _initialized; bool _initialized;
bool _realized; bool _realized;
AGLPixelFormat _pixelformat; AGLPixelFormat _pixelformat;
AGLPbuffer _pbuffer; AGLPbuffer _pbuffer;
AGLContext _context; AGLContext _context;
}; };