Changeset 11649

Show
Ignore:
Timestamp:
06/23/10 15:28:19 (4 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:
5 removed
4 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/CMakeLists.txt

    r11640 r11649  
    742742 
    743743 
    744 # 
    745 # Provide target for generating wrappers 
    746 # 
    747 SET(GENWRAPPER genwrapper) 
    748  
    749 ADD_CUSTOM_TARGET(wrappers 
    750     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 - 
    751     COMMAND ${GENWRAPPER} -c ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/introspection/genwrapper.conf -l ${OpenSceneGraph_SOURCE_DIR} 
    752 ) 
    753  
    754744# For Doxygen 
    755745INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL) 
     
    877867  openscenegraph-osgVolume 
    878868) 
    879  
    880 IF(BUILD_OSG_WRAPPERS) 
    881   SET(PKGCONFIG_FILES ${PKGCONFIG_FILES} openscenegraph-osgIntrospection) 
    882 ENDIF(BUILD_OSG_WRAPPERS) 
    883869 
    884870IF(QT4_FOUND) 
  • OpenSceneGraph/trunk/examples/CMakeLists.txt

    r11610 r11649  
    160160 
    161161    ADD_SUBDIRECTORY(osgpdf) 
    162      
    163     IF   (BUILD_OSG_WRAPPERS) 
    164         ADD_SUBDIRECTORY(osgintrospection) 
    165     ENDIF(BUILD_OSG_WRAPPERS) 
    166162 
    167163    IF   (GLUT_FOUND) 
  • OpenSceneGraph/trunk/src/CMakeLists.txt

    r11455 r11649  
    3131ENDIF() 
    3232 
    33 OPTION(BUILD_OSG_WRAPPERS "Enable to build Introspection and Wrappers" OFF) 
    34 IF(BUILD_OSG_WRAPPERS) 
    35     ADD_SUBDIRECTORY(osgIntrospection) 
    36     ADD_SUBDIRECTORY(osgWrappers/introspection) 
    37 ENDIF() 
    38  
    3933IF(MSVC80 OR MSVC90) 
    4034  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

    r11232 r11649  
    3333static bool readColorLayers( osgDB::InputStream& is, osgTerrain::TerrainTile& tile ) 
    3434{ 
    35     unsigned int size = 0; is >> size >> osgDB::BEGIN_BRACKET; 
    36     for ( unsigned int i=0; i<size; ++i ) 
     35    unsigned int numValidLayers = 0; is >> numValidLayers >> osgDB::BEGIN_BRACKET; 
     36    for ( unsigned int i=0; i<numValidLayers; ++i ) 
    3737    { 
     38        unsigned int layerNum=0; is >> osgDB::PROPERTY("Layer") >> layerNum; 
    3839        osgTerrain::Layer* layer = dynamic_cast<osgTerrain::Layer*>( is.readObject() ); 
    39         if ( layer ) tile.setColorLayer( i, layer ); 
     40        if ( layer ) tile.setColorLayer( layerNum, layer ); 
    4041    } 
    4142    is >> osgDB::END_BRACKET; 
     
    4546static bool writeColorLayers( osgDB::OutputStream& os, const osgTerrain::TerrainTile& tile ) 
    4647{ 
    47     unsigned int size = tile.getNumColorLayers(); 
    48     os << size << osgDB::BEGIN_BRACKET << std::endl; 
    49     for ( unsigned int i=0; i<size; ++i ) 
     48    unsigned int numValidLayers = 0; 
     49    for ( unsigned int i=0; i<tile.getNumColorLayers(); ++i ) 
    5050    { 
    51         os << tile.getColorLayer(i); 
     51        if (tile.getColorLayer(i)) ++numValidLayers; 
     52    } 
     53 
     54    os << numValidLayers << osgDB::BEGIN_BRACKET << std::endl; 
     55    for ( unsigned int i=0; i<tile.getNumColorLayers(); ++i ) 
     56    { 
     57        if (tile.getColorLayer(i)) os << osgDB::PROPERTY("Layer") << i << tile.getColorLayer(i); 
    5258    } 
    5359    os << osgDB::END_BRACKET << std::endl;