From 18c37d14cd449a81ca18eb39982afaf1e898ac6d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 27 May 2013 08:10:42 +0000 Subject: [PATCH] Moved quad buffer definitions into include/osg/Camera --- include/osg/Camera | 8 ++++++++ src/osgUtil/SceneView.cpp | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/osg/Camera b/include/osg/Camera index c12544f51..2bf23ee1d 100644 --- a/include/osg/Camera +++ b/include/osg/Camera @@ -25,6 +25,14 @@ #include + +#if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GL3_AVAILABLE) + #define GL_FRONT_LEFT 0x0400 + #define GL_FRONT_RIGHT 0x0401 + #define GL_BACK_LEFT 0x0402 + #define GL_BACK_RIGHT 0x0403 +#endif + namespace osg { // forward declare View to allow Camera to point back to the View that its within diff --git a/src/osgUtil/SceneView.cpp b/src/osgUtil/SceneView.cpp index 583b465a1..1fa0f63be 100644 --- a/src/osgUtil/SceneView.cpp +++ b/src/osgUtil/SceneView.cpp @@ -32,12 +32,6 @@ using namespace osg; using namespace osgUtil; -#if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GL3_AVAILABLE) - // define under GLES to keep the main SceneView.cpp clean. - #define GL_BACK_LEFT 0x0402 - #define GL_BACK_RIGHT 0x0403 -#endif - static const GLubyte patternVertEven[] = { 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,