5 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.

5 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.

5 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.

5 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.

5 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

5 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

5 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

5 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.

5 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

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

5 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.

5 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

5 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.

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

5 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

5 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."

5 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.

5 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.

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

5 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

5 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:

windows/qt5.2, and

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)

5 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.

5 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."

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

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

5 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:

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

5 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

5 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

5 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

5 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<>.

5 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."

5 years agoRemoved more odd characters
Robert OSFIELD [Wed, 8 Jan 2014 10:31:36 +0000 (10:31 +0000)]
Removed more odd characters

5 years agoRemoved more odd characters
Robert OSFIELD [Wed, 8 Jan 2014 10:28:24 +0000 (10:28 +0000)]
Removed more odd characters

5 years agoRemoved odd characters
Robert OSFIELD [Wed, 8 Jan 2014 10:24:43 +0000 (10:24 +0000)]
Removed odd characters

5 years agoMoved destructor to protected
Robert OSFIELD [Wed, 8 Jan 2014 10:16:39 +0000 (10:16 +0000)]
Moved destructor to protected

5 years agoRefined the GLint64 definitions
Robert OSFIELD [Tue, 7 Jan 2014 19:06:44 +0000 (19:06 +0000)]
Refined the GLint64 definitions

5 years agoRemoved duplicated instances of GLint64EXT declarations
Robert OSFIELD [Tue, 7 Jan 2014 18:32:45 +0000 (18:32 +0000)]
Removed duplicated instances of GLint64EXT declarations

5 years agoRemoved execute properties via svn propdel svn:executable file
Robert OSFIELD [Tue, 7 Jan 2014 16:43:07 +0000 (16:43 +0000)]
Removed execute properties via svn propdel svn:executable file

5 years agoFrom Farshid Lashkari, "I've attached a small change to the DAE writer to support...
Robert OSFIELD [Tue, 7 Jan 2014 16:29:22 +0000 (16:29 +0000)]
From Farshid Lashkari, "I've attached a small change to the DAE writer to support writing out unknown transform types. It will essentially treat it as a matrix transform, using the the local to world matrix value."

5 years agoBumped SO_VERSION number of OpenThreads to avoid conflicts with Debian SO_VERSION...
Robert OSFIELD [Tue, 7 Jan 2014 16:18:05 +0000 (16:18 +0000)]
Bumped SO_VERSION number of OpenThreads to avoid conflicts with Debian SO_VERSION bump

5 years agoFrom Sebastian Messerschmidt, "Original shader was not running on various NVidia...
Robert OSFIELD [Tue, 7 Jan 2014 16:15:50 +0000 (16:15 +0000)]
From Sebastian Messerschmidt, "Original shader was not running on various NVidia cards due to old syntax in shader."

5 years agoAdded State::getMaxTextureCoords() and State::getMaxTextureUnits() inline methods.
Robert OSFIELD [Tue, 7 Jan 2014 11:01:32 +0000 (11:01 +0000)]
Added State::getMaxTextureCoords() and State::getMaxTextureUnits() inline methods.

5 years agoAdded support for Switch::set/getValue()
Robert OSFIELD [Mon, 6 Jan 2014 17:19:21 +0000 (17:19 +0000)]
Added support for Switch::set/getValue()

5 years agoAdded Group::setChild(..) and Geode::setDrawable(..) MethodObjects
Robert OSFIELD [Mon, 6 Jan 2014 16:58:07 +0000 (16:58 +0000)]
Added Group::setChild(..) and Geode::setDrawable(..) MethodObjects

5 years agoRemoved the prototype MethodObject classes
Robert OSFIELD [Mon, 6 Jan 2014 15:46:36 +0000 (15:46 +0000)]
Removed the prototype MethodObject classes

5 years agoMoved osgDB::MethodObject from lua plugin into osgDB, added support for running metho...
Robert OSFIELD [Mon, 6 Jan 2014 15:45:46 +0000 (15:45 +0000)]
Moved osgDB::MethodObject from lua plugin into osgDB, added support for running methods via the osgDB::PropertyInterface class.

Updated lua plugin to use new osgDB::PropertyInterface to run methods.

Added addChild/removeChild() etc to Group.cpp, and addDrawable/removeDrawable() etc. to Geode.cpp serializers.

5 years agoRenamed the OSGSIM cmake variable to OSGSIM_LIBRARY to be consistent with the rest...
Robert OSFIELD [Mon, 6 Jan 2014 10:23:26 +0000 (10:23 +0000)]
Renamed the OSGSIM cmake variable to OSGSIM_LIBRARY to be consistent with the rest of the variables.

5 years agoFixed build of V8 and Python plugins
Robert OSFIELD [Fri, 3 Jan 2014 14:36:58 +0000 (14:36 +0000)]
Fixed build of V8 and Python plugins

5 years agoPreliminary support for wrapping methods in the lua script plugin.
Robert OSFIELD [Wed, 25 Dec 2013 17:36:32 +0000 (17:36 +0000)]
Preliminary support for wrapping methods in the lua script plugin.

5 years agoAdded <switch> tag to .p3d to allow one to provide multiple ways to render children...
Robert OSFIELD [Fri, 20 Dec 2013 09:57:35 +0000 (09:57 +0000)]
Added <switch> tag to .p3d to allow one to provide multiple ways to render children within a layer.

5 years agoFrom Kristofer Tingdahl, "the syntax of the moc executable has changed between 5...
Robert OSFIELD [Thu, 19 Dec 2013 17:13:24 +0000 (17:13 +0000)]
From Kristofer Tingdahl, "the syntax of the moc executable has changed between 5.1.1 and 5.2.0 versions of qt (see below). The difference is that the <file> argument has become mandatory after the -f option.

Hence, moc will complain when osg throws in a -f without anything after it. Hence I propose removing the -f on Qt5 builds. I have tested building without -f on both qt520 and qt511, and that works well.

The attached src/osgQt/CMakeLists.txt that can be patched into 3.2 safely. For the trunk, I would consider dropping the check on the version, and simply remove the option on qt5. I have tested that on qt5.1.1, and that worked fine. Question is however if it works on qt5.0. Probably it does, so the question is simplicity of CMakeList.txt vs safety."

5 years agoFrom Sylvain Marie, When compiling OSG for the iOS simulator, providing both -miphone...
Robert OSFIELD [Thu, 19 Dec 2013 15:10:28 +0000 (15:10 +0000)]
From Sylvain Marie, When compiling OSG for the iOS simulator, providing both -miphoneos-version-min and -mios-simulator-version-min doesn’t please clang (tested on OS X 10.9.0 with Xcode 5.0.1).
Here is a small change (against commit da597ab16945c572a2ad2f4f26fcef38ed21b074) in the CMakeLists.txt to avoid this situation.

5 years agoFrom Michal Durkovic, "I’m building current trunk on Mac OS X 10.9 and have encounter...
Robert OSFIELD [Thu, 19 Dec 2013 13:53:40 +0000 (13:53 +0000)]
From Michal Durkovic, "I’m building current trunk on Mac OS X 10.9 and have encountered this error during linking of osgdb_lua plugin:

Undefined symbols for architecture x86_64:

  "lua::LuaScriptEngine::pushValue(osg::Quat const&) const", referenced from:

      PushStackValueVisitor::apply(osg::Quat const&) in LuaScriptEngine.o

  "lua::LuaScriptEngine::pushValue(osg::Plane const&) const", referenced from:

      PushStackValueVisitor::apply(osg::Plane const&) in LuaScriptEngine.o

ld: symbol(s) not found for architecture x86_64

clang: error: linker command failed with exit code 1 (use -v to see invocation)

Looks like LuaScriptEngine was missing implementation of those 2 member functions. Fixed src/osgPlugins/lua/LuaScriptEngine.cpp file in attachment.


5 years agoFrom Stephan Hunber, "attached you’ll find some changes to osg/p3d:
Robert OSFIELD [Thu, 19 Dec 2013 13:49:27 +0000 (13:49 +0000)]
From Stephan Hunber, "attached you’ll find some changes to osg/p3d:

* a new command-line-option to present3d and a new option to the p3d-plugin to suppress any found <env> tags
* a new command-line-option to present3d to forward mouse-events via osgGA::Device (defaults to off) so we can test the interface-files with present3d better
* I added a new attribute forward_to_devices for click_to_event to forward the event to all attached devices instead of handling the event locally. This will fix the annoyance with the new interface-files when toggling polygon-mode or switching light on/off.

Here’s an example:

<click_to_event forward_to_devices="true">0x72</click_to_event>

5 years agoFrom Stephan Hunber, "I found some time and ported osgDB::FileUtils and DarwinUtils...
Robert OSFIELD [Thu, 19 Dec 2013 13:44:42 +0000 (13:44 +0000)]
From Stephan Hunber, "I found some time and ported osgDB::FileUtils and DarwinUtils across new apis to fix the warnings about deprecated api-usage.

* osgDB::FileUtils uses now the Cocoa-API to determine the paths of the application-support-folder
* DarwinUtils uses now modern functions of the quartz-api to get and set screen-resolutions. Removed some of the osg-deprecated stuff.

5 years agoImplemented support for calling scripts from with Present3D.
Robert OSFIELD [Thu, 19 Dec 2013 10:02:16 +0000 (10:02 +0000)]
Implemented support for calling scripts from with Present3D.

5 years agoAdded support for new osgVolume::MultiPassTechnique to Present3D. To use add propert...
Robert OSFIELD [Tue, 17 Dec 2013 12:18:06 +0000 (12:18 +0000)]
Added support for new osgVolume::MultiPassTechnique to Present3D.  To use add property renderer="MultiPass":

  <volume renderer="MultiPass">MyVolumeData</volume>

5 years agoAdded experimental image 3d downsample function.
Robert OSFIELD [Tue, 17 Dec 2013 10:52:50 +0000 (10:52 +0000)]
Added experimental image 3d downsample function.

5 years agoRemoved the unused Texture::Extensions::numTextureUnits()
Robert OSFIELD [Mon, 16 Dec 2013 11:28:10 +0000 (11:28 +0000)]
Removed the unused Texture::Extensions::numTextureUnits()

5 years agoImplemented ability to switch between different shaders with new MultipassTechnique
Robert OSFIELD [Fri, 13 Dec 2013 12:38:01 +0000 (12:38 +0000)]
Implemented ability to switch between different shaders with new MultipassTechnique

5 years agoAdded SampleRatioWhenMoving property and support to new osgVolume::MultipassTechnique.
Robert OSFIELD [Thu, 12 Dec 2013 09:53:24 +0000 (09:53 +0000)]
Added SampleRatioWhenMoving property and support to new osgVolume::MultipassTechnique.

5 years agoApplied unquie CullVisitor::Identifier rather than reusing the cloned one.
Robert OSFIELD [Thu, 12 Dec 2013 09:51:30 +0000 (09:51 +0000)]
Applied unquie CullVisitor::Identifier rather than reusing the cloned one.

5 years agoChanged epsilon to 1e-5 to address picking problems with planaer objects
Robert OSFIELD [Wed, 11 Dec 2013 17:20:14 +0000 (17:20 +0000)]
Changed epsilon to 1e-5 to address picking problems with planaer objects

5 years agoAdded initial support for 1D transfer functions to MultipassTechnique
Robert OSFIELD [Wed, 11 Dec 2013 12:00:27 +0000 (12:00 +0000)]
Added initial support for 1D transfer functions to MultipassTechnique

5 years agoAdded support for handling viewports with offset origins, and with it split stereo.
Robert OSFIELD [Tue, 10 Dec 2013 13:38:27 +0000 (13:38 +0000)]
Added support for handling viewports with offset origins, and with it split stereo.

5 years agoIntroduced SampleRatioValueProperty for more intuitive control of how many samples...
Robert OSFIELD [Tue, 10 Dec 2013 10:43:48 +0000 (10:43 +0000)]
Introduced SampleRatioValueProperty for more intuitive control of how many samples to take when volume rendering

5 years agoImprovements to new MultipassTechnique
Robert OSFIELD [Mon, 9 Dec 2013 10:39:01 +0000 (10:39 +0000)]
Improvements to new MultipassTechnique

5 years agoFurther work on new MultipassTechnique/VolumeScene.
Robert OSFIELD [Fri, 6 Dec 2013 19:31:12 +0000 (19:31 +0000)]
Further work on new MultipassTechnique/VolumeScene.

5 years agoFrom Mike Krus, compile fix to enable compiling across a wider set of versions.
Robert OSFIELD [Fri, 6 Dec 2013 09:35:57 +0000 (09:35 +0000)]
From Mike Krus, compile fix to enable compiling across a wider set of versions.

5 years agoAdded support for using shaders to render the RTT textures with depth
Robert OSFIELD [Tue, 26 Nov 2013 19:03:46 +0000 (19:03 +0000)]
Added support for using shaders to render the RTT textures with depth

5 years agoReplaced readShaderFile() usage to readRefShaderFile()
Robert OSFIELD [Tue, 26 Nov 2013 10:38:35 +0000 (10:38 +0000)]
Replaced readShaderFile() usage to readRefShaderFile()

5 years agoAdded initial render to texture functionality into osgVolume::VolumeScene
Robert OSFIELD [Mon, 25 Nov 2013 17:36:17 +0000 (17:36 +0000)]
Added initial render to texture functionality into osgVolume::VolumeScene

5 years agoWarning fixes
Robert OSFIELD [Fri, 22 Nov 2013 10:27:15 +0000 (10:27 +0000)]
Warning fixes

5 years agoFrom Kristofer Tingdahl, Build fix for svg plugin that makes sure the version of...
Robert OSFIELD [Fri, 22 Nov 2013 09:48:02 +0000 (09:48 +0000)]
From Kristofer Tingdahl, Build fix for svg plugin that makes sure the version of librsvg is at sufficient, and fixed a missing virtual destructor warning.

5 years agoRemoved trailing spaces, added missing return to last lines
Robert OSFIELD [Fri, 22 Nov 2013 09:38:50 +0000 (09:38 +0000)]
Removed trailing spaces, added missing return to last lines

5 years agoAdded new osgVolume::VolumeScene and osgVolume::MultipassTechnique class shells that...
Robert OSFIELD [Thu, 21 Nov 2013 18:17:44 +0000 (18:17 +0000)]
Added new osgVolume::VolumeScene and osgVolume::MultipassTechnique class shells that will be filled out to provide multi-pass volume rendering that handles mixing of
3D meshes with volume rendering and segmentation of volumes via a user defined hull mesh.

5 years agoFrom Stephan Huber, "CLang / LLVM on OS X seems to have a problem compiling the osgGA...
Robert OSFIELD [Thu, 21 Nov 2013 14:21:55 +0000 (14:21 +0000)]
From Stephan Huber, "CLang / LLVM on OS X seems to have a problem compiling the osgGA-serializer. (It was reported before on the list, but the error is hard to track as it shows up only sometimes)

I fixed the compile-error with a dedicated destructor of osgGA::GUIEventHandler"

5 years agoFrom Farshid Lashkari, " recently encountered an issue attempting to load an IVE...
Robert OSFIELD [Thu, 21 Nov 2013 14:08:01 +0000 (14:08 +0000)]
From Farshid Lashkari, " recently encountered an issue attempting to load an IVE file generated by an older version of OSG. The file contained dxt1 compressed image data with mipmaps. The loaded model would cause crashes when passing the mipmap data to glCompressedTexImage2D. It seems that the size of the data array within the IVE file did not match the computed size from Image::getTotalSizeInBytesIncludingMipmaps(). This essentially made the mipmap offsets invalid within the Image object.

I'm not sure if the IVE was simply generated incorrectly, or if the Image::getTotalSizeInBytesIncludingMipmaps() was modified since the file was generated. Either way, I added a simple check in the IVE loader so that it clears the mipmap offsets if the actual data size does not match the computed data size. This seems like a safe fallback since the mipmap data can be automatically generated, and it fixes the problem in my case.

Also, while looking into this issue, I noticed that the osgDB::InputStream class applies the serialized image allocation mode. However, since the serializer is allocating the image data itself, it seems like it should force the allocation mode to USE_NEW_DELETE.

5 years agoFrom Farshid Lashkari, "I recently encountered an issue attempting to load an IVE...
Robert OSFIELD [Thu, 21 Nov 2013 13:59:00 +0000 (13:59 +0000)]
From Farshid Lashkari, "I recently encountered an issue attempting to load an IVE file generated by an older version of OSG. The file contained dxt1 compressed image data with mipmaps. The loaded model would cause crashes when passing the mipmap data to glCompressedTexImage2D. It seems that the size of the data array within the IVE file did not match the computed size from Image::getTotalSizeInBytesIncludingMipmaps(). This essentially made the mipmap offsets invalid within the Image object.

I'm not sure if the IVE was simply generated incorrectly, or if the Image::getTotalSizeInBytesIncludingMipmaps() was modified since the file was generated. Either way, I added a simple check in the IVE loader so that it clears the mipmap offsets if the actual data size does not match the computed data size. This seems like a safe fallback since the mipmap data can be automatically generated, and it fixes the problem in my case.

Also, while looking into this issue, I noticed that the osgDB::InputStream class applies the serialized image allocation mode. However, since the serializer is allocating the image data itself, it seems like it should force the allocation mode to USE_NEW_DELETE.

5 years agoConverted std::max to osg::maximum to fix VS2013 build error
Robert OSFIELD [Thu, 21 Nov 2013 11:02:08 +0000 (11:02 +0000)]
Converted std::max to osg::maximum to fix VS2013 build error

5 years agoAdded Geometry::drawVertexArraysomplemetation(..) and drawPrimitivesImplemenation...
Robert OSFIELD [Thu, 21 Nov 2013 10:31:34 +0000 (10:31 +0000)]
Added Geometry::drawVertexArraysomplemetation(..) and drawPrimitivesImplemenation(..) methods that are called from drawImplementation(..).  These new vertex methods
allow subclasses from osg::Geometry to specialize the vertex array setup or how the primitives are dispatched to OpenGL.

5 years agoFrom Stephan Huber, "minor ios-fixes/-enhancements
Robert OSFIELD [Mon, 18 Nov 2013 14:21:06 +0000 (14:21 +0000)]
From Stephan Huber, "minor ios-fixes/-enhancements

* force _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC for IOS device + simulator as the test does not pick the right implementation
* fixed a small compile-bug for iphone-example
* added a check to prevent multiple realization of a GraphicsWindowIOS-object

5 years agoFrom Stephan Huber, compile fix for OpenGL ES on iOS.
Robert OSFIELD [Mon, 18 Nov 2013 13:31:44 +0000 (13:31 +0000)]
From Stephan Huber, compile fix for OpenGL ES on iOS.

5 years agoFrom Stephan Huber, * GUIEventAdapter: add support for getting normalized touch points
Robert OSFIELD [Mon, 18 Nov 2013 13:25:55 +0000 (13:25 +0000)]
From Stephan Huber, * GUIEventAdapter: add support for getting normalized touch points
* MultiTouchTrackball: some code cleanup and support for normalized touch-points
* oscdevice: receiving and sending multi-touch-events via the Cursor2D-profile from TUIO
* added some documentation

5 years agoAdded panning and zooming functionality to transfer function UI prototype code.
Robert OSFIELD [Mon, 18 Nov 2013 12:46:00 +0000 (12:46 +0000)]
Added panning and zooming functionality to transfer function UI prototype code.

5 years agoAdded BoundingBox::contains(const vec_type& v, value_type epsilon) method with new...
Robert OSFIELD [Mon, 18 Nov 2013 12:45:04 +0000 (12:45 +0000)]
Added BoundingBox::contains(const vec_type& v, value_type epsilon) method with new epsilon parameter to make it easier to test for containment in the presence of numerical errors

5 years agoMoved Handled propety from GUIEventAdapter to Event base class.
Robert OSFIELD [Fri, 15 Nov 2013 16:15:09 +0000 (16:15 +0000)]
Moved Handled propety from GUIEventAdapter to Event base class.

Added CameraManipulator::finishAnimation() method to allow application code to stop any animation/throw of manipulators.

5 years agoRestored the rescaleToZeroToOneRange() to address rendering issues.
Robert OSFIELD [Tue, 12 Nov 2013 14:21:00 +0000 (14:21 +0000)]
Restored the rescaleToZeroToOneRange() to address rendering issues.

5 years agoRemoved unused variables
Robert OSFIELD [Mon, 11 Nov 2013 10:55:51 +0000 (10:55 +0000)]
Removed unused variables

5 years agoFrom Stepan Huber, "attached are my changes for the osc, zeroconf and resthttp-plugin...
Robert OSFIELD [Fri, 8 Nov 2013 12:28:51 +0000 (12:28 +0000)]
From Stepan Huber, "attached are my changes for the osc, zeroconf and resthttp-plugin to use the new event-class. I refactored the osgoscdevice-example so that it’s working again. "

5 years agoAdded support for assinging and display transfer functions
Robert OSFIELD [Fri, 8 Nov 2013 12:26:14 +0000 (12:26 +0000)]
Added support for assinging and display transfer functions

5 years agoQuietened down debug messages
Robert OSFIELD [Fri, 8 Nov 2013 12:25:35 +0000 (12:25 +0000)]
Quietened down debug messages

5 years agoChanged the LineSegmentIntersector to RayIntersector to provide more reliable interse...
Robert OSFIELD [Thu, 7 Nov 2013 12:37:10 +0000 (12:37 +0000)]
Changed the LineSegmentIntersector to RayIntersector to provide more reliable intersections with flat meshes.

5 years agoAdded osgUtil::Intersector::PrecisionHint member and set it's default to USE_DOUBLE_C...
Robert OSFIELD [Thu, 7 Nov 2013 12:35:34 +0000 (12:35 +0000)]
Added osgUtil::Intersector::PrecisionHint member and set it's default to USE_DOUBLE_COMPUTATIONS, and implemented support for use double or float maths internally in LineSegmentIntersector and RayIntersector classes

5 years agoRe-enabled the disable of the transfer function
Robert OSFIELD [Wed, 6 Nov 2013 09:50:16 +0000 (09:50 +0000)]
Re-enabled the disable of the transfer function

5 years agoFixed handling of web cams
Robert OSFIELD [Wed, 6 Nov 2013 09:49:51 +0000 (09:49 +0000)]
Fixed handling of web cams

5 years agoIntroduced a cast(T) method into the ImageUtils template functor to allow code readin...
Robert OSFIELD [Wed, 6 Nov 2013 09:23:21 +0000 (09:23 +0000)]
Introduced a cast(T) method into the ImageUtils template functor to allow code reading images to handle casting from source data to a form that a user can use more conviently

5 years agoRestructed the call to avformat_open_input to provide more information.
Robert OSFIELD [Wed, 6 Nov 2013 09:20:35 +0000 (09:20 +0000)]
Restructed the call to avformat_open_input to provide more information.

5 years agoFixed typo
Robert OSFIELD [Tue, 5 Nov 2013 15:23:32 +0000 (15:23 +0000)]
Fixed typo

5 years agoFrom Stephan Huber, "Build Problem with osgGA at MacOS with Xcode 5"..."attached...
Robert OSFIELD [Fri, 1 Nov 2013 14:40:50 +0000 (14:40 +0000)]
From Stephan Huber, "Build Problem with osgGA at MacOS with Xcode 5"..."attached you'll find a possible solution for the issue. This will add a new option to cmake called OSG_CXX_LANGUAGE_STANDARD which defaults to C++11. If you set it to C++98 it will setup the project accordingly."