FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged fixes to osgVolume's handling of ImageSequence animated volumes, merge command:

Browse Source 
svn merge -r 9746:9747 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.8
This commit is contained in:
Robert Osfield
2009-02-10 18:51:43 +00:00
parent 2fcd7f1d99
commit 51f6fa249f
6 changed files with 103 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/osgWrappers/osgVolume/Layer.cpp
View File

@@ -13,6 +13,7 @@
#include <osg/BoundingSphere>
#include <osg/CopyOp>
#include <osg/Image>
#include <osg/NodeVisitor>
#include <osg/Object>
#include <osg/Texture>
#include <osg/Vec4>
@@ -108,6 +109,16 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::CompositeLayer)
__unsigned_int__getNumLayers,
"",
"");
I_Method0(bool, requiresUpdateTraversal,
Properties::VIRTUAL,
__bool__requiresUpdateTraversal,
"Specify whether ImageLayer requires update traversal. ",
"");
I_Method1(void, update, IN, osg::NodeVisitor &, x,
Properties::VIRTUAL,
__void__update__osg_NodeVisitor_R1,
"Call update on the Layer. ",
"");
I_IndexedProperty(const std::string &, FileName,
__C5_std_string_R1__getFileName__unsigned_int,
__void__setFileName__unsigned_int__C5_std_string_R1,
@@ -203,6 +214,16 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::ImageLayer)
__void__translateMinToZero,
"Compute the min color component of the image and then translate and pixels by this offset to make the new min component 0. ",
"");
I_Method0(bool, requiresUpdateTraversal,
Properties::VIRTUAL,
__bool__requiresUpdateTraversal,
"Specify whether ImageLayer requires update traversal. ",
"");
I_Method1(void, update, IN, osg::NodeVisitor &, x,
Properties::VIRTUAL,
__void__update__osg_NodeVisitor_R1,
"Call update on the Layer. ",
"");
I_Method0(void, dirty,
Properties::VIRTUAL,
__void__dirty,
@@ -349,6 +370,16 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::Layer)
__void__addProperty__Property_P1,
"Add a property, automatically creating a CompositePorperty if one isn't already assigned. ",
"");
I_Method0(bool, requiresUpdateTraversal,
Properties::VIRTUAL,
__bool__requiresUpdateTraversal,
"Specify whether ImageLayer requires update traversal. ",
"");
I_Method1(void, update, IN, osg::NodeVisitor &, x,
Properties::VIRTUAL,
__void__update__osg_NodeVisitor_R1,
"Call update on the Layer. ",
"");
I_Method0(void, dirty,
Properties::VIRTUAL,
__void__dirty,