diff --git a/AUTHORS.txt b/AUTHORS.txt index d04eedae8..8390acc5e 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,6 +1,6 @@ -OpenSceneGraph Library 2.7.5 +OpenSceneGraph Library 2.7.6 -349 Contributors: +357 Contributors: Firstname Surname ----------------- @@ -16,8 +16,8 @@ Mathias Fr Geoff Michel Farshid Lashkari Bob Kuehne -Eric Sokolowsky Ulrich Hertlein +Eric Sokolowsky Martin Lavery Jean-Sebastien Guay David Callu @@ -30,72 +30,73 @@ Colin McDonald Pavel Moloshtan Tom Jolley Roger James +Jeremy Moles Andy Skinner Norman Vine -Jeremy Moles Alberto Farre André Garneau Ruben Lopez Randall Hopper Michael Platings +Jason Beverage Art Tevs Adrian Egli Paul Melis Olaf Flebbe -Jason Beverage Gideon May Don Tidrow Romano José Magacho da Silva Per Fahlberg Michael Gronager Mathieu Marache +Joakim Simonsson J.P. Delport +David Spilling Daniel Sjölie Chris Hanson Sherman Wilcox -David Spilling Philip Lowman Melchior Franz -Joakim Simonsson -Chris Denham -Joran Jessurun Jason Daly +Chris Denham +Cedric Pinson +Serge Lages +Roland Smeenk +Joran Jessurun Frederic Marmond David Fries Boris Bralo +Alberto Luaces Yefei He +Tim Moore Terry Welsh Stephane Lamoliatte Sondra Iverson -Serge Lages Rune Schmidt Jensen Rainer Oder Mike Connell +Mario Valle +Gordon Tomlinson +Gino van den Bergen Carlo Camporesi Bryan Thrall Ben Discoe Andreas Ekstrand -Alberto Luaces Sasa Bistrovic Neil Groves Martin Naylor Martin Aumueller Markus Trenkwalder -Mario Valle Loic Dachary Joseph Steel John Shue Jan Peciva Jan Ciger -Gordon Tomlinson Glenn Waldron -Gino van den Bergen Brad Colbert Vivek Rajan -Tim Moore Thibault Genessay Sean Spicer -Roland Smeenk Ravi Mathur Nikolaus Hanekamp Neil Salter @@ -105,7 +106,6 @@ Luc Frauciel Laurens Voerman David Guthrie Corbin Holtz -Cedric Pinson Brad Christiansen Toshiyuki Takahei Thom DeCarlo @@ -117,6 +117,7 @@ Paul de Repentigny Mattias Helsing Liang Aibin Leandro Motta Barros +John Vidar Larring John Kelso Daniel Larimer Csaba Halasz @@ -138,8 +139,8 @@ Mattias Linde Maria Ten Ken Sewell Julian Ortiz -John Vidar Larring Jeremy Bell +Jaromir Vitek James French Garrett Potts Gabor Dorka @@ -179,9 +180,11 @@ Martijn Kragtwijk Lionel Lagarde Kevin Moiule Keith Steffen +Katharina Plugge Joseph Winston John Aughey Johan Nouvel +Jim Vaughan James Moliere Igor Kravtchenko He Sicong @@ -220,6 +223,7 @@ Thom Carlo Tery Welsh Tanguy Fautré Steven Thomas +Simon Hammett Sid Byce Shuxing Xiao Shane Arnott @@ -235,7 +239,9 @@ Rene Molenaar Reinhard Sainitzer Rein Kadijk Raymond de Vries +Ragnar Hammarqvist Qing Shen +Piotr Rak Philipp Siemoleit Philipp Mächler Paul Palumbo @@ -279,7 +285,6 @@ Lewis Harmon Lars Nilson Kyle Centers Kristopher Bixler -Katharina Plugge Karsten Weiss Karl Heijdenberg Jutta Sauer @@ -290,7 +295,6 @@ John Donovan John Davis John Argentieri Joan Abadie -Jim Vaughan Jeoen den Dekker Jean-Christophe Lombardo Jay Zuckerman @@ -310,6 +314,7 @@ Frank Warmerdam Frank Lindeman Frank Lichtenheld Ferdinand Cornelissen +Ferdi Smit Fabien Dachicourt Ewe Woessner Emmanuel Roche @@ -322,6 +327,7 @@ Douglas A. Pouk Dean Iverson David Jung David Gurhrie +Danny Valente Daniel Stien Dan Minor Cyril Brulebois @@ -336,11 +342,13 @@ Bruno Herbelin Brian Keener Brandon Hamm Bora Utka +Björn Hein Bill Prendergast Benoit Laniel Ben van Basten Bart Gallet Axel Volley +Andy Preece Andrew Reyonolds Andreas Jochens Andre Normann diff --git a/ChangeLog b/ChangeLog index c03c5b0a0..cccc24f0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,53 @@ +2008-11-29 11:35 +0000 [r9294] robert: + + * Build fix for when implicit conversion in ref_ptr<> is switched + off. + +2008-11-29 11:10 +0000 [r9293] robert: + + * Fixed build for when ref_ptr<> impicit cast is not built + +2008-11-28 17:18 +0000 [r9292] robert: + + * Removed cmath include as it was causing build problems under + Cgwin + +2008-11-28 14:37 +0000 [r9286-9291] robert: + + * Added new examples + + * From Cedric Pinson, updates to osganimation examples. Merged by + Robert Osfield, from OpenSceneGraph-osgWidget-dev + + * From Jeremy Moles, updates to osgwidget examples. Merged by + Robert Osfield from OpenSceneGraph-osgWidget-dev + + * Updated wrappers + + * From Jeremy Moles, updates to osgWidget Merged my Robert Osfield + from OpenSceneGraph-osgWidget-dev. + + * From Cedric Pinson, updates toosgAnimation. Merged by Robert + Osfield, from OpenSceneGraph-osgWidget-dev. + +2008-11-27 17:31 +0000 [r9280-9282] robert: + + * From Cedric Pinson, "updated the CMakelist.txt of curl plugin to + compile with the static library of curl. I added the external + dependency wldap32" + + * Updated SO version number for 2.5.6 release + + * Updated ChangeLog + +2008-11-27 16:58 +0000 [r9278] shuber: + + * From Stephan Huber: updated XCode project, added osgAnimation + framework + one example using it (osganimationviewer). Added + _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC to local OpenThreads/Config + when compiling for the 10.5 SDK. Some minor fixes on some of the + configurations/targets + 2008-11-27 14:05 +0000 [r9276] robert: * Changed unsigned long to unsigned int to avoid 64bit portability diff --git a/applications/osgversion/osgversion.cpp b/applications/osgversion/osgversion.cpp index a23492834..84b5985ba 100644 --- a/applications/osgversion/osgversion.cpp +++ b/applications/osgversion/osgversion.cpp @@ -226,6 +226,9 @@ bool validName(const std::string& first) if (first=="LineSegment") return false; if (first=="Canvas") return false; if (first=="OpenSceneGraph-2") return false; + if (first=="OpenSceneGraph-osgWidget-dev") return false; + if (first=="Valve") return false; + if (first=="Source") return false; return true; } @@ -279,6 +282,7 @@ std::string typoCorrection(const std::string& name) if (name=="Garret") return "Garrett"; if (name=="Geof") return "Geoff"; if (name=="Giatan") return "Gaitan"; + if (name=="Rolad") return "Roland"; if (name=="Gronenger") return "Gronager"; if (name=="Gronger") return "Gronager"; if (name=="Hebelin") return "Herbelin"; @@ -372,12 +376,25 @@ std::string typoCorrection(const std::string& name) if (name=="Xennon") return "Hanson"; if (name=="Yefrei") return "Yefei"; if (name=="Yfei") return "Yefei"; + if (name=="Urlich") return "Ulrich"; return name; } void nameCorrection(NamePair& name) { + if (name.first=="BjornHein" && name.second=="") + { + name.first = "Björn"; + name.second = "Hein"; + } + + if (name.first=="Bjorn" && name.second=="Hein") + { + name.first = "Björn"; + name.second = "Hein"; + } + if (name.first=="Erik" && name.second=="van") { name.first = "Erik";