From 6cb9115170f4c844668b315f1bce82a9ebf7c6ae Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 28 May 2013 16:39:48 +0000 Subject: [PATCH] Updated ChangeLog and Contributors list --- ChangeLog | 151 +++++++++++++++++++++++ applications/osgversion/Contributors.cpp | 2 + 2 files changed, 153 insertions(+) diff --git a/ChangeLog b/ChangeLog index f7fffdd93..c078aa54a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,154 @@ +2013-05-28 15:43 robert + + * src/osgPlugins/3ds/ReaderWriter3DS.cpp: From Farshid Lashkari, + "The logic for handling opacity maps in the 3ds reader seems to + be incorrect. It checks whether the diffuse texture contains + transparency, instead of the opacity texture. If the diffuse does + not contain an alpha channel it outputs the warning: + + The plugin does not support images without alpha channel for + opacity + + This seems to indicate that the check for alpha should be against + the opacity map. I've attached the updated file. + + " + +2013-05-28 15:40 robert + + * src/osg/State.cpp: From Michael Bach Jensen and Robert Osfield, + "As discussed + (http://forum.openscenegraph.org/viewtopic.php?t=12027) here is + my submission :-) + + The following change to State.cpp fixes the case where textures + in a stateset along with a compute shader program did not make + those textures available to the shader, since it got evaluated + before the texture bind(s)." + + Note from Robert, Michael only change State::apply(StateSet*) so + I also applied the same reversal in apply of texutre modes/state + into the State::apply() method for consistency. + +2013-05-28 15:18 robert + + * src/osgPlugins/ive/Text.cpp: Replaced the initialization of the + strarray to use reseve instead of a initial size provided in the + constructor as this was leading to a bug in output. + +2013-05-28 14:40 robert + + * include/osgShadow/ViewDependentShadowMap: Fixed date typo + +2013-05-28 14:35 robert + + * src/osg/State.cpp: From Farshid Lashkari, "I just started looking + into the shader composition feature. I enabled shader composition + on the osg::State object and noticed a 6x increase in draw time. + I figured that the default composer might have performance + issues, so I created a custom ShaderComposer that overrides + "getOrCreateProgram" and does nothing. This still resulted in a + performance drop. + + I looked into the "State::applyShaderComposition" method and + noticed that it will print debug information to the osg::INFO + stream. I commented that line out and the performance drop was + gone. + + I'm not sure if the printing was accidentally left in or is meant + to be enabled. I've modified the function to only call the print + function if INFO logging is enabled. I've attached the change." + +2013-05-28 14:14 robert + + * examples/osgphotoalbum/ImageReaderWriter.cpp, include/osg/Image, + src/osg/Image.cpp, src/osgPlugins/dds/ReaderWriterDDS.cpp: From + Marcin Prus and Robert Osfield, moved the key parts of the .dds + plugins computeRowWidthInBytes implementation into the + osg::Image::computeImageSizeInBytes(..) to + address bugs in the computation of image size. + +2013-05-28 11:47 robert + + * src/osgPlugins/dds/ReaderWriterDDS.cpp: From Sukender, "Added + ".dds" file deletion on writing failure." + +2013-05-28 11:46 robert + + * src/osgPlugins/dds/ReaderWriterDDS.cpp: From Sukender, "Added + vertical flipping to the writer depending on the + Image::getOrigin() value (= flip the image when + Image::BOTTOM_LEFT). Most of the time this will not change DDS + writing (= no v-flip), as it seems images are rarely + "BOTTOM_LEFT". To skip this behaviour, the "ddsNoAutoFlipWrite" + option was added. + I also moved a few lines of code about "dds_flip" option, and + made options reading more like in other ReaderWriters." + +2013-05-28 11:44 robert + + * src/osgPlugins/dds/ReaderWriterDDS.cpp: From Diane Delallée & + Sukender, "Added some support of non-modulus-4 dimensions in + S3TC-DXTC images (previous implementation seem just not to handle + these properly). + - Added missing packing value on S3TC images. Images are coded + with 4x4 blocs, whatever the image size. So there is an + horizontal packing of 4 pixels (2 bytes in DXT1, 4 bytes in + DXT2-5). + - Added crash guard against writing corrupted S3TC images. + Notes: + - What is missing is a support of "lines packing" in osg::Image + (see code comments). + - S3TC-DXTC vertical flipping crashes (access violation) with + some unusual dimensions (see code). I could not implement missing + cases, so I added guards to avoid crashing." + +2013-05-28 11:25 robert + + * src/osg/Image.cpp, src/osg/dxtctool.cpp, src/osg/dxtctool.h: From + Diane Delallée and Sukender, "1. Image.cpp + Failure to perform a vertical flip on S3TC-DXTC now simply leaves + the original image instead of corrupting it. + Image.cpp was sometimes performing a "normal" (= for uncompressed + images) vertical flip on S3TC-DXTC images, producing weird + results. + Actually, code was trying a "DXTC vertical flip" and relied on + the result to call a "normal vertical flip". But when the "DXTC + v-flip" encounters an error, this is is not necessarily because + the image is not S3TC (ex: unhandled image dimensions)! + So now the code simply does "if dxtc, then flip_dxtc; else + flip_normal;". + + Note from Robert Osfield, moved the isDXT function into the + dxt_tool file and namespace. + +2013-05-28 10:46 robert + + * src/osgPlugins/OpenFlight/PrimaryRecords.cpp: Fixed the + computation of the spot light direction. + +2013-05-28 09:20 robert + + * src/osgViewer/View.cpp: Fixed View::setUpViewInWindow() parameter + +2013-05-28 08:38 robert + + * src/osg/GLExtensions.cpp: Added an OSG_INIT_SINGLETON_PROXY(..) + to initialize the static s_GLExtensionDisableString variable + +2013-05-27 09:10 robert + + * AUTHORS.txt: Updated AUTHORS file + +2013-05-27 09:07 robert + + * AUTHORS.txt, applications/osgversion/Contributors.cpp: Updated + AUTHORS file + +2013-05-27 09:05 robert + + * AUTHORS.txt, ChangeLog: Updated ChangeLog and AUTHORS file + 2013-05-27 08:13 robert * examples/osgforest/osgforest.cpp: From Martin Naylor, "I am diff --git a/applications/osgversion/Contributors.cpp b/applications/osgversion/Contributors.cpp index 46b07b0fc..7e418b65c 100644 --- a/applications/osgversion/Contributors.cpp +++ b/applications/osgversion/Contributors.cpp @@ -497,6 +497,8 @@ NameCorrection nameCorrections[] = "Thomas", "Hogarth"}, {"Marin", "Lavery", "Martin", "Lavery"}, + {"Michael", "Bach", + "Michael", "Bach Jensen"}, {"Nguyen", "Van", "Nguyen", "Van Truong"}, {"Thom", "Carlo",