Robert Osfield 99fd6ed93a From Neil Groves, "Frequently I would like code that has a signature like: void foo(osg::ref_ptr<osg::Node> node) to work for osg::ref_ptr<osg::Group>, osg::ref_ptr<osg::Geode> etc. The behaviour of osg::ref_ptr does not mimic the behaviour of a raw pointer in this regard. ...

To facilitate this possibility I have added a template copy constructor and a template assignment operator. These work for safe conversions like those in my previous example, but fail as desired for non-safe conversions since the template instantiation fails during the raw pointer copy/assignment.

The lack of this facility has appreciably handicapped development of generic algorithms applied to the scene graph, and I believe that this alteration will be welcomed by most of the community. If there are issues with antiquated compilers not supporting template member functions then perhaps a small piece of conditional compilation is in order.

I have made the change using the latest release version (2.6) as the base. The full file is attached.

I have not tested building the osg wrappers and the script binding code. I have tested the legal and illegal conversions of both copying and assignment to ensure that behave as expected on MSVC7.1, MSVC8, MSVC9, GCC 4.3."

2008-10-03 09:55:20 +00:00

..

AlphaFunc

From Mike Wittman, " noticed that some type references of osg::Drawable::AttributeFunctor, osg::Drawable::ConstAttributeFunctor, and osg::StateAttribute::ModeUsage in osg and osgSim were not being properly reflected in osgIntrospection. This appears to be due to Doxygen not handling nested types from superclasses if they're not qualified when referenced in subclasses.

2007-03-05 17:34:36 +00:00

AnimationPath

From Alan Dickinson, change methods to virtual.

2008-09-18 13:54:13 +00:00

ApplicationUsage

From Eric Sokolowski and Robert Osfield, moved command line option usage setup

2008-05-12 10:55:55 +00:00

ArgumentParser

From Eric Sokolowski and Robert Osfield, moved command line option usage setup

2008-05-12 10:55:55 +00:00

Array

From Neil Groves,

2008-06-19 20:38:38 +00:00

AutoTransform

Converted AutoTransform to use doubles.

2008-08-28 09:43:00 +00:00

Billboard

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

BlendColor

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

BlendEquation

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

BlendFunc

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

BoundingBox

From Mathias Froehlich, moved optional config variables into include/osg/Config file that

2008-06-20 15:50:53 +00:00

BoundingSphere

From Mathias Froehlich, moved optional config variables into include/osg/Config file that

2008-06-20 15:50:53 +00:00

BoundsChecking

Updated copyright years.

2006-07-18 15:21:48 +00:00

buffered_value

Added Object::resizeGLObjectBuffers(uint) method to help improve the ability

2007-01-04 14:11:51 +00:00

BufferObject

Added #define's for PixelBufferObject extensions.

2008-05-24 11:05:10 +00:00

Camera

From Erik van Dekker,

2008-08-18 11:00:40 +00:00

CameraNode

Renamed osg::CameraNode to osg::Camera, cleaned up osg::View.

2006-11-27 14:52:07 +00:00

CameraView

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

ClampColor

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

ClearNode

Updated copyright years.

2006-07-18 15:21:48 +00:00

ClipNode

From Roland Smeenk, "ClipNode contains a method getClipPlaneList that should actually be called setClipPlaneList."

2007-02-16 15:17:43 +00:00

ClipPlane

Moved the setting of _clipPlaneNum from the {} body to the intializer list to

2008-01-18 21:01:18 +00:00

ClusterCullingCallback

Removed the using to avoid VS 7.1 build problem

2007-03-29 15:41:59 +00:00

CollectOccludersVisitor

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

ColorMask

Updated copyright years.

2006-07-18 15:21:48 +00:00

ColorMatrix

Updated copyright years.

2006-07-18 15:21:48 +00:00

ComputeBoundsVisitor

Added new osg::ComputeBoundsVisitor

2007-02-16 17:34:34 +00:00

ConvexPlanarOccluder

Removed inappropriate comment about normal orientation.

2007-01-05 09:55:04 +00:00

ConvexPlanarPolygon

Removed inappropriate comment about normal orientation.

2007-01-05 09:55:04 +00:00

CoordinateSystemNode

Added docs explaining units

2008-04-14 10:38:37 +00:00

CopyOp

From Bob Kuehne, "he attached are conversions of the 3 main places i found in osg where tokens are used to represent bitmasks with 'magic' numbers, like 32. i've changed these to a more representative bitshift representation, showing clearly in which bit you can expect this token to manifest. ie, converted things like:

2008-04-16 15:23:12 +00:00

CullFace

From Mike Wittman, " noticed that some type references of osg::Drawable::AttributeFunctor, osg::Drawable::ConstAttributeFunctor, and osg::StateAttribute::ModeUsage in osg and osgSim were not being properly reflected in osgIntrospection. This appears to be due to Doxygen not handling nested types from superclasses if they're not qualified when referenced in subclasses.

2007-03-05 17:34:36 +00:00

CullingSet

Updated copyright years.

2006-07-18 15:21:48 +00:00

CullSettings

From Mathias Froehlich, build fixes for various unices

2008-06-26 12:08:37 +00:00

CullStack

Updated wrappers

2007-08-10 17:44:54 +00:00

DeleteHandler

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Depth

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

DisplaySettings

From Galen Faidley," Please find attached the modifications to get the new checkerboard

2007-08-23 14:31:23 +00:00

Drawable

Improved the constness of parameters the Node::getWorldMatrices(..) method.

2008-09-18 10:38:18 +00:00

DrawPixels

Fixed parameter name

2007-05-14 16:16:22 +00:00

Endian

Simplified swap bytes code to make it more efficient.

2006-08-24 20:15:32 +00:00

Export

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

fast_back_stack

Updated copyright years.

2006-07-18 15:21:48 +00:00

Fog

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

FragmentProgram

Introduced new osg::discardDeletedOpenGLObjects() methods, and usage of it in

2008-01-08 13:24:29 +00:00

FrameBufferObject

From Philip Lowman, workaround of Centos 5's missing definition of GL_MAX_SAMPLES_EXT.

2008-08-04 14:01:42 +00:00

FrameStamp

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

FrontFace

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Geode

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Geometry

Introduced Geometry::containsSharedArrays() and Geometry::duplicateSharedArrays() to

2008-09-14 10:31:27 +00:00

GL

From Andy Skinner, warning fix for Windows 64-bit build

2007-04-03 19:42:43 +00:00

GL2Extensions

Removed non standard and redundent /*EOF*/

2008-01-08 14:38:58 +00:00

GLExtensions

From Sherman Wilcox, "Minor change to bool setGLExtensionFuncPtr(T& t, const char* str1) and

2008-08-04 17:08:28 +00:00

GLObjects

Introduced new osg::discardDeletedOpenGLObjects() methods, and usage of it in

2008-01-08 13:24:29 +00:00

GLU

Added GLU_TESS_CALLBACK_TRIPLEDOT path into include/osg/GLU and enabled this

2007-10-03 20:21:01 +00:00

GraphicsContext

Added support for X11's overrideRedirect functionality

2008-06-21 17:50:58 +00:00

GraphicsThread

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Group

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Hint

From Mathias Froehlich, fixed typo

2008-05-12 10:16:40 +00:00

Image

Added osg::Image::set/getWriteHint() that allows images themselves to control how

2008-09-10 11:26:30 +00:00

ImageSequence

Changed osg::ImageSequence::set/getDuration to set/getLength() to be in keeping with the

2008-08-15 16:21:44 +00:00

ImageStream

Further work on osg::ImageSequence, improving pause functionality, and introducing new seek(double time) method

2008-08-15 12:45:20 +00:00

io_utils

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

KdTree

Changed int's to unsigned int's to avoid warnings

2008-07-16 13:26:06 +00:00

Light

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

LightModel

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

LightSource

Added setThreadSafeRefUnref to LightSource

2007-01-07 10:00:50 +00:00

LineSegment

Added double versions of intersect methods

2008-03-13 16:05:40 +00:00

LineStipple

Added extra constructors

2008-03-12 20:15:45 +00:00

LineWidth

Renamed SG_LIBRARY and SG_EXPORT macro's to OSG_LIBRARY and OSG_EXPORT

2005-04-11 17:14:17 +00:00

LOD

Introduced CMake build option for compiling double or float versions of osg::BoundingSphere and osg::BoundingBox.

2008-04-03 18:36:50 +00:00

LogicOp

From Mike Wittman, " noticed that some type references of osg::Drawable::AttributeFunctor, osg::Drawable::ConstAttributeFunctor, and osg::StateAttribute::ModeUsage in osg and osgSim were not being properly reflected in osgIntrospection. This appears to be due to Doxygen not handling nested types from superclasses if they're not qualified when referenced in subclasses.

2007-03-05 17:34:36 +00:00

Material

From Mike Wittman, " noticed that some type references of osg::Drawable::AttributeFunctor, osg::Drawable::ConstAttributeFunctor, and osg::StateAttribute::ModeUsage in osg and osgSim were not being properly reflected in osgIntrospection. This appears to be due to Doxygen not handling nested types from superclasses if they're not qualified when referenced in subclasses.

2007-03-05 17:34:36 +00:00

Math

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Matrix

From Mathias Froehlich, moved optional config variables into include/osg/Config file that

2008-06-20 15:50:53 +00:00

Matrixd

From Mathias Froehlich, "This is a generic optimization that does not depend on any cpu or instruction

2008-09-17 16:14:28 +00:00

Matrixf

From Mathias Froehlich, "This is a generic optimization that does not depend on any cpu or instruction

2008-09-17 16:14:28 +00:00

MatrixTransform

Updated copyright years.

2006-07-18 15:21:48 +00:00

MixinVector

Simplified the MixinVector class so that it no longer supports custom allocators,

2008-06-27 12:44:41 +00:00

Multisample

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Node

Improved the constness of parameters the Node::getWorldMatrices(..) method.

2008-09-18 10:38:18 +00:00

NodeCallback

From Paul Martz, "minor code comment cleaup/rewording"

2006-12-19 17:16:14 +00:00

NodeTrackerCallback

Fixed typo

2007-07-11 16:06:04 +00:00

NodeVisitor

Updated wrappers, and further refined the ImageSequence API

2008-07-25 16:11:51 +00:00

Notify

Updated copyright years.

2006-07-18 15:21:48 +00:00

Object

Changed the macro usage so that the quotes are now added inside the .cpp

2008-09-22 13:16:29 +00:00

observer_ptr

Changed the const get(), operator*() and operator->() methods to return non const T versions

2008-03-14 11:06:35 +00:00

OccluderNode

Updated copyright years.

2006-07-18 15:21:48 +00:00

OcclusionQueryNode

From Paul Martz, fixed get/set methods API

2008-02-27 11:43:58 +00:00

OperationThread

Added getNumOperationsInQueue() method

2008-01-18 09:17:32 +00:00

PagedLOD

From Maceij Krol, "I have implement frame based expiration of PagedLOD children.

2008-08-17 16:52:35 +00:00

Plane

From Mathias Froehlich, moved optional config variables into include/osg/Config file that

2008-06-20 15:50:53 +00:00

Point

Added extra constructors

2008-03-12 20:15:45 +00:00

PointSprite

From Mike Wittman, " noticed that some type references of osg::Drawable::AttributeFunctor, osg::Drawable::ConstAttributeFunctor, and osg::StateAttribute::ModeUsage in osg and osgSim were not being properly reflected in osgIntrospection. This appears to be due to Doxygen not handling nested types from superclasses if they're not qualified when referenced in subclasses.

2007-03-05 17:34:36 +00:00

PolygonMode

Fixed unitialized variable

2008-07-23 15:42:02 +00:00

PolygonOffset

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

PolygonStipple

Added extra constructors

2008-03-12 20:15:45 +00:00

Polytope

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

PositionAttitudeTransform

Updated copyright years.

2006-07-18 15:21:48 +00:00

PrimitiveSet

From Neil Groves,

2008-06-19 20:38:38 +00:00

Program

In Program::PerContextProgram changed const Uniform* to osg::ref_ptr<const Uniform*> to avoid the possibility of a uniform being deleted

2008-06-19 11:58:34 +00:00

Projection

Updated copyright years.

2006-07-18 15:21:48 +00:00

ProxyNode

Refactored DatabasePager and related classes to introduce support for

2008-05-21 21:09:45 +00:00

Quat

Updated copyright years.

2006-07-18 15:21:48 +00:00

ref_ptr

From Neil Groves, "Frequently I would like code that has a signature like: void foo(osg::ref_ptr<osg::Node> node) to work for osg::ref_ptr<osg::Group>, osg::ref_ptr<osg::Geode> etc. The behaviour of osg::ref_ptr does not mimic the behaviour of a raw pointer in this regard.

2008-10-03 09:55:20 +00:00

Referenced

From Mathias Froechlich, "Attached is a change to that atomic stuff to move the win32, msvc

2008-06-26 10:27:16 +00:00

RenderInfo

Added Camera::g/setIntialDrawCallback and g/setFinalDrawCallback(), and added

2008-02-29 15:25:57 +00:00

Scissor

From Mike Wittman, " noticed that some type references of osg::Drawable::AttributeFunctor, osg::Drawable::ConstAttributeFunctor, and osg::StateAttribute::ModeUsage in osg and osgSim were not being properly reflected in osgIntrospection. This appears to be due to Doxygen not handling nested types from superclasses if they're not qualified when referenced in subclasses.

2007-03-05 17:34:36 +00:00

Sequence

From Jason Daly, "I'm still having a problem with SWING animations on sequences. Here's

2007-12-24 14:45:31 +00:00

ShadeModel

Set default ShadeModel back to SMOOTH

2007-04-05 20:27:02 +00:00

Shader

From Art Trevs, add support for saving external shader files.

2008-03-04 14:04:48 +00:00

ShadowVolumeOccluder

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Shape

Simplified the MixinVector class so that it no longer supports custom allocators,

2008-06-27 12:44:41 +00:00

ShapeDrawable

Removed todo entry

2008-08-18 10:47:43 +00:00

State

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

StateAttribute

Added support for ImageSequence to all Texture classes

2008-07-22 12:28:46 +00:00

StateSet

From Michael Platings and Robert Osfield, added support for controlling,

2008-06-19 11:09:20 +00:00

Stats

Removed inappropriate Stats:: prefix

2007-02-15 10:25:11 +00:00

Stencil

From Mike Wittman, " noticed that some type references of osg::Drawable::AttributeFunctor, osg::Drawable::ConstAttributeFunctor, and osg::StateAttribute::ModeUsage in osg and osgSim were not being properly reflected in osgIntrospection. This appears to be due to Doxygen not handling nested types from superclasses if they're not qualified when referenced in subclasses.

2007-03-05 17:34:36 +00:00

StencilTwoSided

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Switch

Updated copyright years.

2006-07-18 15:21:48 +00:00

TemplatePrimitiveFunctor

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

TexEnv

Updated copyright years.

2006-07-18 15:21:48 +00:00

TexEnvCombine

From Paul Melis, fixes to spelling mistakes/typos.

2007-07-11 15:51:17 +00:00

TexEnvFilter

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

TexGen

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

TexGenNode

Added support for setThreadSafeRefUnref into TexGenNode

2007-01-11 10:35:03 +00:00

TexMat

From Farshid Lashkari, Added missing initialization of the _scaleByTextureRectangleSize

2006-11-22 20:39:44 +00:00

Texture

Added support for ImageSequence to all Texture classes

2008-07-22 12:28:46 +00:00

Texture1D

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Texture2D

Removed the mutable from the _image variable

2008-04-23 20:49:19 +00:00

Texture2DArray

From Art Tevs, "I've attached a patch for the Texture2DArray which solves problems of loading image data into the texture array. So here are a small description:

2008-05-26 21:53:57 +00:00

Texture3D

Build fixes for Windows

2008-09-01 09:57:35 +00:00

TextureCubeMap

From Art Trevs, "Features of the patch are:

2007-09-11 12:04:58 +00:00

TextureRectangle

Removed the mutable from the _image variable

2008-04-23 20:49:19 +00:00

Timer

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

TransferFunction

Removed unused methods

2008-09-25 15:19:42 +00:00

Transform

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

TriangleFunctor

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

TriangleIndexFunctor

Added support for new double Vec*Array classes in various functors.

2007-12-04 14:46:46 +00:00

Uniform

Removed non standard and redundent /*EOF*/

2008-01-08 14:38:58 +00:00

Vec2

Updated copyright years.

2006-07-18 15:21:48 +00:00

Vec2b

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Vec2d

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Vec2f

Updated copyright years.

2006-07-18 15:21:48 +00:00

Vec2s

From David Cullu, added various mathematical operators

2007-12-17 17:43:57 +00:00

Vec3

Updated copyright years.

2006-07-18 15:21:48 +00:00

Vec3b

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Vec3d

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Vec3f

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Vec3s

From David Cullu, added various mathematical operators

2007-12-17 17:43:57 +00:00

Vec4

Updated copyright years.

2006-07-18 15:21:48 +00:00

Vec4b

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Vec4d

Introduced CMake build option for compiling double or float versions of osg::BoundingSphere and osg::BoundingBox.

2008-04-03 18:36:50 +00:00

Vec4f

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Vec4s

From David Cullu, added various mathematical operators

2007-12-17 17:43:57 +00:00

Vec4ub

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00

Version

Updated version numbers in prep for up comming dev release

2008-09-11 16:11:51 +00:00

VertexProgram

Introduced new osg::discardDeletedOpenGLObjects() methods, and usage of it in

2008-01-08 13:24:29 +00:00

View

From Ulrich Hertlein, "attached are some minor tweaks:

2008-07-17 13:51:14 +00:00

Viewport

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

2007-12-10 17:30:18 +00:00