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

From Tree, moved GL_ #define's out of osg namespaces

Browse Source
This commit is contained in:
Robert Osfield 2005-01-07 19:00:40 +00:00
parent 814300f896
commit 40632c97b0
5 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/osg/Drawable
View File

@ -20,15 +20,6 @@
#include <osg/Shape> #include <osg/Shape>
#include <osg/buffered_value> #include <osg/buffered_value>
namespace osg {
class Vec2f;
class Vec3f;
class Vec4f;
class UByte4;
class Geometry;
#ifndef GL_ARB_vertex_buffer_object #ifndef GL_ARB_vertex_buffer_object
// for compatibility with gl.h headers that don't support VBO, // for compatibility with gl.h headers that don't support VBO,
@ -98,6 +89,16 @@ class Geometry;
#endif #endif
namespace osg {
class Vec2f;
class Vec3f;
class Vec4f;
class UByte4;
class Geometry;
// this is defined to alter the way display lists are compiled inside the // this is defined to alter the way display lists are compiled inside the
// the draw method, it has been found that the NVidia drivers fail completely // the draw method, it has been found that the NVidia drivers fail completely
// to optimize COMPILE_AND_EXECUTE in fact make it go slower than for no display // to optimize COMPILE_AND_EXECUTE in fact make it go slower than for no display

4
include/osg/State
View File

@ -26,8 +26,6 @@
#include <vector> #include <vector>
#include <map> #include <map>
namespace osg {
#ifndef GL_TEXTURE0 #ifndef GL_TEXTURE0
#define GL_TEXTURE0 0x84C0 #define GL_TEXTURE0 0x84C0
#endif #endif
@ -48,6 +46,8 @@ namespace osg {
#endif #endif
#endif #endif
namespace osg {
/** macro for use with osg::StateAttribute::apply methods for detecting and /** macro for use with osg::StateAttribute::apply methods for detecting and
* reporting OpenGL error messages.*/ * reporting OpenGL error messages.*/
#define OSG_GL_DEBUG(message) \ #define OSG_GL_DEBUG(message) \

12
include/osg/StateAttribute
View File

@ -21,6 +21,12 @@
#include <typeinfo> #include <typeinfo>
#include <utility> #include <utility>
// define for the GL_EXT_secondary_color extension, GL_COLOR_SUM is OpenGL
// mode to be used to enable and disable the second color.
#ifndef GL_COLOR_SUM
#define GL_COLOR_SUM 0x8458
#endif
namespace osg { namespace osg {
@ -59,12 +65,6 @@ class StateSet;
if (rhs.parameter<parameter) return 1; if (rhs.parameter<parameter) return 1;
// define for the GL_EXT_secondary_color extension, GL_COLOR_SUM is OpenGL
// mode to be used to enable and disable the second color.
#ifndef GL_COLOR_SUM
#define GL_COLOR_SUM 0x8458
#endif
/** Base class for state attributes. /** Base class for state attributes.
*/ */
class SG_EXPORT StateAttribute : public Object class SG_EXPORT StateAttribute : public Object

4
include/osg/TexEnvFilter
View File

@ -17,14 +17,14 @@
#include <osg/GL> #include <osg/GL>
#include <osg/StateAttribute> #include <osg/StateAttribute>
namespace osg {
#ifndef GL_EXT_texture_lod_bias #ifndef GL_EXT_texture_lod_bias
#define GL_MAX_TEXTURE_LOD_BIAS_EXT 0x84FD #define GL_MAX_TEXTURE_LOD_BIAS_EXT 0x84FD
#define GL_TEXTURE_FILTER_CONTROL_EXT 0x8500 #define GL_TEXTURE_FILTER_CONTROL_EXT 0x8500
#define GL_TEXTURE_LOD_BIAS_EXT 0x8501 #define GL_TEXTURE_LOD_BIAS_EXT 0x8501
#endif #endif
namespace osg {
/** TexEnvFilter - encapsulates the OpenGL glTexEnv (GL_TEXTURE_FILTER_CONTROL) state.*/ /** TexEnvFilter - encapsulates the OpenGL glTexEnv (GL_TEXTURE_FILTER_CONTROL) state.*/
class SG_EXPORT TexEnvFilter : public StateAttribute class SG_EXPORT TexEnvFilter : public StateAttribute
{ {

4
include/osg/TexGen
View File

@ -17,8 +17,6 @@
#include <osg/Plane> #include <osg/Plane>
#include <osg/StateAttribute> #include <osg/StateAttribute>
namespace osg {
#ifndef GL_NORMAL_MAP_ARB #ifndef GL_NORMAL_MAP_ARB
#define GL_NORMAL_MAP_ARB 0x8511 #define GL_NORMAL_MAP_ARB 0x8511
#endif #endif
@ -27,6 +25,8 @@ namespace osg {
#define GL_REFLECTION_MAP_ARB 0x8512 #define GL_REFLECTION_MAP_ARB 0x8512
#endif #endif
namespace osg {
/** TexGen encapsulates the OpenGL glTexGen (texture coordinate generation) /** TexGen encapsulates the OpenGL glTexGen (texture coordinate generation)
* state.*/ * state.*/
class SG_EXPORT TexGen : public StateAttribute class SG_EXPORT TexGen : public StateAttribute