diff --git a/AUTHORS.txt b/AUTHORS.txt index a4f2b2b22..d8ef07243 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,6 +1,6 @@ OpenSceneGraph Library 3.2.0 -511 Contributors: +520 Contributors: Firstname Surname ----------------- @@ -13,8 +13,8 @@ Marco Jez Farshid Lashkari Wang Rui Jean-Sébastien Guay -Mike Weiblen Ulrich Hertlein +Mike Weiblen Eric Wing Sukender Cedric Pinson @@ -40,14 +40,14 @@ Jeremy Moles Jason Beverage Jan Peciva J.P. Delport +Alberto Luaces Mattias Helsing Magnus Kessler David Fries Andy Skinner -Paul Melis -Alberto Luaces -Luc Frauciel Tom Jolley +Paul Melis +Luc Frauciel Pavel Moloshtan Brad Christiansen Olaf Flebbe @@ -65,6 +65,7 @@ Alberto Farre Sherman Wilcox Robert Michael Mourad Boufarguine +Aurelien Albert André Garneau Adrian Egli Ruben Lopez @@ -74,7 +75,6 @@ Torben Dannhauer Glenn Waldron Gideon May Don Tidrow -Aurelien Albert Stephane Lamoliatte Romano José Magacho da Silva Michael Gronager @@ -88,6 +88,7 @@ Andreas Ekstrand Mike Connell Melchior Franz Johannes Baeuerle +Thomas Hogarth Riccardo Corsi Rafa Gaitan Neil Hughes @@ -101,7 +102,6 @@ Cory Riddell Chuck Seberino Boris Bralo Yefei He -Thomas Hogarth Sondra Iverson Simon Julier Rune Schmidt Jensen @@ -154,6 +154,7 @@ Alexander Sinditskiy Alexander Irion Toshiyuki Takahei Sebastien Grignard +Sebastian Messerschmidt Ryan Kawicki Rudolf Wiedemann Romano Magacho @@ -181,7 +182,6 @@ Tugkan Calapoglu Tim Daoust Sohey Yamamoto Sergey Leontyev -Sebastian Messerschmidt Santosh Gaikwad Ryan Pavlik Robert Milharcic @@ -279,6 +279,7 @@ Guy Volckaert Gustavo Wagner Guillaume Taze Guillaume Chouvenc +Giuseppe Donvito Gill Peacegood Gerrick Bivins George Tarantilis @@ -334,6 +335,7 @@ Simon Buckley Sid Byce Shuxing Xiao Shane Arnott +Sergey Kurdakov Sebastien Kuntz Ruth Lang Ruben Smelik @@ -472,6 +474,7 @@ Duvan Cope Duncan Cavens Drew Whitehouse Douglas A. Pouk +Dmitry Marakasov Dean Iverson David Jung Danny Valente @@ -479,9 +482,11 @@ Daniel Stien Dan Minor César L. B. Silveira Cyril Brulebois +Colin Cochran Clay Fowler Chuck Sembroski Christopher Blaesius +Christopher Baker Christophe Herreman Christian Noon Christian Kaser @@ -494,6 +499,8 @@ Brian Keener Brandon Hamm Bora Utka Björn Hein +Björn Hein +Björn Blissing Bjorn Blissing Bill Prendergast Bernardt Duvenhage @@ -503,6 +510,7 @@ Ben van Basten Bart Gallet Axel Volley Anthousis Andreadis +Anish Thomas Andy Preece Andrew Reyonolds Andreas Roth @@ -514,4 +522,5 @@ Alberto Jaspe Alan Purvis Alan Ott Alan Harris +Adrien Grandemange Adam Richard diff --git a/ChangeLog b/ChangeLog index 71f6db622..a9c26d663 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,372 @@ +2013-10-02 11:29 robert + + * src/osgPlugins/osc/osc/OscHostEndianness.h: From Dmitry + Marakasov, "These are FreeBSD bits for + src/osgPlugins/osc/osc/OscHostEndianness.h, + required to build newever OSG on this OS. Also corrects file name + in the error message - I was confused not to find + OSCHostEndianness.h + after I've got this error. + + Tested by successfully building OSG 3.2.0 with this patch on + FreeBSD + 9.1." + +2013-10-02 11:09 robert + + * src/osgPlugins/stl/ReaderWriterSTL.cpp: From Björn Hein, "it + seems that for generating "per vertex normals" as stated in the + comment, two of them are missing. This results in wrong display + of + STL-files regarding normals. Following simple fix seems to work: + + Index: ReaderWriterSTL.cpp + =================================================================== + --- ReaderWriterSTL.cpp (Revision 13797) + +++ ReaderWriterSTL.cpp (Arbeitskopie) + @@ -108,6 +108,8 @@ + ++itr) + { + perVertexNormals->push_back(*itr); + + perVertexNormals->push_back(*itr); + + perVertexNormals->push_back(*itr); + } + + geom->setNormalArray(perVertexNormals.get(), + osg::Array::BIND_PER_VERTEX); + " + +2013-10-01 16:20 robert + + * src/osgAnimation/LinkVisitor.cpp, + src/osgAnimation/RigGeometry.cpp: From Björn Blissing, "I propose + making the following outputs a little bit more silent. In my mind + it would suffice with OSG_DEBUG (compared to OSG_NOTICE) for + these information messages." + +2013-10-01 09:37 robert + + * src/osgPlugins/Inventor/ConvertFromInventor.cpp: From Christopher + Baker, submitted by Alberto Luacas, "there is a bug report in the + Ubuntu tracker that points to a bug when + loading multiple VRML files in parallel. Christopher R. Baker has + detected this bug and crafted a patch. In addition, libcoin has + to be + also built with the "--enable-threadsafe" option. + + I copy here his report, extracted from + (https://bugs.launchpad.net/ubuntu/+source/openscenegraph/+bug/1211993) + and attach his fix. All credit is due to him: + + « + There are three instances of a classical method-local-static + multithreaded initialization bug in the Inventor plugin for OSG + that + trigger various memory faults when reading multiple VRML files in + parallel via osgDB::readNodeFile. These bugs are of the form: + + static std::map myHandyMap; + static bool once = true; + if(once) { ...fill myHandyMap; once = false } + ... use myHandyMap; + + To repeat: try loading multiple VRML files from multiple threads. + The + liklihood of the bug depends on many factors, but my application, + which + parallel-loads some dozens of small (<100K) VRML files on + startup, + triggers this problem 25% of the time or more. + + The attached patch (inventor-plugin-multithread.patch) rectifies + this + problem by: + + 1 - Inheriting MyHandyMap from std::map, then + 2 - Moving the map initialization into the derived constructor, + which + 3 - Is intrinsically protected from multithread issues by g++ + (and is + part of the C++ standard), unless you pass + -fno-threadsafe-statics, + which is strongly discouraged by the man page. + » + " + +2013-10-01 09:11 robert + + * src/osgViewer/GraphicsWindowWin32.cpp: From Adrien Grandemange, + "On Windows 7 and 8, mouse messages are generated in addition to + touch messages, which leads to duplicate PUSH, DRAG and RELEASE + events in OSG. Besides, the mouse and touch messages referring to + the same user input are not necessarily sent at the same time, + due to gesture translation done by Windows by default, such as + double-tap => double-click and long-push => right-click. + The delay between the 2 types of messages is more noticeable on + Windows 8 and leads to serious disruptions in our application. + + Mouse messages generated by touch input are only present for + legacy support. I think they should be filtered out by OSG (real + click events originating from a physical mouse will of course + still go through). + + This is what this patch does, according to this suggestion: + http://msdn.microsoft.com/en-us/library/dd693088%28v=VS.85%29.aspx + (third issue in this page)." + +2013-10-01 09:05 robert + + * src/osg/PointSprite.cpp: From Thomas Hogarth, "Attached is a + small build fix for PointSprite when compiling under GLES2 + (r13788) + + GL_POINT_SPRITE_OES does not exist in GLES2, instead you just + draw using GL_POINTS then use gl_PointSize in a vertex shader to + set the size." + +2013-09-30 18:32 robert + + * src/osgPlugins/avfoundation/CMakeLists.txt, + src/osgPlugins/avfoundation/OSXAVFoundationCoreVideoTexture.cpp, + src/osgPlugins/avfoundation/OSXAVFoundationCoreVideoTexture.h, + src/osgPlugins/avfoundation/OSXAvFoundationCoreVideoTexture.cpp, + src/osgPlugins/avfoundation/OSXAvFoundationCoreVideoTexture.h: + +2013-09-30 18:16 robert + + * src/osg/StateSet.cpp: From Farshid Lashkari, "I have a scene that + makes heavy use of the StateSet::compare method and my profiler + showed that a lot of time was being spent inside it. I made a + small change to the method so that it performs a quick size + comparison between the attribute/mode lists and bin mode before + iterating through all the attributes. This made a noticeable + improvement in my scene. I've attached the change." + +2013-09-30 10:45 robert + + * src/osgUtil/LineSegmentIntersector.cpp: Refactored the epsilon + code to use the same one now used in svn/trunk. + +2013-09-20 15:43 robert + + * src/osgVolume/VolumeTile.cpp: Removed unnceccesary + setNumChildrenRequiringUpdateTraversal from VolumeTile + constructor. + +2013-09-10 15:18 robert + + * src/osgPlugins/dds/ReaderWriterDDS.cpp: From Giuseppe Donvito, + "I'm using OSG 320 and I need to flush a DDS 3D texture on disk. + I found a bug on DDS ReaderWriter that generates a false positive + on a guard for the size check on writing operation. This is due + to a wrong imageSize computation that uses + img->getImageSizeInBytes() method instead of + img->getTotalSizeInBytes(), that actually ignores the r() + dimension, contrariwise taken into account by the function + ComputeImageSizeInBytes() later. + + The line 1062 on file ReaderWriterDDS.cpp should be fixed with: + [code]unsigned int imageSize = + img->getTotalSizeInBytes();[/code]" + +2013-09-10 13:29 robert + + * include/osgUtil/SceneView: From Giuseppe Donvito, Fixed typo of + "CLEAR_GLOBAL_STATESET = 0x16," to indended + "CLEAR_GLOBAL_STATESET = "0x10". + +2013-09-09 14:58 robert + + * src/osg/PointSprite.cpp: From Colin Cochran, OES support for + point sprites + +2013-09-09 13:33 robert + + * src/osg/FrameBufferObject.cpp, src/osg/Texture.cpp: osg uses + osg::FBOExtensions to check if Frame Buffer Objects are + available. But this just checks if the fbo functions can be + called. + It doesn't check if the OpenGL renderer supports fbos. For + indirect + rendering on linux the client side capability may be different + from + the display server, which can lead to mipmapped textures failing + to + render. I've added a fbo extension check. + +2013-09-09 12:44 robert + + * CMakeModules/FindAVFoundation.cmake: From Ulrich Hertlein, "Patch + for FindAVFoundation to work with OS X 10.9" + +2013-09-09 12:37 robert + + * examples/osgviewerMFC/MFC_OSG.cpp: From Wang Rui, "Some + developers report that the osgviewerMFC example is broken in 3.2, + in which depth test is not enabled by default so all models + loaded look awkward. I submit this patch to make it work again. I + haven't gone deep to check why previous example goes wrong in + newer version but I believe the problem was because the newly + created camera object missed some important global statesets + before set as the main camera." + +2013-09-09 12:33 robert + + * examples/osgmultiplemovies/CMakeLists.txt, + src/osgPlugins/osg/CMakeLists.txt: From Laurens Voerman, "two + minor fixes, both in a CMakeList.txt file, + + 1> osgmultiplemovies example does not use SDL so needs no link to + SDL + + 2> Added header files to "Plugins osg" project, so visual studio + can find the source of + OSG_WARN << "AsciiInputIterator::readProperty(): Unmatched + property " + " + +2013-09-05 10:23 robert + + * include/osgUtil/SceneView, src/osg/Uniform.cpp, + src/osgDB/OutputStream.cpp, src/osgPlugins/lws/SceneLoader.cpp: + From Colin McDonald, "Attached are some fixes to build osg using + the Solaris Studio compiler. + I've also checked the modified files still build ok with other + compilers (Linux gcc, Windows Visual Studio). + + osgDB/OutputStream.cpp and osgPlugins/lws/SceneLoader.cpp require + stdlib.h for atoi use. + + In osg/Uniform.cpp the compiler complains that base_class is + unknown + unless I add a class name qualifier. + + Not a build fix, but I spotted a typo in osgUtil/SceneView." + +2013-09-05 10:08 robert + + * src/osgWrappers/serializers/osg/PagedLOD.cpp: From Laurens + Voerman, "like the "Bug in ProxyNode serializer" Farshid Lashkari + found (svn submit 13754) the PagedLOD serializer attempts to read + begin and and brackets. + Fix is identical (don't read brackets when num_chidren is zero) + and applies both to trunk and 3.2 branch." + +2013-09-05 10:05 robert + + * src/osgPlugins/ffmpeg/FFmpegDecoder.cpp, + src/osgPlugins/ffmpeg/FFmpegParameters.cpp: Fixed warnings + +2013-09-05 08:41 robert + + * src/osgPlugins/ffmpeg/FFmpegDecoder.cpp: From Alberto Luaces, + "current versions of ffmpeg render «url_feof» macro as obsolete. + The fix + is very simple and it is contained in the attached file." + +2013-09-02 10:57 robert + + * src/osgWrappers/serializers/osg/ProxyNode.cpp: From Farshid + Lashkari, "The ProxyNode serializer was not correctly reading the + "Children" field. It conditionally writes the begin/end brackets, + depending on whether it has children. However, during input it + unconditionally attempts to read the begin/end brackets. I've + modified the code to only read the brackets if it has children." + +2013-09-02 09:13 robert + + * src/osgAnimation/StackedTransform.cpp: Merged from svn/trunk, + fixed double copy in StackedTransform constructor + +2013-08-05 12:00 robert + + * src/osg/State.cpp: From Aurelien Albert, "I've go some problem + with the method "State_Utils::replace" : if the original_phrase + is empty, it leads to an infinite loop. + + Here is a path to prevent this." + +2013-08-01 11:25 robert + + * src/osgUtil/DelaunayTriangulator.cpp: From Anish Thomas, added + catch for to an empty DrawElementsUInt creation. + +2013-08-01 10:28 robert + + * src/osgPlugins/shp/ESRIShapeReaderWriter.cpp, + src/osgPlugins/shp/XBaseParser.cpp, + src/osgPlugins/shp/XBaseParser.h: From Ulrich Hertlein, "Based on + the exchange on osg-users I went ahead and reworked + shp/XBaseParser to avoid + weird behaviour (closing stdin) and leaking file descriptors, as + well as some const-ness." + +2013-08-01 10:04 robert + + * src/osgPlugins/OpenFlight/PrimaryRecords.cpp: From Sebastian + Messerschmidt, "Seems like your re-factoring didn't really + produces the correct results. + You can check with the tester2.flt provided earlier and check + with the result image. + I double checked this with OpenFlight creator, and it seems the + yaw is broken. + + With my initial quaternion version is seems correct and if I + change the + + + float cos_yaw = cosf(osg::inDegrees(yaw)); + float sin_yaw = sinf(osg::inDegrees(yaw)); + + to be + float cos_yaw = cosf(osg::inDegrees(-yaw)); + float sin_yaw = sinf(osg::inDegrees(-yaw)); + + it seems to work as well." + +2013-08-01 10:00 robert + + * src/osg/Geometry.cpp: From Tom Jolley, "I found a couple more + bugs after closely looking at the small piece of deprecated + geometry in my model. There were problems with more than one + primitive in a couple places. The first was the number of + vertices were not being accumulated for DrawArraysPrimitiveType + (caused another crash). The second is I had to move target_vindex + and source_pindex before the PrimitiveSetList loop so they don't + get reset on the next primitive (otherwise you end up with a lot + of zeros in per vertex lists)." + +2013-07-31 07:11 robert + + * include/osg/FrameBufferObject: From Aurelien Albert, "Here is the + code to get access to OpenGL handle of an osg::FrameBufferObject" + +2013-07-31 06:56 robert + + * src/osg/Geometry.cpp: From Tom Jolly, "I ran across this error + reading one of our older files. An iterator was being changed + inside a loop that caused a crash." + +2013-07-31 06:43 robert + + * src/osg/State.cpp: From Sergey Kurdakov, merged from svn/trunk + fix for GLES2 runtime invalid enumerant warning. + +2013-07-30 06:39 robert + + * applications/present3D/present3D.cpp: From svn/trunk merged + "Changed default cull mask to match the left cull mask so that + mono rendering of presentations with left/right stereo + images/movies works fine." + +2013-07-30 06:39 robert + + * applications/present3D/present3D.cpp: Removed trailing spaces + +2013-07-24 17:29 robert + + * ChangeLog: Updated ChangeLog + 2013-07-24 17:27 robert * src/osg/DisplaySettings.cpp: Changed default of serialize draw to diff --git a/applications/osgversion/Contributors.cpp b/applications/osgversion/Contributors.cpp index 874f9de62..a7f3f91e9 100644 --- a/applications/osgversion/Contributors.cpp +++ b/applications/osgversion/Contributors.cpp @@ -254,7 +254,9 @@ const char* invalidNames[] = "GraphicsContext*", "Apple", "GeometryNew", - "FrameBufferObject" + "FrameBufferObject", + "Lua", + "VolumeTile" };