diff --git a/AUTHORS.txt b/AUTHORS.txt index 3939c5bb1..196355466 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,6 +1,6 @@ -OpenSceneGraph Library 2.7.3 +OpenSceneGraph Library 2.7.4 -340 Contributors: +346 Contributors: Firstname Surname ----------------- @@ -25,8 +25,8 @@ Tree Luigi Calori Trajce Nikolov Mike Wittman -Colin McDonald Wojciech Lewandowski +Colin McDonald Pavel Moloshtan Tom Jolley Roger James @@ -39,20 +39,20 @@ Ruben Lopez Randall Hopper Art Tevs Adrian Egli +Paul Melis Olaf Flebbe +Jason Beverage Gideon May Don Tidrow Romano José Magacho da Silva -Paul Melis +Per Fahlberg Michael Platings Michael Gronager -Jason Beverage +Mathieu Marache +J.P. Delport Daniel Sjölie Chris Hanson Sherman Wilcox -Per Fahlberg -Mathieu Marache -J.P. Delport David Spilling Philip Lowman Melchior Franz @@ -61,6 +61,7 @@ Joran Jessurun Jason Daly Frederic Marmond David Fries +Chris Denham Boris Bralo Yefei He Terry Welsh @@ -74,6 +75,7 @@ Carlo Camporesi Bryan Thrall Ben Discoe Andreas Ekstrand +Alberto Luaces Sasa Bistrovic Neil Groves Martin Naylor @@ -104,7 +106,6 @@ David Guthrie Corbin Holtz Cedric Pinson Brad Christiansen -Alberto Luaces Toshiyuki Takahei Tim Moore Thom DeCarlo @@ -145,8 +146,8 @@ Doug McCorkle Donn Mielcarek Donald Cipperly Domenico Mangieri -Chris Denham Charles Cole +Blasius Czink Blake Williams Antoine Hue Andrew Bettison @@ -174,11 +175,13 @@ Maya Leonard Max Bandazian Mathew May Martijn Kragtwijk +Lionel Lagarde Kevin Moiule Keith Steffen Joseph Winston John Aughey Johan Nouvel +James Moliere Igor Kravtchenko He Sicong Gustavo Wagner @@ -226,6 +229,7 @@ Ronny Krueger Robert Swain Rob Bloemkool Rick Pingry +Ricard Schmidt Rene Molenaar Reinhard Sainitzer Rein Kadijk @@ -238,6 +242,7 @@ Paul Obermeier Paul Fredrikson Parag Chaudhur Panagiotis Papadakos +Panagiotis Koutsourakis Orhun Birsoy Ole-Morten Duesund Nicolas Brodu @@ -265,12 +270,13 @@ Mario Guimaraes Marin Lavery Marco Lehmann Maceij Krol +Lukas Diduch Louis Hamilton -Lionel Lagarde Lilin Xiong Lewis Harmon Lars Nilson Kristopher Bixler +Katharina Plugge Karsten Weiss Karl Heijdenberg Jutta Sauer @@ -281,6 +287,7 @@ John Donovan John Davis John Argentieri Joan Abadie +Jim Vaughan Jeoen den Dekker Jean-Christophe Lombardo Jay Zuckerman @@ -326,7 +333,6 @@ Bruno Herbelin Brian Keener Brandon Hamm Bora Utka -Blasius Czink Bill Prendergast Benoit Laniel Ben van Basten diff --git a/ChangeLog b/ChangeLog index 1160d163c..c325e7323 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,382 @@ +2008-10-29 10:38 +0000 [r9073] robert: + + * Updated wrappers + +2008-10-29 10:25 +0000 [r9072] robert: + + * From Lukas Diduch, added a multithread compsite viewer path, + accessible using: osgviewerQT --MTCompositeViewer --QOSGWidget + cow.osg + +2008-10-29 10:12 +0000 [r9071] robert: + + * From James Moliere, fixed display of axis + +2008-10-28 17:28 +0000 [r9070] robert: + + * From Lionel Lagrade, "I've replaced readsome by read+gcount." + From Robert Osfeld, added throw on uncompress error. + +2008-10-27 19:59 +0000 [r9069] robert: + + * From Chris Denham, changed nested Camera intersection test so + that it requires the command line --relative-camera-scene to + enable it + +2008-10-27 17:42 +0000 [r9068] robert: + + * Added --help-env docs for OSG_MAX_PAGEDLOD + +2008-10-27 17:11 +0000 [r9066-9067] robert: + + * Merged in comment split code from the old flt plugin so that FLT + comments string with returns in them are put into separate + description entries. + + * From Wojciech Lewandowski, "I am sending a really minor fix for + StatsHandler::reset method. We dynamically add and remove slave + cameras in our application. StatsHandler does not automatically + adapt to this situation, and we call StatsHandler::reset to force + it to update number of cameras and their graphs. Unfortunately, + if stats were already drawn, reset would not remove former graph + drawables and they would remain frozen below new stats. This + update fixes it. " + +2008-10-27 16:16 +0000 [r9065] robert: + + * From Chris Denham, default scene that tests the use of in scene + graph Camera which has a RELATIVE_RF ReferenceFrame. + +2008-10-27 16:06 +0000 [r9064] robert: + + * From Chris Denham, fixed support of in scene graph osg::Camera's + with ReferenceFrame of RELATIVE_RF. + +2008-10-27 15:26 +0000 [r9063] robert: + + * From Katharina Plugge, "I found a bug in the OpenFlight-Plugin. + When exporting to OpenFlight it could happen that palettes of an + external reference like the texture palette are set wrong, + because they are overwritten by parent settings (userData), which + actually do not refer to palette entries respectively ParentPools + (happens for example if a Transform is parent of a ProxyNode). + The static cast from userData to ParentPools should therefore be + a dynamic cast. --------------------------- function + FltExportVisitor::writeExternalReference( const osg::ProxyNode& + proxy ): Line 423 in file expPrimaryRecords.cpp has to be changed + from const ParentPools* pp = static_cast(proxy.getUserData() ); to const ParentPools* pp = + dynamic_cast(proxy.getUserData() ); " + +2008-10-27 13:09 +0000 [r9062] robert: + + * Various warning fixes + +2008-10-27 11:49 +0000 [r9061] robert: + + * Updated wrappers + +2008-10-27 11:08 +0000 [r9060] robert: + + * From Mathias Froehlich, "This change is a result of a recent + thread on osg-users. The semantic change that went into the ac + loader with the past patch was incorrect wrt the document + describing the behaviour of ac files and inconsistent with what + ac3d itself displays for that files. This attached change reverts + the behaviour to the original one. The infrastructure to change + this is left in place. The change is based on rev 9045." + +2008-10-27 10:42 +0000 [r9058-9059] robert: + + * From Blasius Czink, "Among other things I added support for + atomic operations on BSD-like systems and additional methods (for + "and", "or", "xor"). " and a later post the same osg-submissions + thread: "it's been a while since I have made the changes but I + think it was due to problems with static builds of OpenThreads on + windows. I was using OpenThreads in a + communication/synchronisation library (without OpenSceneGraph). + It seems I forgot to post a small change in the CMakeLists file + of OpenThreads. If a user turns DYNAMIC_OPENTHREADS to OFF + (static build) OT_LIBRARY_STATIC will be defined in the Config. + Without these changes a windows user will always end up with a + "__declspec(dllexport)" or "__declspec(dllimport)" which is a + problem for static builds." And another post from Blasius on this + topic: "I tested with VS2005 and VS2008. For 32 bit everything + works as expected. For x64 and VS2008 I could successfully do the + cmake-configure and then the compilation but I had occasional + crashes of cmTryCompileExec.exe (during the cmake-configure + phase) which seems to be a cmake bug. With VS2005 and 64bit cmake + does not set _OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED although + the interlocked functionality should be there. If I place the + source snippet from the CHECK_CXX_SOURCE_RUNS macro to a separate + sourcefile I can compile and run the resulting executable + successfully. Forcing OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED + (on VS2005/x64) reveals a bug in "intrin.h" which seems to be + fixed in VS2008 but not in VS2005. In case anyone is interested + the lines: __MACHINEI(unsigned char + _interlockedbittestandset(long *a, long b)) __MACHINEI(unsigned + char _interlockedbittestandreset(long *a, long b)) + __MACHINEX64(unsigned char _interlockedbittestandset64(__int64 + *a, __int64 b)) __MACHINEX64(unsigned char + _interlockedbittestandreset64(__int64 *a, __int64 b)) should be + changed to: __MACHINEI(unsigned char + _interlockedbittestandset(long volatile *a, long b)) + __MACHINEI(unsigned char _interlockedbittestandreset(long + volatile *a, long b)) __MACHINEX64(unsigned char + _interlockedbittestandset64(__int64 volatile *a, __int64 b)) + __MACHINEX64(unsigned char _interlockedbittestandreset64(__int64 + volatile *a, __int64 b)) The worst thing that can happen is that + interlocked funtionality is not detected during cmake-configure + and the mutex fallback is used. Which reminds me another small + glitch in the Atomic header so I attached a corrected version. + Why is the OT_LIBRARY_STATIC added to the config file? It is not + needed anywhere. OT_LIBRARY_STATIC is needed if you are doing + static-builds on Windows. See my previous post on that. " + + * Fixed positioning of wings + +2008-10-27 09:48 +0000 [r9057] robert: + + * From Mathieu Marache, "I came across a bug when building + OpenSceneGraph with MSVC_VERSIONED_DLL, NMake makefiles and CMake + 2.6.2. The compilation fails because it tries to copy + ot11-OpenThreads.lib to OpenThreads.lib which is valid for the + 2.4.x era of CMake but not anymore in 2.6.x era. The provided + file from the CMakeModules directory adds a tests on the CMake + version and corrects this. Works for me now." + +2008-10-27 09:44 +0000 [r9056] robert: + + * From Alberto Lucas, fixed typo + +2008-10-26 22:22 +0000 [r9054-9055] robert: + + * Improved the support for no pre compile, and configuring the + number of threads in the DatabasePager. + + * Improved the error reporting + +2008-10-25 13:17 +0000 [r9053] robert: + + * From Jim Vaughan, - Matrix transform nodes were stripped out, and + the vertices and normals of each node were transposed by the + modelling matrix. My change preserves the matrix transform nodes, + so that models can still be articulated by changing the matrices. + - Lights were copied from the COIN scenegraph to the OSG + scenegraph, but they were not associated with a LightSource node. + My change for this creates a Group and adds a LightSource for + each Light. - If VRML textures have names, the name is now copied + to -- Form Robert Osfild, changed SbString to std::string usage M + Inventor/ConvertFromInventor.h M Inventor/ConvertFromInventor.cpp + +2008-10-24 11:38 +0000 [r9051] robert: + + * From Alberto Luaces, "it seems a copy-paste error is present on + the OBJ loader when parsing the options given by the user. + "noTesselateLargePolygons" is being activated instead of + "noTriStripPolygons". I'm attaching the fixed file." + +2008-10-24 10:02 +0000 [r9050] robert: + + * Fixed typo + +2008-10-24 09:59 +0000 [r9049] robert: + + * Add osgParticle:: qualifiers in front of Program entries to avoid + issues when combining osg::Program and osgParticle::Program in a + single app + +2008-10-24 09:49 +0000 [r9048] robert: + + * Changed timing stats to osg::INFO level + +2008-10-24 08:09 +0000 [r9047] robert: + + * Removed debugging test. + +2008-10-23 16:33 +0000 [r9046] robert: + + * Introduced new method of management the number of PagedLOD + active, by using a capping the number of PagedLOD to a sepcified + maximum, with pruning of inactive PagedLOD when the total number + of inactive and active PagedLOD goes above the maximum. To enable + the mode set the env var OSG_MAX_PAGEDLOD to a value something + like 1000. + +2008-10-21 16:39 +0000 [r9045] robert: + + * From Panagiotis Koutsourakis, "We are using Open Scene Graph for + an application and we need COLLADA support. While testing the + pluggin we found a small bug and we are submitting a patch. The + first attachment is a small program that creates a scene with two + pyramids, transformed by two instances of + osg::PositionAttitudeTransform. One of them is rotated 90 degrees + in the X axis, and the scene is exported both in the native OSG + (.osg) and COLLADA (.dae) formats. In the first case the rotated + pyramid is displayed correctly whereas in the second the pyramid + seems not to be rotated. In the COLLADA 1.4.1 specification + (found at http://www.khronos.org/collada/) it is specified that + "The element contains a list of four floating-point + values [...] followed by an angle in degrees" but the plugin + seems to write the value in radians. The problem seems to be in + the method daeWriter::apply() that seems to be writing the angle + value in radians to the COLLADA file. The patch can be found in + the second attachment and is simply a call to RadiansToDegrees + wrapped around the angle. " + +2008-10-21 16:32 +0000 [r9043-9044] robert: + + * From Wojciech Lewandowski, "I made a minor tweak in + StandardShadowMap.cpp. As agreed with J-S I have added + AlphaFunc/AlphaTest to shadow camera stateset to make sure + transparent objects will not cast blocky solid shadows." + + * From Chris Denham, "However, just spotted another inconsistency + between UFOManipulator::getMatrix() and + UFOManipulator::getInverseMatrix() It assumes that + inverse(_inverseMatrix * _offset) = _offset * _matrix This is + only true when _offset=identity, so I think it should be + inverse(_offset) * _matrix This inconsistency can cause problems + when switching from UFO to other manipulators, because the + UFO:Manipulator::getMatrix function is not necessarily returning + a correct inverse of the currently set ModelViewTransform. It was + tempting to change the name of the _offset member to + _inverseOffset, or to maintain both variables, but in the end + went for the minimal change." + +2008-10-21 16:27 +0000 [r9042] robert: + + * From Per Fahlberg, "I ran into a problem when using another + library that implemented the same functions as the osg jpeg + plugin, i guess they both originated from the same example code + :) As a solution I added a namespace in ReaderWriterJPEG.cpp + around the functions. " + +2008-10-21 15:51 +0000 [r9041] robert: + + * #if'd out an premature StateSet optimization that was causing + problems with datasets that mixed multi-texture coord geometry + with single texture coord geometries in a single scene graph. + +2008-10-21 09:50 +0000 [r9040] robert: + + * Updated wrappers + +2008-10-20 16:24 +0000 [r9038] robert: + + * Introduce osgDB::FileCache, and updated osgfilecache and + DatabasePager to use it. + +2008-10-20 08:43 +0000 [r9037] robert: + + * Introduced support for controlling mipmapping of + osgTerrain::ImageLayer and compression of + osgTerrain::HeightFieldLayer. + +2008-10-17 09:16 +0000 [r9036] robert: + + * From Paul Melis, fixed typo + +2008-10-15 10:07 +0000 [r9034] robert: + + * From Chris Denham, "I noticed that UFOManipulator _matrix and + _inverseMatrix may be inconsistently set due to typo in + UFOManipulator::home(). I assume the intention is that _matrix + and _inverseMatrix are kept consistent, so corrected file + attached. ///////////// OSG 2.6 ////////////////// + _inverseMatrix.makeLookAt( _homeEye, _homeCenter, _homeUp ); + _matrix.invert( _matrix ); ///////////// after typo correction + ///////////////// _inverseMatrix.makeLookAt( _homeEye, + _homeCenter, _homeUp ); _matrix.invert( _inverseMatrix ); + ///////////////////////////////////////" + +2008-10-14 17:20 +0000 [r9033] robert: + + * Changed erroneous ZLIB_INCLUDE_DIRS to ZLIB_INCLUDE_DIR + +2008-10-14 16:57 +0000 [r9032] robert: + + * From Jason Beverage, "Here is a small change to the CURL plugin + to distinguish between a 400 level error and a 500 level error. + If a 400 level error occurs, a FILE_NOT_FOUND ReadResult is + appropriate. If a 500 level error occurs (such a 503, Service + unavailable), the application might want to try to load the file + again in a few seconds/minutes. This submission returns + ERROR_IN_READING_FILE if a 500 level error occurs so that clients + can easily distinguish between the errors. The actual error code + is also added to the "message" of the ReadResult so if a client + needs more information, they can just parse the message to + retrieve the error code." + +2008-10-14 16:44 +0000 [r9031] robert: + + * Converted M_PI* usage across to osg::PI + +2008-10-14 16:35 +0000 [r9030] robert: + + * From Ricard Schmidt, dot writer plugin. + +2008-10-14 15:24 +0000 [r9029] robert: + + * From James Moliere, " The code below is to show how a heirarchy + of objects can be made within a scenegraph. In other words, how + there can be a parent/child relationship between objects such + that when a parent is rotated or translated, the children move is + respect to it's parent movement. A robotic arm is used in this + example because this is what I'm using OSG for." + +2008-10-14 15:10 +0000 [r9028] robert: + + * Removed geomoflife_frag.cpp experiement from CMakeList.txt file + +2008-10-14 14:58 +0000 [r9026] robert: + + * From J.P Delport, game of life example that demonstrates ping + pong render to texture rendering + +2008-10-14 14:37 +0000 [r9024-9025] robert: + + * Added zlib support to curl and ive plugins + + * Added debug timing code + +2008-10-14 14:27 +0000 [r9022-9023] robert: + + * Added a Refrenced::getGlobalReferencedMutex, and + OpenThreads::ScopedPointerLock() and use of this in + add/removeParent() codes to avoid threading problems when using + atomic ref counting. + + * UPdated version numbers + +2008-10-10 12:01 +0000 [r9021] robert: + + * Moved compress/uncompress code across to using gzip compatible + methods + +2008-10-09 18:46 +0000 [r9020] robert: + + * Added initial cut of gz compress/uncompress plugin + +2008-10-09 17:02 +0000 [r9019] robert: + + * Initial cut of zlib based compress/uncompress plugin + +2008-10-09 13:16 +0000 [r9017] shuber: + + * From Stephan Huber: updated XCode-project, added osgVolume-lib + +2008-10-09 08:52 +0000 [r9016] robert: + + * Fixed the frame rate reporting so that it handles the case when + animation is slowed or speeded up + +2008-10-08 13:19 +0000 [r9013-9014] robert: + + * Updated date + + * Updated ChangeLog and AUTHORS.txt for 2.7.3 dev release + 2008-10-08 12:54 +0000 [r9012] robert: * Updated wrappers diff --git a/applications/osgversion/osgversion.cpp b/applications/osgversion/osgversion.cpp index e50054613..98a362e07 100644 --- a/applications/osgversion/osgversion.cpp +++ b/applications/osgversion/osgversion.cpp @@ -245,7 +245,11 @@ std::string typoCorrection(const std::string& name) if (name=="Antione") return "Antoine"; if (name=="Antonoine") return "Antoine"; if (name=="Atr") return "Art"; + if (name=="Osfeld") return "Osfield"; + if (name=="Rucard") return "Richard"; if (name=="Baverage") return "Beverage"; + if (name=="Lagrade") return "Lagarde"; + if (name=="Lucas") return "Luaces"; if (name=="Bistroviae") return "Bistrovic"; if (name=="Callue") return "Callu"; if (name=="Christaiansen") return "Christiansen";