Robert Osfield e3f0876e87 From Konstantin Matveyev, "I've changed osg::Uniform::Callback to osg::UniformCallback. ...

osg::UniformCallback inherits osg::Callback now.

I don't really now if this class should be inside osgWrappers/serializers
because StateAttributeCallback is not presented there, but i've included it in the patch.


Please see archive in the attachment.


PS
DEEP_COPY_UNIFORMS works for me.
"
Note from Robert Osfield, added typedef UniformCallback Callback for backwards compatibility.



git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14885 16af8721-9629-0410-8352-f15c8da7e697

2015-06-02 09:33:22 +00:00

..

glu

From Farshid Lashkari, "I've attached a fix for some internal glu functions so that they use size_t for computing allocation sizes instead of GLint. I encountered some large images that were triggering integer overflows with the current code."

2015-02-13 07:45:49 +00:00

AlphaFunc.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

AnimationPath.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

ApplicationUsage.cpp

Added an OSG_INIT_SINGLETON_PROXY to make sure that the ApplicationUsage singleton gets intialized before usage.

2014-06-27 15:38:52 +00:00

ArgumentParser.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Array.cpp

From Pjotr Svetachov, "In a submission on June 27th a lot of new array types were added. This modified the osg::Array::Type enum. Because of this s_ArrayNames array in Array.cpp is now not in sync. This can lead to corrupt exports or crashes when writing .osg files because the change added new types in the middle of the enum instead of at the end.

2013-07-01 16:15:25 +00:00

ArrayDispatchers.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

AudioStream.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

AutoTransform.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Billboard.cpp

Refactor osg::Geode to subclass from osg::Group and reuse the NodeList children container

2014-06-03 09:23:24 +00:00

BlendColor.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

BlendEquation.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

BlendEquationi.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

BlendFunc.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

BlendFunci.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

BufferIndexBinding.cpp

From Marcus Hein, Added support for OpenGL SSBO and SSBB via osg::ShaderStorageBufferObject and osg::ShaderStorageBufferBinding to core OSG library, and added new osgSSBO example

2014-12-10 12:23:04 +00:00

BufferObject.cpp

From Jannik Heller, typo fixes

2015-06-01 13:11:49 +00:00

Callback.cpp

From Konstantin Matveyev, "I've changed osg::Uniform::Callback to osg::UniformCallback.

2015-06-02 09:33:22 +00:00

Camera.cpp

Introduced osg::Camera::resize(..) method and associated enum thus:

2015-03-31 16:23:43 +00:00

CameraView.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Capability.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

ClampColor.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

ClearNode.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

ClipNode.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

ClipPlane.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

ClusterCullingCallback.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

CMakeLists.txt

Removed old GL2Extensions class, replacing it with a typedef to GL2Extensions

2014-12-10 10:44:58 +00:00

CollectOccludersVisitor.cpp

Refactored the way that hole are pruned from the occluder hole list.

2014-06-25 15:47:59 +00:00

ColorMask.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

ColorMaski.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

ColorMatrix.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

ComputeBoundsVisitor.cpp

Added handling of Drawables added directly to scene graph without Geode decorating them.

2014-07-28 16:19:44 +00:00

Config.in

Removed OSG_USE_BOUND and associated osg::Bound adapter class to avoid problems with BoundingBox::expandBy/expandByRadius() implementation choosing a null BoundingBox from

2014-06-02 16:20:39 +00:00

ConvexPlanarOccluder.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

ConvexPlanarPolygon.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

CoordinateSystemNode.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

CopyOp.cpp

From Konstantin Matveyev, "I've changed osg::Uniform::Callback to osg::UniformCallback.

2015-06-02 09:33:22 +00:00

CullFace.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

CullingSet.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

CullSettings.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

CullStack.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

DeleteHandler.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Depth.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

DisplaySettings.cpp

From Alexey Pavlov, "Export fix for Windows platform"

2015-01-22 16:41:34 +00:00

Drawable.cpp

Moved osg::Drawable::Extensions into osg::GL2Extensions

2014-12-05 17:26:42 +00:00

DrawPixels.cpp

2014-05-14 10:19:43 +00:00

dxtctool.cpp

From Diane Delallée and Sukender, "1. Image.cpp

2013-05-28 11:25:13 +00:00

dxtctool.h

From Jannik Heller, typo fixes

2015-06-01 13:11:49 +00:00

Fog.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

FragmentProgram.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

FrameBufferObject.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

FrameStamp.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

FrontFace.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Geode.cpp

Refactor osg::Geode to subclass from osg::Group and reuse the NodeList children container

2014-06-03 09:23:24 +00:00

Geometry.cpp

Introduced new shader composition approach that utilizes #pragma requires(), #pragma import_defines() and #ifdef in GLSL to enable multiple different versions of shaders based

2015-02-10 17:04:02 +00:00

GL.in

From Konstantin Matveyev, "I've added GLES3 profile, which also enables GLES2 features (OSG_GLES3_AVAILABLE=true => OSG_GLES2_AVAILABLE=true).

2015-04-13 10:11:32 +00:00

GLBeginEndAdapter.cpp

From Aurelien Albert, added passing on of the gl array normalize to OpenGL when uses vertex attribute aliasing.

2013-06-27 15:18:38 +00:00

GLExtensions.cpp

From Julien Valentin and Alberto Luaces, added support for transform feedback extensions

2015-02-26 17:49:36 +00:00

GLObjects.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

GLStaticLibrary.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

GLStaticLibrary.h

Fixed typo of commercial

2010-11-22 11:22:03 +00:00

GraphicsContext.cpp

From Jannik Heller, typo fixes

2015-06-01 13:11:49 +00:00

GraphicsCostEstimator.cpp

From David Callu, warning fixes and removal of spaces at end of lines.

2013-06-28 12:00:43 +00:00

GraphicsThread.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Group.cpp

Refactor osg::Geode to subclass from osg::Group and reuse the NodeList children container

2014-06-03 09:23:24 +00:00

Hint.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Image.cpp

From Jannik Heller, typo fixes

2015-04-07 18:01:12 +00:00

ImageSequence.cpp

From Laurens Voerman, "while debugging ImageSequence I had a crash, due to the very large frametimes caused by halting the program. The problem is that when the frame time exceeds the length of the entire image sequence, a looping sequence will try to read it's _imageDataList beyond its size.

2014-06-26 10:24:41 +00:00

ImageStream.cpp

Commented out the disabling of use of PBO's in ImageStream, and disabled the use ClientStoreHint in Present3D.

2012-06-12 10:31:50 +00:00

ImageUtils.cpp

From Albert Luaces, typo fixes.

2015-06-01 13:40:20 +00:00

KdTree.cpp

Revised KdTreeBuilder so that is used the new apply(osg::Geometry&) method rather than expanding an osg::Geode.

2014-06-26 14:16:11 +00:00

Light.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

LightModel.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

LightSource.cpp

From Jannik Heller, typo fixes

2015-04-07 18:01:12 +00:00

LineSegment.cpp

Renamed LineSegment::intersect(BoundingSphere/Box, double/float&, double/float&) methods to LineSegment::intersectAndComputeRations(..) to avoid confusion with the change in convention for

2015-04-27 19:31:13 +00:00

LineStipple.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

LineWidth.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

LOD.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

LogicOp.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Material.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Math.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Matrix_implementation.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Matrixd.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

MatrixDecomposition.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Matrixf.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

MatrixTransform.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Multisample.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

Node.cpp

Fixed CollectParentPaths visitor so that it sets the setNodeMaskOverride(0xffffffff) to make sure all parents are traversed to find parents, even ones that have their NodeMask set to 0x0.

2015-04-17 13:24:44 +00:00

NodeTrackerCallback.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

NodeVisitor.cpp

Changed the NodeVisitor::apply(Drawable&) to call apply(Node&)

2014-08-27 15:07:47 +00:00

Notify.cpp

From Jannik Heller, typo fixes

2015-06-01 13:11:49 +00:00

Object.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Observer.cpp

Introduced a alternative implementation of observer_ptr<> that uses ObserverSet rather than an local WeakReference object.

2010-05-20 13:38:28 +00:00

ObserverNodePath.cpp

Changed the ref_ptr<T> observer_ptr<>::lock() method to be

2010-05-28 08:57:48 +00:00

OccluderNode.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

OcclusionQueryNode.cpp

From Jannik Heller, typo fixes

2015-04-07 18:01:12 +00:00

OperationThread.cpp

From Jannik Heller, typo fixes

2015-06-01 13:11:49 +00:00

PagedLOD.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

PatchParameter.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

Point.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

PointSprite.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

PolygonMode.cpp

Re-organized the #ifdef's to avoid usage of glPolyginMode under GLES

2015-03-03 12:00:52 +00:00

PolygonOffset.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

PolygonStipple.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

PositionAttitudeTransform.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

PrimitiveRestartIndex.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

PrimitiveSet.cpp

Fixed handling of enums in Lua plugin.

2014-02-13 18:52:41 +00:00

Program.cpp

Introduced new shader composition approach that utilizes #pragma requires(), #pragma import_defines() and #ifdef in GLSL to enable multiple different versions of shaders based

2015-02-10 17:04:02 +00:00

Projection.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

ProxyNode.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Quat.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Referenced.cpp

From Jannik Heller, typo fixes

2015-04-13 10:43:56 +00:00

SampleMaski.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

Scissor.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

ScriptEngine.cpp

Refactored Callback system in osg::Node, osg::Drawable, osg::StateSet and osg::StateAttribute to use a new osg::Callback base class.

2014-06-05 16:26:13 +00:00

Sequence.cpp

From Albert Luaces, typo fixes.

2015-06-01 13:40:20 +00:00

ShadeModel.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Shader.cpp

From Jannik Heller, typo fixes

2015-04-13 10:43:56 +00:00

ShaderAttribute.cpp

From David Callu, warning fixes and removal of spaces at end of lines.

2013-06-28 12:00:43 +00:00

ShaderComposer.cpp

Added State::releaseGLObjects() and ShaderComposer::releaseGLObjects() to avoid problems with cleanup of graphics context

2013-10-21 16:35:12 +00:00

ShadowVolumeOccluder.cpp

From Albert Luaces, typo fixes.

2015-06-01 13:40:20 +00:00

Shape.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

ShapeDrawable.cpp

2014-05-14 10:19:43 +00:00

State.cpp

Moved uniform substitution to infront of vertex attribute substituion to make sure gl_Vertex usage is replaced when required.

2015-04-20 09:39:00 +00:00

StateAttribute.cpp

Refactored Callback system in osg::Node, osg::Drawable, osg::StateSet and osg::StateAttribute to use a new osg::Callback base class.

2014-06-05 16:26:13 +00:00

StateSet.cpp

From Konstantin Matveyev, "I've changed osg::Uniform::Callback to osg::UniformCallback.

2015-06-02 09:33:22 +00:00

Stats.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Stencil.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

StencilTwoSided.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

Switch.cpp

Further work on Bound class/Node::getBound() and Drawable::getBound() and usage in OSG codebase

2014-05-14 16:01:40 +00:00

TexEnv.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

TexEnvCombine.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

TexEnvFilter.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

TexGen.cpp

From Albert Luaces, typo fixes.

2015-06-01 13:40:20 +00:00

TexGenNode.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

TexMat.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Texture1D.cpp

From Albert Luaces, typo fixes.

2015-06-01 13:40:20 +00:00

Texture2D.cpp

From Albert Luaces, typo fixes.

2015-06-01 13:40:20 +00:00

Texture2DArray.cpp

From Albert Luaces, typo fixes.

2015-06-01 13:40:20 +00:00

Texture2DMultisample.cpp

From Jannik Heller, "I have added new functions Texture::generateAndAssignTextureObject mirroring the Texture::generateTextureObject functions.

2015-06-01 10:50:44 +00:00

Texture3D.cpp

From Albert Luaces, typo fixes.

2015-06-01 13:40:20 +00:00

Texture.cpp

From Jannik Heller, typo fixes

2015-06-01 13:11:49 +00:00

TextureBuffer.cpp

From Jannik Heller, "I have added new functions Texture::generateAndAssignTextureObject mirroring the Texture::generateTextureObject functions.

2015-06-01 10:50:44 +00:00

TextureCubeMap.cpp

From Albert Luaces, typo fixes.

2015-06-01 13:40:20 +00:00

TextureRectangle.cpp

From Albert Luaces, typo fixes.

2015-06-01 13:40:20 +00:00

Timer.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

TransferFunction.cpp

Fixed image allocation operations.

2015-02-23 20:28:28 +00:00

Transform.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Uniform.cpp

From Konstantin Matveyev, "I've changed osg::Uniform::Callback to osg::UniformCallback.

2015-06-02 09:33:22 +00:00

UserDataContainer.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Version.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Version.in

From Paul Martz, typo fixes

2009-11-23 09:53:08 +00:00

VertexAttribDivisor.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

VertexProgram.cpp

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

2014-12-10 10:38:12 +00:00

View.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Viewport.cpp

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00