diff --git a/AUTHORS.txt b/AUTHORS.txt index dc72d55b9..587af01f9 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,6 +1,6 @@ -OpenSceneGraph Library 2.1.9 +OpenSceneGraph Library 2.1.10 -276 Contributors: +278 Contributors: Firstname Surname ----------------- @@ -19,30 +19,30 @@ Martin Lavery Ulrich Hertlein Eric Sokolowsky Tree +Mike Wittman Luigi Calori Trajce Nikolov -Mike Wittman Pavel Moloshtan Tom Jolley Norman Vine Alberto Farre Roger James +Mathias Fröhlich André Garneau Ruben Lopez Randall Hopper Olaf Flebbe -Mathias Fröhlich Gideon May Don Tidrow Romano José Magacho da Silva Michael Gronager +David Callu +Daniel Sjölie Colin McDonald Chris Hanson -Daniel Sjölie Per Fahlberg Joran Jessurun Jean-Sebastien Guay -David Callu Frederic Marmond David Spilling David Fries @@ -80,9 +80,11 @@ Loic Dachary Laurens Voerman Joseph Steel John Shue +Jan Peciva David Guthrie Corbin Holtz Brad Christiansen +Art Tevs Toshiyuki Takahei Thom DeCarlo Terry Welsh @@ -91,7 +93,6 @@ Sebastien Grignard Romano Magacho Paul de Repentigny Leandro Motta Barros -Jan Peciva Carlo Camporesi Bryan Thrall Bruce Clay @@ -102,6 +103,7 @@ Sohey Yamamoto Serge Lages Phil Atkin Mathieu Marache +Maria Ten Luc Frauciel Ken Sewell Julian Ortiz @@ -128,6 +130,7 @@ Stephan Eilemann Stanislav Blinov Roland Smeenk Riccardo Corsi +Rafa Giatan Philip Lowman Peter Hrenka Perry Miller @@ -137,7 +140,6 @@ Maya Leonard Max Behensky Mathew May Martijn Kragtwijk -Maria Ten Kevin Moiule Keith Steffen Joseph Winston @@ -187,7 +189,6 @@ Rick Pingry Reinhard Sainitzer Rein Kadijk Ralf Kern -Rafa Giatan Radu Mihai Qing Shen Philipp Siemoleit @@ -204,10 +205,10 @@ Michael Morrison Michael Logan Max Rhiener Mauricio Hofmam +Mattias Linde Matthew May Matt Green Matt Burke -Mathias Froelich Mathia Walker Mason Menninger Martin Spott @@ -231,6 +232,7 @@ Jason Ballenger J.E. Hoffmann Henrique Bucher Gustavo Wagner +Guillaume Millet Graeme Harkness Glenn Waldrom Gian Lorenzetto diff --git a/CMakeLists.txt b/CMakeLists.txt index c586b21ca..d622454db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,8 +16,8 @@ PROJECT(OpenSceneGraph) SET(OPENSCENEGRAPH_MAJOR_VERSION 2) SET(OPENSCENEGRAPH_MINOR_VERSION 1) -SET(OPENSCENEGRAPH_PATCH_VERSION 9) -SET(OPENSCENEGRAPH_SOVERSION 20) +SET(OPENSCENEGRAPH_PATCH_VERSION 10) +SET(OPENSCENEGRAPH_SOVERSION 21) SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}) diff --git a/ChangeLog b/ChangeLog index 28c0b9c0a..d9b152d59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,235 @@ +2007-09-12 10:04 +0000 [r7399] robert: + + * From Jan Peciva, build fix + +2007-09-11 20:54 +0000 [r7397] robert: + + * Added log2(int) and log2(uint) methods + +2007-09-11 20:24 +0000 [r7396] robert: + + * Removed int version of log2 to avoid possible errors in assuming + log2(10) should ~= log2(10.0) + +2007-09-11 17:10 +0000 [r7394-7395] robert: + + * Added OpenThreads to target libraries + + * From Art Tevs, Added log2 function. + +2007-09-11 16:59 +0000 [r7392-7393] robert: + + * From Art Tevs, build fix. + + * Replaced allocateMipmap code with warning message as mipmaps + aren't support for TextureRectangle. + +2007-09-11 13:47 +0000 [r7391] robert: + + * Removed the output num_children from Group .osg output and + removed the output of "DataVaraince UNSPECIFIED" as this is + redundent considering the default value is UNSPECIFIED. + +2007-09-11 13:42 +0000 [r7389-7390] robert: + + * Updated wrappers + + * From Mathias Froenlich, "have a problem with the SunOS CC. It + does not like that the prototype of ClipNode::setStateSetModes() + differs from implementation of that function in the constness of + the second parameter. On SunOS it compiles fine, but I get link + errors when the variant that is declared in the header is + referenced. The attached src/osg/ClipNode.cpp file removes the + const qualifier from the implementation to match exactly the + prototype in the header file. The file is based on revision 7386 + as of today. " + +2007-09-11 13:34 +0000 [r7387-7388] robert: + + * From Art Trevs, "File Changes: - GL2Extensions, Program and + Program.cpp Features: - Support for fragment output binding. + (e.g. You can now specify in the fragment shader varying out vec3 + fragOut; fragOut = vec3(1,0,1); to write to the fragOut variable. + In your program you call glBindFragDataLocation(program, 1, + "fragOut") to bind the fragOut variable with the MRT 1 - + GL_COLOR_ATTACHMENT1_EXT) - new methods + Program::add/removeBindFragDataLocation + Program::getFragDataBindingList " + + * Seperated out GeometryTechnique .osg support. + +2007-09-11 12:28 +0000 [r7386] robert: + + * Changed the isTextureIntegerSupported method so that it no longer + has the EXT entry in it for forward compatability reasons. + +2007-09-11 12:04 +0000 [r7385] robert: + + * From Art Trevs, "Features of the patch are: - Implementation of + integer textures as in EXT_texture_integer - setBorderColor(Vec4) + changed to setBorderColor(Vec4d) to pass double values as border + color. (Probably we have to provide an overloading function to + still support Vec4f ?) - new method + Texture::getInternalFormatType() added. Gives information if the + internal format normalized, float, signed integer or unsigned + integer. Can help people to write better code ;-) " Futher + changes to this submission by Robert Osfield, changed the dirty + mipmap flag into a buffer_value<> vector to ensure safe handling + of multiple contexts. + +2007-09-11 10:16 +0000 [r7384] robert: + + * From Rafa Giatan, "Changed int to GLsizei in the input parameter + of the method osg::Texture2DArray::applyTexImage2DArray_subload + inside Texture2DArray (lines 214 and 257), Otherwise it gives a + compile error on MacOSX." + +2007-09-11 10:10 +0000 [r7383] robert: + + * From Mike Wittman and Robert Osfield, added support for + SO_VERSION number in runtime version info. Added checks for + OpenThreads version. + +2007-09-10 16:06 +0000 [r7380] robert: + + * Maded versioning under Windows the default. + +2007-09-10 15:19 +0000 [r7379] robert: + + * Intoduced a new setGLExtensions template method to do a copy of + void* pointer to local function pointer to avoid compiler + warnings related to case void*. Moved various OSG classes across + to using setGLExtensions instead of getGLExtensions, and changed + them to use typedef declarations in the headers rather than casts + in the .cpp. Updated wrappers + +2007-09-08 07:21 +0000 [r7378] robert: + + * Flesh out a bit more of the view IO support + +2007-09-08 07:04 +0000 [r7377] robert: + + * Fixed typo + +2007-09-07 15:03 +0000 [r7375] robert: + + * From David Callu, warning fixes + +2007-09-07 13:54 +0000 [r7374] robert: + + * Removed warning type not support by gcc 4.1.x + +2007-09-07 13:37 +0000 [r7373] robert: + + * Updated wrappers for new Texture2DArray class + +2007-09-07 13:25 +0000 [r7372] robert: + + * Moved defined from Texture2DArray into Texture + +2007-09-07 11:21 +0000 [r7371] robert: + + * From Art Tevs, "A new texture class Texture2DArray derived from + Texture extends the osg to support the new EXT_texture_array + extensions. Texture arrays provides a feature for people + interesting in GPGPU programming. Faetures and changes: - Full + support for layered 2D textures. - New uniform types were added + (sampler2DArray) - FrameBufferObject implementation were changed + to support attaching of 2D array textures to the framebuffer - + StateSet was slightly changed to support texture arrays. NOTE: + array textures can not be used in fixed function pipeline. Thus + using the layered texture as a statemode for a Drawable produce + invalid enumerant OpenGL errors. - Image class was extended to + support handling of array textures Tests: I have used this class + as a new feature of my application. It works for me without + problems (Note: Texture arrays were introduced only for shading + languages and not for fixed function pipelines!!!). RTT with + Texture2DArray works, as I have tested them as texture targets + for a camera with 6 layers/faces (i.e. replacement for cube + maps). I am using the array textures in shader programming. Array + textures can be attached to the FBO and used as input and as + output." + +2007-09-07 10:50 +0000 [r7370] robert: + + * From Daniel Sjolie, "I patched the zip plugin to make use of my + favorite zip/pack-application for windows if it is installed in + the standard location..." + +2007-09-07 10:15 +0000 [r7369] robert: + + * From Guillaume Millet, "Please find in attachment a small + improvement to the pfb plugin CmakeLists.txt and to the + FindPerformer.cmake module. Under Windows libs are: libpf.lib (we + need to add the lib prefix) and libpfdu-util.lib (libpfdu and + libpfutil are compiled into one lib) We need to add PFROOT to the + search path for libs and includes (default environment variable + for Performer path) And at last we need to put PFROOT/include and + PFROOT/include/Performer as include dir for compiling." + +2007-09-07 09:53 +0000 [r7368] robert: + + * From Maria Ten, fix lat/long usage. + +2007-09-07 09:49 +0000 [r7367] robert: + + * From Mattias Linde, "Have made the updates now. Added a std::map + for easy lookup if a visual node is targeted by a rigid body + which is the reason why the .h-file was changed too. So now + there'll be Group as often as possible, otherwise + PostitionAttitudeTransform." + +2007-09-06 08:23 +0000 [r7366] robert: + + * Added osg lib + +2007-09-05 17:12 +0000 [r7365] robert: + + * From David Callu, improved consistency of Version strings and add + version support for osgIntrospection and osgManipulator. + +2007-09-05 17:03 +0000 [r7364] robert: + + * Changed tabs to four spaces to make merges more straight forward + +2007-09-05 16:47 +0000 [r7363] robert: + + * Added automatic removal of .qt extension that allows one to + automatically select the quicktime plugin. + +2007-09-05 16:36 +0000 [r7362] robert: + + * Added setting of locator source + +2007-09-05 14:15 +0000 [r7361] robert: + + * Added option to Locator to help specify here the locator value + was defined from. Update wrappers and Gdal plugin to use this new + parameter + +2007-09-04 14:00 +0000 [r7360] robert: + + * Improved Terrain IO + +2007-09-04 12:38 +0000 [r7359] robert: + + * Added mutex to DefaultFont::instance(). + +2007-09-04 12:32 +0000 [r7358] robert: + + * Added mutex into osgText::Font::GlphTexture to marshel adding to + and reading from glyph list + +2007-09-04 09:00 +0000 [r7357] robert: + + * Rearrange _stateset member variable to avoid compile warning + +2007-09-03 16:04 +0000 [r7354-7355] robert: + + * Updated AUTHORS and README to 2.1.9 dev release + + * Updated ChangeLog + 2007-09-03 15:47 +0000 [r7353] robert: * Updated wrappers diff --git a/applications/osgversion/osgversion.cpp b/applications/osgversion/osgversion.cpp index aa1e9e19c..a05c5a4f5 100644 --- a/applications/osgversion/osgversion.cpp +++ b/applications/osgversion/osgversion.cpp @@ -51,6 +51,9 @@ bool validName(const std::string& first) if (first=="SpotExponent") return false; if (first=="Framstamp") return false; if (first=="Stats") return false; + if (first=="Group") return false; + if (first=="Texture") return false; + if (first=="Texture2DArray") return false; if (first=="Creator") return false; if (first=="CullVisitor") return false; if (first=="Drawable") return false; @@ -213,6 +216,8 @@ std::string typoCorrection(const std::string& name) if (name=="") return ""; if (name=="") return ""; #endif + if (name=="Froenlich") return "Fröhlich"; + if (name=="Froelich") return "Fröhlich"; if (name=="Fruciel") return "Frauciel"; if (name=="Hebelin") return "Herbelin"; if (name=="Jea-Sebastien") return "Jean-Sebastien"; @@ -314,6 +319,11 @@ std::string typoCorrection(const std::string& name) void nameCorrection(NamePair& name) { + if (name.first=="Art" && name.second=="Trevs") + { + name.first = "Art"; + name.second = "Tevs"; + } if (name.first=="Tim" && name.second=="More") { name.first = "Tim"; diff --git a/include/osg/Version b/include/osg/Version index b34dd1fc4..18f244cfe 100644 --- a/include/osg/Version +++ b/include/osg/Version @@ -21,8 +21,8 @@ extern "C" { #define OPENSCENEGRAPH_MAJOR_VERSION 2 #define OPENSCENEGRAPH_MINOR_VERSION 1 -#define OPENSCENEGRAPH_PATCH_VERSION 9 -#define OPENSCENEGRAPH_SOVERSION 20 +#define OPENSCENEGRAPH_PATCH_VERSION 10 +#define OPENSCENEGRAPH_SOVERSION 21 /** * osgGetVersion() returns the library version number.