Changeset 9793

Show
Ignore:
Timestamp:
02/19/09 15:24:10 (4 years ago)
Author:
robert
Message:

Merged in various changes from the OSG-2.8 to being svn/trunk up to date.

Location:
OpenSceneGraph/trunk
Files:
11 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/AUTHORS.txt

    r9645 r9793  
    11OpenSceneGraph Library 2.8.0 
    22 
    3 364 Contributors: 
     3365 Contributors: 
    44 
    55Firstname Surname 
    … …  
    2727Mike Wittman 
    2828Wojciech Lewandowski 
     29Paul Melis 
    2930Colin McDonald 
    3031Andy Skinner 
    … …  
    3334Tom Jolley 
    3435Jeremy Moles 
    35 Paul Melis 
     36Jason Beverage 
    3637Norman Vine 
    3738Mattias Helsing 
    38 Jason Beverage 
     39Cedric Pinson 
    3940Art Tevs 
    4041Alberto Farre 
    4142André Garneau 
    4243Ruben Lopez 
     44Roland Smeenk 
    4345Randall Hopper 
    4446Michael Platings 
    45 Cedric Pinson 
    4647Adrian Egli 
    4748Olaf Flebbe 
    … …  
    5253Sherman Wilcox 
    5354Romano José Magacho da Silva 
    54 Roland Smeenk 
    5555Per Fahlberg 
    5656Michael Gronager 
    … …  
    6060Daniel Sjölie 
    6161Chris Hanson 
     62Alberto Luaces 
    6263Philip Lowman 
    63 Alberto Luaces 
    6464Melchior Franz 
    6565Chris Denham 
    … …  
    6868Frederic Marmond 
    6969David Fries 
     70Bryan Thrall 
    7071Boris Bralo 
    7172Yefei He 
    … …  
    8182Gino van den Bergen 
    8283Carlo Camporesi 
    83 Bryan Thrall 
    8484Ben Discoe 
    8585Andreas Ekstrand 
     86Sukender  
    8687Sasa Bistrovic 
    8788Neil Groves 
    … …  
    9091Markus Trenkwalder 
    9192Loic Dachary 
     93Lionel Lagarde 
    9294Joseph Steel 
    9395John Shue 
    … …  
    106108Michael Hartman 
    107109Luc Frauciel 
    108 Lionel Lagarde 
    109110Laurens Voerman 
    110111David Guthrie 
    … …  
    115116Thom DeCarlo 
    116117Tatsuhiro Nishioka 
    117 Sukender  
    118118Simon Julier 
    119119Sebastien Grignard 
    120120Romano Magacho 
    121121Richard Schmidt 
     122Riccardo Corsi 
     123Ralf Habacker 
    122124Paul de Repentigny 
    123125Liang Aibin 
    … …  
    135137Sohey Yamamoto 
    136138Rudolf Wiedemann 
    137 Riccardo Corsi 
    138 Ralf Habacker 
    139139Rafa Gaitan 
    140140Phil Atkin 
     141Miguel Escriva 
    141142Mattias Linde 
    142143Maria Ten 
    … …  
    146147Jaromir Vitek 
    147148James French 
     149Gary Quinn 
    148150Garrett Potts 
    149151Gabor Dorka 
    150152Fabio Mierlo 
     153Fabien Lavignotte 
    151154Doug McCorkle 
    152155Donn Mielcarek 
    … …  
    174177Sebastian Messerschmidt 
    175178Ralf Kern 
     179Pierre Haritchabalet 
    176180Perry Miller 
    177181Nathan Monteleone 
    178 Miguel Escriva 
     182Morné Pistorius 
    179183Michael Henheffer 
    180184Michael Guerrero 
    … …  
    263267Nathan Cournia 
    264268Morten Haukness 
    265 Morné Pistorius 
    266269Mirko Viviani 
    267270Mikkel GjÞl 
    … …  
    316319Gian Lorenzetto 
    317320George Papagiannakis 
    318 Gary Quinn 
    319321Galen Faidley 
    320322Frederic Bouvier 
    … …  
    323325Frank Lichtenheld 
    324326Ferdinand Cornelissen 
    325 Fabien Lavignotte 
    326327Fabien Dachicourt 
    327328Emmanuel Roche 

  • OpenSceneGraph/trunk/CMakeLists.txt

    r9770 r9793  
    9797        SET(SVNSOURCEDIR ${SVNTRUNKDIR}) 
    9898    ELSE (OPENSCENEGRAPH_SVN STREQUAL "trunk") 
    99         SET(SVNSOURCEDIR ${SVNBRANCH_DIR}/${OPENSCENEGRAPH_BRANCH}) 
     99        SET(SVNSOURCEDIR ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH}) 
    100100    ENDIF(OPENSCENEGRAPH_SVN STREQUAL "trunk") 
    101101 

  • OpenSceneGraph/trunk/ChangeLog

    r9602 r9793  
     12009-02-11 20:26  robert 
     2 
     3        * applications/osgversion/osgversion.cpp: Fixed typo 
     4 
     52009-02-11 20:02  robert 
     6 
     7        * src/osgWrappers/OpenThreads/Thread.cpp, 
     8          src/osgWrappers/osg/AlphaFunc.cpp, 
     9          src/osgWrappers/osg/AnimationPath.cpp, 
     10          src/osgWrappers/osg/ApplicationUsage.cpp, 
     11          src/osgWrappers/osg/ArgumentParser.cpp, 
     12          src/osgWrappers/osg/Billboard.cpp, 
     13          src/osgWrappers/osg/BlendColor.cpp, 
     14          src/osgWrappers/osg/BlendEquation.cpp, 
     15          src/osgWrappers/osg/BlendFunc.cpp, 
     16          src/osgWrappers/osg/BoundingBox.cpp, 
     17          src/osgWrappers/osg/BoundingSphere.cpp, 
     18          src/osgWrappers/osg/BufferObject.cpp, 
     19          src/osgWrappers/osg/Camera.cpp, 
     20          src/osgWrappers/osg/ClampColor.cpp, 
     21          src/osgWrappers/osg/ClipNode.cpp, 
     22          src/osgWrappers/osg/ClipPlane.cpp, 
     23          src/osgWrappers/osg/ClusterCullingCallback.cpp, 
     24          src/osgWrappers/osg/CollectOccludersVisitor.cpp, 
     25          src/osgWrappers/osg/ColorMask.cpp, 
     26          src/osgWrappers/osg/ColorMatrix.cpp, 
     27          src/osgWrappers/osg/ConvexPlanarOccluder.cpp, 
     28          src/osgWrappers/osg/CoordinateSystemNode.cpp, 
     29          src/osgWrappers/osg/CopyOp.cpp, src/osgWrappers/osg/CullFace.cpp, 
     30          src/osgWrappers/osg/CullSettings.cpp, 
     31          src/osgWrappers/osg/CullingSet.cpp, 
     32          src/osgWrappers/osg/Depth.cpp, 
     33          src/osgWrappers/osg/DisplaySettings.cpp, 
     34          src/osgWrappers/osg/DrawPixels.cpp, 
     35          src/osgWrappers/osg/Drawable.cpp, src/osgWrappers/osg/Fog.cpp, 
     36          src/osgWrappers/osg/FragmentProgram.cpp, 
     37          src/osgWrappers/osg/FrameBufferObject.cpp, 
     38          src/osgWrappers/osg/FrontFace.cpp, 
     39          src/osgWrappers/osg/GL2Extensions.cpp, 
     40          src/osgWrappers/osg/Geometry.cpp, 
     41          src/osgWrappers/osg/GraphicsContext.cpp, 
     42          src/osgWrappers/osg/Group.cpp, src/osgWrappers/osg/Hint.cpp, 
     43          src/osgWrappers/osg/Image.cpp, 
     44          src/osgWrappers/osg/ImageSequence.cpp, 
     45          src/osgWrappers/osg/ImageStream.cpp, 
     46          src/osgWrappers/osg/KdTree.cpp, src/osgWrappers/osg/LOD.cpp, 
     47          src/osgWrappers/osg/Light.cpp, 
     48          src/osgWrappers/osg/LightModel.cpp, 
     49          src/osgWrappers/osg/LineStipple.cpp, 
     50          src/osgWrappers/osg/LineWidth.cpp, 
     51          src/osgWrappers/osg/LogicOp.cpp, 
     52          src/osgWrappers/osg/Material.cpp, 
     53          src/osgWrappers/osg/Multisample.cpp, 
     54          src/osgWrappers/osg/Node.cpp, 
     55          src/osgWrappers/osg/NodeCallback.cpp, 
     56          src/osgWrappers/osg/OcclusionQueryNode.cpp, 
     57          src/osgWrappers/osg/PagedLOD.cpp, src/osgWrappers/osg/Point.cpp, 
     58          src/osgWrappers/osg/PointSprite.cpp, 
     59          src/osgWrappers/osg/PolygonMode.cpp, 
     60          src/osgWrappers/osg/PolygonOffset.cpp, 
     61          src/osgWrappers/osg/PolygonStipple.cpp, 
     62          src/osgWrappers/osg/PrimitiveSet.cpp, 
     63          src/osgWrappers/osg/Program.cpp, 
     64          src/osgWrappers/osg/ProxyNode.cpp, 
     65          src/osgWrappers/osg/Scissor.cpp, 
     66          src/osgWrappers/osg/Sequence.cpp, 
     67          src/osgWrappers/osg/ShadeModel.cpp, 
     68          src/osgWrappers/osg/Shader.cpp, src/osgWrappers/osg/Shape.cpp, 
     69          src/osgWrappers/osg/ShapeDrawable.cpp, 
     70          src/osgWrappers/osg/State.cpp, 
     71          src/osgWrappers/osg/StateAttribute.cpp, 
     72          src/osgWrappers/osg/StateSet.cpp, 
     73          src/osgWrappers/osg/Stencil.cpp, 
     74          src/osgWrappers/osg/StencilTwoSided.cpp, 
     75          src/osgWrappers/osg/Switch.cpp, src/osgWrappers/osg/TexEnv.cpp, 
     76          src/osgWrappers/osg/TexEnvCombine.cpp, 
     77          src/osgWrappers/osg/TexEnvFilter.cpp, 
     78          src/osgWrappers/osg/TexGen.cpp, src/osgWrappers/osg/TexMat.cpp, 
     79          src/osgWrappers/osg/Texture.cpp, 
     80          src/osgWrappers/osg/Texture1D.cpp, 
     81          src/osgWrappers/osg/Texture2D.cpp, 
     82          src/osgWrappers/osg/Texture2DArray.cpp, 
     83          src/osgWrappers/osg/Texture3D.cpp, 
     84          src/osgWrappers/osg/TextureCubeMap.cpp, 
     85          src/osgWrappers/osg/TextureRectangle.cpp, 
     86          src/osgWrappers/osg/TransferFunction.cpp, 
     87          src/osgWrappers/osg/Uniform.cpp, 
     88          src/osgWrappers/osg/VertexProgram.cpp, 
     89          src/osgWrappers/osg/View.cpp, src/osgWrappers/osg/Viewport.cpp, 
     90          src/osgWrappers/osgAnimation/Animation.cpp, 
     91          src/osgWrappers/osgAnimation/AnimationManager.cpp, 
     92          src/osgWrappers/osgAnimation/BasicAnimationManager.cpp, 
     93          src/osgWrappers/osgAnimation/Bone.cpp, 
     94          src/osgWrappers/osgAnimation/Channel.cpp, 
     95          src/osgWrappers/osgAnimation/CubicBezier.cpp, 
     96          src/osgWrappers/osgAnimation/EaseMotion.cpp, 
     97          src/osgWrappers/osgAnimation/Interpolator.cpp, 
     98          src/osgWrappers/osgAnimation/Keyframe.cpp, 
     99          src/osgWrappers/osgAnimation/RigGeometry.cpp, 
     100          src/osgWrappers/osgAnimation/Skeleton.cpp, 
     101          src/osgWrappers/osgAnimation/Target.cpp, 
     102          src/osgWrappers/osgAnimation/Timeline.cpp, 
     103          src/osgWrappers/osgAnimation/TimelineAnimationManager.cpp, 
     104          src/osgWrappers/osgAnimation/UpdateCallback.cpp, 
     105          src/osgWrappers/osgAnimation/VertexInfluence.cpp, 
     106          src/osgWrappers/osgDB/DatabasePager.cpp, 
     107          src/osgWrappers/osgDB/DotOsgWrapper.cpp, 
     108          src/osgWrappers/osgDB/DynamicLibrary.cpp, 
     109          src/osgWrappers/osgDB/FileUtils.cpp, 
     110          src/osgWrappers/osgDB/ImageOptions.cpp, 
     111          src/osgWrappers/osgDB/ReaderWriter.cpp, 
     112          src/osgWrappers/osgDB/Registry.cpp, 
     113          src/osgWrappers/osgFX/Registry.cpp, 
     114          src/osgWrappers/osgFX/Validator.cpp, 
     115          src/osgWrappers/osgGA/AnimationPathManipulator.cpp, 
     116          src/osgWrappers/osgGA/DriveManipulator.cpp, 
     117          src/osgWrappers/osgGA/FlightManipulator.cpp, 
     118          src/osgWrappers/osgGA/GUIEventAdapter.cpp, 
     119          src/osgWrappers/osgGA/GUIEventHandler.cpp, 
     120          src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp, 
     121          src/osgWrappers/osgGA/NodeTrackerManipulator.cpp, 
     122          src/osgWrappers/osgParticle/AccelOperator.cpp, 
     123          src/osgWrappers/osgParticle/AngularAccelOperator.cpp, 
     124          src/osgWrappers/osgParticle/BoxPlacer.cpp, 
     125          src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp, 
     126          src/osgWrappers/osgParticle/ConstantRateCounter.cpp, 
     127          src/osgWrappers/osgParticle/ForceOperator.cpp, 
     128          src/osgWrappers/osgParticle/LinearInterpolator.cpp, 
     129          src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp, 
     130          src/osgWrappers/osgParticle/ParticleProcessor.cpp, 
     131          src/osgWrappers/osgParticle/ParticleSystem.cpp, 
     132          src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp, 
     133          src/osgWrappers/osgParticle/PointPlacer.cpp, 
     134          src/osgWrappers/osgParticle/PrecipitationEffect.cpp, 
     135          src/osgWrappers/osgParticle/RadialShooter.cpp, 
     136          src/osgWrappers/osgParticle/RandomRateCounter.cpp, 
     137          src/osgWrappers/osgParticle/SectorPlacer.cpp, 
     138          src/osgWrappers/osgParticle/SegmentPlacer.cpp, 
     139          src/osgWrappers/osgShadow/DebugShadowMap.cpp, 
     140          src/osgWrappers/osgShadow/LightSpacePerspectiveShadowMap.cpp, 
     141          src/osgWrappers/osgShadow/MinimalCullBoundsShadowMap.cpp, 
     142          src/osgWrappers/osgShadow/MinimalDrawBoundsShadowMap.cpp, 
     143          src/osgWrappers/osgShadow/MinimalShadowMap.cpp, 
     144          src/osgWrappers/osgShadow/OccluderGeometry.cpp, 
     145          src/osgWrappers/osgShadow/ParallelSplitShadowMap.cpp, 
     146          src/osgWrappers/osgShadow/ShadowMap.cpp, 
     147          src/osgWrappers/osgShadow/ShadowTechnique.cpp, 
     148          src/osgWrappers/osgShadow/ShadowTexture.cpp, 
     149          src/osgWrappers/osgShadow/ShadowVolume.cpp, 
     150          src/osgWrappers/osgShadow/ShadowedScene.cpp, 
     151          src/osgWrappers/osgShadow/SoftShadowMap.cpp, 
     152          src/osgWrappers/osgShadow/StandardShadowMap.cpp, 
     153          src/osgWrappers/osgShadow/ViewDependentShadowTechnique.cpp, 
     154          src/osgWrappers/osgSim/BlinkSequence.cpp, 
     155          src/osgWrappers/osgSim/DOFTransform.cpp, 
     156          src/osgWrappers/osgSim/Impostor.cpp, 
     157          src/osgWrappers/osgSim/LightPointNode.cpp, 
     158          src/osgWrappers/osgSim/LightPointSystem.cpp, 
     159          src/osgWrappers/osgSim/MultiSwitch.cpp, 
     160          src/osgWrappers/osgSim/ObjectRecordData.cpp, 
     161          src/osgWrappers/osgSim/OverlayNode.cpp, 
     162          src/osgWrappers/osgSim/ScalarBar.cpp, 
     163          src/osgWrappers/osgSim/Sector.cpp, 
     164          src/osgWrappers/osgSim/ShapeAttribute.cpp, 
     165          src/osgWrappers/osgSim/SphereSegment.cpp, 
     166          src/osgWrappers/osgSim/VisibilityGroup.cpp, 
     167          src/osgWrappers/osgTerrain/GeometryTechnique.cpp, 
     168          src/osgWrappers/osgTerrain/Layer.cpp, 
     169          src/osgWrappers/osgTerrain/Locator.cpp, 
     170          src/osgWrappers/osgTerrain/Terrain.cpp, 
     171          src/osgWrappers/osgTerrain/TerrainTechnique.cpp, 
     172          src/osgWrappers/osgTerrain/TerrainTile.cpp, 
     173          src/osgWrappers/osgText/FadeText.cpp, 
     174          src/osgWrappers/osgText/KerningType.cpp, 
     175          src/osgWrappers/osgText/String.cpp, 
     176          src/osgWrappers/osgText/Text.cpp, 
     177          src/osgWrappers/osgText/Text3D.cpp, 
     178          src/osgWrappers/osgUtil/CullVisitor.cpp, 
     179          src/osgWrappers/osgUtil/DelaunayTriangulator.cpp, 
     180          src/osgWrappers/osgUtil/GLObjectsVisitor.cpp, 
     181          src/osgWrappers/osgUtil/IntersectVisitor.cpp, 
     182          src/osgWrappers/osgUtil/RenderBin.cpp, 
     183          src/osgWrappers/osgUtil/RenderStage.cpp, 
     184          src/osgWrappers/osgUtil/SceneView.cpp, 
     185          src/osgWrappers/osgUtil/Simplifier.cpp, 
     186          src/osgWrappers/osgUtil/Statistics.cpp, 
     187          src/osgWrappers/osgUtil/Tessellator.cpp, 
     188          src/osgWrappers/osgViewer/CompositeViewer.cpp, 
     189          src/osgWrappers/osgViewer/GraphicsWindow.cpp, 
     190          src/osgWrappers/osgViewer/View.cpp, 
     191          src/osgWrappers/osgViewer/Viewer.cpp, 
     192          src/osgWrappers/osgViewer/ViewerBase.cpp, 
     193          src/osgWrappers/osgViewer/ViewerEventHandlers.cpp, 
     194          src/osgWrappers/osgVolume/FixedFunctionTechnique.cpp, 
     195          src/osgWrappers/osgVolume/Layer.cpp, 
     196          src/osgWrappers/osgVolume/Locator.cpp, 
     197          src/osgWrappers/osgVolume/Property.cpp, 
     198          src/osgWrappers/osgVolume/RayTracedTechnique.cpp, 
     199          src/osgWrappers/osgVolume/Volume.cpp, 
     200          src/osgWrappers/osgVolume/VolumeTechnique.cpp, 
     201          src/osgWrappers/osgVolume/VolumeTile.cpp, 
     202          src/osgWrappers/osgWidget/Browser.cpp, 
     203          src/osgWrappers/osgWidget/Frame.cpp, 
     204          src/osgWrappers/osgWidget/Label.cpp, 
     205          src/osgWrappers/osgWidget/StyleManager.cpp, 
     206          src/osgWrappers/osgWidget/ViewerEventHandlers.cpp, 
     207          src/osgWrappers/osgWidget/Widget.cpp, 
     208          src/osgWrappers/osgWidget/Window.cpp: Updated wrappers 
     209 
     2102009-02-11 19:55  robert 
     211 
     212        * src/osgWrappers/Doxyfile.template, 
     213          src/osgWrappers/genwrapper.conf: Updated wrappers to works with 
     214          doxygen 1.5.8 output. 
     215 
     2162009-02-11 17:21  robert 
     217 
     218        * CMakeLists.txt: Disabled the use of aggressive warnings under OSX 
     219          as the default. 
     220 
     2212009-02-11 17:14  robert 
     222 
     223        * src/osgPlugins/quicktime/QTImportExport.cpp, 
     224          src/osgPlugins/quicktime/QTUtils.cpp, 
     225          src/osgPlugins/quicktime/QTUtils.h, 
     226          src/osgPlugins/quicktime/ReaderWriterQT.cpp: From Riccardo Corsi, 
     227          "in attach you'll find a patch to cleanup a little bit the 
     228          (de)initialization code of QuickTime environment from the 
     229          quickTime pluging. 
     230          It basically removes the static init() and exit() functions,and 
     231          move them inside the observer class (the one that cleans 
     232          everything up when the last media is unloaded). 
     233           
     234          It also add an extra check to clean up on exit if the QuickTime 
     235          env is initialized, but no media is succesfully loaded / written 
     236          (it might happens with streaming resources). 
     237           
     238          I tested it under WinXP with zero, one and multiple videos. 
     239           
     240          Stephan reads in copy: could you kindly check if everything runs 
     241          smooth under OSX as well? Also, have you got a chance to test it 
     242          with streaming media? 
     243          " 
     244 
     2452009-02-11 13:33  robert 
     246 
     247        * doc/Doxyfiles/all_Doxyfile, doc/Doxyfiles/auto_Mainpage, 
     248          doc/Doxyfiles/core_Doxyfile, doc/Doxyfiles/doxyfile.cmake, 
     249          doc/Doxyfiles/openthreads.doxyfile.cmake, 
     250          src/osgWrappers/Doxyfile.template: From Sukender, changed doxygen 
     251          verbosity to quite 
     252 
     2532009-02-11 12:10  robert 
     254 
     255        * src/OpenThreads/sproc/SprocThread.c++: Added brackets around 
     256          (unsigned int) to avoid IRIX compile error. 
     257 
     2582009-02-11 10:41  robert 
     259 
     260        * include/osg/BoundingBox, include/osgAnimation/Vec3Packed, 
     261          include/osgTerrain/Terrain, 
     262          include/osgUtil/DrawElementTypeSimplifier, 
     263          include/osgWidget/Browser: Fixes for doxgen warnings 
     264 
     2652009-02-11 09:14  robert 
     266 
     267        * CMakeModules/FindCOLLADA.cmake, 
     268          src/osgPlugins/dae/daeRMaterials.cpp: From Roland Smeenk, 
     269          "Attached are two small fixes: 
     270          -I changed the SET of COLLADA_BOOST_INCLUDE_DIR to use findpath, 
     271          so users may override this setting if they choose not to build 
     272          against to precompiled boost libraries delivered with the Collada 
     273          DOM. 
     274           
     275          -Changed daeRMaterials.cpp to prevent a compiler warning about a 
     276          potentially uninitialized variable." 
     277 
     2782009-02-10 20:31  robert 
     279 
     280        * CMakeLists.txt, src/osgPlugins/cfg/ConfigParser.cpp: Merged 
     281          warning fix from OSG-2.8 branch: 
     282           
     283          svn merge -r 9755:9756 
     284          http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.8 
     285 
     2862009-02-10 20:09  robert 
     287 
     288        * src/osgDB/DynamicLibrary.cpp: Changed notication level to INFO, 
     289          merged changed from OSG-2.8 branch using: 
     290           
     291          svn merge -r 9751:9752 
     292          http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.8 
     293 
     2942009-02-10 19:25  robert 
     295 
     296        * CMakeModules/FindCOLLADA.cmake, 
     297          src/osgPlugins/dae/CMakeLists.txt: From Roger James and Robert 
     298          Osfield, fixes and reorganization to better support Windows 
     299          dyanmic library build 
     300 
     3012009-02-10 18:56  robert 
     302 
     303        * src/osgPlugins/osgParticle/IO_FluidProgram.cpp: From Pierre 
     304          Haritchabalet, "In IO_FluidProgram.cpp, 
     305          FluidProgram_readLocalData() function is wrong. When density 
     306          parameter is read, the function "setFluidViscosity()" is called 
     307          instead of "setFluidDensity()". 
     308          This patch fixes osg plug'in FluidProgram_readLocalData. " 
     309 
     3102009-02-10 18:51  robert 
     311 
     312        * examples/osgvolume/osgvolume.cpp, include/osgVolume/Layer, 
     313          include/osgVolume/VolumeTile, src/osgVolume/Layer.cpp, 
     314          src/osgVolume/VolumeTile.cpp, 
     315          src/osgWrappers/osgVolume/Layer.cpp: Merged fixes to osgVolume's 
     316          handling of ImageSequence animated volumes, merge command: 
     317           
     318          svn merge -r 9746:9747 
     319          http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.8 
     320 
     3212009-02-10 14:01  robert 
     322 
     323        * PlatformSpecifics/Windows/OpenSceneGraphVersionInfo.rc.in, 
     324          PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc.in: From 
     325          Roger James, fixes for VS build handling of new VS versioning 
     326          support 
     327 
     3282009-02-10 13:37  robert 
     329 
     330        * src/osgPlugins/curl/ReaderWriterCURL.cpp: From Jason Beverage, 
     331          "I've added a small change to the CURL plugin that allows support 
     332          for HTTP redirects." 
     333 
     3342009-02-10 13:25  robert 
     335 
     336        * CMakeModules/FindZLIB.cmake: From Miguel Escriva,"OSG 2.8.0-rc4 
     337          don't found zlib in Windows. 
     338           
     339          Here you will find a patch. " 
     340 
     3412009-02-10 11:44  robert 
     342 
     343        * CMakeLists.txt, CMakeModules/FindCOLLADA.cmake, 
     344          src/osgPlugins/dae/CMakeLists.txt: From Roland Smeenk and Robert 
     345          Osfiled, tweaks to the Collada finding/linking to improve support 
     346          for Collada DOM 2.1 + 2.2 across platforms. 
     347 
     3482009-02-09 22:56  robert 
     349 
     350        * examples/osganimationskinning/osganimationskinning.cpp, 
     351          include/osgAnimation/RigGeometry, include/osgAnimation/Timeline, 
     352          src/osgWrappers/osgAnimation/RigGeometry.cpp, 
     353          src/osgWrappers/osgAnimation/Timeline.cpp: From Fabien 
     354          Lavignotte, "Here is some various small fixes i have done while 
     355          playing with 
     356          osgAnimation. 
     357          - Animation : removed the _name attribute that is never used. 
     358          - BasicAnimationManager : fix a crash on Windows with the example 
     359          osganimationviewer. The _lastUpdate attribute was not initialized 
     360          when 
     361          using copy constructor. 
     362          - CMakeLists.txt : add RigGeometry to the headers list" 
     363 
     3642009-02-09 22:33  robert 
     365 
     366        * src/osgDB/DatabasePager.cpp: Fixed to 
     367          DatabasePager::getRequestsInProgress(), merged from: 
     368           
     369          svn merge -r 9734:9735 
     370          http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.8 
     371 
     3722009-02-09 22:12  robert 
     373 
     374        * src/osgWrappers/genwrapper.conf, 
     375          src/osgWrappers/osgParticle/ParticleSystem.cpp: Merged from 
     376          OSG-2.8 branch the suppression of the wrapping of the 
     377          ScopeLock<Mutext> 
     378 
     3792009-02-09 21:48  robert 
     380 
     381        * src/osgPlugins/osg/ReaderWriterOSG.cpp: From Bryan Thrall, "The 
     382          .osg plugin doesn't seem to support an option to write shader 
     383          files 
     384          separately, so it always inlines them in the .osg file (as far as 
     385          I can 
     386          tell). This change adds that ability. " 
     387 
     3882009-02-09 21:42  robert 
     389 
     390        * src/osgViewer/GraphicsWindowWin32.cpp: From Ralf Habacker, fix to 
     391          memory leak in GraphicsWindowWin32.cpp. Merged from OSG-2.8 
     392          branch using svn command: 
     393           
     394          svn merge -r 9726:9727 
     395          http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.8 
     396 
     3972009-02-09 21:38  robert 
     398 
     399        * include/osgParticle/ParticleSystem, 
     400          src/osgParticle/ConnectedParticleSystem.cpp, 
     401          src/osgParticle/ParticleProcessor.cpp, 
     402          src/osgParticle/ParticleSystem.cpp, 
     403          src/osgParticle/ParticleSystemUpdater.cpp, 
     404          src/osgWrappers/osgParticle/ParticleSystem.cpp: Merged from 
     405          OSG-2.8 branch changes to the use of ReadWriteMutex to Mutex in 
     406          osgParticle::ParticleSystem. 
     407           
     408          svn command: 
     409           
     410          svn merge -r 9725:9726 
     411          http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.8 
     412 
     4132009-02-09 13:49  shuber 
     414 
     415        * Xcode/OpenSceneGraph/config/OpenThreads/Config: From Stephan 
     416          Huber: fixed local Config file needed for xcode-project 
     417 
     4182009-02-09 11:15  robert 
     419 
     420        * NEWS.txt: From Paul Melis, syncing improvements made to wiki 
     421          version of NEWS for 2.8 
     422 
     4232009-02-09 11:13  robert 
     424 
     425        * src/osgDB/Registry.cpp: Removed redundent #pragma 
     426 
     4272009-02-09 10:00  robert 
     428 
     429        * src/osgWrappers/osgAnimation/Animation.cpp: Updated wrappers 
     430 
     4312009-02-09 09:41  robert 
     432 
     433        * include/osgAnimation/Animation: From Cedric Pinson, removed 
     434          virtual inheritance from osgAnimation::Animation 
     435 
     4362009-02-08 19:30  robert 
     437 
     438        * src/osgText/Text.cpp: Fixed handling of a series of \n in the 
     439          text string so that the correct line spacing is maintained. 
     440 
     4412009-02-08 15:56  robert 
     442 
     443        * examples/osgcompositeviewer/osgcompositeviewer.cpp, 
     444          examples/osgfont/osgfont.cpp, examples/osgmovie/osgmovie.cpp, 
     445          examples/osgocclusionquery/osgocclusionquery.cpp, 
     446          src/osgDB/DynamicLibrary.cpp: From Paul Melis, "While trying out 
     447          the osgbrowser example (where I had forgotten to update 
     448          LD_LIBRARY_PATH so the XUL libs would be found) I noticed that 
     449          although 
     450          the gecko plugin was found it could not be loaded. But this did 
     451          not 
     452          trigger any visible warning/error message (at least not without 
     453          INFO 
     454          notify level). Would you mind if we change the notify level for a 
     455          dlerror() to WARNING? This will also make it more explicit for 
     456          the case 
     457          when a plugin isn't actually found, which seems to come up a lot 
     458          for 
     459          novice users (e.g. no freetype on win32, so no freetype plugin, 
     460          etc). 
     461          Also, the current error message is misleading ("Warning: Could 
     462          not FIND 
     463          plugin to ...") because the it's not always a case of not finding 
     464          the 
     465          plugin. I slightly enhanced the situation of not finding a plugin 
     466          versus 
     467          finding it but not being able to load it. 
     468           
     469          Here's also a few fixes to some of the examples: 
     470          - osgfont: make usage help line more in line with the actual 
     471          behaviour 
     472          - osgcompositeviewer: complain when no model file was provided 
     473          - osgmovie: don't include quicktime-dependent feature on Linux 
     474          - osgocclussionquery: comment addition (as I was surprised that 
     475          lines 
     476          were being drawn in a function called createRandomTriangles())" 
     477 
     4782009-02-07 11:30  robert 
     479 
     480        * src/osgUtil/Optimizer.cpp: Merged from OSG-2.8 branch, fix to 
     481          handle of StateSet attached to transforms being removed by the 
     482          FlattentStaticTransformVisitor 
     483 
     4842009-02-06 15:49  robert 
     485 
     486        * CMakeLists.txt, include/osg/Version: Bumped version number of 
     487          svn/trunk to 2.9.0 
     488 
     4892009-02-06 15:39  robert 
     490 
     491        * include/osg/Export: Added a couple more pragma's to resolve final 
     492          Windows warnings 
     493 
     4942009-02-06 15:38  robert 
     495 
     496        * CMakeModules/FindOurDCMTK.cmake, CMakeModules/FindXUL.cmake: From 
     497          Paul Melis & Robert Osfeild, improvements to find scripts to 
     498          better handle diffrent installation combinations 
     499 
     5002009-02-06 15:17  robert 
     501 
     502        * examples/osg2cpp/osg2cpp.cpp, 
     503          examples/osganimationtimeline/osganimationtimeline.cpp, 
     504          examples/osganimationviewer/AnimtkViewerKeyHandler.cpp, 
     505          examples/osgcluster/broadcaster.cpp, 
     506          examples/osgcluster/osgcluster.cpp, 
     507          examples/osggeodemo/osggeodemo.cpp, 
     508          examples/osgmemorytest/osgmemorytest.cpp, 
     509          examples/osgmultitexture/osgmultitexture.cpp: From Gary Quinn, 
     510          spelling fixes 
     511 
     5122009-02-06 14:19  robert 
     513 
     514        * src/OpenThreads/CMakeLists.txt: Fixed path to version resource 
     515          input file 
     516 
     5172009-02-06 14:13  robert 
     518 
     519        * PlatformSpecifics/Windows/osgShell.bat: From Gary Quin + Robert 
     520          Osfield, clean up of old batch file 
     521 
     5222009-02-06 12:15  robert 
     523 
     524        * src/osgPlugins/lwo/lwo2read.h: Fixed data copy bug 
     525 
     5262009-02-06 10:35  robert 
     527 
     528        * src/osg/Image.cpp, src/osg/State.cpp, 
     529          src/osgPlugins/dicom/ReaderWriterDICOM.cpp, 
     530          src/osgPlugins/osgVolume/ImageLayer.cpp, 
     531          src/osgUtil/RenderStage.cpp: From Alberto Luaces, "here are some 
     532          minor fixes to notify warnings were the std::hex modifier was 
     533          used but never restored to the decimal notation. That made OSG 
     534          print messages 
     535          like the following after some notifications: 
     536           
     537          Warning: detected OpenGL error 'invalid value' after 
     538          RenderBin::draw(,) 
     539          RenderStage::drawInner(,) FBO status= 0x8cd5 
     540          [...] 
     541          Scaling image 'brick_side.JPG' from (1b4,24f) to (200,200) <--- 
     542          Values in hex 
     543          because of previous error. 
     544          [...]" 
     545 
     5462009-02-06 08:46  robert 
     547 
     548        * CMakeLists.txt, 
     549          PlatformSpecifics/Windows/OpenSceneGraphVersionInfo.rc.in, 
     550          PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc.in, 
     551          PlatformSpecifics/Windows/VersionInfo.rc.in, 
     552          src/OpenThreads/CMakeLists.txt, 
     553          src/OpenThreads/win32/CMakeLists.txt: Added support for VS 
     554          versioning of OpenThreads 
     555 
     5562009-02-05 15:22  robert 
     557 
     558        * include/osgAnimation/Animation, 
     559          include/osgAnimation/BasicAnimationManager, 
     560          src/osgAnimation/BasicAnimationManager.cpp, 
     561          src/osgAnimation/CMakeLists.txt: From Fabian Lavignotte, "Here is 
     562          some various small fixes i have done while playing with 
     563          osgAnimation. 
     564          - Animation : removed the _name attribute that is never used. 
     565          - BasicAnimationManager : fix a crash on Windows with the example 
     566          osganimationviewer. The _lastUpdate attribute was not initialized 
     567          when 
     568          using copy constructor. 
     569          - CMakeLists.txt : add RigGeometry to the headers list" 
     570 
     5712009-02-05 14:56  robert 
     572 
     573        * CMakeLists.txt: Changed version to only be run for Visual Studio 
     574 
     5752009-02-05 14:55  robert 
     576 
     577        * CMakeLists.txt, PlatformSpecifics/Windows/VersionInfo.rc.in, 
     578          src/osg/CMakeLists.txt, src/osgAnimation/CMakeLists.txt, 
     579          src/osgDB/CMakeLists.txt, src/osgFX/CMakeLists.txt, 
     580          src/osgGA/CMakeLists.txt, src/osgIntrospection/CMakeLists.txt, 
     581          src/osgManipulator/CMakeLists.txt, 
     582          src/osgParticle/CMakeLists.txt, src/osgShadow/CMakeLists.txt, 
     583          src/osgSim/CMakeLists.txt, src/osgTerrain/CMakeLists.txt, 
     584          src/osgText/CMakeLists.txt, src/osgUtil/CMakeLists.txt, 
     585          src/osgViewer/CMakeLists.txt, src/osgVolume/CMakeLists.txt, 
     586          src/osgWidget/CMakeLists.txt: From Sherman Wilcox, added VS 
     587          versioning information into libs 
     588 
     5892009-02-05 14:54  robert 
     590 
     591        * include/osgTerrain/TerrainTile, include/osgVolume/VolumeTile, 
     592          src/osgTerrain/TerrainTile.cpp, src/osgVolume/VolumeTile.cpp: 
     593          Added exports, and moved constructors into .cpp. 
     594 
     5952009-02-05 14:42  robert 
     596 
     597        * src/osgPlugins/dicom/ReaderWriterDICOM.cpp: Added initializer and 
     598          fixed indentation 
     599 
     6002009-02-05 14:35  robert 
     601 
     602        * src/osgPlugins/gecko/CMakeLists.txt, 
     603          src/osgPlugins/xine/CMakeLists.txt: Suppress gcc warnings emitted 
     604          by external headers 
     605 
     6062009-02-05 12:21  robert 
     607 
     608        * examples/osgviewerQT/QOSGWidget.cpp: From Morne Pistorius, 
     609          "Attached is a modified version of the QOSGWidget example that 
     610          shows 
     611          the workaround we discussed for adding/removing views in a 
     612          composite 
     613          viewer at runtime. A dummy view is added to the viewer to always 
     614          keep 
     615          it live. 
     616           
     617          Also, I added a #define to the Qt event relay methods to not 
     618          override 
     619          them on a Windows system. This fixes the bug where duplicate 
     620          events 
     621          are being sent and making it impossible to throw the trackball." 
     622 
     6232009-02-05 12:03  robert 
     624 
     625        * examples/osgviewerQT/QOSGWidget.cpp: Warning fixes 
     626 
     6272009-02-05 11:10  robert 
     628 
     629        * CMakeLists.txt, include/osg/Export: Added VS and gcc warning 
     630          suppression to clean up a few last stubborn warnings 
     631 
     6322009-02-05 10:14  robert 
     633 
     634        * examples/osglauncher/osglauncher.cpp, 
     635          examples/osgviewerGLUT/osgviewerGLUT.cpp, 
     636          src/osgPlugins/cfg/ConfigLexer.cpp, 
     637          src/osgUtil/TriStrip_graph_array.h: From Jean-Sebastien Guay, 
     638          warning fixes 
     639 
     6402009-02-04 16:12  shuber 
     641 
     642        * Xcode/OpenSceneGraph/config/OpenThreads/Config: From Stephan 
     643          Huber: fix for local config-file used by the deprecated 
     644          XCode-project 
     645 
     6462009-02-04 13:51  robert 
     647 
     648        * include/osgVolume/Property, include/osgWidget/WindowManager, 
     649          src/osgWrappers/osgVolume/Property.cpp: Form Paul Melis, spelling 
     650          fixes 
     651 
     6522009-02-04 12:59  robert 
     653 
     654        * CMakeLists.txt: Set the release candidate to 1. 
     655 
     6562009-02-04 12:54  robert 
     657 
     658        * NEWS.txt: Updated news to keep in sync with online news entry 
     659 
     6602009-02-04 12:50  robert 
     661 
     662        * AUTHORS.txt: Updated AUTHORS file for 2.8 branch. 
     663 
     6642009-02-04 12:31  robert 
     665 
     666        * NEWS.txt, README.txt: Updated NEWS and README for 2.8 branch 
     667 
     6682009-02-04 11:35  robert 
     669 
     670        * include/osg/Image, src/osg/Image.cpp, 
     671          src/osgWrappers/osg/Image.cpp: Fixed the constness of osg::Image* 
     672          pointer 
     673 
     6742009-02-04 09:03  robert 
     675 
     676        * src/OpenThreads/common/Atomic.cpp: Removed cast, to quieten VS 
     677          warnings. Confirm change with original author Mathias Froehlich. 
     678 
     6792009-02-03 20:26  robert 
     680 
     681        * include/osgIntrospection/Export, 
     682          include/osgIntrospection/TypedMethodInfo: Clean up warning 
     683          disable code 
     684 
     6852009-02-03 20:17  robert 
     686 
     687        * examples/osgviewerGLUT/osgviewerGLUT.cpp: Disabled warning 
     688 
     6892009-02-03 17:14  robert 
     690 
     691        * src/osg/MatrixDecomposition.cpp: Fixed warning 
     692 
     6932009-02-03 17:11  robert 
     694 
     695        * src/osgUtil/Simplifier.cpp: Fixed warning 
     696 
     6972009-02-03 15:28  robert 
     698 
     699        * examples/osgcluster/broadcaster.cpp, 
     700          examples/osgcluster/osgcluster.cpp, 
     701          examples/osgcluster/receiver.cpp, 
     702          examples/osgimagesequence/osgimagesequence.cpp, 
     703          examples/osgmovie/osgmovie.cpp, 
     704          examples/osgunittests/UnitTestFramework.cpp, 
     705          examples/osgunittests/UnitTestFramework.h, 
     706          include/osgIntrospection/Reflector, 
     707          include/osgIntrospection/TypedConstructorInfo, 
     708          include/osgIntrospection/TypedMethodInfo, 
     709          src/OpenThreads/win32/Win32Thread.cpp, 
     710          src/osgPlugins/3ds/ReaderWriter3DS.cpp, 
     711          src/osgPlugins/cfg/ConfigLexer.cpp, 
     712          src/osgPlugins/jpeg/ReaderWriterJPEG.cpp, 
     713          src/osgPlugins/lwo/lwo2types.h, 
     714          src/osgPlugins/obj/OBJWriterNodeVisitor.cpp, 
     715          src/osgPlugins/txp/ReaderWriterTXP.cpp, 
     716          src/osgPlugins/txp/TXPIO.cpp, src/osgPlugins/txp/TXPParser.cpp, 
     717          src/osgPlugins/txp/trpage_material.cpp, 
     718          src/osgUtil/Simplifier.cpp, src/osgUtil/TriStrip_tri_stripper.h: 
     719          Warning fixes 
     720 
     7212009-02-03 12:47  robert 
     722 
     723        * examples/osgtexture2D/osgtexture2D.cpp: Added 
     724          setDataVariance(DYNAMIC) to text label as it's being updated 
     725          dynamically 
     726 
     7272009-02-03 11:54  robert 
     728 
     729        * include/osgIntrospection/TypedMethodInfo: Added local disabling 
     730          the the VS C4121 "alignment of a member was sensitive to packing" 
     731          warning 
     732 
     7332009-02-03 11:07  robert 
     734 
     735        * src/osgWidget/Input.cpp: Fixed warning 
     736 
     7372009-02-03 11:05  robert 
     738 
     739        * CMakeLists.txt: Added disabling of "warning: format not a string 
     740          literal, argument types not checked" under FreeBSD as these 
     741          errors are being generated from std library ostream 
     742          implementation. 
     743 
     7442009-02-03 11:04  robert 
     745 
     746        * include/osgViewer/ViewerEventHandlers: Added explict 
     747          initialization of osg::Object contstructor to fix warning 
     748 
     7492009-02-02 20:42  robert 
     750 
     751        * src/osgWrappers/osg/TransferFunction.cpp: Updated wrappers 
     752 
     7532009-02-02 20:35  robert 
     754 
     755        * include/osgIntrospection/Attributes, 
     756          include/osgIntrospection/ConstructorInfo, 
     757          include/osgIntrospection/MethodInfo, 
     758          include/osgIntrospection/ParameterInfo, 
     759          include/osgIntrospection/PropertyInfo, 
     760          include/osgIntrospection/Value, src/osg/ShapeDrawable.cpp, 
     761          src/osg/Transform.cpp, src/osgDB/DatabasePager.cpp, 
     762          src/osgSim/SphereSegment.cpp, src/osgText/String.cpp, 
     763          src/osgUtil/CullVisitor.cpp, 
     764          src/osgUtil/DelaunayTriangulator.cpp, 
     765          src/osgUtil/EdgeCollector.cpp, src/osgUtil/IntersectVisitor.cpp, 
     766          src/osgUtil/LineSegmentIntersector.cpp, 
     767          src/osgUtil/Simplifier.cpp, src/osgUtil/TriStripVisitor.cpp, 
     768          src/osgUtil/TriStrip_graph_array.h, 
     769          src/osgViewer/PixelBufferWin32.cpp: Warnings fixes for VS. 
     770 
     7712009-02-02 20:34  robert 
     772 
     773        * src/osgViewer/CMakeLists.txt: Attempt to appease both FreeBSD 
     774          CMAke 2.6.2 + Linux CMake 2.4.8 builds 
     775 
     7762009-02-02 18:55  robert 
     777 
     778        * src/osgAnimation/Timeline.cpp: From Cedric Pinson, warning fix. 
     779 
     7802009-02-02 17:46  robert 
     781 
     782        * src/osg/MatrixDecomposition.cpp: Added initializer for local Quat 
     783          definition 
     784 
     7852009-02-02 17:32  robert 
     786 
     787        * include/osgViewer/ViewerEventHandlers: Added explict intializiers 
     788          of base classes 
     789 
     7902009-02-02 17:16  robert 
     791 
     792        * CMakeModules/FindOSG.cmake: Added /lib64 to search paths. 
     793 
     7942009-02-02 17:15  robert 
     795 
     796        * include/osgViewer/ViewerEventHandlers, 
     797          src/osgViewer/StatsHandler.cpp: Improved handling of stats 
     798          projection size 
     799 
     8002009-02-02 16:56  robert 
     801 
     802        * src/osgPlugins/logo/ReaderWriterLOGO.cpp: From Stephan Huber, 
     803          build fix for OSX XCode build 
     804 
     8052009-02-02 15:04  robert 
     806 
     807        * include/osg/Version: Fixed version 
     808 
     8092009-02-02 14:55  robert 
     810 
     811        * CMakeLists.txt, include/OpenThreads/Version, include/osg/Version, 
     812          src/OpenThreads/CMakeLists.txt: Updated OpenThreads and 
     813          OpenSceneGraph version ready for OSG-2.8 branch. 
     814 
     8152009-02-02 14:51  robert 
     816 
     817        * src/osgPlugins/osgAnimation/ReaderWriter.cpp: From Cedric Pinson, 
     818          "Here an update of the osgAnimation ReaderWriter, it add other 
     819          NodeCallback that could be attached to a node with Bone." 
     820 
     8212009-02-02 14:50  robert 
     822 
     823        * src/osgPlugins/osgParticle/IO_FluidFrictionOperator.cpp: From 
     824          Pierre Haritchablaet, "The wind vector of 
     825          osgParticle::FluidFrictionOperator has not been written and read 
     826          in IO_FluidFrictionOperator. This patch fixes osg plug'in 
     827          FluidFrictionOperator_readLocalData and 
     828          FluidFrictionOperator_writeLocalData." 
     829 
     8302009-02-02 14:43  robert 
     831 
     832        * examples/osgterrain/osgterrain.cpp, 
     833          examples/osgvolume/osgvolume.cpp, include/osg/TransferFunction, 
     834          include/osgTerrain/Layer, src/osg/TransferFunction.cpp, 
     835          src/osgPlugins/osg/TransferFunction.cpp, 
     836          src/osgPlugins/osgTerrain/TerrainTile.cpp, 
     837          src/osgPlugins/osgVolume/VolumeTile.cpp, 
     838          src/osgTerrain/Layer.cpp, src/osgViewer/CMakeLists.txt, 
     839          src/osgVolume/Layer.cpp, 
     840          src/osgWrappers/osg/TransferFunction.cpp: Refactored 
     841          osg::TransferFunction1D to use an std::map internally which is 
     842          kept in sync with the actual osg::Image that is passed to the 
     843          GPU. 
     844           
     845          Added .osg support for osg::TransferFunction1D. 
     846           
     847          Updated wrappers 
     848 
     8492009-02-02 09:23  robert 
     850 
     851        * include/osg/Node: From Sukender, add check against NULL parameter 
     852          value 
     853 
     8542009-02-01 12:38  robert 
     855 
     856        * include/osg/TransferFunction, src/osg/TransferFunction.cpp, 
     857          src/osgPlugins/osg/CMakeLists.txt, 
     858          src/osgPlugins/osg/TransferFunction.cpp, 
     859          src/osgPlugins/osgVolume/TransferFunctionProperty.cpp: Ground 
     860          work for full .osg support for osg::TransferFunction* 
     861 
     8622009-01-31 21:46  robert 
     863 
     864        * NEWS.txt: Updated NEWS 
     865 
     8662009-01-31 21:46  robert 
     867 
     868        * src/osgPlugins/osgVolume/CMakeLists.txt, 
     869          src/osgPlugins/osgVolume/TransferFunctionProperty.cpp: Added 
     870          initial placeholder for .osg support for 
     871          osgVolume::TransferFunctionProperty 
     872 
     8732009-01-31 21:45  robert 
     874 
     875        * examples/osgvolume/osgvolume.cpp: Fixed handling of 
     876          TransferFunctionProperty. 
     877 
     8782009-01-31 10:21  robert 
     879 
     880        * src/osgViewer/CMakeLists.txt: Rejigged the Xrandr include 
     881 
     8822009-01-30 18:56  robert 
     883 
     884        * src/osgVolume/Shaders/volume_frag.cpp, 
     885          src/osgVolume/Shaders/volume_iso_frag.cpp, 
     886          src/osgVolume/Shaders/volume_lit_frag.cpp, 
     887          src/osgVolume/Shaders/volume_lit_tf_frag.cpp, 
     888          src/osgVolume/Shaders/volume_mip_frag.cpp, 
     889          src/osgVolume/Shaders/volume_tf_frag.cpp, 
     890          src/osgVolume/Shaders/volume_tf_iso_frag.cpp, 
     891          src/osgVolume/Shaders/volume_tf_mip_frag.cpp: Improved shaders to 
     892          better handle region of constant values when doing normal 
     893          generation 
     894 
     8952009-01-30 17:10  robert 
     896 
     897        * src/osgVolume/RayTracedTechnique.cpp, 
     898          src/osgVolume/Shaders/volume_iso_frag.cpp, 
     899          src/osgVolume/Shaders/volume_tf_iso_frag.cpp: Updated iso surface 
     900          shaders 
     901 
     9022009-01-30 16:45  robert 
     903 
     904        * src/osgVolume/Shaders/volume_iso_frag.cpp: Added support for 
     905          discard fragment that don't generate an iso surface intersect 
     906 
     9072009-01-30 15:04  robert 
     908 
     909        * src/osg/TransferFunction.cpp: From Paul Melis, "I think 
     910          TransferFunction needs to call _image->dirty() in two places in 
     911          response to an assign() of new transfer map values. 
     912          Here's an updated file, which seems to work here. 
     913          " 
     914 
     9152009-01-30 14:54  robert 
     916 
     917        * src/osgPlugins/osgParticle/IO_ParticleEffect.cpp: From Lionel 
     918          Lagarde, "this correct how the ParticleEffect are serialized : 
     919          - the texture file name is taken from the TextFileName field 
     920          - the texture file name is written using writeString 
     921          " 
     922 
     9232009-01-30 13:05  robert 
     924 
     925        * AUTHORS.txt, applications/osgversion/osgversion.cpp: Update 
     926          AUTHORS for release 
     927 
     9282009-01-30 12:17  robert 
     929 
     930        * ChangeLog: Updated ChangeLog for 2.7.9 release 
     931 
    19322009-01-30 12:09  robert 
    2933 

  • OpenSceneGraph/trunk/NEWS.txt

    r9719 r9793  
    44= !OpenSceneGraph 2.8 release adds osgAnimation and osgVolume libraries, DICOM support, LispSM shadowing and much more. = 
    55 
    6 PERTHSHIRE, Scotland - 8th February 2009 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.8, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.8 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 2.8 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems. 
     6PERTHSHIRE, Scotland - 12th February 2009 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.8, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.8 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 2.8 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems. 
    77 
    88=== Open-source development delivers industry-leading features and performance === 
    … …  
    3232  * Performance improvements through optimization of matrix operations. 
    3333  * Support for the OpenGL "draw instanced" extension. 
     34  * Support for zlib compressed native .ive and .gz files 
    3435  * Improvements to COLLADA support. 
    3536  * Build reporting using CDash 
    … …  
    5758The diverse and growing community of over 2000 developers is centred around the public osg-users mailing list, where members discuss how best to use !OpenSceneGraph, provide mutual support, and coordinate development of new features and bug fixes. Members of this community come from many different countries with backgrounds ranging from some of the world's largest aerospace companies, game companies, and visual simulation specialists to university researchers, students and hobbyists.  
    5859 
    59 The !OpenSceneGraph project owes a great deal to the community for its development and support, in particular we wish to thank the [http://www.openscenegraph.org/projects/osg/wiki/Support/Contributors/TwoPointEight 364 individuals] from around the world that have directly contributed to the development and refinement of the !OpenSceneGraph code base.  
     60The !OpenSceneGraph project owes a great deal to the community for its development and support, in particular we wish to thank the [http://www.openscenegraph.org/projects/osg/wiki/Support/Contributors/TwoPointEight 365 individuals] from around the world that have directly contributed to the development and refinement of the !OpenSceneGraph code base.  
    6061 
    6162---- 

  • OpenSceneGraph/trunk/README.txt

    r9644 r9793  
    1616Robert Osfield. 
    1717Project Lead. 
    18 4th Februaru 2009. 
     1812th February 2009. 
    1919 
    2020-- 

  • OpenSceneGraph/trunk/examples/osgviewerQT/QOSGWidget.cpp

    r9662 r9793  
    347347          if ( event->text() == "a" ) 
    348348          { 
    349             AddView( _scene ); 
     349            AddView( _scene.get() ); 
    350350          } 
    351351           

  • OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

    r9748 r9793  
    891891    while (arguments.read("--light")) shadingModel = Light; 
    892892 
    893     float xSize=1.0f, ySize=1.0f, zSize=1.0f; 
     893    float xSize=0.0f, ySize=0.0f, zSize=0.0f; 
    894894    while (arguments.read("--xSize",xSize)) {} 
    895895    while (arguments.read("--ySize",ySize)) {} 
    896896    while (arguments.read("--zSize",zSize)) {} 
    897  
    898     float xMultiplier=1.0f, yMultiplier=1.0f, zMultiplier=1.0f; 
    899     while (arguments.read("--xMultiplier",xMultiplier)) {} 
    900     while (arguments.read("--yMultiplier",yMultiplier)) {} 
    901     while (arguments.read("--zMultiplier",zMultiplier)) {} 
    902897 
    903898    osg::ref_ptr<TestSupportOperation> testSupportOperation = new TestSupportOperation; 
    … …  
    11241119 
    11251120    Images::iterator sizeItr = images.begin(); 
    1126     xSize = (*sizeItr)->s(); 
    1127     ySize = (*sizeItr)->t(); 
    1128     zSize = (*sizeItr)->r(); 
     1121    int image_s = (*sizeItr)->s(); 
     1122    int image_t = (*sizeItr)->t(); 
     1123    int image_r = (*sizeItr)->r(); 
    11291124    ++sizeItr; 
    11301125 
    11311126    for(;sizeItr != images.end(); ++sizeItr) 
    11321127    { 
    1133         if ((*sizeItr)->s() != xSize ||  
    1134             (*sizeItr)->t() != ySize || 
    1135             (*sizeItr)->r() != zSize) 
     1128        if ((*sizeItr)->s() != image_s ||  
     1129            (*sizeItr)->t() != image_t || 
     1130            (*sizeItr)->r() != image_r) 
    11361131        { 
    11371132            std::cout<<"Images in sequence are not of the same dimensions."<<std::endl; 
    … …  
    11411136 
    11421137 
    1143     osg::RefMatrix* matrix = dynamic_cast<osg::RefMatrix*>(images.front()->getUserData()); 
     1138    osg::ref_ptr<osg::RefMatrix> matrix = dynamic_cast<osg::RefMatrix*>(images.front()->getUserData()); 
     1139 
     1140    if (!matrix) 
     1141    { 
     1142        if (xSize==0.0) xSize = static_cast<float>(image_s); 
     1143        if (ySize==0.0) ySize = static_cast<float>(image_t); 
     1144        if (zSize==0.0) zSize = static_cast<float>(image_r); 
     1145         
     1146        matrix = new osg::RefMatrix(xSize, 0.0,   0.0,   0.0, 
     1147                                    0.0,   ySize, 0.0,   0.0, 
     1148                                    0.0,   0.0,   zSize, 0.0, 
     1149                                    0.0,   0.0,   0.0,   1.0); 
     1150    } 
    11441151 
    11451152    osg::Vec4 minValue(FLT_MAX, FLT_MAX, FLT_MAX, FLT_MAX); 
    … …  
    12731280    osg::ref_ptr<osgVolume::Layer> layer = new osgVolume::ImageLayer(image_3d.get()); 
    12741281 
    1275     if (matrix) 
    1276     { 
    1277         osgVolume::Locator* locator = new osgVolume::Locator(*matrix); 
    1278         layer->setLocator(locator); 
    1279         tile->setLocator(locator); 
    1280     } 
     1282    osgVolume::Locator* locator = new osgVolume::Locator(*matrix); 
     1283    layer->setLocator(locator); 
     1284    tile->setLocator(locator); 
    12811285 
    12821286    tile->setLayer(layer.get()); 

  • OpenSceneGraph/trunk/include/osgDB/fstream

    r9124 r9793  
    1616 
    1717#include <osgDB/Export> 
     18#include <osg/Export> 
    1819 
    1920#include <fstream> 

  • OpenSceneGraph/trunk/include/osgIntrospection/Export

    r9641 r9793  
    1616#define OSGINTROSPECTION_EXPORTHDR 1 
    1717 
     18#include <osg/Config> 
    1819 
    1920#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS) 

  • OpenSceneGraph/trunk/include/osgWidget/Export

    r9287 r9793  
    1818 
    1919#if defined(_MSC_VER) 
     20    #pragma warning( disable : 4121 ) 
    2021    #pragma warning( disable : 4244 ) 
    2122    #pragma warning( disable : 4251 ) 

  • OpenSceneGraph/trunk/src/osgVolume/Shaders/volume_iso_frag.cpp

    r9610 r9793  
    105105                         "                float lightScale = 0.1 +  abs(dot(normal.xyz, eyeDirection))*0.9;\n" 
    106106                         "\n" 
    107                          "                color.x *= lightScale;\n" 
    108                          "                color.y *= lightScale;\n" 
    109                          "                color.z *= lightScale;\n" 
     107                         "                color.x = lightScale;\n" 
     108                         "                color.y = lightScale;\n" 
     109                         "                color.z = lightScale;\n" 
    110110                         "            }\n" 
    111111                         "            \n"