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