Changeset 11649

Timestamp:

06/23/10 15:28:19 (3 years ago)

Author:

robert

Message:

Removed osgIntrospection as it's now available as a seperate osgIntrospection project that can be checked out thus:

svn co http://www.openscenegraph.org/svn/osg/osgIntrospection osgIntrospection

Location:

OpenSceneGraph/trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• examples/CMakeLists.txt (modified) (1 diff)
• examples/osgintrospection (deleted)
• include/osgIntrospection (deleted)
• packaging/pkgconfig/openscenegraph-osgIntrospection.pc.in (deleted)
• src/CMakeLists.txt (modified) (1 diff)
• src/osgIntrospection (deleted)
• src/osgWrappers/introspection (deleted)
• src/osgWrappers/serializers/osgTerrain/TerrainTile.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/CMakeLists.txt

@@ -742 +742 @@
 
 
-#
-# Provide target for generating wrappers
-#
-SET(GENWRAPPER genwrapper)
-
-ADD_CUSTOM_TARGET(wrappers
-    COMMAND ${GENWRAPPER} -c ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/introspection/genwrapper.conf -t ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/introspection/Doxyfile.template -d ${OpenSceneGraph_SOURCE_DIR} | doxygen -
-    COMMAND ${GENWRAPPER} -c ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/introspection/genwrapper.conf -l ${OpenSceneGraph_SOURCE_DIR}
-)
-
 # For Doxygen
 INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL)
@@ -877 +867 @@
   openscenegraph-osgVolume
 )
-
-IF(BUILD_OSG_WRAPPERS)
-  SET(PKGCONFIG_FILES ${PKGCONFIG_FILES} openscenegraph-osgIntrospection)
-ENDIF(BUILD_OSG_WRAPPERS)
 
 IF(QT4_FOUND)

OpenSceneGraph/trunk/examples/CMakeLists.txt

@@ -160 +160 @@
 
     ADD_SUBDIRECTORY(osgpdf)
-    
-    IF   (BUILD_OSG_WRAPPERS)
-        ADD_SUBDIRECTORY(osgintrospection)
-    ENDIF(BUILD_OSG_WRAPPERS)
 
     IF   (GLUT_FOUND)

OpenSceneGraph/trunk/src/CMakeLists.txt

@@ -31 +31 @@
 ENDIF()
 
-OPTION(BUILD_OSG_WRAPPERS "Enable to build Introspection and Wrappers" OFF)
-IF(BUILD_OSG_WRAPPERS)
-    ADD_SUBDIRECTORY(osgIntrospection)
-    ADD_SUBDIRECTORY(osgWrappers/introspection)
-ENDIF()
-
 IF(MSVC80 OR MSVC90)
   OPTION(OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS "Generate or not manifests files under VS8 for dynamically loaded dlls" ON)

OpenSceneGraph/trunk/src/osgWrappers/serializers/osgTerrain/TerrainTile.cpp

@@ -33 +33 @@
 static bool readColorLayers( osgDB::InputStream& is, osgTerrain::TerrainTile& tile )
 {
-    unsigned int size = 0; is >> size >> osgDB::BEGIN_BRACKET;
-    for ( unsigned int i=0; i<size; ++i )
+    unsigned int numValidLayers = 0; is >> numValidLayers >> osgDB::BEGIN_BRACKET;
+    for ( unsigned int i=0; i<numValidLayers; ++i )
     {
+        unsigned int layerNum=0; is >> osgDB::PROPERTY("Layer") >> layerNum;
         osgTerrain::Layer* layer = dynamic_cast<osgTerrain::Layer*>( is.readObject() );
-        if ( layer ) tile.setColorLayer( i, layer );
+        if ( layer ) tile.setColorLayer( layerNum, layer );
     }
     is >> osgDB::END_BRACKET;
@@ -45 +46 @@
 static bool writeColorLayers( osgDB::OutputStream& os, const osgTerrain::TerrainTile& tile )
 {
-    unsigned int size = tile.getNumColorLayers();
-    os << size << osgDB::BEGIN_BRACKET << std::endl;
-    for ( unsigned int i=0; i<size; ++i )
+    unsigned int numValidLayers = 0;
+    for ( unsigned int i=0; i<tile.getNumColorLayers(); ++i )
     {
-        os << tile.getColorLayer(i);
+        if (tile.getColorLayer(i)) ++numValidLayers;
+    }
+
+    os << numValidLayers << osgDB::BEGIN_BRACKET << std::endl;
+    for ( unsigned int i=0; i<tile.getNumColorLayers(); ++i )
+    {
+        if (tile.getColorLayer(i)) os << osgDB::PROPERTY("Layer") << i << tile.getColorLayer(i);
     }
     os << osgDB::END_BRACKET << std::endl;