Context Navigation

Changeset 9904

Timestamp:

03/11/09 13:55:20 (4 years ago)

Author:

robert

Message:

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

Location:

OpenSceneGraph/trunk/include/osgViewer/api/Carbon

Files:

r9120	r9904
20	20	#define OSGVIEWER_GRAPHICSWINDOWCARBON 1
21	21
22		#if~~def __APPLE__~~
	22	#if defined (__APPLE__) && (!__LP64__)
23	23
24	24	#include <osgViewer/GraphicsWindow>
…	…
143	143	// get the pixelformat
144	144	AGLPixelFormat getAGLPixelFormat() { return _pixelFormat; }
	145
	146	void adaptResize(int x, int y, int w, int h);
145	147
146	148	protected:
…	…
148	150	void init();
149	151
150		void transformMouseXY(float& x, float& y);
151
152
153
	152	void transformMouseXY(float& x, float& y);
154	153
155	154

r7039	r9904
17	17	#define OSGVIEWER_PIXELBUFFERCARBON 1
18	18
19		#if~~def __APPLE__~~
	19	#if defined (__APPLE__) && (!__LP64__)
20	20
21	21	#include <osg/GraphicsContext>
…	…
35	35	PixelBufferCarbon(osg::GraphicsContext::Traits* traits):
36	36	_valid(false),
37		_initialized(false),
	37	_initialized(false),
38	38	_realized(false),
39		_pixelformat(0),
	39	_pixelformat(0),
40	40	_pbuffer(0),
41	41	_context(0)
42		{
	42	{
43	43	_traits = traits;
44	44
…	…
92	92	/** Swap the front and back buffers.*/
93	93	virtual void swapBuffersImplementation();
94
95		static AGLPixelFormat createPixelFormat(osg::GraphicsContext::Traits* traits);
96
97		AGLContext getAGLContext() { return _context; }
	94
	95	static AGLPixelFormat createPixelFormat(osg::GraphicsContext::Traits* traits);
	96
	97	AGLContext getAGLContext() { return _context; }
98	98
99	99	public:
…	…
101	101
102	102	protected:
103
	103
104	104
105	105
…	…
111	111	bool _initialized;
112	112	bool _realized;
113
114		~~AGLPixelFormat~~ _pixelformat;
115		~~AGLPbuffer~~ _pbuffer;
116		~~AGLContext~~ _context;
	113
	114	AGLPixelFormat _pixelformat;
	115	AGLPbuffer _pbuffer;
	116	AGLContext _context;
117	117
118	118	};