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

Added GL_LINES_ADJACENCY_EXT variants back into ObjectWraper to enable backwards compatibility.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14685 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-02-10 18:01:02 +00:00
parent ea7dbabda1
commit 06f186dc07
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgDB/Serializer
View File

@@ -46,7 +46,7 @@ public:
{
if ( _valueToString.find(value)!=_valueToString.end() )
{
osg::notify(osg::WARN) << "Duplicate enum value " << value
osg::notify(osg::INFO) << "Duplicate enum value " << value
<< " with old string: " << _valueToString[value]
<< " and new string: " << str << std::endl;
}

11
src/osgDB/ObjectWrapper.cpp
View File

@@ -624,14 +624,17 @@ ObjectWrapperManager::ObjectWrapperManager()
primitiveTable.add( "GL_QUADS", GL_QUADS );
primitiveTable.add( "GL_QUAD_STRIP", GL_QUAD_STRIP );
primitiveTable.add( "GL_POLYGON", GL_POLYGON );
primitiveTable.add( "GL_LINES_ADJACENCY_EXT", GL_LINES_ADJACENCY );
primitiveTable.add( "GL_LINE_STRIP_ADJACENCY_EXT", GL_LINE_STRIP_ADJACENCY );
primitiveTable.add( "GL_TRIANGLES_ADJACENCY_EXT", GL_TRIANGLES_ADJACENCY );
primitiveTable.add( "GL_TRIANGLE_STRIP_ADJACENCY_EXT", GL_TRIANGLE_STRIP_ADJACENCY );
primitiveTable.add( "GL_LINES_ADJACENCY_EXT", GL_LINES_ADJACENCY_EXT );
primitiveTable.add( "GL_LINE_STRIP_ADJACENCY_EXT", GL_LINE_STRIP_ADJACENCY_EXT );
primitiveTable.add( "GL_TRIANGLES_ADJACENCY_EXT", GL_TRIANGLES_ADJACENCY_EXT );
primitiveTable.add( "GL_TRIANGLE_STRIP_ADJACENCY_EXT", GL_TRIANGLE_STRIP_ADJACENCY_EXT );
primitiveTable.add( "GL_LINES_ADJACENCY", GL_LINES_ADJACENCY );
primitiveTable.add( "GL_LINE_STRIP_ADJACENCY", GL_LINE_STRIP_ADJACENCY );
primitiveTable.add( "GL_TRIANGLES_ADJACENCY", GL_TRIANGLES_ADJACENCY );
primitiveTable.add( "GL_TRIANGLE_STRIP_ADJACENCY", GL_TRIANGLE_STRIP_ADJACENCY );
primitiveTable.add( "GL_PATCHES", GL_PATCHES );
}