6 years agoFrom Stephan Huber, "Attached you'll find a new ImageSequence.cpp which will fix... master
Robert OSFIELD [Thu, 22 Nov 2012 15:13:46 +0000 (15:13 +0000)]
From Stephan Huber, "Attached you'll find a new ImageSequence.cpp which will fix an issue I had when moving the mouse cursor over the left window-border, as the index becomes negative. And I added a UdpSocket.cpp-file with more debuggin-output via some sprinkled printf-calls. "

6 years agoSimplified CMakeLists and adjusted OscHostEndianness to automatically detect the...
Robert OSFIELD [Thu, 22 Nov 2012 11:55:38 +0000 (11:55 +0000)]
Simplified CMakeLists and adjusted OscHostEndianness to automatically detect the endian at compile time

6 years agoFrom Stephan Huber, updates to explictly set the HOST Endian using Cmake
Robert OSFIELD [Thu, 22 Nov 2012 11:47:03 +0000 (11:47 +0000)]
From Stephan Huber, updates to explictly set the HOST Endian using Cmake

6 years agoAdded explict handling of osg::Image, osg::HeightField, osg::Shader and osg::Node...
Robert OSFIELD [Thu, 22 Nov 2012 09:49:24 +0000 (09:49 +0000)]
Added explict handling of osg::Image, osg::HeightField, osg::Shader and osg::Node when doing writes to the archive.

6 years agoFrom Stephan Huber, further work on osc plugin
Robert OSFIELD [Wed, 21 Nov 2012 15:19:58 +0000 (15:19 +0000)]
From Stephan Huber, further work on osc plugin

6 years agoMoved static for local to global scope in Uniform.cpp and removed the local static...
Robert OSFIELD [Wed, 21 Nov 2012 14:27:54 +0000 (14:27 +0000)]
Moved static for local to global scope in Uniform.cpp and removed the local static usage in Registry.cpp

6 years agoRefactored osgDB::Input::readObjectOfType to use a template, and updated associated...
Robert OSFIELD [Wed, 21 Nov 2012 13:38:11 +0000 (13:38 +0000)]
Refactored osgDB::Input::readObjectOfType to use a template, and updated associated wrappers to avoid using local static's

6 years agoFrom Paul Martz, fix for Windows build
Robert OSFIELD [Tue, 20 Nov 2012 18:41:30 +0000 (18:41 +0000)]
From Paul Martz, fix for Windows build

6 years agoFrom Stephan Huber, added missing windows dependency
Robert OSFIELD [Tue, 20 Nov 2012 13:01:57 +0000 (13:01 +0000)]
From Stephan Huber, added missing windows dependency

6 years agoAdded ws2_32 library to Win32 build
Robert OSFIELD [Tue, 20 Nov 2012 10:37:42 +0000 (10:37 +0000)]
Added ws2_32 library to Win32 build

6 years agoFrom Paul Martz, build fixes
Robert OSFIELD [Mon, 19 Nov 2012 11:25:52 +0000 (11:25 +0000)]
From Paul Martz, build fixes

6 years agoFrm Stephan Huber, osc plugin that supports send and recieving events via UDP packets.
Robert OSFIELD [Mon, 19 Nov 2012 10:48:37 +0000 (10:48 +0000)]
Frm Stephan Huber, osc plugin that supports send and recieving events via UDP packets.

6 years agoAdded first cut implememtation of PropertyAnimation class
Robert OSFIELD [Fri, 16 Nov 2012 15:40:41 +0000 (15:40 +0000)]
Added first cut implememtation of PropertyAnimation class

6 years agoMoved PropertyManager related classes out from SlideEventHandler into their own dedic...
Robert OSFIELD [Thu, 15 Nov 2012 12:11:19 +0000 (12:11 +0000)]
Moved PropertyManager related classes out from SlideEventHandler into their own dedicated header/source file.

6 years agoAdded support for P3D_UPDATE env var for setting the UpdateVisitor::TRAVERSAL_MODE...
Robert OSFIELD [Tue, 13 Nov 2012 16:15:20 +0000 (16:15 +0000)]
Added support for P3D_UPDATE env var for setting the UpdateVisitor::TRAVERSAL_MODE.  Accepted settings are "active", "Active", "ACTIVE", or "all", "All", "ALL".

6 years agoAdded --update-active and --update-all command line options that set the UpdateVisito...
Robert OSFIELD [Tue, 13 Nov 2012 15:26:06 +0000 (15:26 +0000)]
Added --update-active and --update-all command line options that set the UpdateVisitor::TraversalMode to TRAVERSE_ACTIVE_CHILDREN and TRAVERSE_ALL_CHILDREN respecively.

6 years agoAdded support for <image blending="ON" or blending="OFF"> to allow user definition...
Robert OSFIELD [Tue, 13 Nov 2012 14:22:37 +0000 (14:22 +0000)]
Added support for <image blending="ON" or blending="OFF"> to allow user definition of when to enable OpenGL blending for an image or not.

6 years agoFrom Stephan Huber, fixed warning
Robert OSFIELD [Tue, 13 Nov 2012 13:52:33 +0000 (13:52 +0000)]
From Stephan Huber, fixed warning

6 years agoChanged COLOUR to COLOR to be consistent with OpenGL spelling
Robert OSFIELD [Tue, 13 Nov 2012 13:32:01 +0000 (13:32 +0000)]
Changed COLOUR to COLOR to be consistent with OpenGL spelling

6 years agoMoved colour space conversion of volumes from the osgvolume example into osg/ImageUti...
Robert OSFIELD [Tue, 13 Nov 2012 13:16:10 +0000 (13:16 +0000)]
Moved colour space conversion of volumes from the osgvolume example into osg/ImageUtils and added support for colorSpaceConversion="MODULATE_ALPHA_BY_LUMINANCE","MODULATE_ALPHA_BY_COLOUR","REPLACE_ALPHA_WITH_LUMINANCE" and "REPLACE_RGB_WITH_LUMINANCE" to .p3d <volume> tag

6 years agoAdded first step to adding pruning of expired image requests.
Robert OSFIELD [Tue, 13 Nov 2012 11:45:20 +0000 (11:45 +0000)]
Added first step to adding pruning of expired image requests.

6 years agoFrom Stephan Huber, introduced syncornization of osgGA::Device
Robert OSFIELD [Tue, 13 Nov 2012 11:20:36 +0000 (11:20 +0000)]
From Stephan Huber, introduced syncornization of osgGA::Device

6 years agoCleaned up reported of events and added assigned of <volume> tag region properities...
Robert OSFIELD [Mon, 12 Nov 2012 16:46:08 +0000 (16:46 +0000)]
Cleaned up reported of events and added assigned of <volume> tag region properities when using the wildcard definition of the volume.

6 years agoAdded osgframerenderer example
Robert OSFIELD [Mon, 12 Nov 2012 15:26:30 +0000 (15:26 +0000)]
Added osgframerenderer example

6 years agoChanged the default settings to fix a jump problems
Robert OSFIELD [Mon, 12 Nov 2012 10:36:21 +0000 (10:36 +0000)]
Changed the default settings to fix a jump problems

6 years agoAdded missing files in support of key_jump and key_run tags
Robert OSFIELD [Sat, 10 Nov 2012 12:12:24 +0000 (12:12 +0000)]
Added missing files in support of key_jump and key_run tags

6 years agoAdded support for naming slides and layers with slide_name and layer_name properties...
Robert OSFIELD [Fri, 9 Nov 2012 21:32:54 +0000 (21:32 +0000)]
Added support for naming slides and layers with slide_name and layer_name properties respectively.
Added support for creating events based on key presses using a <key_to_run> and <key_to_jump> tags.

6 years agoAdded Node::getName() and getUserDataContainer() to check to see if an node can be...
Robert OSFIELD [Fri, 9 Nov 2012 21:23:42 +0000 (21:23 +0000)]
Added Node::getName() and getUserDataContainer() to check to see if an node can be removed or not.

6 years agoFrom Alexander Sinditskiy, "I found issue with capturing mouse buttons.
Robert OSFIELD [Thu, 8 Nov 2012 17:19:51 +0000 (17:19 +0000)]
From Alexander Sinditskiy, "I found issue with capturing mouse buttons.
This issue can be reproduced:
1. Create osgViewer window,
2. Push right&left mouse buttons on the osgViewer window,
3. Move mouse out of window, and release right&left mouse buttons.

osgViewer window handle only first mouse release, as result window thinks that we did not released second mouse button.

I attached fix for this issue."

6 years agoAdded support for <imagesequence interaction_mode="USE_MOUSE_Y_POSITION">
Robert OSFIELD [Thu, 8 Nov 2012 15:45:23 +0000 (15:45 +0000)]
Added support for <imagesequence interaction_mode="USE_MOUSE_Y_POSITION">

6 years agoChanged the way the mouse position is update to handle the remote device control.
Robert OSFIELD [Thu, 8 Nov 2012 15:28:24 +0000 (15:28 +0000)]
Changed the way the mouse position is update to handle the remote device control.

6 years agoAdded check to avoid doing update when the imagesequence is empty.
Robert OSFIELD [Thu, 8 Nov 2012 14:15:59 +0000 (14:15 +0000)]
Added check to avoid doing update when the imagesequence is empty.

6 years agoRefactored ImageSequence to better handle random access usage.
Robert OSFIELD [Thu, 8 Nov 2012 11:19:31 +0000 (11:19 +0000)]
Refactored ImageSequence to better handle random access usage.

6 years agoTweaked casts/types to fix build under Linux
Robert OSFIELD [Tue, 6 Nov 2012 17:49:32 +0000 (17:49 +0000)]
Tweaked casts/types to fix build under Linux

6 years agoAdded f qualifer to 1.0 to fix build problem under MSVS
Robert OSFIELD [Tue, 6 Nov 2012 14:25:28 +0000 (14:25 +0000)]
Added f qualifer to 1.0 to fix build problem under MSVS

6 years agoFrom Stephan Huber, improved performance by using native apple functions for flipping...
Robert OSFIELD [Tue, 6 Nov 2012 11:18:33 +0000 (11:18 +0000)]
From Stephan Huber, improved performance by using native apple functions for flipping image

6 years agoFrom Stephan Huber, "Attached you'll find a fix for the image-io-plugin to handle...
Robert OSFIELD [Mon, 5 Nov 2012 17:22:34 +0000 (17:22 +0000)]
From Stephan Huber, "Attached you'll find a fix for the image-io-plugin to handle out-of-memory situations more gracefully as before (don't crash)"

6 years agoQuitened down debug output
Robert OSFIELD [Mon, 5 Nov 2012 12:21:34 +0000 (12:21 +0000)]
Quitened down debug output

6 years agoFrom Stephan Huber, updated to debug output to RestHttpDevice and tweaks to ImageIO...
Robert OSFIELD [Mon, 5 Nov 2012 12:03:50 +0000 (12:03 +0000)]
From Stephan Huber, updated to debug output to RestHttpDevice and tweaks to ImageIO and QTKit plugins

6 years agoAdded static cast to float to avoid compile error under MSV
Robert OSFIELD [Mon, 5 Nov 2012 09:36:00 +0000 (09:36 +0000)]
Added static cast to float to avoid compile error under MSV

6 years agoFrom David Longest, "When drawing, a transform with an absolute reference frame will...
Robert OSFIELD [Thu, 1 Nov 2012 18:06:46 +0000 (18:06 +0000)]
From David Longest, "When drawing, a transform with an absolute reference frame will ignore the
calculated model / view matrices up to that point. The IntersectionVisitor would instead keep the
view matrices calculated up to that point even though the Transform class will throw out the
calculated model matrix via “computeLocalToWorldMatrix.”

The change I made will push an identity matrix as the view matrix when running into a transform
with an absolute reference frame and will pop the matrix off after the traverse.

To test this, I created a camera with a perspective view and added a transform with some geometry
in it. Afterwards, I set the transform’s reference frame to ABSOLUTE_RF and spun the camera around
using the trackball manipulator. When trying to pick with a LineSegmentIntersector, it would not
pick the geometry in the transform with the reference frame set to ABSOLUTE_RF."

6 years agoChanged the PropertyEventCallback to only respond to mouse releated events.
Robert OSFIELD [Thu, 1 Nov 2012 16:11:13 +0000 (16:11 +0000)]
Changed the PropertyEventCallback to only respond to mouse releated events.

6 years ago(no commit message)
Robert OSFIELD [Thu, 1 Nov 2012 14:29:26 +0000 (14:29 +0000)]

6 years agoAdded reading of the P3D_DEVICE env var for setting up the --device entry.
Robert OSFIELD [Wed, 31 Oct 2012 17:06:29 +0000 (17:06 +0000)]
Added reading of the P3D_DEVICE env var for setting up the --device entry.

6 years agoAdded event and update callbacks to pass up changes to the mouse position to the...
Robert OSFIELD [Wed, 31 Oct 2012 16:07:23 +0000 (16:07 +0000)]
Added event and update callbacks to pass up changes to the mouse position to the ImageSequence::seek() to control which images is selected based on mouse x position

6 years agoFrom Stephan Huber, RestHttpDevice plugin for support of remote application control...
Robert OSFIELD [Tue, 30 Oct 2012 12:31:27 +0000 (12:31 +0000)]
From Stephan Huber, RestHttpDevice plugin for support of remote application control via Rest http.

6 years agoIntial work towards support an interaction <imagesequence> tag in Present3D.
Robert OSFIELD [Mon, 29 Oct 2012 15:58:02 +0000 (15:58 +0000)]
Intial work towards support an interaction <imagesequence> tag in Present3D.

6 years agoFrom Luc Frauciel, "Compile Fix - KTX plugin with Visual Studio, <stdint.h>not define...
Robert OSFIELD [Fri, 26 Oct 2012 15:31:18 +0000 (15:31 +0000)]
From Luc Frauciel, "Compile Fix - KTX plugin with Visual Studio, <stdint.h>not defined under MSVC"

6 years agoFixed bug in click_to_run feature where events would be handled by hidden labels
Robert OSFIELD [Wed, 24 Oct 2012 16:10:38 +0000 (16:10 +0000)]
Fixed bug in click_to_run feature where events would be handled by hidden labels

6 years agoFrom Stephan Huber, "attached you'll find the latest versions of the QTKit + the...
Robert OSFIELD [Wed, 24 Oct 2012 10:43:01 +0000 (10:43 +0000)]
From Stephan Huber, "attached you'll find the latest versions of the QTKit + the AVFoundation-plugin, some changes to osgPresentation and a small enhancement für ImageIO.

I fixed some bugs and did some more tests with both of the video-plugins. I integrated CoreVideo with osgPresentation, ImageStream has a new virtual method called createSuitableTexture which returns NULL for default implementations. Specialized implementations like the QTKit-plugin return a CoreVideo-texture. I refactored the code in SlideShowConstructor::createTexturedQuad to use a texture returned from ImageStream::createSuitableTexture.

I did not use osgDB::readObjectFile to get the texture-object, as a lot of image-related code in SlideShowConstructor had to be refactored to use a texture.  My changes are minimal and should not break existing code.

There's one minor issue with CoreVideo in general: As the implementation is asynchronous, there might be no texture available, when first showing the video the first frame. I am a bit unsure how to tackle this problem, any input on this is appreciated.

Back to the AVFoundation-plugin: the current implementation does not support CoreVideo as the QTKit-plugin supports it. There's no way to get decoded frames from AVFoundation stored on the GPU, which is kind of sad. I added some support for CoreVideo to transfer decoded frames back to the GPU, but in my testings the performance was worse than using the normal approach using glTexSubImage. This is why I disabled CoreVideo for AVFoundation. You can still request a CoreVideoTexture via readObjectFile, though.

6 years agoAdded osgGA::Device class for integration of both physical and virtual devices.
Robert OSFIELD [Tue, 23 Oct 2012 16:15:03 +0000 (16:15 +0000)]
Added osgGA::Device class for integration of both physical and virtual devices.

Added template readFile(..) function to make it more convinient to cast to a specific object type.

Added support for osgGA::Device to osgViewer.

Added sdl plugin to provides very basic joystick osgGA::Device integration.

6 years agoAdded mutex lock to Uniform::addParent()/removeParent().
Robert OSFIELD [Mon, 22 Oct 2012 16:21:04 +0000 (16:21 +0000)]
Added mutex lock to Uniform::addParent()/removeParent().

6 years agoAdded serializers for osgGA
Robert OSFIELD [Fri, 12 Oct 2012 14:51:08 +0000 (14:51 +0000)]
Added serializers for osgGA

6 years agoRemoved the insert of requests in the ImageSequence::_filesRequested data structure...
Robert OSFIELD [Tue, 9 Oct 2012 16:14:21 +0000 (16:14 +0000)]
Removed the insert of requests in the ImageSequence::_filesRequested data structure so that it always requests files, leaving it up the ImagePager to decide to track duplicates

6 years agoFrom Wang Rui, "I modified the Serializer header to add a UPDATE_TO_VERSION_SCOPED
Robert OSFIELD [Tue, 9 Oct 2012 16:05:50 +0000 (16:05 +0000)]
From Wang Rui, "I modified the Serializer header to add a UPDATE_TO_VERSION_SCOPED
macro, which could set version within brackets and reset it after
that. All related serializers are also modified so that the
backward-compatibility bug reported by Farshid can be fixed.

From Robert Osfield, removed the use of osg::Referenced and creating the proxy object on the heap.

6 years agoFrom Wang Rui, "I've added CDATA tag support to XmlParser so that we can keep user
Robert OSFIELD [Mon, 8 Oct 2012 16:14:23 +0000 (16:14 +0000)]
From Wang Rui, "I've added CDATA tag support to XmlParser so that we can keep user
data (e.g., GLSL shader texts) in XML files without parsing them. This
will be necessary for the coming-soon effect compositor submission.

6 years agoAdded a static_cast to avoid build issues under Windows
Robert OSFIELD [Mon, 8 Oct 2012 16:12:59 +0000 (16:12 +0000)]
Added a static_cast to avoid build issues under Windows

6 years agoFixed warning
Robert OSFIELD [Mon, 8 Oct 2012 16:03:16 +0000 (16:03 +0000)]
Fixed warning

6 years agoFrom Aurelein Albert, "Under some Visual Studio configuration, I get compile error...
Robert OSFIELD [Mon, 8 Oct 2012 15:10:56 +0000 (15:10 +0000)]
From Aurelein Albert, "Under some Visual Studio configuration, I get compile error on "lib3ds_io.c" due to use of these kind of conversion :

    b[1] = uint8_t((w & 0xFF00) >> 8);

I replaced it with :

    b[1] = (uint8_t)((w & 0xFF00) >> 8);

And it compiles fine

6 years agoFrom Gill Peacegood, "In the attached file I have changed the colour space used for...
Robert OSFIELD [Mon, 8 Oct 2012 12:00:53 +0000 (12:00 +0000)]
From Gill Peacegood, "In the attached file I have changed the colour space used for writing images to match the one used for reading images. Also this color space does not make subtle changes to the original colours which i think is probably what most people intend when writing an image and is more consistent with other plugins.

The effect is that an image that is written does not have a noticeably different colour when it is read back."

6 years agoFrom Oren Fromberg, ""
Robert OSFIELD [Mon, 8 Oct 2012 11:54:40 +0000 (11:54 +0000)]
From Oren Fromberg, ""
--This line, and thosAttached is an update to ReaderWriterDAE.cpp/h and daeReader.cpp/h that implements


ReaderWriterDAE::readNode (std::istream&, const osgDB::ReaderWriter::Options*)

This virtual function had never been implemented in ReaderWriterDAE. I implemented this function because the DAE plugin could not load files from other ReaderWriter derived objects that use protocol handlers.

I have updated function declarations in the header to have identical signatures with the base class declarations that include the default parameter.

readNode (std::istream&, …) is nearly identical to readNode(const std::string &, …) except it uses a new private function to convert the file from standard input:

bool daeReader::convert( std::istream& fin )

When this function is called fileURI is the string “from std::istream” to make the user aware where the file is coming from. Then instead of calling


we call


Where is a pointer to the dae file text in memory.

Other changes include private functions to clear caches and to consolidate redundant code that appears between the two convert functions.

e below, will be ignored--

M    src/osgPlugins/dae/ReaderWriterDAE.cpp
M    src/osgPlugins/dae/daeReader.cpp
M    src/osgPlugins/dae/ReaderWriterDAE.h
M    src/osgPlugins/dae/daeReader.h

6 years agoFrom James Athey, "I've attached a new osgDB ReaderWriter that can read Khronos Textu...
Robert OSFIELD [Mon, 8 Oct 2012 11:10:25 +0000 (11:10 +0000)]
From James Athey, "I've attached a new osgDB ReaderWriter that can read Khronos Texture Files
(KTX).  The KTX file format is straightforward and designed to be easy to
use in OpenGL.

The attached plugin can read:

* 1D, 2D, and 3D textures
* uncompressed and compressed images
* mipmapped and non-mipmapped textures
* little-endian and big-endian files
* textures from files as well as seekable istream objects

It does not handle:

* array textures (not supported by the ReaderWriter API)
* cubemap textures (not supported by the ReaderWriter API)
* the "KTXorientation" key-value pair; support could be added later (see
the file format spec for more information)
* non-seekable istream objects (would require more complicated memory

6 years agoMade TouchData and osg::Object to aid with serialization.
Robert OSFIELD [Fri, 5 Oct 2012 16:31:23 +0000 (16:31 +0000)]
Made TouchData and osg::Object to aid with serialization.

6 years agoImproved ImageSequence's handling of seek() and added a simply hack to ImagePager...
Robert OSFIELD [Fri, 5 Oct 2012 10:37:36 +0000 (10:37 +0000)]
Improved ImageSequence's handling of seek() and added a simply hack to ImagePager to prevent the number of requests accumulating.

6 years agoFrom Stephan Huber and Robert Osfield, addded interactive setting of the ImageSequenc...
Robert OSFIELD [Fri, 5 Oct 2012 10:35:06 +0000 (10:35 +0000)]
From Stephan Huber and Robert Osfield, addded interactive setting of the ImageSequence::seek() based on the mouse x position.

6 years agoAdded set methods to assist with serialization support
Robert OSFIELD [Fri, 5 Oct 2012 10:07:09 +0000 (10:07 +0000)]
Added set methods to assist with serialization support

6 years agoFrom Stephan Huber, "attached you'll find a fix for Registry.cpp not using the QTKit...
Robert OSFIELD [Thu, 4 Oct 2012 13:45:54 +0000 (13:45 +0000)]
From Stephan Huber, "attached you'll find a fix for Registry.cpp not using the QTKit-plugin for video-files. W/o this fix you had to preload the plugin to open movie-files."

6 years agoFrom Stephan Huber, OSX and iOS Video support via a QTKit plugin from OSX 10.7 and...
Robert OSFIELD [Tue, 2 Oct 2012 14:07:12 +0000 (14:07 +0000)]
From Stephan Huber, OSX and iOS Video support via a QTKit plugin from OSX 10.7 and before, and an AVFoundation plugin for iOS and OSX10.8 and later.

6 years agoFrom Leigh Stivers, "We had this problem which shows up with nVidia's latest Quadro...
Robert OSFIELD [Fri, 28 Sep 2012 16:36:42 +0000 (16:36 +0000)]
From Leigh Stivers, "We had this problem which shows up with nVidia's latest Quadro driver, 305.93 - and older drivers when the nVidia's setting "Thread Optimization" was turned on, running Windows 7.   The symptom, is that after creating a first view and using it, and then creating a second view, the first view will never render anything but black.

What happens is this:
A view is created, and then the viewers thread is created and runs.
The setReleaseContextAtEndOfFrameHint is true.
To create a second view, the viewer is setDone(true), and we wait for the thread exit.

At this point, inside the ViewerBase::RenderingTraversals code, there are places where it reads "if(_done) return;"

The problem, is that it won't reach the code that will releaseContext().

Apparently, this driver won't let any other thread to makeCurrent(), if another thread (dead or not) has ownership.  So when the Viewers is re-started, the first view won't be able to use the gc.

The change attached (against rev 13153) corrects this."

6 years agoFrom Thomas Hogarth, "Apple have decided in their eternal wisdom to do away with...
Robert OSFIELD [Thu, 27 Sep 2012 08:34:56 +0000 (08:34 +0000)]
From Thomas Hogarth, "Apple have decided in their eternal wisdom to do away with separate depth and stencil buffers on iOS from version 5 and above.

Attached are changes to to support setting up the new buffer type when compiling for iOS5,
also attached is a small change to FrameBufferObject.cpp to report support for packed depth stencil via the
GL_OES_packed_depth_stencil extension.

For anyone reading this you can attach a packed depth stencil to your FBO like so

_rttCamera->attach( osg::Camera::PACKED_DEPTH_STENCIL_BUFFER, GL_DEPTH24_STENCIL8_EXT );

Luckily GL_DEPTH24_STENCIL8_EXT happens to have the same value as iOSs GL_DEPTH24_STENCIL8_OES"

6 years agoFrom Paul Martz, "This change to include/osg/GL correctly includes the OpenGL header...
Robert OSFIELD [Wed, 26 Sep 2012 08:42:04 +0000 (08:42 +0000)]
From Paul Martz, "This change to include/osg/GL correctly includes the OpenGL header on OSX 10.7 when building OSG trunk for GL3. It also adds some CPP defines for compatibility."

6 years agoChanged dispatch to virtual
Robert OSFIELD [Tue, 25 Sep 2012 11:04:11 +0000 (11:04 +0000)]
Changed dispatch to virtual

6 years agoFrom Frederic Bouvier, "fix PNG write for images with bits per components different...
Robert OSFIELD [Mon, 24 Sep 2012 10:10:28 +0000 (10:10 +0000)]
From Frederic Bouvier, "fix PNG write for images with bits per components different than 8 that was hard coded."

6 years agoFrom Aurelien Albert, "In the DXF plugin, DXF layers are decoded and each layer is...
Robert OSFIELD [Thu, 20 Sep 2012 14:06:01 +0000 (14:06 +0000)]
From Aurelien Albert, "In the DXF plugin, DXF layers are decoded and each layer is added in a separate group, which is very usefull to retrieve a layer or display a list of all layers in the aplication.

But the layers are not always children of the "model root" node : there can be a matrix transform between "model root" and "layers parent", so I've added the name "Layers" on the node which contains all layers to easily retrieve the layers groups from application code."

6 years agoFrom Luc Frauciel, Added sRGB FrameBuffer string
Robert OSFIELD [Thu, 20 Sep 2012 14:03:47 +0000 (14:03 +0000)]
From Luc Frauciel, Added sRGB FrameBuffer string

6 years agoFrom Vladimir Cheaev, "
Robert OSFIELD [Thu, 20 Sep 2012 11:27:57 +0000 (11:27 +0000)]
From Vladimir Cheaev, "
I worked with a osg::Constraint and found strange part of code:
class OSGMANIPULATOR_EXPORT Constraint : public osg::Referenced
        virtual bool constrain(ScaleUniformCommand& command) const     { return constrain((MotionCommand&)command); }
        virtual bool constrain(const Rotate3DCommand& command)         { return constrain((MotionCommand&)command); }

If i use osgManipulator::Rotate3DCommand then method Rotate3DCommand::accept(const Constraint& constraint) calls Constraint::constrain(MotionCommand&) instead Constraint:: constrain(const Rotate3DCommand&).

If you replace
        virtual bool constrain(const Rotate3DCommand& command)         { return constrain((MotionCommand&)command); }
on to
        virtual bool constrain(Rotate3DCommand& command) const         { return constrain((MotionCommand&)command); }
then all works correctly.

6 years agoFrom Farshid Lashkari, Added GLBeginEndAdapter::reset(), and _overallNormalAssigned...
Robert OSFIELD [Thu, 20 Sep 2012 11:18:19 +0000 (11:18 +0000)]
From Farshid Lashkari, Added GLBeginEndAdapter::reset(), and _overallNormalAssigned, _overallColorAssigned flags to avoid the GLBeginEndAdapter adapter setting colour and normals when none has been assigned.

6 years agoFrom Ulrich Hertlein, "attached is a patch to src/osgViewer/CMakeLists.txt that inver...
Robert OSFIELD [Thu, 20 Sep 2012 11:16:02 +0000 (11:16 +0000)]
From Ulrich Hertlein, "attached is a patch to src/osgViewer/CMakeLists.txt that inverts the logic of when to use
Cocoa and when to use the old Carbon interface for the windowing system.

The old code had to be modified for every new OS X release to default to Cocoa.
The new code uses Carbon for <= OS X 10.4 and Cocoa on everything else."

6 years agoAdded ReadQueue::size() method to help with debugging.
Robert OSFIELD [Thu, 20 Sep 2012 11:14:10 +0000 (11:14 +0000)]
Added ReadQueue::size() method to help with debugging.

6 years agoAdded handling of directory names in osgimagesequence commandline.
Robert OSFIELD [Wed, 12 Sep 2012 16:35:12 +0000 (16:35 +0000)]
Added handling of directory names in osgimagesequence commandline.

From Stephan Huber, added support for controlling the ImageSequence seek position via mouse x position, toggled on/off via 'i' key.

6 years agoAdded osgDB::getSortedDirectoryContents and osgDB::FileNameComparator to help with...
Robert OSFIELD [Wed, 12 Sep 2012 16:02:02 +0000 (16:02 +0000)]
Added osgDB::getSortedDirectoryContents and osgDB::FileNameComparator to help with sorting directory contents into alphabetic and numerical order.

6 years agoConverted sorting of directory contents across to use the new osgDB::FileNameComparat...
Robert OSFIELD [Wed, 12 Sep 2012 11:09:41 +0000 (11:09 +0000)]
Converted sorting of directory contents across to use the new osgDB::FileNameComparator and osgDB::getSortedDirectoryContents()

6 years agoUpdated version after 3.1.3 dev release
Robert OSFIELD [Mon, 10 Sep 2012 08:24:49 +0000 (08:24 +0000)]
Updated version after 3.1.3 dev release

6 years agoUpdated ChangeLog for 3.1.3 dev release
Robert OSFIELD [Fri, 7 Sep 2012 17:04:31 +0000 (17:04 +0000)]
Updated ChangeLog for 3.1.3 dev release

6 years agoFrom Wojciech Lewandowski, "With current trunk I had an error while compiling osg...
Robert OSFIELD [Fri, 7 Sep 2012 14:55:09 +0000 (14:55 +0000)]
From Wojciech Lewandowski, "With current trunk I had an error while compiling osg/Image.cpp for IOS simulator / GLES2. Symbol GL_RGBA16 was missing. Adding #define GL_RGBA16 0x805B to Image header solves the problem. "

6 years agoAdded setting of the input range of the event state based on the master cameras viewport.
Robert OSFIELD [Fri, 7 Sep 2012 09:31:26 +0000 (09:31 +0000)]
Added setting of the input range of the event state based on the master cameras viewport.

6 years agoAdded check so not intialization is down when you select the current camera manipulator
Robert OSFIELD [Fri, 7 Sep 2012 08:33:24 +0000 (08:33 +0000)]
Added check so not intialization is down when you select the current camera manipulator

6 years agoFrom Piotr Domagalski, "I've added reading of node names ('DEF' element) to the VRML...
Robert OSFIELD [Thu, 6 Sep 2012 13:53:58 +0000 (13:53 +0000)]
From Piotr Domagalski, "I've added reading of node names ('DEF' element) to the VRML reading plugin. The changes were based on trunk's version of the plugin."

6 years agoFrom Piotr Domagalski, "I've rewritten some bits of the STL plugin in order to suppor...
Robert OSFIELD [Thu, 6 Sep 2012 13:48:17 +0000 (13:48 +0000)]
From Piotr Domagalski, "I've rewritten some bits of the STL plugin in order to support ASCII STL files with multiple named solids (reading and writing). The names are also used as OSG nodes names.

- Also, a 'dontSaveNormals' was added. It allows to ignore normals when writing an STL file. For example, it is useful for me when writing an STL file for CFD simulations.

- Some comments and code formatting were improved (to be consistent with the formatting already used in the plugin).

- With 'separateFiles' option files are now named fooX.stl instead of foo.stlX

The changes have been tested on various STL, both ASCII and binary found on the net. The change was based on the trunk branch."

From Robert Osfield, changed assert in Piotr's code to a runtime check warning report.

6 years agoFrom Piotr Domagalski, "Currently, code using OpenSceneGraph doesn't build with clang...
Robert OSFIELD [Thu, 6 Sep 2012 10:52:28 +0000 (10:52 +0000)]
From Piotr Domagalski, "Currently, code using OpenSceneGraph doesn't build with clang due to the way __sync_bool_compare_and_swap() is used in OpenThreads/Atomic header file.

I tested it with clang 3.1 and it seems that clang is enforcing the use of the same type for all parameters in this builtin. Looking at the function declaration [1]

bool __sync_bool_compare_and_swap (type *ptr, type oldval type newval, ...)

it seems to be doing the right thing: here the same type is used for *ptr, oldval and newval.


6 years agoFrom Fredric Bouvier, fix to CMake build selection of FLTK
Robert OSFIELD [Thu, 6 Sep 2012 10:32:07 +0000 (10:32 +0000)]
From Fredric Bouvier, fix to CMake build selection of FLTK

6 years agoFrom Colin McDonald and Robert Osfield, converted Traits::sharedContext from Graphics...
Robert OSFIELD [Wed, 5 Sep 2012 21:03:41 +0000 (21:03 +0000)]
From Colin McDonald and Robert Osfield, converted Traits::sharedContext from GraphicsContext* to osg:observer_ptr<GraphicsContext> to prevent dangling pointer issues.

6 years agoFixed inappropriate comment
Robert OSFIELD [Wed, 5 Sep 2012 13:51:34 +0000 (13:51 +0000)]
Fixed inappropriate comment

6 years agoMoved the OSG_INIT_SINGLETON_PROXY macro into include/osg/Object to make it more...
Robert OSFIELD [Wed, 5 Sep 2012 13:48:23 +0000 (13:48 +0000)]
Moved the OSG_INIT_SINGLETON_PROXY macro into include/osg/Object to make it more generally useful and added it's usage into the RenderBinPrototypeList initialization.

6 years agoFrom Thomas Hogarth, "I submitted a change for the IOS CMake system a few weeks back...
Robert OSFIELD [Wed, 5 Sep 2012 10:27:08 +0000 (10:27 +0000)]
From Thomas Hogarth, "I submitted a change for the IOS CMake system a few weeks back which hasn't made it into the trunk. I've just made the modifications again against the latest trunk and have attached the file

It basically accounts for the fact that XCode has changed it's default install location.


6 years agoFrom Andreas Ekstrand, The attached ESRIShape.cpp contains fixes for comparing calcul...
Robert OSFIELD [Wed, 5 Sep 2012 10:24:10 +0000 (10:24 +0000)]
From Andreas Ekstrand, The attached ESRIShape.cpp contains fixes for comparing calculated byte sizes with the content length from the record header. According to the ESRI Shape documentation (, the content length is specified in 16 bit words, which is why I have multiplied it by 2 when comparing to byte sizes. Note that the comparison in line 813 is made with a fix number of 16-bit words so it hasn't been changed.

This fixes problems with PolygonZ records where the previous code was reading past the end of the record since it thought it had M values even if it didn't. I suspect the problem that James McGlone had back in 2006 was the same but reversed, when he tried to simply comment out the check, which was a (correctly) refused submission.""

6 years agoFrom Nico Kruithof, "There is a small typo in the ShapeDrawable code for a sphere...
Robert OSFIELD [Wed, 5 Sep 2012 10:19:01 +0000 (10:19 +0000)]
From Nico Kruithof, "There is a small typo in the ShapeDrawable code for a sphere. There was a gl.Begin(GL_QUAD_STRIP) that was never closed, nor used.


6 years agoUpdated SO version number to avoid collision with new additions to serializers
Robert OSFIELD [Wed, 5 Sep 2012 09:30:33 +0000 (09:30 +0000)]
Updated SO version number to avoid collision with new additions to serializers

6 years agoAdded GL_RGBA8 and GL_RGBA16 entries to the Image::computePixelFormat() and improved...
Robert OSFIELD [Wed, 5 Sep 2012 09:08:25 +0000 (09:08 +0000)]
Added GL_RGBA8 and GL_RGBA16 entries to the Image::computePixelFormat() and improved he readability of the method by inserting line spacing.

6 years agoFrom Ulrich Hertlein, "fixes a typo and adds support for OS X 10.8"
Robert OSFIELD [Wed, 5 Sep 2012 08:48:10 +0000 (08:48 +0000)]
From Ulrich Hertlein, "fixes a typo and adds support for OS X 10.8"