Show
Ignore:
Timestamp:
03/17/10 15:33:47 (3 years ago)
Author:
paulmartz
Message:

2.8 branch: Minor bug fixes for ac and 3dc plugins. Merges these revisions from trunk: 10010, 10758, and 11175.

Location:
OpenSceneGraph/branches/OpenSceneGraph-2.8
Files:
49 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/branches/OpenSceneGraph-2.8

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2:10664 
        2 /OpenSceneGraph/trunk:9769,9879-9880,9895,9932,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk:9769,9879-9880,9895,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/applications/osgarchive/osgarchive.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/applications/osgarchive/osgarchive.cpp:10664 
        2 /OpenSceneGraph/trunk/applications/osgarchive/osgarchive.cpp:9769,9810,9879-9880,9895,9932,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/applications/osgarchive/osgarchive.cpp:9769,9810,9879-9880,9895,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/examples

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/examples:10664 
        2 /OpenSceneGraph/trunk/examples:9769,9879-9880,9895,9932,10064,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11009,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/examples:9769,9879-9880,9895,9932,10010,10064,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11009,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/examples/osgcluster/broadcaster.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/examples/osgcluster/broadcaster.cpp:10664 
        2 /OpenSceneGraph/trunk/examples/osgcluster/broadcaster.cpp:9769,9828,9879-9880,9895,9932,10064,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11009,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/examples/osgcluster/broadcaster.cpp:9769,9828,9879-9880,9895,9932,10010,10064,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11009,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/include/osg

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/include/osg:10664 
        2 /OpenSceneGraph/trunk/include/osg:9769,9879-9880,9895,9932,10208,10228,10340,10410,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/include/osg:9769,9879-9880,9895,9932,10010,10208,10228,10340,10410,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/include/osgAnimation

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/trunk:9646-11206 
        2 /OpenSceneGraph/trunk/include/osgAnimation:9769,9879-9880,9895,9932,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/include/osgAnimation:9769,9879-9880,9895,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/OpenThreads/pthreads

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/OpenThreads/pthreads:10664 
        2 /OpenSceneGraph/trunk/src/OpenThreads/pthreads:9769,9879-9880,9895,9932,10208,10219,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/OpenThreads/pthreads:9769,9879-9880,9895,9932,10010,10208,10219,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/OpenThreads/win32

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/OpenThreads/win32:10664 
        2 /OpenSceneGraph/trunk/src/OpenThreads/win32:9769,9832,9879-9880,9895,9932,10191,10208,10340,10417,10456-10457,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/OpenThreads/win32:9769,9832,9879-9880,9895,9932,10010,10191,10208,10340,10417,10456-10457,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg:10664 
        22/OpenSceneGraph/trunk:10327 
        3 /OpenSceneGraph/trunk/src/osg:9769,9879-9880,9895,9932,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         3/OpenSceneGraph/trunk/src/osg:9769,9879-9880,9895,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/Drawable.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/Drawable.cpp:10664 
        22/OpenSceneGraph/trunk/include/osg/src/osg/Drawable.cpp:9882 
        3 /OpenSceneGraph/trunk/src/osg/Drawable.cpp:9769,9879-9880,9895,9897,9932,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         3/OpenSceneGraph/trunk/src/osg/Drawable.cpp:9769,9879-9880,9895,9897,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/Geometry.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/Geometry.cpp:10664 
        22/OpenSceneGraph/trunk/include/osg/src/osg/Geometry.cpp:9882 
        3 /OpenSceneGraph/trunk/src/osg/Geometry.cpp:9769,9879-9880,9895,9900,9932,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         3/OpenSceneGraph/trunk/src/osg/Geometry.cpp:9769,9879-9880,9895,9900,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/GraphicsContext.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/GraphicsContext.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osg/GraphicsContext.cpp:9769,9879-9880,9895,9932,10154,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osg/GraphicsContext.cpp:9769,9879-9880,9895,9932,10010,10154,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/Image.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/Image.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osg/Image.cpp:9769,9879-9880,9895,9932,10062,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osg/Image.cpp:9769,9879-9880,9895,9932,10010,10062,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/Node.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/Node.cpp:10664 
        22/OpenSceneGraph/trunk/include/osg/src/osg/Node.cpp:9882 
        3 /OpenSceneGraph/trunk/src/osg/Node.cpp:9769,9879-9880,9895,9897,9932,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         3/OpenSceneGraph/trunk/src/osg/Node.cpp:9769,9879-9880,9895,9897,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/PolygonOffset.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/PolygonOffset.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osg/PolygonOffset.cpp:9769,9879-9880,9895,9932,10083-10084,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osg/PolygonOffset.cpp:9769,9879-9880,9895,9932,10010,10083-10084,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/State.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/State.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osg/State.cpp:9769,9798,9879-9880,9895,9932,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osg/State.cpp:9769,9798,9879-9880,9895,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgAnimation

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/trunk:9646-11206 
        2 /OpenSceneGraph/trunk/src/osgAnimation:9769,9879-9880,9895,9932,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgAnimation:9769,9879-9880,9895,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgDB

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgDB:10664 
        2 /OpenSceneGraph/trunk/src/osgDB:9769,9879-9880,9895,9932,10150,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgDB:9769,9879-9880,9895,9932,10010,10150,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgDB/CMakeLists.txt

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgDB/CMakeLists.txt:10664 
        22/OpenSceneGraph/trunk/include/osg/src/osgDB/CMakeLists.txt:9882 
        3 /OpenSceneGraph/trunk/src/osgDB/CMakeLists.txt:9769,9879-9880,9895,9922,9932,10150,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         3/OpenSceneGraph/trunk/src/osgDB/CMakeLists.txt:9769,9879-9880,9895,9922,9932,10010,10150,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgDB/DatabasePager.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgDB/DatabasePager.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp:9769,9879-9880,9895,9932,10054,10150,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp:9769,9879-9880,9895,9932,10010,10054,10150,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgManipulator

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgManipulator:10664 
        2 /OpenSceneGraph/trunk/src/osgManipulator:9769,9879-9880,9895,9932,10208,10340,10358,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgManipulator:9769,9879-9880,9895,9932,10010,10208,10340,10358,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins:10664 
        22/OpenSceneGraph/trunk:10539 
        3 /OpenSceneGraph/trunk/src/osgPlugins:9769,9879-9880,9895,9932,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         3/OpenSceneGraph/trunk/src/osgPlugins:9769,9879-9880,9895,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/3dc/ReaderWriter3DC.cpp

    r9343 r11238  
    1212#include <string.h> 
    1313 
    14  
    15 using namespace osg; 
     14class Writer3DCNodeVisitor: public osg::NodeVisitor { 
     15 
     16    public: 
     17        Writer3DCNodeVisitor(std::ostream& fout) : 
     18            osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN), 
     19            _fout(fout) 
     20        { 
     21           // _fout << "# file written by OpenSceneGraph" << std::endl << std::endl; 
     22        } 
     23 
     24        virtual void apply(osg::Geode &node); 
     25 
     26    protected: 
     27 
     28        Writer3DCNodeVisitor& operator = (const Writer3DCNodeVisitor&) { return *this; } 
     29        std::ostream& _fout; 
     30 
     31}; 
     32 
     33void Writer3DCNodeVisitor::apply( osg::Geode &node ) 
     34{ 
     35    osg::Matrix matrix = osg::computeLocalToWorld(getNodePath()); 
     36 
     37    unsigned int count = node.getNumDrawables(); 
     38    for ( unsigned int i = 0; i < count; i++ ) 
     39    { 
     40        osg::Geometry *geometry = node.getDrawable( i )->asGeometry(); 
     41        if ( geometry ) 
     42        { 
     43            osg::Vec3Array* vertices = dynamic_cast<osg::Vec3Array*>(geometry->getVertexArray()); 
     44            osg::Vec3Array* normals = dynamic_cast<osg::Vec3Array*>(geometry->getNormalArray()); 
     45            osg::Vec3Array* colours = dynamic_cast<osg::Vec3Array*>(geometry->getColorArray()); 
     46 
     47            if ( vertices ) { 
     48                for (unsigned int ii=0;ii<vertices->size();ii++) { 
     49 
     50                    // update nodes with world coords 
     51                    osg::Vec3d v = vertices->at(ii) * matrix; 
     52                    _fout << v[0] << ' ' << v[1] << ' ' << v[2]; 
     53 
     54                    if ( colours ) 
     55                    { 
     56                        v=colours->at(ii); 
     57                        _fout << ' ' << (int)v[0]*255.0 << ' ' << (int)v[1]*255.0 << ' ' << (int)v[2]*255.0; 
     58                    } 
     59                    else 
     60                    { 
     61                        _fout << " 255 255 255"; 
     62                    } 
     63 
     64                    if ( normals ) 
     65                    { 
     66                        v = normals->at(ii); 
     67                        _fout << ' ' << v[0] << ' ' << v[1] << ' ' << v[2]; 
     68                    } 
     69                    else 
     70                    { 
     71                        _fout << " 0.0 0.0 1.0"; 
     72                    } 
     73 
     74 
     75                    _fout << std::endl; 
     76                } 
     77            } 
     78 
     79        } 
     80    } 
     81} 
    1682 
    1783class ReaderWriter3DC : public osgDB::ReaderWriter 
    1884{ 
    1985    public: 
    20      
     86 
    2187        ReaderWriter3DC() 
    2288        { 
    … …  
    2490            supportsExtension("asc","3DC point cloud format"); 
    2591        } 
    26      
     92 
    2793        virtual const char* className() const { return "3DC point cloud reader"; } 
    28          
     94 
    2995        virtual ReadResult readNode(const std::string& file, const osgDB::ReaderWriter::Options* options) const 
    3096        { 
    … …  
    34100            std::string fileName = osgDB::findDataFile( file, options ); 
    35101            if (fileName.empty()) return ReadResult::FILE_NOT_FOUND; 
    36              
     102 
    37103            osg::notify(osg::INFO) << "Reading file "<<fileName<<std::endl; 
    38      
     104 
    39105            const int LINE_SIZE = 1024; 
    40106            char line[LINE_SIZE]; 
    41              
     107 
     108            unsigned int targetNumVertices = 10000; 
     109 
     110            osg::Geode* geode = new osg::Geode; 
     111 
     112            osg::Geometry* geometry = new osg::Geometry; 
     113 
     114            osg::Vec3Array* vertices = new osg::Vec3Array; 
     115            osg::Vec3Array* normals = new osg::Vec3Array; 
     116            osg::Vec4ubArray* colours = new osg::Vec4ubArray; 
     117 
     118            osg::Vec3 pos; 
     119            osg::Vec3 normal(0.0,0.0,1.0); 
     120            int r=255,g=255,b=255,a=255; 
     121            char sep; 
     122 
    42123            osgDB::ifstream fin(fileName.c_str()); 
    43              
    44             unsigned int num = 0; 
    45124            while (fin) 
    46125            { 
    … …  
    51130                    osg::notify(osg::INFO) <<"Comment: "<<line<<std::endl; 
    52131                } 
    53                 else 
    54                 { 
    55                     ++num; 
    56                 } 
    57             } 
    58              
    59              
    60             osg::notify(osg::INFO) << "num="<<num<<std::endl; 
    61              
    62             unsigned int targetNumVertices = 10000; 
    63             
    64      
    65             osg::Geode* geode = new osg::Geode; 
    66  
    67             osg::Geometry* geometry = new osg::Geometry; 
    68              
    69             osg::Vec3Array* vertices = new osg::Vec3Array; 
    70             osg::Vec3Array* normals = new osg::Vec3Array; 
    71             osg::Vec4ubArray* colours = new osg::Vec4ubArray; 
    72              
    73             vertices->reserve(targetNumVertices); 
    74             normals->reserve(targetNumVertices); 
    75             colours->reserve(targetNumVertices); 
    76              
    77             fin.close(); 
    78              
    79             osgDB::ifstream fin2(fileName.c_str()); 
    80             while (fin2) 
    81             { 
    82                 fin2.getline(line,LINE_SIZE); 
    83                 if (line[0]=='#') 
    84                 { 
    85                     // comment line 
    86                     osg::notify(osg::INFO) <<"Comment: "<<line<<std::endl; 
    87                 } 
    88132                else if (strlen(line)>0) 
    89133                { 
    90                     ++num; 
    91                      
    92                     osg::Vec3 pos,normal; 
    93                     int r,g,b; 
    94                      
    95                     int a = sscanf(line,"%f %f %f %d %d %d %f %f %f", 
    96                                    &pos.x(),&pos.y(),&pos.z(), 
    97                                    &r,&g,&b, 
    98                                    &normal.x(),&normal.y(),&normal.z()); 
    99                                  
    100                                  
    101                     if (a) 
    102                     { 
    103                      
     134                    int matched = sscanf(line,"%f%c%f%c%f%c%d%c%d%c%d%c%f%c%f%c%f", 
     135                                   &pos.x(),&sep,&pos.y(),&sep,&pos.z(),&sep, 
     136                                   &r,&sep,&g,&sep,&b,&sep, 
     137                                   &normal.x(),&sep,&normal.y(),&sep,&normal.z()); 
     138 
     139                    if (matched) 
     140                    { 
     141 
    104142                        if (vertices->size()>=targetNumVertices) 
    105143                        { 
    … …  
    113151                            geometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX); 
    114152                            geometry->addPrimitiveSet(new osg::DrawArrays(GL_POINTS,0,vertices->size())); 
    115                              
     153 
    116154                            geode->addDrawable(geometry); 
    117155 
    118                             // allocate a new geometry                             
     156                            // allocate a new geometry 
    119157                            geometry = new osg::Geometry; 
    120158 
    … …  
    128166 
    129167                        } 
    130                                                          
     168 
    131169                        vertices->push_back(pos); 
    132170                        normals->push_back(normal); 
    133                         colours->push_back(osg::Vec4ub(r,g,b,255)); 
    134                          
     171                        colours->push_back(osg::Vec4ub(r,g,b,a)); 
    135172                    } 
    136173                } 
    137                  
    138174            } 
    139175 
    … …  
    149185 
    150186            geode->addDrawable(geometry); 
    151      
     187 
    152188            return geode; 
    153      
    154         } 
    155      
     189 
     190        } 
     191 
     192        virtual WriteResult writeNode(const osg::Node& node,const std::string& fileName,const Options* options =NULL) const  
     193        {  
     194            if (!acceptsExtension(osgDB::getFileExtension(fileName))) 
     195                return WriteResult(WriteResult::FILE_NOT_HANDLED); 
     196 
     197            osgDB::ofstream f(fileName.c_str()); 
     198 
     199            Writer3DCNodeVisitor nv(f);  
     200 
     201            // we must cast away constness 
     202            (const_cast<osg::Node*>(&node))->accept(nv); 
     203 
     204            return WriteResult(WriteResult::FILE_SAVED);  
     205        } 
    156206}; 
    157207 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/3ds/ReaderWriter3DS.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/3ds/ReaderWriter3DS.cpp:10664 
        22/OpenSceneGraph/trunk/include/osg/src/osgPlugins/3ds/ReaderWriter3DS.cpp:9882 
        3 /OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp:9769,9879-9880,9895,9906,9932,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         3/OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp:9769,9879-9880,9895,9906,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/OpenFlight

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/OpenFlight:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/OpenFlight:9769,9879-9880,9895,9932,10084,10208,10340,10417,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgPlugins/OpenFlight:9769,9879-9880,9895,9932,10010,10084,10208,10340,10417,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/ac/ac3d.cpp

    r9527 r11238  
    166166        virtual WriteResult writeNode(const osg::Node& node,std::ostream& fout, const Options* opts) const 
    167167        { 
    168             try 
    169             { 
    170                 // write ac file. 
    171                 if(dynamic_cast<const osg::Group*>(&node)) { 
    172                     const osg::Group *gp=dynamic_cast<const osg::Group*>(&node); 
    173                     const unsigned int nch=gp->getNumChildren(); 
    174                     for (unsigned int i=0; i<nch; i++) { 
    175                         writeNode(*(gp->getChild(i)), fout, opts); 
    176                     } 
    177                 } 
    178                 else 
    179                     osg::notify(osg::WARN)<<"File must start with a geode "<<std::endl; 
    180                 fout.flush(); 
    181                 return WriteResult::FILE_SAVED; 
    182             } 
    183             catch(ac3d::Exception e) 
    184             { 
    185                 osg::notify(osg::WARN)<<"Error parsing OSG tree: "<< e.getError() << std::endl;             
    186             } 
    187             return WriteResult::FILE_NOT_HANDLED; 
    188  
     168            // write ac file. 
     169            if(dynamic_cast<const osg::Group*>(&node)) 
     170            { 
     171                const osg::Group *gp=dynamic_cast<const osg::Group*>(&node); 
     172                const unsigned int nch=gp->getNumChildren(); 
     173                for (unsigned int i=0; i<nch; i++) 
     174                { 
     175                    writeNode(*(gp->getChild(i)), fout, opts); 
     176                } 
     177            } 
     178            else 
     179                osg::notify(osg::WARN)<<"File must start with a geode "<<std::endl; 
     180             
     181            fout.flush(); 
     182            return WriteResult::FILE_SAVED; 
    189183        } 
    190184private: 
    … …  
    417411    TextureData toTextureData(const std::string& texName) 
    418412    { 
     413        // If it is already there, use this 
    419414        TextureDataMap::iterator i = mTextureStates.find(texName); 
    420         if (i == mTextureStates.end()) 
    421             mTextureStates[texName].setTexture(texName, mOptions.get(), mModulateTexEnv.get()); 
    422         return mTextureStates[texName]; 
     415        if (i != mTextureStates.end()) 
     416            return i->second; 
     417        // Try to load that texture. 
     418        TextureData textureData; 
     419        textureData.setTexture(texName, mOptions.get(), mModulateTexEnv.get()); 
     420        if (textureData.valid()) { 
     421            mTextureStates[texName] = textureData; 
     422            return textureData; 
     423        } 
     424        // still no joy?, try with the stripped filename if this is different 
     425        // Try the pure file name if it is different 
     426        std::string simpleTexName = osgDB::getSimpleFileName(texName); 
     427        if (simpleTexName != texName) 
     428            return toTextureData(simpleTexName); 
     429 
     430        // Nothing that worked, return invalid data 
     431        return TextureData(); 
    423432    } 
    424433 
    … …  
    11671176        else if (token == "texture") { 
    11681177            // read the texture name 
    1169             std::string texname = readString(stream); 
    1170  
    1171             // strip absolute paths 
    1172             if (texname[0] == '/' ||  
    1173                 (isalpha(texname[0]) && texname[1] == ':')) { 
    1174                 std::string::size_type p = texname.rfind('\\'); 
    1175                 if (p != std::string::npos) 
    1176                     texname = texname.substr(p+1, std::string::npos); 
    1177                 p = texname.rfind('/'); 
    1178                 if (p != std::string::npos) 
    1179                     texname = texname.substr(p+1, std::string::npos); 
    1180             } 
    1181          
    1182             textureData = fileData.toTextureData(texname); 
     1178            textureData = fileData.toTextureData(readString(stream)); 
    11831179        } 
    11841180        else if (token == "texrep") { 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/bsp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/bsp:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/bsp:9769,9879-9880,9895,9932,10208,10340,10417,10456,10482-10484,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgPlugins/bsp:9769,9879-9880,9895,9932,10010,10208,10340,10417,10456,10482-10484,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/bsp/VBSPReader.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/bsp/VBSPReader.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/bsp/VBSPReader.cpp:9769,9879-9880,9895,9932,10208,10340,10417,10456,10482-10484,10487,10539,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgPlugins/bsp/VBSPReader.cpp:9769,9879-9880,9895,9932,10010,10208,10340,10417,10456,10482-10484,10487,10539,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/bvh

    • Property svn:mergeinfo

      •  

        old new  
        22/OpenSceneGraph/trunk:11009 
        33/OpenSceneGraph/trunk/bvh:10539 
        4 /OpenSceneGraph/trunk/src/osgPlugins/bvh:9769,9879-9880,9895,9932,10208,10340,10417,10456,10487,10622-10623,10625,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         4/OpenSceneGraph/trunk/src/osgPlugins/bvh:9769,9879-9880,9895,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/curl

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/curl:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/curl:9769,9879-9880,9895,9932,10208,10222,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgPlugins/curl:9769,9879-9880,9895,9932,10010,10208,10222,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/dxf

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/dxf:10664 
        22/OpenSceneGraph/trunk:9804 
        3 /OpenSceneGraph/trunk/src/osgPlugins/dxf:9769,9879-9880,9895,9932,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         3/OpenSceneGraph/trunk/src/osgPlugins/dxf:9769,9879-9880,9895,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/dxf/dxfEntity.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/dxf/dxfEntity.cpp:10664 
        22/OpenSceneGraph/trunk/dxfEntity.cpp:9804 
        3 /OpenSceneGraph/trunk/src/osgPlugins/dxf/dxfEntity.cpp:9769,9804,9879-9880,9895,9932,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         3/OpenSceneGraph/trunk/src/osgPlugins/dxf/dxfEntity.cpp:9769,9804,9879-9880,9895,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/hdr/hdrloader.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/hdr/hdrloader.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/hdr/hdrloader.cpp:9769,9801,9879-9880,9895,9932,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgPlugins/hdr/hdrloader.cpp:9769,9801,9879-9880,9895,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/jpeg

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/jpeg:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/jpeg:9769,9879-9880,9895,9932,10208,10340,10417,10456,10487,10496,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgPlugins/jpeg:9769,9879-9880,9895,9932,10010,10208,10340,10417,10456,10487,10496,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/mdl

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/mdl:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/mdl:9769,9879-9880,9895,9932,10093,10208,10340,10417,10456,10482-10483,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgPlugins/mdl:9769,9879-9880,9895,9932,10010,10093,10208,10340,10417,10456,10482-10483,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/mdl/MDLReader.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/mdl/MDLReader.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/mdl/MDLReader.cpp:9769,9879-9880,9895,9932,10093,10208,10340,10417,10456,10482-10483,10487,10539,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgPlugins/mdl/MDLReader.cpp:9769,9879-9880,9895,9932,10010,10093,10208,10340,10417,10456,10482-10483,10487,10539,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/osgAnimation

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/trunk:9646-10557 
        22/OpenSceneGraph/trunk/osgAnimation:10539 
        3 /OpenSceneGraph/trunk/src/osgPlugins/osgAnimation:9769,9879-9880,9895,9932,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         3/OpenSceneGraph/trunk/src/osgPlugins/osgAnimation:9769,9879-9880,9895,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/osgVolume

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/osgVolume:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/osgVolume:9769,9879-9880,9895,9932,10101-10137,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgPlugins/osgVolume:9769,9879-9880,9895,9932,10010,10101-10137,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/pdf

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/pdf:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/pdf:9769,9879-9880,9895,9932,10144,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgPlugins/pdf:9769,9879-9880,9895,9932,10010,10144,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/txp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/txp:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/txp:9769,9879-9880,9895,9932,10208,10340,10387,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgPlugins/txp:9769,9879-9880,9895,9932,10010,10208,10340,10387,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgSim

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgSim:10664 
        2 /OpenSceneGraph/trunk/src/osgSim:9769,9879-9880,9895,9932,10208,10321,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgSim:9769,9879-9880,9895,9932,10010,10208,10321,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgTerrain

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgTerrain:10664 
        2 /OpenSceneGraph/trunk/src/osgTerrain:9769,9879-9880,9895,9932,10208,10230,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgTerrain:9769,9879-9880,9895,9932,10010,10208,10230,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgText/TextBase.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgText/TextBase.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osgText/TextBase.cpp:9769,9879-9880,9895,9932,10208,10340,10376,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgText/TextBase.cpp:9769,9879-9880,9895,9932,10010,10208,10340,10376,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgUtil/Optimizer.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgUtil/Optimizer.cpp:10664 
        22/OpenSceneGraph/trunk/include/osg/src/osgUtil/Optimizer.cpp:9882 
        3 /OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp:9769,9879-9880,9895,9902,9920,9932,9987,10208,10340,10417,10456,10480,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         3/OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp:9769,9879-9880,9895,9902,9920,9932,9987,10010,10208,10340,10417,10456,10480,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgUtil/RenderStage.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgUtil/RenderStage.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osgUtil/RenderStage.cpp:9769,9822,9879-9880,9895,9932,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgUtil/RenderStage.cpp:9769,9822,9879-9880,9895,9932,10010,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgViewer

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgViewer:10664 
        2 /OpenSceneGraph/trunk/src/osgViewer:9769,9879-9880,9895,9932,10147,10208,10340,10364-10365,10417,10456,10460,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgViewer:9769,9879-9880,9895,9932,10010,10147,10208,10340,10364-10365,10417,10456,10460,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgViewer/GraphicsWindowWin32.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgViewer/GraphicsWindowWin32.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowWin32.cpp:9769,9824,9879-9880,9895,9932,10147,10208,10340,10364-10365,10417,10456,10460,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowWin32.cpp:9769,9824,9879-9880,9895,9932,10010,10147,10208,10340,10364-10365,10417,10456,10460,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgVolume

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgVolume:10664 
        2 /OpenSceneGraph/trunk/src/osgVolume:9769,9879-9880,9895,9932,10101-10137,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgVolume:9769,9879-9880,9895,9932,10010,10101-10137,10208,10340,10417,10456,10487,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgWidget

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgWidget:10664 
        2 /OpenSceneGraph/trunk/src/osgWidget:9769,9879-9880,9895,9932,10182,10208,10340,10417,10456,10487,10489,10622-10623,10625,10671-10672,10697,10722,10753,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131 
         2/OpenSceneGraph/trunk/src/osgWidget:9769,9879-9880,9895,9932,10010,10182,10208,10340,10417,10456,10487,10489,10622-10623,10625,10671-10672,10697,10722,10753,10758,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11175