Robert Osfield
ed4deeb0fb
From Mike Krus, compile fix to enable compiling across a wider set of versions.
2013-12-06 09:35:57 +00:00
Robert Osfield
1b3290221c
Added support for using shaders to render the RTT textures with depth
2013-11-26 19:03:46 +00:00
Robert Osfield
477951b924
Replaced readShaderFile() usage to readRefShaderFile()
2013-11-26 10:38:35 +00:00
Robert Osfield
4fcf8d3e86
Added initial render to texture functionality into osgVolume::VolumeScene
2013-11-25 17:36:17 +00:00
Robert Osfield
f02ed3c629
Warning fixes
2013-11-22 10:27:15 +00:00
Robert Osfield
d3a7115c45
Removed trailing spaces, added missing return to last lines
2013-11-22 09:38:50 +00:00
Robert Osfield
5bea13c172
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.
2013-11-21 18:17:44 +00:00
Robert Osfield
1b269a7711
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"
2013-11-21 14:21:55 +00:00
Robert Osfield
a5d78953d4
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.
"
2013-11-21 13:59:00 +00:00
Robert Osfield
1e2bead9bc
Converted std::max to osg::maximum to fix VS2013 build error
2013-11-21 11:02:08 +00:00
Robert Osfield
a54b999ccc
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.
2013-11-21 10:31:34 +00:00
Robert Osfield
dbf88cc209
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
"
2013-11-18 14:21:06 +00:00
Robert Osfield
e0d3ab4412
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
2013-11-18 13:25:55 +00:00
Robert Osfield
c194e92df8
Moved Handled propety from GUIEventAdapter to Event base class.
...
Added CameraManipulator::finishAnimation() method to allow application code to stop any animation/throw of manipulators.
2013-11-15 16:15:09 +00:00
Robert Osfield
835d9455a9
Restored the rescaleToZeroToOneRange() to address rendering issues.
2013-11-12 14:21:00 +00:00
Robert Osfield
eede49d15c
Removed unused variables
2013-11-11 10:55:51 +00:00
Robert Osfield
829cd9718a
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. "
2013-11-08 12:28:51 +00:00
Robert Osfield
25b8b8bd16
Quietened down debug messages
2013-11-08 12:25:35 +00:00
Robert Osfield
70c78264dc
Changed the LineSegmentIntersector to RayIntersector to provide more reliable intersections with flat meshes.
2013-11-07 12:37:10 +00:00
Robert Osfield
7a2900e238
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
2013-11-07 12:35:34 +00:00
Robert Osfield
2ebe81cb0e
Fixed handling of web cams
2013-11-06 09:49:51 +00:00
Robert Osfield
6f6c44446c
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
2013-11-06 09:23:21 +00:00
Robert Osfield
ef3a65b93f
Restructed the call to avformat_open_input to provide more information.
2013-11-06 09:20:35 +00:00
Robert Osfield
2b3665f010
Fixed typo
2013-11-05 15:23:32 +00:00
Robert Osfield
ff8fe4143e
From Likasz Izebski, "added support for etc2/eac compression"
2013-10-28 12:03:55 +00:00
Robert Osfield
ac383e15c1
Added explict setting of the PolygonMode to over the distion mesh being toggled to wireframe.
2013-10-25 15:47:41 +00:00
Robert Osfield
4a660f6266
Introduce new osgGA::Event and osgGA::EventHandler base classes that the old GUIEventAdapter and GUIEventHandler now subclass from.
...
The new osgGA::Event is written to support more generic events than the original GUIEventAdapter which are written for keyboard and mouse events.
2013-10-25 14:54:15 +00:00
Robert Osfield
191eabd3ab
Fixed warning
2013-10-25 09:02:39 +00:00
Robert Osfield
b3603f76e4
Removed depreated glib call
2013-10-24 19:56:04 +00:00
Robert Osfield
95e8d2838c
Fixed FileInfo self intialization bug
2013-10-24 19:32:00 +00:00
Robert Osfield
1861e025e9
Fixed build problems with the OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION off
2013-10-24 17:43:02 +00:00
Robert Osfield
37fa2d698f
From Stephan Huber, add support for controlling the OSXMenubarBehavior set by DisplaySettings.
2013-10-24 10:10:16 +00:00
Robert Osfield
234adf7daf
Cleaned up addChild/getChild/setChild/getNumChildren methods and added readNodeFile, readImageFile and readObjectFile functions
2013-10-24 09:06:52 +00:00
Robert Osfield
f548bc79d4
Added support for Group::addChild/setChild/getChild/getNumChildren.
2013-10-23 16:17:26 +00:00
Robert Osfield
c45f3aa4fb
Merged changes to DisplaySettings from Stephan Huber in prep for controlling the menu hiding behaviour under OSX.
...
Added new WindowSystemInterface::setDisplaySettings() method to provide a mechanism for passing settings onto the WindowSystemInterface so it can then set up the system appropriately.
Added assignment of the DisplaySettings to the WindowSystemInterface in Viewer/ComppsiteViewer::realize().
2013-10-22 19:12:34 +00:00
Robert Osfield
b7b7186cf8
Preliminary remapping of internalFormat for GL3 core profile
2013-10-22 18:58:15 +00:00
Robert Osfield
3dba54c10a
Fixed warnings
2013-10-22 16:28:20 +00:00
Robert Osfield
1196f153fc
From Colin McDonald, "The osgt/osgb file formats output a scenegraph node with the type
...
set to "SCENE" in the file header. But if the file is stored and
then extracted again from an osga archive this header info is lost,
and the resulting file is just an "OBJECT". Possibly other plugin
operations would have the same effect. The osgt/osgb plugin won't
then return the scenegraph contents.
I have updated the osgt/osgb plugin to return a node from an "OBJECT"
file."
2013-10-22 11:32:21 +00:00
Robert Osfield
c34a8e4ddb
From Colin McDonald, "The osgb file reader uses seek to position within the file.
...
But the nested stream implementation for osga archive files doesn't
support seeking. So osgb files can't currently be used in an osga
archive e.g. if osgdem is used to output a osgb format database it
can't be packaged in an archive file, in the same manner that ive
files could.
I've added seek support to the osga nested stream implementation."
2013-10-22 11:26:45 +00:00
Robert Osfield
5ed399ca48
Fixed handling of osg::Program so that it's not overriden by shader composition when enabled
2013-10-22 11:18:28 +00:00
Robert Osfield
4493d11ca3
Added State::releaseGLObjects() and ShaderComposer::releaseGLObjects() to avoid problems with cleanup of graphics context
2013-10-21 16:35:12 +00:00
Robert Osfield
074eb8e41c
Build fixes for clang
2013-10-21 09:54:41 +00:00
Robert Osfield
a68f0f26a8
From Farshid Lashkari, "previously discussed change to the dae loader which applies the node ID as a "dae_node_id" user value."
2013-10-18 09:57:49 +00:00
Robert Osfield
5bfb2ef26d
From Konstantin Matveyev, "Multiple light fix in FBX-importer"
2013-10-18 07:55:26 +00:00
Robert Osfield
bddeecdbee
From Colin McDonald, "Some missing updates to the serializer static build support."
2013-10-18 07:52:18 +00:00
Robert Osfield
49625a1baf
From Andreas Henne, "in my application I use the TrackballDragger, the ScaleAxisDragger and the TranslateAxisDragger. Unfortunately these draggers are very thin and they do not provide methods to change their visual appearance. Another problem that I noticed is that lighting on the cones and boxes of the TranslateAxisDragger and ScaleAxisDragger is incorrect when the draggers are scaled due to not normalized normals. This small patch adresses these problems, providing methods to make the draggers thicker. I have attached a zip archive containing the corresponding files and also a modified osgManipulator example that makes use of the modifications. I don't want to retain any copyright."
2013-10-18 07:31:22 +00:00
Robert Osfield
a97e092619
Fix for error in getting the uniform block max name length, fix suggested by Christopher Fennell.
2013-10-17 18:29:39 +00:00
Robert Osfield
eb7c2ae3f7
Added set/get to the ImageSerializer and removed some redudent comments
2013-10-10 20:43:03 +00:00
Robert Osfield
cd86995d7d
From Pjotr Svetachov, "With the new osg::Geometry the binding for arrays now default to undefined. This breaks previously working code in osgAnimation::RigTransformHardware where the arrays got an undefined bounding and because of this the bone indices and weights were not loaded by the shader. Here is a little patch to fix this."
2013-10-10 20:42:24 +00:00
Robert Osfield
4e4d2b35cf
Added get/set method to Serializer to allow pointer passing without going through InputStream/OutputStream.
2013-10-10 09:28:26 +00:00
