openscenegraph:osg.git
4 years agoAdded support for animating volume hulls.
Robert OSFIELD [Mon, 17 Mar 2014 15:54:52 +0000 (15:54 +0000)]
Added support for animating volume hulls.

4 years agoFrom Stephan Huber, "attached is a fix for the rest-http-plugin which should fix...
Robert OSFIELD [Thu, 13 Mar 2014 14:02:50 +0000 (14:02 +0000)]
From Stephan Huber, "attached is a fix for the rest-http-plugin which should fix the font-issue reported by Phil. The old implementation did forward all requests to the internal http-server via user-events. This prevented error-reporting for missing files, as the request was accidentally handled by the plugin. As a request for missing font-file succeeds and returned an empty file, the curl-plugin hands the data happily to the freetype-plugin which failed trying to load an empty font-file, obviously.

My fix was to rename the standard request handler to a specialized user-event-handler which handles only requests for "/user-event“

So fonts should work on iOS when loaded remotely, even when a local file is available and with the resthttp-plugin serving the presentation.
"

4 years agoFrom Stephan Huber, fix for building lua plugin from local source
Robert OSFIELD [Thu, 13 Mar 2014 13:59:34 +0000 (13:59 +0000)]
From Stephan Huber, fix for building lua plugin from local source

4 years agoAdded support for directly invoking scripts using <run-script> and <run-script-file...
Robert OSFIELD [Thu, 13 Mar 2014 10:28:18 +0000 (10:28 +0000)]
Added support for directly invoking scripts using <run-script> and <run-script-file> to enable scripts to interact with each other.

4 years agoImproved support for passing events between scripts and Present3D application
Robert OSFIELD [Wed, 12 Mar 2014 11:01:09 +0000 (11:01 +0000)]
Improved support for passing events between scripts and Present3D application

4 years agoAdded PresentationInterface class to make it more convinient to access the current...
Robert OSFIELD [Tue, 11 Mar 2014 10:52:10 +0000 (10:52 +0000)]
Added PresentationInterface class to make it more convinient to access the current presentation from scripting languages

4 years agoAdded scripting support for JumpData, KeyPosition, HomePosition and parts of SlideEve...
Robert OSFIELD [Mon, 10 Mar 2014 19:08:46 +0000 (19:08 +0000)]
Added scripting support for JumpData, KeyPosition, HomePosition and parts of SlideEventHandler that enable dispatching of user created events.

4 years agoAdded ability to replace callback objects via lua scripts to allow one to override...
Robert OSFIELD [Fri, 7 Mar 2014 11:09:25 +0000 (11:09 +0000)]
Added ability to replace callback objects via lua scripts to allow one to override callbacks.

Added fallback for osgGA::Widget::Extents.

4 years agoAdded support for osg::Image to the lua plugin.
Robert OSFIELD [Thu, 6 Mar 2014 10:27:26 +0000 (10:27 +0000)]
Added support for osg::Image to the lua plugin.

4 years agoImplement add, set and get methods for StateSet.
Robert OSFIELD [Tue, 4 Mar 2014 13:36:13 +0000 (13:36 +0000)]
Implement add, set and get methods for StateSet.

4 years agoRelaxed the handling of Image objects
Robert OSFIELD [Tue, 4 Mar 2014 13:35:27 +0000 (13:35 +0000)]
Relaxed the handling of Image objects

4 years agoFixed handling of OverrideValue
Robert OSFIELD [Tue, 4 Mar 2014 13:34:23 +0000 (13:34 +0000)]
Fixed handling of OverrideValue

4 years agoFrom Stephan Huber, fix for handling font paths on a local machine when other files...
Robert OSFIELD [Fri, 28 Feb 2014 17:38:36 +0000 (17:38 +0000)]
From Stephan Huber, fix for handling font paths on a local machine when other files have been source from a remote machine.

4 years agoAdded MapReverseIterator implementation.
Robert OSFIELD [Thu, 27 Feb 2014 10:02:55 +0000 (10:02 +0000)]
Added MapReverseIterator implementation.

4 years agoAdded MapIteratorObject and support for it in the lua plugin to provide map iterator...
Robert OSFIELD [Wed, 26 Feb 2014 18:18:08 +0000 (18:18 +0000)]
Added MapIteratorObject and support for it in the lua plugin to provide map iterator functionality.

4 years agoAdded Map serializer size() method and support for it in the lua plugin. Renamed...
Robert OSFIELD [Wed, 26 Feb 2014 11:01:35 +0000 (11:01 +0000)]
Added Map serializer size() method and support for it in the lua plugin.  Renamed functions in lua plugin to be more consistent.

4 years agoAdded support for vector and map containers in osgDB::Serailizer's and lua plugin.
Robert OSFIELD [Wed, 26 Feb 2014 08:26:51 +0000 (08:26 +0000)]
Added support for vector and map containers in osgDB::Serailizer's and lua plugin.

4 years agoAdded Vector serialization and support in lua plugin top enable script users to set...
Robert OSFIELD [Mon, 24 Feb 2014 10:19:48 +0000 (10:19 +0000)]
Added Vector serialization and support in lua plugin top enable script users to set/get vector properties such as osg::Array, osg::PrimitiveSet and children lists.

4 years agoFixed handling of enums in Lua plugin.
Robert OSFIELD [Thu, 13 Feb 2014 18:52:41 +0000 (18:52 +0000)]
Fixed handling of enums in Lua plugin.

Fixed computation of getNumPrimitives() so that it returns 0 when PrimitiveSet is zero.

Added missing properties to PrimitiveSet serializers

4 years agoAdded inital cut of PrimitiveSetSet wrappers to scripting
Robert OSFIELD [Thu, 13 Feb 2014 11:01:36 +0000 (11:01 +0000)]
Added inital cut of PrimitiveSetSet wrappers to scripting

4 years agoAdded full range of Array subclasses to wrappers
Robert OSFIELD [Wed, 12 Feb 2014 18:10:52 +0000 (18:10 +0000)]
Added full range of Array subclasses to wrappers

4 years agoAdded initial support for wrapping osg::Array in a way that can be used via scripting.
Robert OSFIELD [Wed, 12 Feb 2014 18:03:53 +0000 (18:03 +0000)]
Added initial support for wrapping osg::Array in a way that can be used via scripting.

4 years agoFixed handling of assignment of User Object's that replace existing Object with the...
Robert OSFIELD [Tue, 11 Feb 2014 18:18:48 +0000 (18:18 +0000)]
Fixed handling of assignment of User Object's that replace existing Object with the specified propertyName.

4 years agoImproved support for setting/getting properties via the osg::UserDataContainer.
Robert OSFIELD [Tue, 11 Feb 2014 18:07:37 +0000 (18:07 +0000)]
Improved support for setting/getting properties via the osg::UserDataContainer.

4 years agoQuitened down debug messages
Robert OSFIELD [Tue, 11 Feb 2014 10:56:51 +0000 (10:56 +0000)]
Quitened down debug messages

4 years agoChanged implementation of enums to use strings as lua type to make it easier to do...
Robert OSFIELD [Tue, 11 Feb 2014 09:43:08 +0000 (09:43 +0000)]
Changed implementation of enums to use strings as lua type to make it easier to do comparisons and track values

4 years agoImplemented Widget::handle, handleImplementation, traverse and travseImplementation...
Robert OSFIELD [Mon, 10 Feb 2014 18:07:26 +0000 (18:07 +0000)]
Implemented Widget::handle, handleImplementation, traverse and travseImplementation() wrappers to enable them to be extended via scripting

4 years agoAdded support for serailizing and scripting BoundingBox and BoundingSphere objects
Robert OSFIELD [Mon, 10 Feb 2014 16:44:13 +0000 (16:44 +0000)]
Added support for serailizing and scripting BoundingBox and BoundingSphere objects

4 years agoFixed handling of setting member variables via the Serializers when the value is...
Robert OSFIELD [Sat, 8 Feb 2014 17:53:51 +0000 (17:53 +0000)]
Fixed handling of setting member variables via the Serializers when the value is the default.

Added support for more features of the osgDB::Widget class.

Fixed handling of boolean values in the Lua plugin

4 years agoAdded support for enum's in the Lua script integration
Robert OSFIELD [Sat, 8 Feb 2014 10:39:20 +0000 (10:39 +0000)]
Added support for enum's in the Lua script integration

4 years agoFixed export
Robert OSFIELD [Sat, 8 Feb 2014 10:38:51 +0000 (10:38 +0000)]
Fixed export

4 years agoFixed handling of returns when invoking a script, removed some debug messages, added...
Robert OSFIELD [Fri, 7 Feb 2014 16:06:57 +0000 (16:06 +0000)]
Fixed handling of returns when invoking a script, removed some debug messages, added a warning message when detecting erronous types.

Added FocusBehaviour enum to osgGA::Widget serialization

4 years agoAdded initial Widget wrapper
Robert OSFIELD [Fri, 7 Feb 2014 10:46:16 +0000 (10:46 +0000)]
Added initial Widget wrapper

4 years agoMoved experimental Widget class to osgGA
Robert OSFIELD [Thu, 6 Feb 2014 17:32:41 +0000 (17:32 +0000)]
Moved experimental Widget class to osgGA
Add computeIntersections() to the osgGA::GUIActionAdapter base class to enable intersection tests without needing to directly link to osgViewer.

4 years agoAdded osg::CallbackObject suport to the experiment Widget base class to enable script...
Robert OSFIELD [Thu, 6 Feb 2014 17:04:40 +0000 (17:04 +0000)]
Added osg::CallbackObject suport to the experiment Widget base class to enable script language extension of widgets

4 years agoAdded support for casting objects to allow one to access a parent classes methods.
Robert OSFIELD [Thu, 6 Feb 2014 11:25:37 +0000 (11:25 +0000)]
Added support for casting objects to allow one to access a parent classes methods.

4 years agoTweaked the detection of when the position transform for the hull is required.
Robert OSFIELD [Wed, 5 Feb 2014 11:08:39 +0000 (11:08 +0000)]
Tweaked the detection of when the position transform for the hull is required.

4 years agoAdded support for a <hull> tag that can be used within <volume> tag.
Robert OSFIELD [Wed, 5 Feb 2014 11:07:03 +0000 (11:07 +0000)]
Added support for a <hull> tag that can be used within <volume> tag.

4 years agoImproved the white space trimming
Robert OSFIELD [Wed, 5 Feb 2014 11:04:29 +0000 (11:04 +0000)]
Improved the white space trimming

4 years agoAdded lua-5.2.3 as source code so it can be optinally built as part of the lua plugin...
Robert OSFIELD [Tue, 4 Feb 2014 16:49:13 +0000 (16:49 +0000)]
Added lua-5.2.3 as source code so it can be optinally built as part of the lua plugin, making it possible to work out of the box across all platforms with needing lua as an external dependency.

Added the Cmake option OSG_USE_LOCAL_LUA_SOURCE to control whether to build and use the Lua source code in the lua plugin, or look for lua as an external dependency.

4 years agoAdded test code for nesting a <hull> within a volume tag.
Robert OSFIELD [Tue, 4 Feb 2014 16:46:33 +0000 (16:46 +0000)]
Added test code for nesting a <hull> within a volume tag.

4 years agoFrom Stephan Huber, added support for compile source code of lua with the lua plugin
Robert OSFIELD [Tue, 4 Feb 2014 11:24:01 +0000 (11:24 +0000)]
From Stephan Huber, added support for compile source code of lua with the lua plugin

4 years agoFixed error in the computation of tex coords of Maximum Intensity Projection + Transf...
Robert OSFIELD [Mon, 3 Feb 2014 15:35:22 +0000 (15:35 +0000)]
Fixed error in the computation of tex coords of Maximum Intensity Projection + Transfer Function rendering.

4 years agoReplaced C cast to long with a static_cast<const void*>() to avoid a build error...
Robert OSFIELD [Fri, 31 Jan 2014 19:18:18 +0000 (19:18 +0000)]
Replaced C cast to long with a static_cast<const void*>() to avoid a build error under Mingw 64.

4 years agoAdded osg::CallbackObject to be used to extend C++ class from scripting languages...
Robert OSFIELD [Fri, 31 Jan 2014 16:20:29 +0000 (16:20 +0000)]
Added osg::CallbackObject to be used to extend C++ class from scripting languages by providing callback objects assigned to the osg::Object UserDataContainer, with the CallbackObject's Name used to map the "method" provided by the CallbackObject.  The CallbackObject is implemented by the script engine to provide the neccessary glue to invoking the script with the appropriate input parameters and handling the output parameters.

To the Lua plugin added support for assigned lua functions to C++ osg::Objects via the new osg::CallbackObject mechanism.  To invoke the scripts function from C++ one must get the CallbackObject and call run on it.

Renamed ScriptCallback to ScriptNodeCallback to avoid possibly confusion between osg::CallbackObject and the ScriptNodeCallback.

4 years agoUpdated ChangeLog
Robert OSFIELD [Wed, 29 Jan 2014 11:01:24 +0000 (11:01 +0000)]
Updated ChangeLog

4 years agoFrom Kristofer Tingdahl, made method virtual
Robert OSFIELD [Tue, 28 Jan 2014 16:49:20 +0000 (16:49 +0000)]
From Kristofer Tingdahl, made method virtual

4 years agoFixed MingW build's handling of debug d postfix.
Robert OSFIELD [Tue, 28 Jan 2014 16:48:47 +0000 (16:48 +0000)]
Fixed MingW build's handling of debug d postfix.

4 years agoRemoved the invocation of gcc on all platforms
Robert OSFIELD [Tue, 28 Jan 2014 15:28:17 +0000 (15:28 +0000)]
Removed the invocation of gcc on all platforms

4 years agoFrom Kristofer Tingdahl, "the vertical bar is upside down, and hence not as the docum...
Robert OSFIELD [Tue, 28 Jan 2014 11:01:28 +0000 (11:01 +0000)]
From Kristofer Tingdahl, "the vertical bar is upside down, and hence not as the documentation says it should be. This is corrected with this patch"

From Robert Osfield, changed the example so that the vertical and horizon scalar bars are rotated to the XZ plane so you can see them with the default viewer's camera orientation.
Tweaked the positioning of title text of vertic scalar bar to avoid overlap of text.

4 years agoRemoved unimplemented method
Robert OSFIELD [Mon, 27 Jan 2014 15:43:36 +0000 (15:43 +0000)]
Removed unimplemented method

4 years agoFrom Laurens Voerman, "I experienced a crash in Geometry::fixDeprecatedData(), on...
Robert OSFIELD [Fri, 24 Jan 2014 17:31:09 +0000 (17:31 +0000)]
From Laurens Voerman, "I experienced a crash in Geometry::fixDeprecatedData(), on certain files, and brought the problem down to a very simple test file, attached as test3.zip.

There are two problems:
1> for DrawElementsUShortPrimitiveType (and UInt) the source_pindex still equals -1 and causes a crash
     in DrawElementsUBytePrimitiveType source_pindex is incremented, and in DrawElementsU(Short/Int)PrimitiveType primitiveNum is incremented, but never used

2> The drawelements need to be rewritten as the vertices are reordered.

created a patch for osg stable branch(r14038): attached as Geometry-osg-3.2.zip
and for svn brach(r14044): attached as Geometry_osg_svn.zip"

4 years agoFrom Aurelien Albert, "In the "apply" method of osg::FrameBufferObject, the draw...
Robert OSFIELD [Fri, 24 Jan 2014 17:06:32 +0000 (17:06 +0000)]
From Aurelien Albert, "In the "apply" method of osg::FrameBufferObject, the draw buffers are always enabled, even if the target is only "READ_FRAMEBUFFER".

This can lead to inconsistency if you bind a framebuffer with multiple attachments in DRAW mode and then a framebuffer with different attachment count in READ mode (for example to manually "blit" from a FBo to another).

On some ATI cards (at least RADEON HD) this also leads to an "incomplete " FBO status

I've added a test to enable drawbuffers only if target is "DRAW" or "READ_DRAW", this solves my problems on ATI cards."

4 years agoFrom Michael Schanne, "small fix for a duplicate OR operand in KdTree.cpp."
Robert OSFIELD [Fri, 24 Jan 2014 16:45:45 +0000 (16:45 +0000)]
From Michael Schanne, "small fix for a duplicate OR operand in KdTree.cpp."

4 years agoFrom Torben Dannahuer, "modified findcollada.cmake which can now detect Boost 1.55...
Robert OSFIELD [Fri, 24 Jan 2014 16:28:34 +0000 (16:28 +0000)]
From Torben Dannahuer, "modified findcollada.cmake which can now detect Boost 1.55 libraries, which are used by Collada in my 3rdParty package"

4 years agoFrom Torben Dannhauer, VisualStudio 2013 build fixes
Robert OSFIELD [Fri, 24 Jan 2014 16:24:59 +0000 (16:24 +0000)]
From Torben Dannhauer, VisualStudio 2013 build fixes

4 years agoFrom Kristofer, "The osgSim::ScalarBar has a problem in that if the scalarbar has...
Robert OSFIELD [Fri, 24 Jan 2014 16:19:38 +0000 (16:19 +0000)]
From Kristofer, "The osgSim::ScalarBar has a problem in that if the scalarbar has a color in one end that co-incides with the background color, one cannot see where the scalarbar ends. With this patch, we add a line around the perimiter of the bar to mark it.

Secondly, we thought the text-annotation missed ticks that mark out precisely where on the bar the texts relate to, so we added that as well."

4 years agoFrom Marc Helbling, "I am sending a small fix in the PLY pseudo-loader; the extension...
Robert OSFIELD [Fri, 24 Jan 2014 16:01:59 +0000 (16:01 +0000)]
From Marc Helbling, "I am sending a small fix in the PLY pseudo-loader; the extension was checked in plyfile.cpp thus preventing the loading of any .PLY file (extension in uppercase). The extension filtering is already handled by ReaderWriter::acceptsExtension in a case unsensitive way."

4 years agoFixed warnings
Robert OSFIELD [Fri, 24 Jan 2014 15:40:18 +0000 (15:40 +0000)]
Fixed warnings

4 years agoChanged the handling of single window configurations so that simply reuse the View...
Robert OSFIELD [Fri, 24 Jan 2014 14:26:25 +0000 (14:26 +0000)]
Changed the handling of single window configurations so that simply reuse the View::getCamera() instead of creating a slave.

4 years agoAdded a getModeUsage() method that prevents any mode being automatically associated...
Robert OSFIELD [Fri, 24 Jan 2014 12:01:37 +0000 (12:01 +0000)]
Added a getModeUsage() method that prevents any mode being automatically associated with these Texture types that are only usable using non fixed function pipeline.

4 years agoFixed crash when reading a viewer configuration file where the EventVisitor was being...
Robert OSFIELD [Fri, 24 Jan 2014 11:37:35 +0000 (11:37 +0000)]
Fixed crash when reading a viewer configuration file where the EventVisitor was being re-assigned but left a dangling pointer

4 years agoFrom Stephan Huber, "attached is a new zip containing two small fixes:
Robert OSFIELD [Fri, 24 Jan 2014 10:10:43 +0000 (10:10 +0000)]
From Stephan Huber, "attached is a new zip containing two small fixes:
* forwarded touch-events do have a correct input-range from 0 .. 1
* I refactored sending touch-events per osc so the receiver can detect a TOUCH_ENDED better"

4 years agoFixed warnings
Robert OSFIELD [Thu, 23 Jan 2014 19:55:37 +0000 (19:55 +0000)]
Fixed warnings

4 years agoFrom Kristofer Tingdahl,"we have a bunch of classes that inherit osg::Node, and they...
Robert OSFIELD [Thu, 23 Jan 2014 16:48:29 +0000 (16:48 +0000)]
From Kristofer Tingdahl,"we have a bunch of classes that inherit osg::Node, and they create their own, internal geometry which is passed into the render bucket at the cull-traversal. Last week, we realised that these classes are not accounted for when doing an ComputeBoundVisitor- traversal, as there is no specialization in ComputeBoundVisitor for them.

One solution is naturally to create a new class that would inherit the osg::ComputeBoundVisitor, and use that. I don't like that idea as the ComputeBoundVisitor does actually have what I need - it is only hidden in a protected function.

I am therefor suggesting a slight generalization of the ComputeBoundVisitor with the attached patch, which is tested.

The patch has two parts:
we add applyBBox() so that one can use that in a customized traverse-function and add a bbox to the visitor. I considered calling this function expandByBBox(), but I though  applyBBox was better.
The MatrixStack is made available to the outside world. That enables a traverse-function to do whatever it wishes.
I do actually only need one of the two, as I can implement what I wish either way, but adding getMatrixStack() will make more generic expansions possible.
"

From Robert Osfield, changed the name of the new applyBBox(..) method to applyBoundingBox(..) to keep it's naming more consistent with the rest of the OSG.

4 years agoFrom Stephan Huber, "attached are some fixes to the osc-plugin and the touch-implemen...
Robert OSFIELD [Thu, 23 Jan 2014 15:37:48 +0000 (15:37 +0000)]
From Stephan Huber, "attached are some fixes to the osc-plugin and the touch-implementations for iOS and os x and other small bugfixes. These fixes will normalize the orientation of the touch points, and transmitting the touch points over osc via the TUIO-protocol works now more robustly between two osg-applications.

I added a new tag to p3d called forward_touch_event_to_device and renamed the existing forward_event_to_device to forward_mouse_event_to_device. This new tag will transmit touches to the virtual trackpad as touch events. I added the MultitouchTrackball to the p3d-app so zooming and moving a model remotely should now work, if you use forward_touch_event_to_device. I kept (and fixed) forward_mouse_event_to_device for background compatibility, so old presentations works as in previous versions, without the ability to zoom + scale. of course.

forward_touch_event_to_device needs some more testing, (e.g. with image-streams and keystone, afaik there’s no support for touch-events...) but for a first version it works nice.
"

4 years agoRemoved debug message
Robert OSFIELD [Thu, 23 Jan 2014 10:56:17 +0000 (10:56 +0000)]
Removed debug message

4 years agoChanged the TransprencyProperty range to 0 to 2.0 to enable forcing opaque qualities...
Robert OSFIELD [Thu, 23 Jan 2014 10:50:55 +0000 (10:50 +0000)]
Changed the TransprencyProperty range to 0 to 2.0 to enable forcing opaque qualities on fragments

4 years agoCleaned up debug message.
Robert OSFIELD [Thu, 23 Jan 2014 10:11:15 +0000 (10:11 +0000)]
Cleaned up debug message.

4 years agoCleaned up the Qt find package, and made changed the default threading model to Singl...
Robert OSFIELD [Thu, 23 Jan 2014 10:09:53 +0000 (10:09 +0000)]
Cleaned up the Qt find package, and made changed the default threading model to SingleThreaded when using Qt5 to avoid crash due to regresssion since Qt4.

4 years agoAdded clean up of osg::Program that are applied by the GLObjectsVisitor, which addres...
Robert OSFIELD [Thu, 23 Jan 2014 09:41:09 +0000 (09:41 +0000)]
Added clean up of osg::Program that are applied by the GLObjectsVisitor, which addresses a state leak that creates GL error once the main scene graph is rendered.

4 years agoAdded GL_TEXTURE_2D_MULTISAMPLE to texture mode list.
Robert OSFIELD [Thu, 23 Jan 2014 07:59:46 +0000 (07:59 +0000)]
Added GL_TEXTURE_2D_MULTISAMPLE to texture mode list.

4 years agoMade protected methods virtual to allow subclassing to customize more aspects of...
Robert OSFIELD [Wed, 22 Jan 2014 17:29:44 +0000 (17:29 +0000)]
Made protected methods virtual to allow subclassing to customize more aspects of the window setup.

4 years agoRefactored .p3d loader to make it less strict about the tag, property and value strin...
Robert OSFIELD [Wed, 22 Jan 2014 16:29:45 +0000 (16:29 +0000)]
Refactored .p3d loader to make it less strict about the tag, property and value strings when matching them to supported values.

Examples of supported matches are:

   <Slide> and <slide> will be treated the same
   <bgcolor>WHITE</bgcolor> and <bgcolor>White</bgcolor> will be treated the same
   <text alignment="TOP_LEFT"</text> and <text alignment="top left"</text>,  <text alignment="TopLeft"</text> will all be treated the same

4 years agoAdded support for sampleRatio and sampleRatioWhenMoving <volume> properties
Robert OSFIELD [Wed, 22 Jan 2014 11:25:54 +0000 (11:25 +0000)]
Added support for sampleRatio and sampleRatioWhenMoving <volume> properties

4 years agoBuild fixes for when ref_ptr<> automatic type conversion is turned off
Robert OSFIELD [Tue, 21 Jan 2014 18:58:52 +0000 (18:58 +0000)]
Build fixes for when ref_ptr<> automatic type conversion is turned off

4 years agoAdded support for osgVolue::SampleRatioProperty. Fixed build errors when compiling...
Robert OSFIELD [Tue, 21 Jan 2014 18:48:53 +0000 (18:48 +0000)]
Added support for osgVolue::SampleRatioProperty.  Fixed build errors when compiling with ref_ptr<> automatic type conversion.

4 years agoBuild fixes for when ref_ptr<> has no auto type conversion
Robert OSFIELD [Tue, 21 Jan 2014 18:31:20 +0000 (18:31 +0000)]
Build fixes for when ref_ptr<> has no auto type conversion

4 years agoFixed build error
Robert OSFIELD [Tue, 21 Jan 2014 17:27:21 +0000 (17:27 +0000)]
Fixed build error

4 years agoFixed build error due to typo.
Robert OSFIELD [Tue, 21 Jan 2014 17:00:56 +0000 (17:00 +0000)]
Fixed build error due to typo.

4 years agoIntegrated multipass volume rendering shaders from OpenSceneGraph-Data
Robert OSFIELD [Mon, 20 Jan 2014 17:23:11 +0000 (17:23 +0000)]
Integrated multipass volume rendering shaders from OpenSceneGraph-Data

4 years agoChanged the default directory for the output files to be the current working directory,
Robert OSFIELD [Mon, 20 Jan 2014 17:03:29 +0000 (17:03 +0000)]
Changed the default directory for the output files to be the current working directory,
with the --write-to-source-file-directory added to allow one to have the original behaviour
of writing to the same directory as the original source file.

4 years agoRemoved nolonger used code paths
Robert OSFIELD [Mon, 20 Jan 2014 16:21:24 +0000 (16:21 +0000)]
Removed nolonger used code paths

4 years agoDisable depth test for rendering of hull backface
Robert OSFIELD [Mon, 20 Jan 2014 15:54:48 +0000 (15:54 +0000)]
Disable depth test for rendering of hull backface

4 years agoFrom Stephan Huber, "recent commits regarding GLuint64EXT broke the build for GLES1...
Robert OSFIELD [Mon, 20 Jan 2014 15:10:49 +0000 (15:10 +0000)]
From Stephan Huber, "recent commits regarding GLuint64EXT broke the build for GLES1 and GLES2. Attached you’ll find a fix which hopefully work for every platform."

4 years agoFrom Kristofer Tingdahl, reimplement of AntiSquish node to avoid the use of an update...
Robert OSFIELD [Mon, 20 Jan 2014 11:00:09 +0000 (11:00 +0000)]
From Kristofer Tingdahl, reimplement of AntiSquish node to avoid the use of an update callback.

From Robert Osfield, small ammendments to clean up header.

4 years agoFrom Roni Zanolli,Added use of Qt's new devicePixelRatio() method to assist with...
Robert OSFIELD [Mon, 20 Jan 2014 10:40:49 +0000 (10:40 +0000)]
From Roni Zanolli,Added use of Qt's new devicePixelRatio() method to assist with handling the upscalling of resolution on iPhone for "retina" displays.

From Robert Osfield, changed Roni's code to use a #define GETDEVICEPIXELRATIO to access the versioned Qt devicePixelRatio() method to avoid duplication of the Qt version checking.

4 years agoFixed warning
Robert OSFIELD [Fri, 17 Jan 2014 18:20:39 +0000 (18:20 +0000)]
Fixed warning

4 years agoFrom Stephan Huber, fix for OSX build issue
Robert OSFIELD [Fri, 17 Jan 2014 18:20:28 +0000 (18:20 +0000)]
From Stephan Huber, fix for OSX build issue

4 years agoFrom Kristoger Tingdahl, "the patch I sent to src/osgQt/CMakeModules.txt did not...
Robert OSFIELD [Fri, 17 Jan 2014 14:02:30 +0000 (14:02 +0000)]
From Kristoger Tingdahl, "the patch I sent to src/osgQt/CMakeModules.txt did not do the work on windows. I have fixed that, and also made it more generic so there is no special handling of qt5.2, but all qt5 are the same.

I have tested this on:

mac/qt5.2
linux/qt5.2
windows/qt5.2, and
mac/qt5.1

All platforms perform as expected.

The previous fix removed the -f flag to the moc-pre-processor, but on windows, it turned out that -f "osgQt/QGraphicsViewer" was needed.

This becomes an include-statement in the file generated by moc which is needed for compiling it. I ask you consider this patch for the trunk and the 3.2 branch.

Secondly, I wonder if it would be possible to apply my patch for FindRSVG.cmake from 22nd November in the 3.2 branch.

In short, the version of librsvg must be equal or higher to 2.35:

PKG_CHECK_MODULES(RSVG librsvg-2.0>=2.35)
"

4 years agoFrom Jordi Torres, "We have a code using gcc with -Wextra flag and using OSG as a...
Robert OSFIELD [Fri, 17 Jan 2014 13:59:29 +0000 (13:59 +0000)]
From Jordi Torres, "We have a code using gcc with -Wextra flag and using OSG as a third party library. It does not compile when importing <osgViewer/Viewer> failing in  EventHandler and GUIEventHandler:

....

GUIEventHandler: In copy constructor 'osgGA::GUIEventHandler::GUIEventHandler(const osgGA::GUIEventHandler&, const osg::CopyOp&)':

/include/osgGA/GUIEventHandler:56:9: error: base class 'class osg::Object' should be explicitly initialized in the copy constructor [-Werror=extra]

It seems the diamond problem:

   A = osg::Object
  / \
 /   \--> Virtual inheritance
B     C
 \   /
  \ /
   D = EventHandler
   |
   |
   E = GUIEventHandler

The most derived class(E)  handles the instantiation of A (osg::Object), but all have to be responsible in case they are the ones instantiated.

In case A is not initialized in the copy constructor of derived classes the default constructor will be called, which seems a bug.

I've added osg::Object to the initalization list of EventHandler and GUIEventHandler copy constructors, because both classes are instantiables.
 "

4 years agoFrom Jordi Torres, "Fixed a typo in ReaderWriterCURL::ReaderWriterCURL() changed...
Robert OSFIELD [Fri, 17 Jan 2014 13:54:14 +0000 (13:54 +0000)]
From Jordi Torres, "Fixed a typo in ReaderWriterCURL::ReaderWriterCURL() changed Psuedo for Pseudo."

4 years agoFixed handling of background colours.
Robert OSFIELD [Fri, 17 Jan 2014 12:40:58 +0000 (12:40 +0000)]
Fixed handling of background colours.

4 years agoRemoved old redundent TexGen usage.
Robert OSFIELD [Thu, 16 Jan 2014 17:26:35 +0000 (17:26 +0000)]
Removed old redundent TexGen usage.

4 years agoAdded hull="hul-filename" property support to <volume> tag that can used thus:
Robert OSFIELD [Thu, 16 Jan 2014 17:17:37 +0000 (17:17 +0000)]
Added hull="hul-filename" property support to <volume> tag that can used thus:

        <layer>
            <volume renderer="MultiPass" hull="cow.osgt.0,-2,-4.trans.50,50,50.scale">CardiacCT</volume>
        </layer>

4 years agoAdded support for controlling the extents of the volume rendering by nesting the...
Robert OSFIELD [Thu, 16 Jan 2014 16:08:43 +0000 (16:08 +0000)]
Added support for controlling the extents of the volume rendering by nesting the hull underneath VolumeTile.  Currently only supported by the new osgVolume::MultipassTechnique

4 years agoFrom Paul Martz, build fix for Windows GL3 build
Robert OSFIELD [Thu, 9 Jan 2014 11:13:09 +0000 (11:13 +0000)]
From Paul Martz, build fix for Windows GL3 build

4 years agoAdded per TileData RTT Camera in prep for rendering backface of volume to a depth...
Robert OSFIELD [Thu, 9 Jan 2014 09:41:43 +0000 (09:41 +0000)]
Added per TileData RTT Camera in prep for rendering backface of volume to a depth texture

4 years agoChanged near/far values to use CullVisitor::value_type and use std::numeric_limits<>.
Robert OSFIELD [Wed, 8 Jan 2014 15:56:43 +0000 (15:56 +0000)]
Changed near/far values to use CullVisitor::value_type and use std::numeric_limits<>.

4 years agoFrom Farshid Lashkari, "I've attached a fix for the Collada loader that prevents...
Robert OSFIELD [Wed, 8 Jan 2014 10:33:00 +0000 (10:33 +0000)]
From Farshid Lashkari, "I've attached a fix for the Collada loader that prevents a crash with some files containing textures. I also converted an OSG_NOTICE to OSG_INFO to be consistent with other log messages within the loader."