<DIV><BR>hi robert,</DIV>
<DIV>OS:windows 7 X64</DIV>
<DIV>compiler:VC2010</DIV>
<DIV>cmake version:<BR>3.2.1</DIV>
<DIV>first of all,i encounter the "<=" problem on json_stream when compile OpenSceneGraph-3.3.7 developer release,current OpenSceneGraphsvn14841 fixed.</DIV>
<DIV>the FFMPEG plugin's cmake added two lines<BR>FFMPEG_LIBAVRESAMPLE_INICLUDE_DIRS<BR>FFMPEG_LIBAVRESAMPLE_LIBRARIES<BR>and the "LIBAVRESAMPLE"'s version is only exist in old version FFMPEG,the 2015-04-15 FFMPEG daily build not contain this lib.</DIV>
<DIV>download a full rewrited version FFMPEG plugin from<BR><A href="https://bitbucket.org/digitalis/osg-ffmpeg-plugin">https://bitbucket.org/digitalis/osg-ffmpeg-plugin</A><BR>replace the current ffmpeg plugin codes.</DIV>
<DIV>compiled and tested OK</DIV>
<DIV>zhuwan</DIV>
<DIV>04,17,2015<BR></DIV><SPAN></SPAN><BR>在2015-4-16 2:34:22，"Robert Osfield" <robert.osfield@gmail.com> 写道:
<BLOCKQUOTE style="BORDER-LEFT: #ccc 1px solid; MARGIN: 0px 0px 0px 0.8ex; PADDING-LEFT: 1ex" id="isReplyContent">-----原始邮件-----<BR><B>发件人:</B> "Robert Osfield" <robert.osfield@gmail.com><BR><B>发送时间:</B> 2015-4-16 2:34:22<BR><B>收件人:</B> "OpenSceneGraph Users" <osg-users@lists.openscenegraph.org><BR><B>主题:</B> [osg-users] OpenSceneGraph-3.3.7 developer release tagged<BR><BR>
<DIV dir="ltr">
<DIV>
<DIV>
<DIV>Hi All,<BR><BR></DIV>I have just tagged the 3.3.7 developer release:<BR>
<P style="LINE-HEIGHT: 1.3em"><STRONG>O</STRONG><STRONG>pen</STRONG><STRONG><STRONG>SceneGraph-3.3.7,</STRONG> </STRONG><STRONG>released on 15th April </STRONG><STRONG>2015</STRONG>, key deliverables in this dev release are:</P>
<UL>
<LI><SPAN style="LINE-HEIGHT: 1.3em"><SPAN style="LINE-HEIGHT: 1.3em">Bug and build fixes<BR></SPAN></SPAN></LI>
<LI><SPAN style="LINE-HEIGHT: 1.3em"><SPAN style="LINE-HEIGHT: 1.3em">New osg::Camera attachment dirty mechanism to streamline the adjustment of FBO and Textures sizes<BR></SPAN></SPAN></LI>
<LI><SPAN style="LINE-HEIGHT: 1.3em"><SPAN style="LINE-HEIGHT: 1.3em">Added EXIF support to JPEG plugin, with automatic rotation of images according to the EXIF orientation setting<BR></SPAN></SPAN></LI>
<LI><SPAN style="LINE-HEIGHT: 1.3em"><SPAN style="LINE-HEIGHT: 1.3em">osg::Texture2DArray support for passing images in via an 3D osg::Image<BR></SPAN></SPAN></LI>
<LI><SPAN style="LINE-HEIGHT: 1.3em"><SPAN style="LINE-HEIGHT: 1.3em">Improvements to the 3DS plugins handling of transparent/diffuse textures and opacity maps.<BR></SPAN></SPAN></LI>
<LI><SPAN style="LINE-HEIGHT: 1.3em"><SPAN style="LINE-HEIGHT: 1.3em">Typo fixes to various doxygen and inline comments.<BR></SPAN></SPAN></LI>
<LI><SPAN style="LINE-HEIGHT: 1.3em"><SPAN style="LINE-HEIGHT: 1.3em">Support of OpenGL ES 3.0<BR></SPAN></SPAN></LI>
<LI><SPAN style="LINE-HEIGHT: 1.3em"><SPAN style="LINE-HEIGHT: 1.3em">Refactored osgManipulator::AntiSquish to address manipulator transform problems.<BR></SPAN></SPAN></LI>
<LI><SPAN style="LINE-HEIGHT: 1.3em"><SPAN style="LINE-HEIGHT: 1.3em">Fixed initial window size problem under WIn32 that was causing problems with mapping mouse coordinates for picking etc.<BR></SPAN></SPAN></LI>
<LI><SPAN style="LINE-HEIGHT: 1.3em"><SPAN style="LINE-HEIGHT: 1.3em">New osgjs and gles plugins to enable easy conversion of the OSG loaded models to work with osgjs (A Javascript/WebGL based OSG like scene graph.)<BR></SPAN></SPAN></LI></UL>
<P><STRONG>source package :</STRONG> <A href="http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.3.7.zip">OpenSceneGraph-3.3.7.zip</A></P>
<P><STRONG>svn tag:</STRONG> svn co <A href="http://svn.openscenegraph.org/osg/OpenSceneGraph/tags/OpenSceneGraph-3.3.7">http://svn.openscenegraph.org/osg/OpenSceneGraph/tags/OpenSceneGraph-3.3.7</A> OpenSceneGraph</P><BR></DIV>Thanks to all the contributors, OSG-3.4 branch very near now ;-)<BR><BR></DIV>
<DIV>Robert.<BR></DIV>
<DIV><BR></DIV>-- ChangeLog since 3.3.6<BR><BR>2015-04-15 18:05 robert<BR><BR> * CMakeLists.txt: Updated version number of dev release<BR><BR>2015-04-15 17:12 robert<BR><BR> * src/osgPlugins/gles/LineIndexFunctor: Added missing const to find<BR> VS2005 build<BR><BR>2015-04-14 18:16 robert<BR><BR> * src/osgViewer/GraphicsWindowWin32.cpp: Added check for changes to<BR> window size during GraphicsWindowWin32::init() to fix bug that<BR> occurs when the window manage resizes the window automatically on<BR> creation.<BR><BR>2015-04-14 15:50 robert<BR><BR> * src/osgPlugins/osgjs/JSON_Objects: From Philippe Renon, MingW<BR> build fix<BR><BR>2015-04-13 11:48 robert<BR><BR> * examples/osgprerender/osgprerender.cpp,<BR> examples/osgprerendercubemap/osgprerendercubemap.cpp,<BR> include/osg/Camera, src/osgSim/ElevationSlice.cpp,<BR> src/osgUtil/RenderStage.cpp,<BR> src/osgWrappers/deprecated-dotosg/osg/Camera.cpp,<BR> src/osgWrappers/serializers/osg/Camera.cpp: Fixed typo of<BR> SEPARATE enums<BR><BR>2015-04-13 10:43 robert<BR><BR> * CMakeModules/FindFFmpeg.cmake, CMakeModules/OsgMacroUtils.cmake,<BR> applications/osgconv/osgconv.cpp,<BR> applications/osgversion/osgversion.cpp,<BR> applications/present3D/Cluster.cpp,<BR> applications/present3D/present3D.cpp,<BR> examples/osg2cpp/osg2cpp.cpp,<BR> examples/osganimationsolid/osganimationsolid.cpp,<BR> examples/osganimationtimeline/osganimationtimeline.cpp,<BR> examples/osgautocapture/osgautocapture.cpp,<BR> examples/osgbillboard/osgbillboard.cpp,<BR> examples/osgcamera/osgcamera.cpp, examples/osgclip/osgclip.cpp,<BR> examples/osgcopy/osgcopy.cpp,<BR> examples/osgdistortion/osgdistortion.cpp,<BR> examples/osggeometry/osggeometry.cpp,<BR> examples/osgparticleshader/osgparticleshader.cpp,<BR> examples/osgreflect/osgreflect.cpp,<BR> examples/osgshadercomposition/osgshadercomposition.cpp,<BR> examples/osgtexture2DArray/osgtexture2DArray.cpp,<BR> examples/osgtexture3D/osgtexture3D.cpp,<BR> examples/osgwindows/osgwindows.cpp, include/OpenThreads/Thread,<BR> include/osg/Billboard, include/osg/BoundingSphere,<BR> include/osg/BufferIndexBinding, include/osg/BufferTemplate,<BR> include/osg/ImageSequence, include/osg/ScriptEngine,<BR> include/osg/Shader, include/osg/Shape, include/osg/State,<BR> include/osg/StateSet, include/osg/ValueObject,<BR> include/osgAnimation/Action, include/osgAnimation/RigGeometry,<BR> include/osgDB/Callbacks, include/osgManipulator/Dragger,<BR> include/osgPresentation/SlideEventHandler,<BR> include/osgShadow/OccluderGeometry,<BR> include/osgShadow/ViewDependentShadowMap,<BR> include/osgUtil/Optimizer, include/osgWidget/EventInterface,<BR> src/OpenThreads/pthreads/PThreadBarrierPrivateData.h,<BR> src/osg/Referenced.cpp, src/osg/Shader.cpp, src/osg/State.cpp,<BR> src/osg/Uniform.cpp, src/osgGA/CameraManipulator.cpp,<BR> src/osgPlugins/txp/trpage_geom.h,<BR> src/osgPlugins/txp/trpage_pparse.cpp,<BR> src/osgPlugins/txp/trpage_write.h,<BR> src/osgPresentation/SlideEventHandler.cpp,<BR> src/osgShadow/ConvexPolyhedron.cpp,<BR> src/osgShadow/DebugShadowMap.cpp,<BR> src/osgShadow/ShadowTechnique.cpp,<BR> src/osgShadow/ShadowVolume.cpp,<BR> src/osgShadow/ViewDependentShadowMap.cpp, src/osgViewer/View.cpp,<BR> src/osgWrappers/serializers/osgManipulator/Dragger.cpp: From<BR> Jannik Heller, typo fixes<BR><BR>2015-04-13 10:11 robert<BR><BR> * CMakeLists.txt, README.txt, src/osg/GL.in,<BR> src/osgPlugins/imageio/ReaderWriterImageIO.cpp,<BR> src/osgViewer/GraphicsWindowIOS.mm: From Konstantin Matveyev,<BR> "I've added GLES3 profile, which also enables GLES2 features<BR> (OSG_GLES3_AVAILABLE=true => OSG_GLES2_AVAILABLE=true).<BR> <BR> If OSG_OPENGL_PROFILE="GLES3" =><BR> GraphicsWindowIOS will create gles3 context.<BR> If failed, GraphicsWindowIOS will create gles2 context.<BR> Multisampling also working.<BR> <BR> "<BR><BR>2015-04-13 09:50 robert<BR><BR> * CMakeModules/FindOpenEXR.cmake,<BR> src/osgPlugins/exr/CMakeLists.txt: From Laurens Voerman, I have<BR> modified the FindOpenEXR.cmake to find the debug libraries, and<BR> to define a variable<BR> (OPENEXR_LIBRARIES_VARS) with the variable names that might have<BR> a _DEBUG version defined.<BR><BR>2015-04-13 08:55 robert<BR><BR> * examples/osgmanipulator/osgmanipulator.cpp: Added passing of<BR> command line arguments to viewer construction to allow one to<BR> specify extra controls for the viewer such as window size etc.<BR><BR>2015-04-09 18:42 robert<BR><BR> * include/osgManipulator/AntiSquish,<BR> src/osgManipulator/AntiSquish.cpp: Refactored<BR> AntiSquish::computeUnSquishedMatrix() method to use the parent<BR> node path of the AntiSquish node<BR> to compute the required matrix rather than using the NodePath<BR> provided by the NodeVistor. This is required<BR> as in osg::computeLocalToWorld() usage case the NodeVisitor<BR> pointer is NULL, so the correct matrix isn't possible to compute.<BR><BR>2015-04-09 18:38 robert<BR><BR> * examples/osgmanipulator/osgmanipulator.cpp: Added<BR> WindowSizeHandler to osgmanipulator example<BR><BR>2015-04-07 18:01 robert<BR><BR> * applications/present3D/present3D.cpp,<BR> examples/osgclip/osgclip.cpp,<BR> examples/osgkeystone/osgkeystone.cpp,<BR> examples/osgmemorytest/osgmemorytest.cpp,<BR> examples/osgocclusionquery/osgocclusionquery.cpp,<BR> examples/osgposter/PosterPrinter.cpp,<BR> examples/osgshadercomposition/oldshadercomposition.cpp,<BR> examples/osgshadercomposition/osgshadercomposition.cpp,<BR> examples/osgtexture1D/osgtexture1D.cpp,<BR> examples/osgtexture2D/osgtexture2D.cpp,<BR> examples/osgtexture3D/osgtexture3D.cpp,<BR> examples/osgtransferfunction/osgtransferfunction.cpp,<BR> include/OpenThreads/Thread, include/osg/Array,<BR> include/osg/Callback, include/osg/Camera,<BR> include/osg/CullSettings, include/osg/CullingSet,<BR> include/osg/DisplaySettings, include/osg/GLU,<BR> include/osg/GraphicsContext, include/osg/Image,<BR> include/osg/ImageUtils, include/osg/Object, include/osg/State,<BR> include/osg/UserDataContainer, include/osg/View,<BR> include/osgDB/ClassInterface,<BR> include/osgManipulator/Scale2DDragger,<BR> include/osgPresentation/PropertyManager,<BR> include/osgSim/LightPointNode, include/osgUtil/IntersectVisitor,<BR> include/osgUtil/IntersectionVisitor,<BR> include/osgUtil/LineSegmentIntersector,<BR> include/osgUtil/PositionalStateContainer,<BR> include/osgUtil/RayIntersector, include/osgUtil/TriStripVisitor,<BR> include/osgViewer/CompositeViewer,<BR> include/osgViewer/GraphicsWindow, include/osgViewer/Keystone,<BR> include/osgViewer/View, include/osgViewer/Viewer,<BR> include/osgViewer/ViewerBase, include/osgWidget/PdfReader,<BR> include/osgWidget/VncClient, include/osgWidget/Window,<BR> src/OpenThreads/pthreads/PThread.cpp, src/osg/Image.cpp,<BR> src/osg/LightSource.cpp, src/osg/OcclusionQueryNode.cpp,<BR> src/osg/Texture1D.cpp, src/osg/Texture2D.cpp,<BR> src/osg/Texture2DMultisample.cpp, src/osg/TextureRectangle.cpp,<BR> src/osgAnimation/Bone.cpp,<BR> src/osgPlugins/jpeg/ReaderWriterJPEG.cpp,<BR> src/osgPlugins/pic/ReaderWriterPIC.cpp,<BR> src/osgPlugins/tga/ReaderWriterTGA.cpp,<BR> src/osgPlugins/txp/trpage_geom.h, src/osgText/String.cpp,<BR> src/osgUtil/SceneView.cpp, src/osgViewer/View.cpp: From Jannik<BR> Heller, typo fixes<BR><BR>2015-04-07 16:58 robert<BR><BR> * src/osgPlugins/3ds/ReaderWriter3DS.cpp: From Giampaolo Viganò,<BR> "you can find in the attached ZIP archive a fix for 3ds plugin<BR> transparent/diffuse textures and opacity maps and the support for<BR> reflection map"<BR><BR>2015-04-07 15:53 robert<BR><BR> * applications/osgconv/osgconv.cpp,<BR> examples/osganalysis/osganalysis.cpp: From Janik Heller, clean up<BR> of drawable/node usage<BR><BR>2015-04-07 15:52 robert<BR><BR> * examples/osggpucull/ShapeToGeometry.cpp,<BR> examples/osggpucull/ShapeToGeometry.h: Removed unused<BR> ShapesToGeometriesVisitor.<BR><BR>2015-04-07 15:49 robert<BR><BR> * include/osgUtil/Optimizer, src/osgDB/SharedStateManager.cpp,<BR> src/osgGA/StateSetManipulator.cpp, src/osgUtil/Optimizer.cpp:<BR> Cleaned up handling of Drawables so it utilizes the Node<BR> inheritance properly.<BR><BR>2015-04-03 15:43 robert<BR><BR> * src/osgPlugins/stl/ReaderWriterSTL.cpp: Build fix for VS2005.<BR><BR>2015-04-03 13:34 robert<BR><BR> * include/osg/ImageUtils: Improved the doxygen comment for the new<BR> createImageWithOrientationConversion(..) function.<BR><BR>2015-04-03 13:29 robert<BR><BR> * src/osgPlugins/jpeg/ReaderWriterJPEG.cpp: Added automatic<BR> rotation of jpeg image based on EXIF rotation information<BR> provided in the header.<BR><BR>2015-04-03 13:19 robert<BR><BR> * include/osg/ImageUtils, src/osg/ImageUtils.cpp: Implemented an<BR> osg::createImageWithOrientationConversion(...) method to aid for<BR> changing orientation of images.<BR><BR>2015-04-02 16:11 robert<BR><BR> * src/osgPlugins/jpeg/CMakeLists.txt,<BR> src/osgPlugins/jpeg/EXIF_Orientation.cpp,<BR> src/osgPlugins/jpeg/EXIF_Orientation.h,<BR> src/osgPlugins/jpeg/ReaderWriterJPEG.cpp: Added reading of<BR> EXIF_Orientation tags when present in a jpeg file.<BR><BR>2015-04-02 10:12 robert<BR><BR> * src/osgPlugins/osgjs/JSON_Objects,<BR> src/osgPlugins/osgjs/json_stream: From Wojciech Lewandowski,<BR> Windows build fixes, "These are the tweaks I had to make.<BR> JSON_Objects / json_stream headers attached. I am not sure how<BR> these will behave on VS 2010. Someone with VS 2010 should test<BR> it. Should be okay on VS 2008 and below + VS 2012 and above,<BR> though."<BR><BR>2015-04-01 09:37 robert<BR><BR> * src/osg/Image.cpp: From Lionel Largarde, "fix for the<BR> Image::computeNumberOfMipmapLevels method. The method did use the<BR> float version of the log function and the / operator.<BR> It works for most of the input sizes, but fails for 8192,<BR> 32768...<BR> For 8192, the method returns 13 instead of 14."<BR><BR>2015-03-31 19:31 robert<BR><BR> * src/osg/Texture2DArray.cpp: Fixed crash when using a subload<BR> callback, where the _images array is empty by _images[0] was<BR> still being accessed.<BR><BR>2015-03-31 19:29 robert<BR><BR> * examples/osgtexture2DArray/osgtexture2DArray.cpp: Added --subload<BR> command line option and test subload callback for testing<BR> purposes<BR><BR>2015-03-31 16:23 robert<BR><BR> * examples/osgdistortion/osgdistortion.cpp, include/osg/Camera,<BR> src/osg/Camera.cpp: Introduced osg::Camera::resize(..) method and<BR> associated enum thus:<BR> <BR> enum ResizeMask<BR> {<BR> RESIZE_VIEWPORT=1,<BR> RESIZE_ATTACHMENTS=2,<BR> RESIZE_PROJECTIONMATRIX=4,<BR> RESIZE_DEFAULT=RESIZE_VIEWPORT|RESIZE_ATTACHMENTS<BR> };<BR> <BR> /** Resize, to the specified width and height, the viewport,<BR> attachments and projection matrix according to the resizeMask<BR> provided.<BR> * Note, the adjustment of the projection matrix is done if the<BR> RESIZE_PROJECTIONMATRIX mask to set and according to the rules<BR> specified in the ProjectionResizePolicy. */<BR> void resize(int width, int height, int<BR> resizeMask=RESIZE_DEFAULT);<BR><BR>2015-03-31 15:08 robert<BR><BR> * examples/osgdistortion/osgdistortion.cpp, include/osg/Camera,<BR> src/osg/Camera.cpp: Introduced Camera::resizeAttachments(int<BR> width, int height) to resize all the Texture and Image assigned<BR> the the Camera attachments.<BR><BR>2015-03-31 10:41 robert<BR><BR> * examples/osgdistortion/osgdistortion.cpp: Refactor the RTT Camera<BR> resize code into a seperate Callback method in prep for this all<BR> being done by a single Camera API call.<BR><BR>2015-03-31 10:36 robert<BR><BR> * include/osg/Camera, include/osgUtil/RenderStage,<BR> src/osg/Camera.cpp, src/osgUtil/RenderStage.cpp: Added<BR> Camera::dirtyAttachmentMap(),<BR> Camera::s/getAttachmentMapModified() value and usage of this in<BR> RenderStage as a new mechanism<BR> for telling the rendering backend to update itself to reflect new<BR> values in the attachments such as new texture or image sizes.<BR><BR>2015-03-23 11:36 robert<BR><BR> * examples/osgtessellationshaders/osgtessellationshaders.cpp: Added<BR> StatsHandler to osgtessellationshaders example to test out<BR> rendering bug associated with stats rendering.<BR><BR>2015-03-20 17:58 robert<BR><BR> * examples/osgdistortion/osgdistortion.cpp: Added event handle to<BR> alter the RTT Camera's dimensions to follow the windows resizes.<BR><BR>2015-03-20 15:49 robert<BR><BR> * src/osgViewer/GraphicsWindowX11.cpp: Fixed resize dimensions of<BR> X11 window<BR><BR>2015-03-20 11:48 robert<BR><BR> * examples/osgviewerQt/osgviewerQt.cpp: From Jannik Heller, "Fix<BR> for Qt4 multi-threaded crash. This patch adds the<BR> AA_X11InitThreads flag to the QApplication setup, meaning QT will<BR> call XInitThreads for us. This also bumps the required QT version<BR> to 4.8+, because the AA_X11InitThreads flag was introduced in<BR> that version. If that is not acceptable, we could add a<BR> QT_VERSION >= 0x040800 guard, or manually call XInitThreads()<BR> instead. Let me know what you think."<BR><BR>2015-03-19 10:49 robert<BR><BR> * examples/osgdistortion/osgdistortion.cpp: Added Texture wrap<BR> setting to CLAMP_TO_EDGE to fix rendering problem when running<BR> the default osgdistortion example<BR><BR>2015-03-17 18:10 robert<BR><BR> * src/osgPlugins/osgjs/JSON_Objects.cpp: Fixed VisualStudio warning<BR><BR>2015-03-17 14:50 robert<BR><BR> * src/osgWrappers/serializers/osg/ComputeBoundingBoxCallback.cpp,<BR> src/osgWrappers/serializers/osg/ComputeBoundingSphereCallback.cpp,<BR> src/osgWrappers/serializers/osg/LibraryWrapper.cpp,<BR> src/osgWrappers/serializers/osg/UpdateCallback.cpp: From<BR> Konstantin Matveyev, "Added ComputeBoundingBoxCallback,<BR> ComputeBoundingSphereCallback and UpdateCallback implmenentations<BR> to serializers"<BR><BR>2015-03-17 09:40 robert<BR><BR> * AUTHORS.txt, ChangeLog: Updated ChangeLog and AUTHORS file for<BR> dev release<BR><BR>2015-03-17 09:09 robert<BR><BR> * src/osgWrappers/serializers/osg/LibraryWrapper.cpp: Fixed library<BR> wrapper<BR><BR>2015-03-17 08:25 robert<BR><BR> * src/osgWrappers/serializers/osg/LibraryWrapper.cpp: Added<BR> ComputeBoundingSphereCallback reference<BR><BR>2015-03-17 08:24 robert<BR><BR> * src/osgWrappers/serializers/osg/LibraryWrapper.cpp,<BR> src/osgWrappers/serializers/osgAnimation/LibraryWrapper.cpp: From<BR> Konstantin Matveyev, "More "LibraryWrapper" fixes for osg and<BR> osgAnimation NodeKits<BR> in the attachment (for 3.3.6 version :)<BR> <BR> Fixes:<BR> <BR> osg:<BR> Unsupported associated class osg::UpdateCallback<BR> (osg_Drawable_UpdateCallback);<BR> ComputeBoundingBoxCallback<BR> <BR> osgAnimation:<BR> Unsupported wrapper class<BR> osgAnimation::RigComputeBoundingBoxCallback<BR> "<BR><BR>2015-03-17 08:19 robert<BR><BR> * src/osgPlugins/osgjs/json_stream: Changed to using<BR> osgDB::ofstream to work around Windows build issue<BR><BR>2015-03-16 17:01 robert<BR><BR> * src/osgPlugins/osgjs/CMakeLists.txt: Removed unneccessary library<BR> link line.<BR><BR>2015-03-16 14:16 robert<BR><BR> * src/osgUtil/MeshOptimizers.cpp: Removed the using namespace std<BR> and replaced with local std:: to make the code clearer<BR><BR>2015-03-16 12:13 robert<BR><BR> * examples/osgdistortion/osgdistortion.cpp: Refactored the command<BR> line setup to enable better control of set up.<BR> Added WindowSizeHandler to allow for adjustment of window size.<BR><BR>2015-03-16 10:30 robert<BR><BR> * src/osgAnimation/Animation.cpp: From Konstantin Matveyev, "Last<BR> update in the osgAnimation::Animation ONCE mode bug fix"<BR><BR>2015-03-16 10:07 robert<BR><BR> * examples/osganimationviewer/AnimtkViewer.cpp: Added --play-mode<BR> [ONCE, STAY, LOOP, PPONG] to help with testing.<BR><BR>2015-03-13 08:12 robert<BR><BR> * src/osgWrappers/serializers/osg/LibraryWrapper.cpp: From<BR> Konstantin Matveyev, "Small fix for OSG 3.3.6.119 in the<BR> attachment.<BR> <BR> One line added in osg/LibraryWrapper.cpp<BR> <BR> USE_SERIALIZER_WRAPPER(Callback)<BR> "<BR><BR>2015-03-12 17:11 robert<BR><BR> * CMakeLists.txt, include/osgAnimation/MorphGeometry,<BR> include/osgAnimation/RigGeometry,<BR> src/osgAnimation/MorphGeometry.cpp,<BR> src/osgAnimation/RigGeometry.cpp,<BR> src/osgWrappers/serializers/osgAnimation/LibraryWrapper.cpp,<BR> src/osgWrappers/serializers/osgAnimation/UpdateBone.cpp,<BR> src/osgWrappers/serializers/osgAnimation/UpdateMaterial.cpp,<BR> src/osgWrappers/serializers/osgAnimation/UpdateMatrixTransform.cpp,<BR> src/osgWrappers/serializers/osgAnimation/UpdateMorph.cpp,<BR> src/osgWrappers/serializers/osgAnimation/UpdateMorphGeometry.cpp,<BR> src/osgWrappers/serializers/osgAnimation/UpdateRigGeometry.cpp,<BR> src/osgWrappers/serializers/osgAnimation/UpdateSkeleton.cpp,<BR> src/osgWrappers/serializers/osgAnimation/UpdateVertex.cpp:<BR> Refactored how the callbacks for updating geometry are managed in<BR> MorphGeometry and RigGeometry to address bugs in serialization.<BR><BR>2015-03-12 15:12 robert<BR><BR> * CMakeModules/FindFBX.cmake: From Laurens Voerman, "attached is a<BR> zip with a modified version of:<BR> OpenSceneGraph\CMakeModules\FindFBX.cmake<BR> <BR> This version can find fbx sdk 2015.1 and will prefer it over<BR> older versions.<BR> <BR> Tested with Visual Studio Express 2013 on 64bit windows 7"<BR><BR>2015-03-12 13:41 robert<BR><BR> * src/osgPlugins/osgjs/json_stream: From Mattias Helsing, add<BR> copyright notice from other osgjs header to the json_stream<BR> header<BR><BR>2015-03-12 13:37 robert<BR><BR> * src/osgPlugins/osgjs/json_stream: Added using namespace std and<BR> removed the std:: prefixes before the std::isfinte and std::isinf<BR> function calls to avoid problems with Android builds against<BR> older NDK's.<BR><BR>2015-03-11 17:47 robert<BR><BR> * src/osgPlugins/exr/ReaderWriterEXR.cpp: From Laurens Voerman,<BR> warning fixes<BR><BR>2015-03-11 17:36 robert<BR><BR> * src/osgPlugins/sdl/JoystickDevice.cpp: From Laurens Voerman, "The<BR> current version will not compile with SDL version 2, error<BR> OpenSceneGraph\src\osgPlugins\sdl\JoystickDevice.cpp(42): error<BR> C2664: 'const char *SDL_JoystickName(SDL_Joystick *)' : cannot<BR> convert argument 1 from 'int' to 'SDL_Joystick *'<BR> due to changes in the SDL api.<BR> <BR> Tested with Visual Studio Express 2013; SDL 2.0.1"<BR><BR>2015-03-11 17:27 robert<BR><BR> * examples/osgtexture2DArray/osgtexture2DArray.cpp,<BR> include/osg/Texture2DArray, src/osg/Texture2DArray.cpp: Completed<BR> support for assigning 3D osg::Image to osg::Texture2DArray.<BR> <BR> Improved the osgtexture2DArray example to add --mipmap and<BR> --packed command line options to help with testing.<BR><BR>2015-03-11 15:44 robert<BR><BR> * examples/osgtexture3D/osgtexture3D.cpp: Updated the comments to<BR> be more relevant<BR><BR>2015-03-10 18:15 robert<BR><BR> * include/osg/Texture2DArray, src/osg/Texture2DArray.cpp,<BR> src/osgWrappers/serializers/osg/Texture2DArray.cpp: Work in<BR> progress to allow osg::Texture2DArray to be set up with a single<BR> osg::Image containing 3D image data.<BR><BR>2015-03-10 18:07 robert<BR><BR> * examples/CMakeLists.txt, examples/osgtexture2DArray,<BR> examples/osgtexture2DArray/CMakeLists.txt,<BR> examples/osgtexture2DArray/osgtexture2DArray.cpp: Work in<BR> progress on new osgtexture2DArray example<BR><BR>2015-03-09 11:27 robert<BR><BR> * src/osgPlugins/CMakeLists.txt, src/osgPlugins/gles,<BR> src/osgPlugins/gles/AnimationVisitor,<BR> src/osgPlugins/gles/BindPerVertexVisitor,<BR> src/osgPlugins/gles/CMakeLists.txt,<BR> src/osgPlugins/gles/DetachPrimitiveVisitor,<BR> src/osgPlugins/gles/DrawArrayVisitor,<BR> src/osgPlugins/gles/EdgeIndexFunctor,<BR> src/osgPlugins/gles/GeometryArray,<BR> src/osgPlugins/gles/GeometrySplitterVisitor,<BR> src/osgPlugins/gles/GeometryUniqueVisitor,<BR> src/osgPlugins/gles/IndexMeshVisitor,<BR> src/osgPlugins/gles/IndexMeshVisitor.cpp,<BR> src/osgPlugins/gles/LineIndexFunctor,<BR> src/osgPlugins/gles/OpenGLESGeometryOptimizer,<BR> src/osgPlugins/gles/OpenGLESGeometryOptimizer.cpp,<BR> src/osgPlugins/gles/PointIndexFunctor,<BR> src/osgPlugins/gles/PreTransformVisitor,<BR> src/osgPlugins/gles/PrimitiveIndexors,<BR> src/osgPlugins/gles/ReaderWriterGLES.cpp,<BR> src/osgPlugins/gles/StatLogger,<BR> src/osgPlugins/gles/TangentSpaceVisitor,<BR> src/osgPlugins/gles/TriangleLinePointIndexFunctor,<BR> src/osgPlugins/gles/TriangleStripVisitor,<BR> src/osgPlugins/gles/TriangleStripVisitor.cpp,<BR> src/osgPlugins/gles/UnIndexMeshVisitor,<BR> src/osgPlugins/gles/UnIndexMeshVisitor.cpp,<BR> src/osgPlugins/gles/WireframeVisitor,<BR> src/osgPlugins/gles/forsythtriangleorderoptimizer.cpp,<BR> src/osgPlugins/gles/forsythtriangleorderoptimizer.h,<BR> src/osgPlugins/gles/glesUtil, src/osgPlugins/osgjs,<BR> src/osgPlugins/osgjs/Adaptator, src/osgPlugins/osgjs/Animation,<BR> src/osgPlugins/osgjs/Animation.cpp, src/osgPlugins/osgjs/Base64,<BR> src/osgPlugins/osgjs/Base64.cpp,<BR> src/osgPlugins/osgjs/CMakeLists.txt,<BR> src/osgPlugins/osgjs/CompactBufferVisitor,<BR> src/osgPlugins/osgjs/JSON_Objects,<BR> src/osgPlugins/osgjs/JSON_Objects.cpp,<BR> src/osgPlugins/osgjs/ReaderWriterJSON.cpp,<BR> src/osgPlugins/osgjs/WriteVisitor,<BR> src/osgPlugins/osgjs/WriteVisitor.cpp,<BR> src/osgPlugins/osgjs/json_stream: From Cedric Pinson, gles and<BR> osgjs plugins that support conversion of OSG loaded models into a<BR> form that can be used with osgjs JavaScript library<BR><BR>
<DIV>
<DIV><BR></DIV></DIV></DIV></BLOCKQUOTE>