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

..

AlphaFunc

Ran script to remove trailing spaces and tabs

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

AnimationPath

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

ApplicationUsage

Moved the expansion of the key codes into ApplicationUsage so that help is only generated for non zero keycodes.

2012-12-05 10:13:51 +00:00

ArgumentParser

Ran script to remove trailing spaces and tabs

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

Array

From Jannik Heller, typo fixes

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

ArrayDispatchers

Removed unused methods

2013-06-26 12:59:40 +00:00

AudioStream

From Laurens Voerman, compile fix for VisualStudio

2013-10-10 14:45:57 +00:00

AutoTransform

From Javier Taibo, "ere is the new code with Billboard "rotate around axis" functionality.

2010-11-05 17:24:50 +00:00

Billboard

From Jannik Heller, typo fixes

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

BlendColor

Moved local Extensions objects to GL2Extensions

2014-12-09 10:37:09 +00:00

BlendEquation

Moved local Extensions objects to GL2Extensions

2014-12-09 10:37:09 +00:00

BlendEquationi

Added osg::BlendFunci, osg::BlendEquationi and osg::ColorMaski StateAttrirbutes that wrap the glBlendFunci, glBlendEquationi and glColorMaski functions

2014-12-02 17:12:56 +00:00

BlendFunc

Moved osg::BlenFunc::Extensions into osg::GL2Extensions

2014-12-04 19:03:16 +00:00

BlendFunci

Added osg::BlendFunci, osg::BlendEquationi and osg::ColorMaski StateAttrirbutes that wrap the glBlendFunci, glBlendEquationi and glColorMaski functions

2014-12-02 17:12:56 +00:00

BoundingBox

Fixed build when using of double BoundingBox/BoundingSphere

2014-04-07 15:04:34 +00:00

BoundingSphere

From Jannik Heller, typo fixes

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

BoundsChecking

From Albert Luaces, typo fixes.

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

buffered_value

Ran script to remove trailing spaces and tabs

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

BufferIndexBinding

From Jannik Heller, typo fixes

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

BufferObject

From Jannik Heller, fix for race condition in orphanded BufferObject handling.

2015-05-29 07:52:27 +00:00

BufferTemplate

From Jannik Heller, typo fixes

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

Callback

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

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

Camera

Fixed typo of SEPARATE enums

2015-04-13 11:48:28 +00:00

CameraView

Ran script to remove trailing spaces and tabs

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

Capability

Moved local Extensions objects to GL2Extensions

2014-12-09 10:37:09 +00:00

ClampColor

Moved local Extensions structs into GL2Extensions

2014-12-09 14:57:25 +00:00

ClearNode

Ran script to remove trailing spaces and tabs

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

ClipNode

Ran script to remove trailing spaces and tabs

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

ClipPlane

Ran script to remove trailing spaces and tabs

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

ClusterCullingCallback

Replaced using NodeCallback::run with explict run() implementation.

2014-06-28 06:22:47 +00:00

CollectOccludersVisitor

From Laurens Voerman, compile fix for VisualStudio

2013-10-10 14:45:57 +00:00

ColorMask

Ran script to remove trailing spaces and tabs

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

ColorMaski

Moved local Extensions structs into GL2Extensions

2014-12-09 14:57:25 +00:00

ColorMatrix

Ran script to remove trailing spaces and tabs

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

ComputeBoundsVisitor

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

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

ConvexPlanarOccluder

Ran script to remove trailing spaces and tabs

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

ConvexPlanarPolygon

Ran script to remove trailing spaces and tabs

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

CoordinateSystemNode

Ran script to remove trailing spaces and tabs

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

CopyOp

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

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

CullFace

Ran script to remove trailing spaces and tabs

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

CullingSet

From Jannik Heller, typo fixes

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

CullSettings

From Jannik Heller, typo fixes

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

CullStack

From Laurens Voerman, "I have implemented and tested (on windows only) your suggestion for resetCullingMask(), it's far less intrusive than my previous submission.

2013-01-28 14:30:21 +00:00

DeleteHandler

From Magnus Kessler, typo and documentation fixes

2012-03-29 15:08:15 +00:00

Depth

Ran script to remove trailing spaces and tabs

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

DisplaySettings

From Jannik Heller, typo fixes

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

Drawable

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

DrawPixels

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

Endian

Added template swapBytes method

2012-12-07 19:04:49 +00:00

Export

Reverted the usage of OSG_UNUSED and OT_UNUSED as in hindsight these should never have been merged. Adding code to quieten

2013-07-01 08:21:13 +00:00

fast_back_stack

Ran script to remove trailing spaces and tabs

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

Fog

Ran script to remove trailing spaces and tabs

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

FragmentProgram

MOved VertexProgram and FragmentProgram::Extensions into GL2Extensions.

2014-12-08 16:08:44 +00:00

FrameBufferObject

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

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

FrameStamp

Ran script to remove trailing spaces and tabs

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

FrontFace

Ran script to remove trailing spaces and tabs

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

Geode

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

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

Geometry

From Albert Luaces, typo fixes.

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

GL2Extensions

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

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

GLBeginEndAdapter

From Farshid Lashkari, Added GLBeginEndAdapter::reset(), and _overallNormalAssigned, _overallColorAssigned flags to avoid the GLBeginEndAdapter adapter setting colour and normals when none has been assigned.

2012-09-20 11:18:19 +00:00

GLDefines

From Christian Kehl, changes for making osgAndroid working with GLES1 enabled

2015-04-30 14:04:51 +00:00

GLExtensions

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

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

GLObjects

Fixed typo

2012-08-22 16:39:47 +00:00

GLU

From Jannik Heller, typo fixes

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

GraphicsContext

From Jannik Heller, typo fixes

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

GraphicsCostEstimator

Added newline to end of file

2011-05-12 18:40:18 +00:00

GraphicsThread

Ran script to remove trailing spaces and tabs

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

Group

Changed the Node::ParentList to be a list of osg::Node rather than osg::Group, and added addChild, removeChild, replaceChild virtual method to Node to enable code

2014-05-13 08:43:07 +00:00

Hint

Ran script to remove trailing spaces and tabs

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

Image

From Albert Luaces, typo fixes.

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

ImageSequence

From Jannik Heller, typo fixes

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

ImageStream

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

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

ImageUtils

From Albert Luaces, typo fixes.

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

io_utils

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

KdTree

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

Ran script to remove trailing spaces and tabs

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

LightModel

Ran script to remove trailing spaces and tabs

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

LightSource

Ran script to remove trailing spaces and tabs

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

LineSegment

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

Ran script to remove trailing spaces and tabs

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

LineWidth

Ran script to remove trailing spaces and tabs

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

LOD

From Ulrich Hertlein, "Attached is a patch that introduces 'static_cast<unsigned int>' on some instances where

2013-05-14 16:12:21 +00:00

LogicOp

Ran script to remove trailing spaces and tabs

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

Material

Ran script to remove trailing spaces and tabs

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

Math

From Björn Blissing, "I found a minor error in documentation in include/osg/Math.

2014-06-25 08:21:13 +00:00

Matrix

Ran script to remove trailing spaces and tabs

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

Matrixd

Ran script to remove trailing spaces and tabs

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

Matrixf

Ran script to remove trailing spaces and tabs

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

MatrixTransform

Ran script to remove trailing spaces and tabs

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

MixinVector

Ran script to remove trailing spaces and tabs

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

Multisample

Moved local Extensions structs into GL2Extensions

2014-12-09 14:57:25 +00:00

Node

From Glen Waldron, "Node: patch for remove*Callback() methods to resolve a crash"

2014-08-08 15:45:54 +00:00

NodeCallback

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

NodeTrackerCallback

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

NodeVisitor

Added NodeVisitor::INTERSECTION_VISITOR VisitorType

2014-07-31 18:29:31 +00:00

Notify

Ran script to remove trailing spaces and tabs

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

Object

From Albert Luaces, typo fixes.

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

Observer

From Magnus Kessler, typo and documentation fixes

2012-03-29 15:08:15 +00:00

observer_ptr

From Albert Luaces, typo fixes.

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

ObserverNodePath

Refactored Observer/ObserverNodePath and DatabasePager to improve their robustness.

2010-05-14 12:24:13 +00:00

OccluderNode

Ran script to remove trailing spaces and tabs

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

OcclusionQueryNode

Ran script to remove trailing spaces and tabs

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

OperationThread

Replaced use of while(isRunning()) { YieldCurrentThread(); } style loops with use of join() to avoid false positives being reported by valgrind when using the helgrind tool for thread debugging.

2014-11-04 10:46:59 +00:00

PagedLOD

From Ulrich Hertlein, "Attached is a patch that introduces 'static_cast<unsigned int>' on some instances where

2013-05-14 16:12:21 +00:00

PatchParameter

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

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

Plane

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

Point

Moved local Extensions structs into GL2Extensions

2014-12-09 14:57:25 +00:00

PointSprite

Moved local Extensions structs into GL2Extensions

2014-12-09 14:57:25 +00:00

PolygonMode

Ran script to remove trailing spaces and tabs

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

PolygonOffset

Ran script to remove trailing spaces and tabs

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

PolygonStipple

Ran script to remove trailing spaces and tabs

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

Polytope

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

PositionAttitudeTransform

Ran script to remove trailing spaces and tabs

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

PrimitiveRestartIndex

Removed no longer used Extension definition

2014-12-09 14:58:34 +00:00

PrimitiveSet

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

Program

Improvements to the #pragma(tic) shader composition support

2015-02-13 12:50:43 +00:00

Projection

Ran script to remove trailing spaces and tabs

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

ProxyNode

From Magnus Kessler, typo and documentation fixes

2012-03-29 15:08:15 +00:00

Quat

Ran script to remove trailing spaces and tabs

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

ref_ptr

From Albert Luaces, typo fixes.

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

Referenced

Ran script to remove trailing spaces and tabs

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

RenderInfo

Added osg::RenderInfo::pushRenderBin()/popRenderBin() and RenderInfo::getRenderBinStack() and getCameraStack() access methods for getting access to the current RenderBin/RenderStage.

2013-08-01 07:19:45 +00:00

SampleMaski

MOved SampleMaski::Extensions into osg::GL2Extensions

2014-12-07 17:31:49 +00:00

Scissor

Ran script to remove trailing spaces and tabs

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

ScriptEngine

From Jannik Heller, typo fixes

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

Sequence

Ran script to remove trailing spaces and tabs

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

ShadeModel

Ran script to remove trailing spaces and tabs

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

Shader

From Jannik Heller, typo fixes

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

ShaderAttribute

Ran script to remove trailing spaces and tabs

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

ShaderComposer

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

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

ShadowVolumeOccluder

Ran script to remove trailing spaces and tabs

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

Shape

From Jannik Heller, typo fixes

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

ShapeDrawable

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

State

From Jannik Heller, typo fixes

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

StateAttribute

From Jannik Heller, typo fixes

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

StateAttributeCallback

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

From Jannik Heller, typo fixes

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

Stats

Ran script to remove trailing spaces and tabs

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

Stencil

Moved local Extensions structs into GL2Extensions

2014-12-09 14:57:25 +00:00

StencilTwoSided

Moveved Stencil/StencilTwoSided::Extensions into GL2Extensions

2014-12-09 11:14:33 +00:00

Switch

Ran script to remove trailing spaces and tabs

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

TemplatePrimitiveFunctor

Added ability to populate a local vertex cache for when one computes final vertex position in a vertex shader but still want to the Primitive functors to work with the transformed positions.

2015-01-12 10:30:50 +00:00

TexEnv

Ran script to remove trailing spaces and tabs

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

TexEnvCombine

Ran script to remove trailing spaces and tabs

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

TexEnvFilter

Ran script to remove trailing spaces and tabs

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

TexGen

Ran script to remove trailing spaces and tabs

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

TexGenNode

Ran script to remove trailing spaces and tabs

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

TexMat

Ran script to remove trailing spaces and tabs

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

Texture

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

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

Texture1D

Ran script to remove trailing spaces and tabs

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

Texture2D

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

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

Texture2DArray

From Jannik Heller, typo fixes

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

Texture2DMultisample

From Sebastian Messerschmidt, "Attached you find a change adding a getNumSamples() function to retrieve the value set via setNumSamples."

2014-11-21 10:44:01 +00:00

Texture3D

From Jannik Heller, typo fixes

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

TextureBuffer

Cleaned up GL_TEXTURE_BUFFER_*ARB usage as include/osg/GLDefines now provides the non ARB variants

2015-01-06 17:23:26 +00:00

TextureCubeMap

From Jannik Heller, typo fixes

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

TextureRectangle

Ran script to remove trailing spaces and tabs

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

Timer

From Jannik Heller, typo fixes

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

TransferFunction

From Albert Luaces, typo fixes.

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

Transform

Ran script to remove trailing spaces and tabs

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

TriangleFunctor

Added ability to populate a local vertex cache for when one computes final vertex position in a vertex shader but still want to the Primitive functors to work with the transformed positions.

2015-01-12 10:30:50 +00:00

TriangleIndexFunctor

Ran script to remove trailing spaces and tabs

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

TriangleLinePointIndexFunctor

From Marc Helbling, "please find enclosed a submission that should improve the VertexAccessOrderVisitor (pre-transform) optimizer:

2014-12-16 09:34:15 +00:00

Types

Centralized the calling of #include <stdint.h> and VS fallback into include/osg/Types header

2014-07-21 16:36:47 +00:00

Uniform

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

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

UserDataContainer

From Jannik Heller, typo fixes

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

ValueObject

From Jannik Heller, typo fixes

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

Vec2

Ran script to remove trailing spaces and tabs

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

Vec2b

Ran script to remove trailing spaces and tabs

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

Vec2d

Ran script to remove trailing spaces and tabs

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

Vec2f

Ran script to remove trailing spaces and tabs

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

Vec2i

From Art Tevs, int and uint Vec classes

2013-06-03 11:38:20 +00:00

Vec2s

Ran script to remove trailing spaces and tabs

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

Vec2ub

From David Callu, "Added Vec3ub, Vec3us, Vec4us, Vec2ub and Vec2us classes"

2013-06-27 17:37:03 +00:00

Vec2ui

From Art Tevs, int and uint Vec classes

2013-06-03 11:38:20 +00:00

Vec2us

From David Callu, "Added Vec3ub, Vec3us, Vec4us, Vec2ub and Vec2us classes"

2013-06-27 17:37:03 +00:00

Vec3

Ran script to remove trailing spaces and tabs

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

Vec3b

Ran script to remove trailing spaces and tabs

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

Vec3d

Ran script to remove trailing spaces and tabs

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

Vec3f

Ran script to remove trailing spaces and tabs

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

Vec3i

From Art Tevs, int and uint Vec classes

2013-06-03 11:38:20 +00:00

Vec3s

Ran script to remove trailing spaces and tabs

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

Vec3ub

From David Callu, "Added Vec3ub, Vec3us, Vec4us, Vec2ub and Vec2us classes"

2013-06-27 17:37:03 +00:00

Vec3ui

From Art Tevs, int and uint Vec classes

2013-06-03 11:38:20 +00:00

Vec3us

From David Callu, "Added Vec3ub, Vec3us, Vec4us, Vec2ub and Vec2us classes"

2013-06-27 17:37:03 +00:00

Vec4

Ran script to remove trailing spaces and tabs

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

Vec4b

Ran script to remove trailing spaces and tabs

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

Vec4d

Ran script to remove trailing spaces and tabs

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

Vec4f

Ran script to remove trailing spaces and tabs

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

Vec4i

From Art Tevs, int and uint Vec classes

2013-06-03 11:38:20 +00:00

Vec4s

Ran script to remove trailing spaces and tabs

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

Vec4ub

Ran script to remove trailing spaces and tabs

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

Vec4ui

From Art Tevs, int and uint Vec classes

2013-06-03 11:38:20 +00:00

Vec4us

From David Callu, "Added Vec3ub, Vec3us, Vec4us, Vec2ub and Vec2us classes"

2013-06-27 17:37:03 +00:00

VertexAttribDivisor

Added VertexAttribDivisor class to wrap up glVertexAttribDivisor function

2014-11-24 14:54:39 +00:00

VertexProgram

MOved VertexProgram and FragmentProgram::Extensions into GL2Extensions.

2014-12-08 16:08:44 +00:00

View

From Jannik Heller, typo fixes

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

Viewport

Preperation for adding stereo support direclty into osgViewer.

2013-04-15 14:21:32 +00:00