Show
Ignore:
Timestamp:
03/21/10 00:19:35 (5 years ago)
Author:
paulmartz
Message:

2.8 branch: Mergine recent changes to FBX. Revisions in this commit: r11251, r11252, r11262.

Location:
OpenSceneGraph/branches/OpenSceneGraph-2.8
Files:
25 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         2/OpenSceneGraph/trunk:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         3/OpenSceneGraph/trunk/src/osgPlugins:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         3/OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/OpenFlight:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10482-10484,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/bsp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10482-10484,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10482-10484,10487,10491,10520,10538-10539,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/bsp/VBSPReader.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10482-10484,10487,10491,10520,10538-10539,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         4/OpenSceneGraph/trunk/src/osgPlugins/bvh:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10222,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/curl:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10222,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         3/OpenSceneGraph/trunk/src/osgPlugins/dxf:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         3/OpenSceneGraph/trunk/src/osgPlugins/dxf/dxfEntity.cpp:9769,9804,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/fbx/ReaderWriterFBX.cpp

    r11214 r11264  
    11#include <sstream> 
    22#include <memory> 
    3 #include <cassert> 
    43 
    54#include <osg/Notify> 
     
    9998}; 
    10099 
     100//Some files don't correctly mark their skeleton nodes, so this function infers 
     101//them from the nodes that skin deformers linked to. 
     102void findLinkedFbxSkeletonNodes(KFbxNode* pNode, std::set<const KFbxNode*>& fbxSkeletons) 
     103{ 
     104    if (const KFbxGeometry* pMesh = dynamic_cast<const KFbxGeometry*>(pNode->GetNodeAttribute())) 
     105    { 
     106        for (int i = 0; i < pMesh->GetDeformerCount(KFbxDeformer::eSKIN); ++i) 
     107        { 
     108            const KFbxSkin* pSkin = (const KFbxSkin*)pMesh->GetDeformer(i, KFbxDeformer::eSKIN); 
     109 
     110            for (int j = 0; j < pSkin->GetClusterCount(); ++j) 
     111            { 
     112                const KFbxNode* pSkeleton = pSkin->GetCluster(j)->GetLink(); 
     113                fbxSkeletons.insert(pSkeleton); 
     114            } 
     115        } 
     116    } 
     117 
     118    for (int i = 0; i < pNode->GetChildCount(); ++i) 
     119    { 
     120        findLinkedFbxSkeletonNodes(pNode->GetChild(i), fbxSkeletons); 
     121    } 
     122} 
     123 
    101124void resolveBindMatrices( 
    102125    osg::Node& root, 
     
    143166 
    144167                    osgAnimation::RigGeometry* pRigGeometry = it->first.second; 
    145                      
     168 
    146169                    osgAnimation::VertexInfluenceMap* vertexInfluences = pRigGeometry->getInfluenceMap(); 
    147170 
     
    158181                    else 
    159182                    { 
    160                         assert(0); 
     183                        osg::notify(osg::WARN) << "No vertex influences found for \"" << osgBone.getName() << "\"" << std::endl; 
    161184                    } 
    162185                } 
     
    165188        else 
    166189        { 
    167             assert(0); 
     190            osg::notify(osg::WARN) << "No bone found for \"" << fbxBone->GetName() << "\"" << std::endl; 
     191            ++it; 
    168192        } 
    169193    } 
     
    262286            FbxMaterialToOsgStateSet fbxMaterialToOsgStateSet(filePath, localOptions.get()); 
    263287 
     288            std::set<const KFbxNode*> fbxSkeletons; 
     289            findLinkedFbxSkeletonNodes(pNode, fbxSkeletons); 
     290 
    264291            std::map<KFbxNode*, osg::Node*> nodeMap; 
    265292            BindMatrixMap boneBindMatrices; 
     
    267294            ReadResult res = readFbxNode(*pSdkManager, pNode, pAnimationManager, 
    268295                bIsBone, nLightCount, fbxMaterialToOsgStateSet, nodeMap, 
    269                 boneBindMatrices, skeletonMap, localOptions.get()); 
     296                boneBindMatrices, fbxSkeletons, skeletonMap, localOptions.get()); 
    270297 
    271298            if (res.success()) 
    272299            { 
     300                fbxMaterialToOsgStateSet.checkInvertTransparency(); 
     301 
    273302                resolveBindMatrices(*res.getNode(), boneBindMatrices, nodeMap); 
    274303 
  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/fbx/fbxMaterialToOsgStateSet.cpp

    r11213 r11264  
    8181        } 
    8282    } 
    83     return std::make_pair(pOsgMat.release(), pOsgTex.release()); 
     83    StateSetContent result(pOsgMat.release(), pOsgTex.release()); 
     84    _kFbxMaterialMap.insert(KFbxMaterialMap::value_type(pFbxMat, result)); 
     85    return result; 
    8486} 
    8587 
     
    110112    } 
    111113} 
     114 
     115void FbxMaterialToOsgStateSet::checkInvertTransparency() 
     116{ 
     117    int zeroAlpha = 0, oneAlpha = 0; 
     118    for (KFbxMaterialMap::const_iterator it = _kFbxMaterialMap.begin(); it != _kFbxMaterialMap.end(); ++it) 
     119    { 
     120        const osg::Material* pMaterial = it->second.first; 
     121        float alpha = pMaterial->getDiffuse(osg::Material::FRONT).a(); 
     122        if (alpha > 0.999f) 
     123        { 
     124            ++oneAlpha; 
     125        } 
     126        else if (alpha < 0.001f) 
     127        { 
     128            ++zeroAlpha; 
     129        } 
     130    } 
     131 
     132    if (zeroAlpha > oneAlpha) 
     133    { 
     134        //Transparency values seem to be back to front so invert them. 
     135 
     136        for (KFbxMaterialMap::const_iterator it = _kFbxMaterialMap.begin(); it != _kFbxMaterialMap.end(); ++it) 
     137        { 
     138            osg::Material* pMaterial = it->second.first; 
     139            osg::Vec4 diffuse = pMaterial->getDiffuse(osg::Material::FRONT); 
     140            diffuse.a() = 1.0f - diffuse.a(); 
     141            pMaterial->setDiffuse(osg::Material::FRONT_AND_BACK, diffuse); 
     142        } 
     143    } 
     144} 
  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/fbx/fbxMaterialToOsgStateSet.h

    r11213 r11264  
    3434        _options(options), 
    3535        _dir(dir) {} 
     36 
     37    void checkInvertTransparency(); 
    3638private: 
    3739    //Convert a texture fbx to an osg texture. 
  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/fbx/fbxRMesh.cpp

    r11213 r11264  
    293293    const char* szName, 
    294294    BindMatrixMap& boneBindMatrices, 
     295    const std::set<const KFbxNode*>& fbxSkeletons, 
    295296    std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap) 
    296297{ 
     
    300301    pGeode->setName(szName); 
    301302 
    302     const KFbxLayer* pFbxLayer = 0; 
     303    const KFbxLayer* pFbxLayer = fbxMesh->GetLayer(0); 
    303304    const KFbxLayerElementNormal* pFbxNormals = 0; 
    304305    const KFbxLayerElementUV* pFbxUVs = 0; 
     
    308309    const KFbxVector4* pFbxVertices = fbxMesh->GetControlPoints(); 
    309310 
    310     if (pFbxLayer = fbxMesh->GetLayer(0)) 
     311    if (pFbxLayer) 
    311312    { 
    312313        pFbxNormals = pFbxLayer->GetNormals(); 
     
    615616        if (pSkin->GetClusterCount()) 
    616617        { 
    617             osgAnimation::Skeleton* pSkeleton = getSkeleton(pSkin->GetCluster(0)->GetLink(), skeletonMap); 
     618            osgAnimation::Skeleton* pSkeleton = getSkeleton( 
     619                pSkin->GetCluster(0)->GetLink(), fbxSkeletons, skeletonMap); 
    618620            pSkeleton->addChild(pResult); 
    619621            return osgDB::ReaderWriter::ReadResult::FILE_LOADED; 
     
    629631    std::vector<StateSetContent>& stateSetList, 
    630632    BindMatrixMap& boneBindMatrices, 
     633    const std::set<const KFbxNode*>& fbxSkeletons, 
    631634    std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap) 
    632635{ 
     
    639642 
    640643    return readMesh(pSdkManager, pNode, lMesh, pAnimationManager, stateSetList, 
    641         pNode->GetName(), boneBindMatrices, skeletonMap); 
    642 } 
     644        pNode->GetName(), boneBindMatrices, fbxSkeletons, skeletonMap); 
     645} 
  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/fbx/fbxRMesh.h

    r11213 r11264  
    1212    std::vector<StateSetContent>&, 
    1313    BindMatrixMap& boneBindMatrices, 
     14    const std::set<const KFbxNode*>& fbxSkeletons, 
    1415    std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap); 
    1516 
  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/fbx/fbxRNode.cpp

    r11213 r11264  
    325325    std::map<KFbxNode*, osg::Node*>& nodeMap, 
    326326    BindMatrixMap& boneBindMatrices, 
     327    const std::set<const KFbxNode*>& fbxSkeletons, 
    327328    std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap, 
    328329    const osgDB::ReaderWriter::Options* options) 
     
    349350            bIsBone = true; 
    350351        } 
     352    } 
     353 
     354    if (!bIsBone && fbxSkeletons.find(pNode) != fbxSkeletons.end()) 
     355    { 
     356        bIsBone = true; 
    351357    } 
    352358 
     
    378384            pSdkManager, pChildNode, pAnimationManager, 
    379385            bChildIsBone, nLightCount, fbxMaterialToOsgStateSet, nodeMap, 
    380             boneBindMatrices, skeletonMap, options); 
     386            boneBindMatrices, fbxSkeletons, skeletonMap, options); 
    381387        if (childResult.error()) 
    382388        { 
     
    426432            size_t bindMatrixCount = boneBindMatrices.size(); 
    427433            osgDB::ReaderWriter::ReadResult meshRes = readFbxMesh(pSdkManager, 
    428                 pNode, pAnimationManager, stateSetList, boneBindMatrices, skeletonMap); 
     434                pNode, pAnimationManager, stateSetList, boneBindMatrices, 
     435                fbxSkeletons, skeletonMap); 
    429436            if (meshRes.error()) 
    430437            { 
     
    491498    if (bCreateSkeleton) 
    492499    { 
    493         osgAnimation::Skeleton* osgSkeleton = getSkeleton(pNode, skeletonMap); 
     500        osgAnimation::Skeleton* osgSkeleton = getSkeleton(pNode, fbxSkeletons, skeletonMap); 
    494501        osgSkeleton->setDefaultUpdateCallback(); 
    495502        pAddChildrenTo->addChild(osgSkeleton); 
     
    511518 
    512519osgAnimation::Skeleton* getSkeleton(KFbxNode* fbxNode, 
     520    const std::set<const KFbxNode*>& fbxSkeletons, 
    513521    std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap) 
    514522{ 
    515523    //Find the first non-skeleton ancestor of the node. 
    516524    while (fbxNode && 
    517         fbxNode->GetNodeAttribute() && 
    518         fbxNode->GetNodeAttribute()->GetAttributeType() == KFbxNodeAttribute::eSKELETON) 
     525        ((fbxNode->GetNodeAttribute() && 
     526        fbxNode->GetNodeAttribute()->GetAttributeType() == KFbxNodeAttribute::eSKELETON) || 
     527        fbxSkeletons.find(fbxNode) != fbxSkeletons.end())) 
    519528    { 
    520529        fbxNode = fbxNode->GetParent(); 
  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/fbx/fbxRNode.h

    r11213 r11264  
    1111typedef std::map<std::pair<KFbxNode*, osgAnimation::RigGeometry*>, osg::Matrix> BindMatrixMap; 
    1212 
    13 osgAnimation::Skeleton* getSkeleton(KFbxNode*, std::map<KFbxNode*, osgAnimation::Skeleton*>&); 
     13osgAnimation::Skeleton* getSkeleton(KFbxNode*, 
     14    const std::set<const KFbxNode*>& fbxSkeletons, 
     15    std::map<KFbxNode*, osgAnimation::Skeleton*>&); 
    1416 
    1517osgDB::ReaderWriter::ReadResult readFbxNode( 
     
    2224    std::map<KFbxNode*, osg::Node*>& nodeMap, 
    2325    BindMatrixMap& boneBindMatrices, 
     26    const std::set<const KFbxNode*>& fbxSkeletons, 
    2427    std::map<KFbxNode*, osgAnimation::Skeleton*>& skeletonMap, 
    2528    const osgDB::ReaderWriter::Options* options = NULL); 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/hdr/hdrloader.cpp:9769,9801,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10496,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/jpeg:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10496,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10093,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10482-10483,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/mdl:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10093,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10482-10483,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10093,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10482-10483,10487,10491,10520,10538-10539,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/mdl/MDLReader.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10093,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10482-10483,10487,10491,10520,10538-10539,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         3/OpenSceneGraph/trunk/src/osgPlugins/osgAnimation:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10101-10137,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/osgVolume:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10101-10137,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10144,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/pdf:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10144,10149,10161,10208,10264,10283,10340,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262 
  • 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,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10387,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/txp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9910,9912,9932-9933,9948,9959-9960,9965,9968-9969,9990,10010,10012-10014,10030,10040-10041,10053,10057,10076,10079-10080,10082,10084,10088,10128,10149,10161,10208,10264,10283,10340,10387,10391-10392,10408,10414,10417,10422,10440,10456,10487,10491,10520,10538,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10809,10818,10851,10853-10855,10858,10887,10891-10892,10914,10923,10925,10932-10933,10938,10941-10942,10945,10961,11019,11032-11035,11056,11111,11123,11127,11131,11159,11165,11173,11175,11177,11180,11182,11194,11203,11237,11251-11252,11262