From a08b3104a8085bec572fbada1f629cac0b89c19c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 19 Nov 2014 17:29:15 +0000 Subject: [PATCH] Fixed Contributors names git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14486 16af8721-9629-0410-8352-f15c8da7e697 --- ChangeLog | 928 +++++++++++++++++++++++ applications/osgversion/Contributors.cpp | 6 +- 2 files changed, 933 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8e7a1e789..71354a0a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,931 @@ +2014-11-19 17:10 robert + + * src/osgPlugins/gif/ReaderWriterGIF.cpp: From Clement Boesch, "Fix + remaining bit of Giflib5 usage" + +2014-11-19 11:37 robert + + * src/osgWrappers/deprecated-dotosg/osg/ProxyNode.cpp: From Laurens + Voerman, "I found a new way to crach the osgviewer: + osgviewer "ProxyNode { FileNameList { cow.osgt } num_children 1 + }".osgs + + The proxy node reader wrongly assumes options to be non NULL. + + fixed in attached zip: + src\osgWrappers\deprecated-dotosg\osg\ProxyNode.cpp + + applies to both the 3.2 branch and svn trunk" + +2014-11-19 11:30 robert + + * examples/osgQtWidgets/osgQtWidgets.cpp, + include/osgQt/QGraphicsViewAdapter, include/osgQt/QWebViewImage, + include/osgQt/QWidgetImage, src/osgQt/QGraphicsViewAdapter.cpp, + src/osgQt/QWidgetImage.cpp, + src/osgViewer/ViewerEventHandlers.cpp: From Wang Rui, "The + submission includes some fixes for osgQt library and osgQtWidgets + example: (1) QTextEdit now works with mouse/drag events, (2) + scrollbars will change when OSG window is resizing, (3) improve + rendering efficiency of QGraphicsViewAdapter so that it works + with complex Qt UI, (4) add new setBackgroundWidget() method to + indicate a 'background widget', which will ignore mouse/key + events on it and pass them to the 3D scene." + +2014-11-19 10:43 robert + + * examples/osgterrain/ShaderTerrain.cpp: Changed the way that the + cell size is passed to the shader + +2014-11-19 09:33 robert + + * src/osg/Texture.cpp: From James Turner, "Converting the loops to + forward versions fixed the issue. The problem is size_t is + unsigned; at the limit condition it doesn’t go negative but wraps + around to 0xffffffffffffffff …. and boom." + +2014-11-17 15:43 robert + + * src/osgPlugins/exr/ReaderWriterEXR.cpp: Fixed typo + +2014-11-17 09:19 robert + + * src/osgDB/ObjectCache.cpp: Fixed typo in comment + +2014-11-14 17:44 robert + + * examples/osgterrain/ShaderTerrain.cpp: Added use of + GL_TRIANGLE_STRIP to cut down the size of the primitive indices + required. + +2014-11-14 16:47 robert + + * examples/osgterrain/ShaderTerrain.cpp: Implemented skirt + functionality + +2014-11-13 09:40 robert + + * include/osgDB/DatabasePager, include/osgDB/ObjectCache, + include/osgDB/Options, src/osgDB/DatabasePager.cpp, + src/osgDB/ObjectCache.cpp, src/osgDB/Options.cpp, + src/osgDB/Registry.cpp: Refactored the handling of use of the + osgDB::ObjectCache in the DatabasePager to use a local thread + specific ObjectCache to handle new additions and + then have these additions merged with the main Registry + ObjectCache during the main loop. + +2014-11-11 18:28 robert + + * include/osgDB/ObjectCache, include/osgDB/Registry, + src/osgDB/CMakeLists.txt, src/osgDB/ObjectCache.cpp, + src/osgDB/Registry.cpp: Moved implementation of ObjectCache + functionality out of Registry into a dedicated osgDB::ObjectCache + class. + +2014-11-10 16:04 robert + + * include/osgDB/DatabasePager, src/osgDB/DatabasePager.cpp: To + handle thread safe paging and use of the osgDB::Registry + ObjectCache, moved the handling of cache into + osgDB::DatabasePager. + +2014-11-06 10:44 robert + + * src/osgDB/InputStream.cpp: From Pjotr Svetachov, "I tried your + fix and it exposed a bug in my fix :) + The problem is that the readObjectFields method will add the + object to the _identifierMap. So all the other instances of that + image in the same file will be replaced by the created dummy + object. In my fix this was an dummy image and I didn't notice it + in our scene's, probably because it covered a small part of an + object. In your fix the dummy object was not an image and that + leads to a crash when something tries to use it as an image. I + have attached a small fix for this bug. + + " + +2014-11-06 10:40 robert + + * include/osg/Object, include/osgDB/DatabasePager, + include/osgUtil/IncrementalCompileOperation, + src/osgDB/DatabasePager.cpp, src/osgDB/InputStream.cpp, + src/osgUtil/IncrementalCompileOperation.cpp: Introduced use of + MarkerObject to IncrmentalCompileOperation/DatabasePager as a way + of marking objects that have already been processed and compiled, + thus avoid potential threading conflicts when paged subgraphs are + reused. + +2014-11-05 16:08 robert + + * include/osgDB/InputStream, src/osgDB/InputStream.cpp: Added + handling of the reading of field properties to a dummy object for + cached images to avoid threading issues associated with reusing + and modifying an active object. + +2014-11-05 13:38 robert + + * src/osg/OperationThread.cpp: Reinstated the original mechanism + for OperationThread::cancel() that co-operatively releases + blocks/barriers to make sure the thread is able to exit + correctly. + +2014-11-04 20:07 robert + + * examples/osgterrain/ShaderTerrain.cpp, + examples/osgterrain/ShaderTerrain.h: Improvements to the + ShaderTerrain experiemental terrain rendering technique. + +2014-11-04 20:07 robert + + * src/osgTerrain/TerrainTile.cpp: Changed TerrainTile::setDirty() + to use children needing update traversal mechanism to address + threadng issues. + +2014-11-04 20:06 robert + + * src/OpenThreads/pthreads/PThread.cpp, + src/OpenThreads/pthreads/PThreadPrivateData.h: Change isRunning + variable to an Atomic to address possible race condition + asscoiated with reading and writing to the variable from + different threads. + +2014-11-04 16:29 robert + + * src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp, + src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp: Build fixes for + ffmpeg LIBAVCODEC_VERSION_MAJOR >= 56 + +2014-11-04 11:18 robert + + * src/osgViewer/ViewerBase.cpp: Added an InitRegistry static + intiialization and destrucion static to help control the order of + construction and destruction of the osgDB::Registry. + +2014-11-04 10:46 robert + + * examples/osgQtBrowser/osgQtBrowser.cpp, + examples/osgunittests/MultiThreadRead.cpp, + examples/osgunittests/osgunittests.cpp, + examples/osguserstats/osguserstats.cpp, + examples/osgviewerMFC/MFC_OSG.cpp, include/osg/OperationThread, + src/OpenThreads/pthreads/PThread.cpp, + src/OpenThreads/qt/QtThread.cpp, + src/OpenThreads/sproc/SprocThread.c++, + src/OpenThreads/win32/Win32Thread.cpp, + src/osg/OperationThread.cpp, src/osgDB/DatabasePager.cpp, + src/osgDB/ImagePager.cpp, src/osgPlugins/cfg/RenderSurface.cpp, + src/osgPlugins/gif/ReaderWriterGIF.cpp, + src/osgPlugins/quicktime/QuicktimeImageStream.cpp, + src/osgPlugins/vnc/ReaderWriterVNC.cpp: Replaced use of + while(isRunning()) { YieldCurrentThread(); } style loops with use + of join() to avoid false positives being reported by valgrind + when using the helgrind tool for thread debugging. + +2014-10-21 15:08 robert + + * examples/osgterrain/CMakeLists.txt, + examples/osgterrain/ShaderTerrain.cpp, + examples/osgterrain/ShaderTerrain.h, + examples/osgterrain/osgterrain.cpp, + src/osgTerrain/TerrainTile.cpp: Added experimental + osgTerrain::ShaderTerrain TerrainTechnique to osgterrain example + to flesh out new shader based displacement mapping approach to + osgTerrain databases. + + Requires shader files place in OpenSceneGraph-Data/shaders from + OpenSceneGraph-Data's svn/trunk to function. + + Run osgterrain example with --shader command line option to + select displacement mapping shader approach. + +2014-10-21 14:47 robert + + * applications/osgviewer/osgviewer.cpp: Removed --sync related code + as it's now integrated into osg::DisplaySettings and osgViewer + +2014-10-21 14:46 robert + + * include/osg/DisplaySettings, include/osg/GraphicsContext, + src/osg/DisplaySettings.cpp, src/osg/GraphicsContext.cpp, + src/osgViewer/CompositeViewer.cpp, src/osgViewer/Viewer.cpp: + Added osg::SyncSwapBuffersCallback to include/osg/GraphicsContext + and support for enabling it to include/osg/DisplaySettings, and + to the Viewer/CompositeViewer::realize() methods. + + To enable the sync of swap buffers set the env var + OSG_SYNC_SWAP_BUFFERS to ON or 1, to switch off set to OFF or 0. + + One can also use the --sync command line option for application + that pass on command line options to the + osg::DisplaySettings::instance(). + +2014-10-21 08:27 robert + + * src/osg/StateSet.cpp: Removed checks against Drawable as these + are no longer required. + +2014-09-17 17:40 robert + + * src/osgPlugins/lua/LuaScriptEngine.cpp, + src/osgPlugins/lua/LuaScriptEngine.h, + src/osgPlugins/lua/ReaderWriterLua.cpp: Added support for writing + the file path of a script to the lua package.path to help with + loading scripts within lua. + +2014-09-16 17:40 robert + + * examples/osgvolume/osgvolume.cpp, + src/osgPlugins/p3d/ReaderWriterP3D.cpp, + src/osgPlugins/tf/ReaderWriterTF.cpp: Changed osgvolume example + to use the new tf plugin rather than having local code for + reading transfer function + +2014-09-16 11:00 robert + + * src/osgPlugins/tf/ReaderWriterTF.cpp: Added write support + +2014-09-15 17:53 robert + + * src/osgDB/Registry.cpp, src/osgPlugins/CMakeLists.txt, + src/osgPlugins/tf, src/osgPlugins/tf/CMakeLists.txt, + src/osgPlugins/tf/ReaderWriterTF.cpp: Added .tf & .tf-255 plugin + for reading ascii 1D transfer functon files in support for volume + rendering. + +2014-09-12 14:16 robert + + * include/osgUI/TabWidget, src/osgUI/TabWidget.cpp: Added basic + frame rendering for TabWidget + +2014-09-10 17:03 robert + + * include/osgUI/AlignmentSettings, src/osgUI/AlignmentSettings.cpp, + src/osgUI/TabWidget.cpp: Improved the alignment and sizing of + TabWidget tab headers + +2014-09-10 11:59 robert + + * src/osgUI/TabWidget.cpp: Implemented the selection of tabs by + clicking, using mouse wheel or arrow keys. + +2014-09-09 16:12 robert + + * src/osgUI/Dialog.cpp, src/osgUI/TabWidget.cpp: Improved the + handling of the dialog title text + +2014-09-09 15:14 robert + + * include/osgUI/Callbacks, src/osgUI/Callbacks.cpp, + src/osgUI/Dialog.cpp, src/osgUI/Widget.cpp: Moved the diaglog + title bar widgets into the Widget::GraphicsSubgraph map to avoid + them poluting the Dialog's children list and to prevent them from + being serialized. + +2014-09-09 13:37 robert + + * include/osgUI/TabWidget, include/osgUI/Widget, + src/osgUI/ComboBox.cpp, src/osgUI/Dialog.cpp, + src/osgUI/Label.cpp, src/osgUI/LineEdit.cpp, src/osgUI/Popup.cpp, + src/osgUI/PushButton.cpp, src/osgUI/Style.cpp, + src/osgUI/TabWidget.cpp, src/osgUI/Widget.cpp, + src/osgWrappers/serializers/osgUI/Tab.cpp, + src/osgWrappers/serializers/osgUI/Widget.cpp: Introduced + Widget::WidgetStateSet to help localize the StateSet set up by + Widget implementations from being serialized or + affecting what end users apply via the standard + Node::s/getStateSet(). + + Further work on TabWidget. + +2014-09-08 08:53 robert + + * examples/osgtransferfunction/TransferFunctionWidget.cpp: Build + fix + +2014-09-05 16:04 robert + + * include/osgUI/TabWidget, src/osgUI/CMakeLists.txt, + src/osgUI/TabWidget.cpp, + src/osgWrappers/serializers/osgUI/Tab.cpp, + src/osgWrappers/serializers/osgUI/TabWidget.cpp: Added shell of + new osgUI::TabWidget class + +2014-09-05 11:05 robert + + * include/osgDB/ObjectWrapper, include/osgDB/Serializer, + src/osgDB/ObjectWrapper.cpp, + src/osgWrappers/serializers/osgVolume/VolumeSettings.cpp: + Introduced support for specifying whether a serializer supports + different types of usage - one or more of READ_WRITE_PROPERTY, + GET_PROPERTY and SET_PROPERTY. + +2014-09-03 15:54 robert + + * include/osgVolume/VolumeSettings, + src/osgPresentation/deprecated/SlideShowConstructor.cpp, + src/osgVolume/VolumeSettings.cpp, + src/osgWrappers/serializers/osgVolume/VolumeSettings.cpp: Added + setting of the IsoSurfaceProperty in VolumeSettings + +2014-09-03 12:28 robert + + * include/osgUI/Callbacks, src/osgUI/Callbacks.cpp, + src/osgUI/Dialog.cpp, src/osgUI/PushButton.cpp: Added close + button on Dialog title bar + +2014-09-02 17:01 robert + + * include/osgUI/ComboBox, src/osgUI/ComboBox.cpp: Refactored the + handling of ComboBox item picking to make it faster and more + reliable + +2014-09-02 10:00 robert + + * src/osgUI/ComboBox.cpp: Improved handling of ComboBox popup + toggling + +2014-09-02 09:14 robert + + * src/osgUI/Callbacks.cpp, src/osgUI/Widget.cpp: Added support for + scaling widgets via the scoll wheel. + +2014-09-02 08:41 robert + + * src/osgGA/KeySwitchMatrixManipulator.cpp: Removed debugging + message + +2014-09-01 19:13 robert + + * include/osgUI/Callbacks, include/osgUI/Widget, + src/osgUI/CMakeLists.txt, src/osgUI/Callbacks.cpp, + src/osgUI/Dialog.cpp, src/osgUI/LineEdit.cpp, + src/osgUI/Widget.cpp: Added DragCallback class to help dialog + dragging support. + Introduced a new + Widget::computeExtentsPositionInLocalCoordinates() method that + intersects with a ray through mouse pointer and the extents of + the widget. + +2014-08-28 15:11 robert + + * src/osgVolume/MultipassTechnique.cpp: Improved support for + controlling the ShadingModel via the VolumeSettings object + +2014-08-28 09:42 robert + + * src/osgPresentation/deprecated/SlideShowConstructor.cpp, + src/osgVolume/Property.cpp: Improved handling of VolumeSettings + +2014-08-27 15:08 robert + + * src/osgPresentation/deprecated/SlideShowConstructor.cpp, + src/osgUI/Widget.cpp, src/osgVolume/Property.cpp, + src/osgWrappers/serializers/osgVolume/SampleRatioProperty.cpp: + Changed the osgUI behaviour so that events are set to be handled + by Widgets that have focus even if they don't directly use them. + +2014-08-27 15:07 robert + + * src/osg/NodeVisitor.cpp: Changed the + NodeVisitor::apply(Drawable&) to call apply(Node&) + +2014-08-27 09:25 robert + + * include/osgDB/Serializer, + src/osgWrappers/serializers/osgVolume/VolumeSettings.cpp: Added + support for getting osgVolumre::Property::ModifieCount + +2014-08-25 16:56 robert + + * include/osgDB/Serializer, include/osgVolume/Property, + include/osgVolume/VolumeSettings, src/osgVolume/Property.cpp, + src/osgWrappers/serializers/osgVolume/Property.cpp, + src/osgWrappers/serializers/osgVolume/VolumeSettings.cpp: Added + Property::getModifiedCount() + dirty() to help with tracking + changes. Added VolumeSettings serializers for Property objects + +2014-08-25 13:43 robert + + * include/osg/StateSet, src/osg/NodeVisitor.cpp, + src/osg/StateSet.cpp: Changed StateSet::ParentList from + vector to vector to reflect that Drawable is now + a Node. + +2014-08-22 19:00 robert + + * include/osgUI/Style, src/osgUI/Popup.cpp, src/osgUI/Style.cpp: + Improved handling of setting of the depth of the UI. + +2014-08-20 14:15 robert + + * src/osgUI/Style.cpp: Reordered method implemenations to make it + easier to compare similar methods + +2014-08-19 16:58 robert + + * src/osgPresentation/deprecated/SlideShowConstructor.cpp: Added + toggling on/off of the VolumeSettings ui via the 'E' key. + +2014-08-19 16:37 robert + + * src/osgPresentation/deprecated/SlideShowConstructor.cpp: Updated + VolumeSettings.lua reference to use ui prefix to work with the + new OpenSceneGraph-Data/ui/VolumeSettings.lua file. + +2014-08-19 09:27 robert + + * src/osgPlugins/md2/ReaderWriterMD2.cpp: Fixed MD2 danglng pointer + crash. + +2014-08-19 09:00 robert + + * examples/osgcallback/osgcallback.cpp: Fixed build + +2014-08-19 08:57 robert + + * src/osgUI/Style.cpp: Fixed build + +2014-08-14 19:00 robert + + * include/osgUI/ComboBox, src/osgUI/ComboBox.cpp, + src/osgWrappers/serializers/osgUI/ComboBox.cpp: Added support for + ComboBox::currentIndexChanged*(uint) callback API. + +2014-08-13 09:24 robert + + * src/osgPresentation/deprecated/SlideShowConstructor.cpp: Resert + default value to 1.0 + +2014-08-08 16:42 robert + + * src/osgPlugins/txp/ReaderWriterTXP.cpp: From Ryan Kawicki, "There + is an issue where the model insets of a terrex terrain are being + removed during the loading process. The issue is described below. + + - the issue here is that the plugin is removing group nodes if + that group node only has one child. becuase transforms are also + group nodes, there were cases when the transform would have only + one child under it and would cause it to remove the translation + portion. this would cause all the vertex data to be loaded around + the last matrix operation, which in our case was the origin + (0,0,0). + + We work off of OSG 2.8.1 but see that this has not been addressed + on latest yet. I’ve tested this against 2.8.1 and have cleanly + applied it to my local repository off of latest." + +2014-08-08 16:34 robert + + * src/osgUtil/RenderStage.cpp: From Tim George, "Currently there is + a problem with using a camera with a viewport with a non 0 offset + and also using an FBO. The problem is that only area made up of + the viewports width and height is drawn based on an offset of 0,0 + instead of using the viewports offset. + + It is caused by line 991 in RenderStage.cpp: + + + Code: + fbo_ext->glBlitFramebuffer( + 0, 0, static_cast(_viewport->width()), + static_cast(_viewport->height()), + 0, 0, static_cast(_viewport->width()), + static_cast(_viewport->height()), + blitMask, GL_NEAREST); + + + + which is not taking into account the viewport x and y when + performing the blit. It probably should be: + + + Code: + fbo_ext->glBlitFramebuffer( + static_cast(_viewport->x()), + static_cast(_viewport->y()), + static_cast(_viewport->width()) + + static_cast(_viewport->x()), + static_cast(_viewport->height()) + + static_cast(_viewport->y()), + static_cast(_viewport->x()), + static_cast(_viewport->y()), + static_cast(_viewport->width()) + + static_cast(_viewport->x()), + static_cast(_viewport->height()) + + static_cast(_viewport->y()), + blitMask, GL_NEAREST); + " + + Note from Robert Osfield, made small tweak to above on merge, + changing the width+x to x+width to make it read more naturally. + +2014-08-08 16:09 robert + + * src/osgUtil/MeshOptimizers.cpp: From Marc Helbling, "please find + a fix for the vertex pretransform visitor + (VertexAccessOrderVisitor). + The issue with current code is that arrays are collected *before* + duplicating shared arrays which leads to arrays that are + correctly duplicated but that are not reordered. + + Also the submitted patch contains a small cleaning in + GeometryArrayGathrer as the _useDrawElements variable is not + used; it is only set in the GeometryArrayGathrer constructor and + VertexAccessOrderVisitor already checks that primitives have + indexed type." + +2014-08-08 15:45 robert + + * include/osg/Node: From Glen Waldron, "Node: patch for + remove*Callback() methods to resolve a crash" + +2014-08-08 09:28 robert + + * CMakeLists.txt, include/osg/Texture: Changes to support building + against ANDROID under OSX. + +2014-08-05 18:32 robert + + * include/osg/Callback, include/osgUI/LineEdit, + include/osgUI/Validator, src/osgUI/CMakeLists.txt, + src/osgUI/LineEdit.cpp, src/osgUI/Validator.cpp, + src/osgWrappers/serializers/osgUI/DoubleValidator.cpp, + src/osgWrappers/serializers/osgUI/IntValidator.cpp, + src/osgWrappers/serializers/osgUI/LineEdit.cpp, + src/osgWrappers/serializers/osgUI/Validator.cpp: Implemented + osgUI::Validator, IntValidator and DoubleValidator classes that + manage validation/specialization of LineEdit widgets to work with + just integer or double values. + +2014-08-01 13:07 robert + + * include/osgUI/LineEdit, src/osgUI/LineEdit.cpp: Implemented + callbacks for validate(), textChanged() and returnPressed() + +2014-08-01 10:57 robert + + * src/osgUI/ComboBox.cpp, src/osgUI/LineEdit.cpp, + src/osgUI/PushButton.cpp, src/osgUI/Widget.cpp: Moved + responsiblity for checking current event focus onto + Widget::handleImplementations(). + + Added support for closing CombinBox popup when the mouse is + clicked outside the popup or combobox widget. + +2014-07-31 18:29 robert + + * include/osg/NodeVisitor, src/osgUI/Widget.cpp, + src/osgUtil/CullVisitor.cpp, src/osgUtil/IntersectVisitor.cpp, + src/osgUtil/IntersectionVisitor.cpp, + src/osgUtil/UpdateVisitor.cpp, + src/osgWrappers/serializers/osg/NodeVisitor.cpp: Added + NodeVisitor::INTERSECTION_VISITOR VisitorType + +2014-07-30 12:48 robert + + * include/osgUI/Style, src/osgUI/ComboBox.cpp, + src/osgUI/Dialog.cpp, src/osgUI/Popup.cpp, src/osgUI/Style.cpp: + Fixed rendering of Popups + +2014-07-30 12:47 robert + + * CMakeLists.txt: Update SO version to account for new changes to + osg::StateSet and osgUI + +2014-07-30 12:47 robert + + * include/osg/StateSet, include/osg/Version, + include/osgUtil/CullVisitor, + src/osgWrappers/serializers/osg/StateSet.cpp: Added + StateSet::RenderBinMode::PROTECTED_RENDERBIN_DETAILS and + OVERRIDE_PROTECTED_RENDERBIN_DETAILS options. + +2014-07-29 15:50 robert + + * include/osgUI/ComboBox, src/osgUI/ComboBox.cpp: Added preliminary + icon to ComboBox. + +2014-07-29 15:50 robert + + * src/osgUI/LineEdit.cpp: Fixed debug comment + +2014-07-29 15:50 robert + + * include/osgUI/Style, src/osgUI/Style.cpp: Implemented prelimary + icon support allowing UI widget to place image and model based + icons on widgets + +2014-07-29 15:47 robert + + * src/osgUtil/Optimizer.cpp: Added catch for NULL Transform + pointers getting into the _transformMap. + +2014-07-28 16:19 robert + + * include/osg/ComputeBoundsVisitor, + src/osg/ComputeBoundsVisitor.cpp: Added handling of Drawables + added directly to scene graph without Geode decorating them. + +2014-07-24 14:14 robert + + * include/osgUI/LineEdit, src/osgUI/LineEdit.cpp, + src/osgUI/PushButton.cpp: Added support for changing background + colour of LineEdit widget when focus changes + +2014-07-24 13:25 robert + + * src/osgUI/ComboBox.cpp, src/osgUI/Dialog.cpp, + src/osgUI/LineEdit.cpp, src/osgUI/PushButton.cpp: Refined the + colouring of widget to be more in sync with the defaults used in + Qt. + +2014-07-23 16:36 robert + + * include/osgVolume/VolumeSettings, + src/osgPlugins/p3d/ReaderWriterP3D.cpp, + src/osgVolume/VolumeSettings.cpp, + src/osgWrappers/serializers/osgVolume/VolumeSettings.cpp: Added + VolumeSettings::Filename property. + +2014-07-23 15:57 robert + + * src/osgUI/Style.cpp: Changed the default text colour to black + +2014-07-23 14:50 robert + + * src/osgPlugins/lua/LuaScriptEngine.cpp: Added writeFile support + +2014-07-23 10:49 robert + + * src/osgPlugins/lua/LuaScriptEngine.cpp: Added + Node:getNumParents() and Node:getParent(index) support + +2014-07-22 16:02 robert + + * CMakeLists.txt, include/osg/State, include/osg/Version, + src/osg/State.cpp, src/osgUtil/SceneView.cpp: Removed + State::AppliedProgramObjectSet container and Obsever usage from + osg::State to address threading bug crash. + + The State::AppliedProgramObjectSet wasn't ever being used + actively in the current rev of the OSG so populating and clearing + was no longer neccessary, allowing the code to be removed + completely. + +2014-07-21 16:36 robert + + * applications/osgviewer/osgviewer.cpp, include/osg/Types, + src/osgPlugins/ktx/ReaderWriterKTX.h, + src/osgPlugins/osg/BinaryStreamOperator.h, + src/osgPlugins/pvr/ReaderWriterPVR.cpp: Centralized the calling + of #include and VS fallback into include/osg/Types + header + +2014-07-21 14:32 robert + + * src/osgUtil/CullVisitor.cpp: From Pjotr Svetachov, "I think I + spotted some unneeded ref_ptrs in the cullvisitor. The call + pushModelViewMatrix or pushProjectionMatrix will already keep the + reference when adding it to the MatrixStack. In + CullVisitor::apply + methods for the billboard and the camera you already take a + pointer + instead of a ref_ptr." + +2014-07-21 13:45 robert + + * src/osgText/Glyph.cpp: Added setting of glPixelStore before + glTexSubImage2D call. + +2014-07-21 13:43 robert + + * src/osgText/Glyph.cpp: From Jaap Gas, "I want to submit a bugfix + for a crash occurring in osgText/Glyph.cpp if + the scene tree contains (large) 2D textures from images with + STRIDE. + + ============================================================================ + #0 0x00007fffe8ea4350 in __memmove_ssse3 () from /lib64/libc.so.6 + #1 0x00007fffe52ced76 in ?? () from + /usr/lib64/libnvidia-glcore.so.310.44 + #2 0x00007fffe52d8e86 in ?? () from + /usr/lib64/libnvidia-glcore.so.310.44 + #3 0x00007fffe53dd8be in ?? () from + /usr/lib64/libnvidia-glcore.so.310.44 + #4 0x00007fffe53c2643 in ?? () from + /usr/lib64/libnvidia-glcore.so.310.44 + #5 0x00007fffe53c7fdd in ?? () from + /usr/lib64/libnvidia-glcore.so.310.44 + #6 0x00007fffe53cbabf in ?? () from + /usr/lib64/libnvidia-glcore.so.310.44 + #7 0x00007fffe53cc1fa in ?? () from + /usr/lib64/libnvidia-glcore.so.310.44 + #8 0x00007ffff30092fd in osgText::GlyphTexture::apply + (this=0x1bb8cf0, state= + ...) + at + /d43/jaap/dev/jaapOSG/build/OpenSceneGraph3.3.1/src/osgText/Glyph.cpp:234 + #9 0x00007ffff56c30b6 in osg::State::applyAttributeOnTexUnit + (this=0x125f180, + unit=0, attribute=0x1bb8cf0, as=...) + at + /d43/jaap/dev/jaapOSG/build/OpenSceneGraph3.3.1/include/osg/State:1713 + #10 0x00007ffff56c2f3f in osg::State::applyTextureAttribute + (this=0x125f180, + unit=0, attribute=0x1bb8cf0) + at + /d43/jaap/dev/jaapOSG/build/OpenSceneGraph3.3.1/include/osg/State:411 + #11 0x00007ffff30204da in osgText::Text::drawTextWithBackdrop + (this=0x1baed70, + state=..., colorMultiplier=...) + ============================================================================== + + The crash disappears if I either (1) disable the use of images + with stride + in the (public) osgGeo-library, or (2) add the following bugfix + to Glyph.cpp. + This combination gives me the confidence that I understand where + this problem + originates from, without trying to understand the full OpenGL + details. + + =============================================================================== + @@ -221,7 +223,12 @@ + imageData[i] = 0; + } + + + glPixelStorei(GL_UNPACK_ALIGNMENT,1); + + + #if !defined(OSG_GLES1_AVAILABLE) && + !defined(OSG_GLES2_AVAILABLE) + + glPixelStorei(GL_UNPACK_ROW_LENGTH,getTextureWidth()); + + #endif + + + // allocate the texture memory. + glTexImage2D( GL_TEXTURE_2D, 0, GL_ALPHA, + getTextureWidth(), getTextureHeight(), 0, + ================================================================================ + + I have copied (and adapted) the added lines above from the same + source file, + where they were used in front of a similar call to + glTexSubImage2D(.) around + line 515. + " + +2014-07-21 12:21 robert + + * src/osgPresentation/CMakeLists.txt, + src/osgPresentation/deprecated/SlideShowConstructor.cpp: Initial + work on integtasting osgUI into Present3D + +2014-07-21 12:18 robert + + * include/osg/NodeVisitor: Fixed indentation + +2014-07-21 09:35 robert + + * src/osgUI/Style.cpp: Added debug messages + +2014-07-18 17:17 robert + + * src/osgWrappers/serializers/CMakeLists.txt, + src/osgWrappers/serializers/osg/NodeVisitor.cpp, + src/osgWrappers/serializers/osgGA/EventVisitor.cpp, + src/osgWrappers/serializers/osgUtil, + src/osgWrappers/serializers/osgUtil/CMakeLists.txt, + src/osgWrappers/serializers/osgUtil/CullVisitor.cpp, + src/osgWrappers/serializers/osgUtil/UpdateVisitor.cpp: Added + serailizer support for NodeVisitor, UpdateVisitor, CullVisitor + and EventVisitor + +2014-07-14 15:59 robert + + * examples/osgpresentation/osgpresentation.cpp, + include/osgDB/Callbacks, include/osgDB/ReadFile, + include/osgDB/ReaderWriter, include/osgDB/Registry, + include/osgDB/WriteFile, src/osgDB/Callbacks.cpp, + src/osgDB/ReadFile.cpp, src/osgDB/ReaderWriter.cpp, + src/osgDB/Registry.cpp, src/osgDB/WriteFile.cpp, + src/osgPlugins/V8/ReaderWriterV8.cpp, + src/osgPlugins/lua/ReaderWriterLua.cpp, + src/osgPlugins/python/ReaderWriterPython.cpp: Added + readScript/writeScript methods to ReaderWriter + +2014-07-14 14:09 robert + + * CMakeLists.txt, examples/osgpresentation/osgpresentation.cpp, + include/osg/Version, include/osgDB/ClassInterface, + include/osgDB/PropertyInterface, src/osgDB/CMakeLists.txt, + src/osgDB/ClassInterface.cpp, src/osgDB/PropertyInterface.cpp, + src/osgPlugins/lua/LuaScriptEngine.cpp, + src/osgPlugins/lua/LuaScriptEngine.h: Renamed + osgDB::PropertyInterface to osgDB::ClassInterface to better + reflect it's functionality + +2014-07-04 16:45 robert + + * include/osgPresentation/deprecated/SlideShowConstructor, + include/osgVolume/Property, include/osgVolume/VolumeSettings, + src/osgPlugins/p3d/ReaderWriterP3D.cpp, + src/osgPresentation/deprecated/SlideShowConstructor.cpp, + src/osgVolume/Property.cpp, src/osgVolume/VolumeSettings.cpp: + Added preliminary support for writing VolumeSettings to disk from + within Present3D in response to pressing and releasing 'Ctrl-S'. + +2014-07-03 16:36 robert + + * src/osgVolume/Shaders/volume_accumulateSamples_iso_frag.cpp, + src/osgVolume/Shaders/volume_accumulateSamples_mip_frag.cpp: + Updated iso and mip shaders from OpenSceneGraph-Data. + +2014-07-03 13:06 robert + + * src/osgPlugins/osc/OscSendingDevice.cpp, + src/osgPresentation/deprecated/PropertyManager.cpp: Added virtual + destructors + +2014-07-03 13:05 robert + + * src/osgPlugins/osc/OscSendingDevice.cpp: Fixed line endings + +2014-07-03 13:01 robert + + * include/osgPresentation/deprecated/SlideShowConstructor, + src/osgPlugins/p3d/ReaderWriterP3D.cpp, + src/osgPresentation/deprecated/SlideShowConstructor.cpp: Changed + enum usage to use the new osgVolume::VolumeSettings versions and + added support for reading a VolumeSettings file. + +2014-07-03 10:01 robert + + * include/osgVolume/VolumeSettings, + src/osgVolume/VolumeSettings.cpp: Refactor VolumeSettings so that + it's subclassed from osgVolume::Property + +2014-07-02 16:26 robert + + * include/osgVolume/VolumeSettings, + src/osgPlugins/dds/ReaderWriterDDS.cpp, + src/osgVolume/CMakeLists.txt, src/osgVolume/VolumeSettings.cpp, + src/osgWrappers/serializers/osgVolume/VolumeSettings.cpp: Added + osgVolume::VolumeSettings object + +2014-07-02 15:34 robert + + * examples/osgvolume/osgvolume.cpp: Changed the default image + output format to .osgb as .dds isn't able to represent signed + byte, short and int data correctly. + +2014-07-02 14:14 robert + + * src/osgPlugins/osg/ReaderWriterOSG2.cpp: fixed handlng of file + type of nested files within a .osgx, .osgt and .osgb file. + +2014-07-02 10:25 robert + + * include/osgViewer/ViewerEventHandlers: From Laurens Voerman, + "just like ClusterCullingCallback (fixed in r14322) visual studio + likes an explicit implementation of run() for + InteractiveImageHandler. + + The warning is (14 times): + include\osgViewer/ViewerEventHandlers(542): warning C4250: + 'osgViewer::InteractiveImageHandler' : inherits + 'osgGA::EventHandler::osgGA::EventHandler::run' via dominance + (src\osgViewer\StatsHandler.cpp) + include\osgGA/EventHandler(45) : see declaration of + 'osgGA::EventHandler::run' + + + attached a zipped version of + include\osgViewer\ViewerEventHandlers" + +2014-07-01 07:31 robert + + * applications/osgviewer/osgviewer.cpp: Added #include + to address compile issue on some Linux distro's. + +2014-06-30 15:31 robert + + * examples/osgvolume/osgvolume.cpp: Add dds no flip on write option + to prevent output of .dds volume from being flipped by the dds + plugin. + +2014-06-30 13:24 robert + + * src/osgPlugins/3ds/WriterNodeVisitor.cpp: REmoved debug cout + +2014-06-30 10:13 robert + + * include/osgUtil/StateGraph: From Mikhail Izmestev, "Attached fix + to avoid vector reallocs on push_back in + StateGraph::moveStateGraph." + +2014-06-30 09:12 robert + + * AUTHORS.txt, ChangeLog: Updated ChangeLog and AUTHORS file + 2014-06-30 08:56 robert * CMakeLists.txt, include/osg/Version: Updated version number diff --git a/applications/osgversion/Contributors.cpp b/applications/osgversion/Contributors.cpp index 694e54652..3759dd014 100644 --- a/applications/osgversion/Contributors.cpp +++ b/applications/osgversion/Contributors.cpp @@ -576,6 +576,8 @@ NameCorrection nameCorrections[] = "Melchior", "Franz"}, {"Glen", "Waldon", "Glenn", "Waldron"}, + {"Glen", "Waldron", + "Glenn", "Waldron"}, {"Ralf", "Karn", "Ralf", "Kern"}, {"Donny", "Cipperly", @@ -637,7 +639,9 @@ NameCorrection nameCorrections[] = {"Ricard", "Schmidt", "Richard", "Schmidt"}, {"Matthias", "Helsing", - "Mattias", "Helsing"} + "Mattias", "Helsing"}, + {"Clement", "Boesch", + "Clément", "B½sch"} };