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

Renamed osgUtil::RenderGraph to osgUtil::StateGraph

Browse Source
This commit is contained in:
Robert Osfield
2005-10-13 12:51:00 +00:00
parent 5d1b46d25f
commit fb524952b6
26 changed files with 209 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgWrappers/osgUtil/CullVisitor.cpp
View File

@@ -35,8 +35,8 @@
#include <osg/Vec3>
#include <osgUtil/CullVisitor>
#include <osgUtil/RenderBin>
#include <osgUtil/RenderGraph>
#include <osgUtil/RenderStage>
#include <osgUtil/StateGraph>
// Must undefine IN and OUT macros defined in Windows headers
#ifdef IN
@@ -75,9 +75,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::CullVisitor)
I_Method0(const osg::ClearNode *, getClearNode);
I_Method1(void, pushStateSet, IN, const osg::StateSet *, ss);
I_Method0(void, popStateSet);
I_Method1(void, setRenderGraph, IN, osgUtil::RenderGraph *, rg);
I_Method0(osgUtil::RenderGraph *, getRootRenderGraph);
I_Method0(osgUtil::RenderGraph *, getCurrentRenderGraph);
I_Method1(void, setStateGraph, IN, osgUtil::StateGraph *, rg);
I_Method0(osgUtil::StateGraph *, getRootStateGraph);
I_Method0(osgUtil::StateGraph *, getCurrentStateGraph);
I_Method1(void, setRenderStage, IN, osgUtil::RenderStage *, rg);
I_Method0(osgUtil::RenderStage *, getRenderStage);
I_Method0(osgUtil::RenderBin *, getCurrentRenderBin);
@@ -104,11 +104,11 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::CullVisitor)
I_ReadOnlyProperty(osgUtil::CullVisitor::value_type, CalculatedNearPlane);
I_Property(const osg::ClearNode *, ClearNode);
I_Property(osgUtil::RenderBin *, CurrentRenderBin);
I_ReadOnlyProperty(osgUtil::RenderGraph *, CurrentRenderGraph);
I_ReadOnlyProperty(osgUtil::StateGraph *, CurrentStateGraph);
I_ReadOnlyProperty(osg::Vec3, EyePoint);
I_WriteOnlyProperty(osgUtil::RenderGraph *, RenderGraph);
I_Property(osgUtil::RenderStage *, RenderStage);
I_ReadOnlyProperty(osgUtil::RenderGraph *, RootRenderGraph);
I_ReadOnlyProperty(osgUtil::StateGraph *, RootStateGraph);
I_Property(osg::State *, State);
I_WriteOnlyProperty(osgUtil::StateGraph *, StateGraph);
END_REFLECTOR

2
src/osgWrappers/osgUtil/GNUmakefile
View File

@@ -14,12 +14,12 @@ CXXFILES =\
PositionalStateContainer.cpp\
ReflectionMapGenerator.cpp\
RenderBin.cpp\
RenderGraph.cpp\
RenderLeaf.cpp\
RenderStage.cpp\
SceneView.cpp\
Simplifier.cpp\
SmoothingVisitor.cpp\
StateGraph.cpp\
Statistics.cpp\
TangentSpaceGenerator.cpp\
Tesselator.cpp\

18
src/osgWrappers/osgUtil/RenderBin.cpp
View File

@@ -13,9 +13,9 @@
#include <osg/Object>
#include <osg/State>
#include <osgUtil/RenderBin>
#include <osgUtil/RenderGraph>
#include <osgUtil/RenderLeaf>
#include <osgUtil/RenderStage>
#include <osgUtil/StateGraph>
#include <osgUtil/Statistics>
// Must undefine IN and OUT macros defined in Windows headers
@@ -32,7 +32,7 @@ END_REFLECTOR
TYPE_NAME_ALIAS(std::vector< osgUtil::RenderLeaf * >, osgUtil::RenderBin::RenderLeafList);
TYPE_NAME_ALIAS(std::vector< osgUtil::RenderGraph * >, osgUtil::RenderBin::RenderGraphList);
TYPE_NAME_ALIAS(std::vector< osgUtil::StateGraph * >, osgUtil::RenderBin::StateGraphList);
TYPE_NAME_ALIAS(std::map< int COMMA osg::ref_ptr< osgUtil::RenderBin > >, osgUtil::RenderBin::RenderBinList);
@@ -59,14 +59,14 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderBin)
I_Method0(osgUtil::RenderStage *, getStage);
I_Method0(const osgUtil::RenderStage *, getStage);
I_Method0(int, getBinNum);
I_Method0(osgUtil::RenderBin::RenderGraphList &, getRenderGraphList);
I_Method0(const osgUtil::RenderBin::RenderGraphList &, getRenderGraphList);
I_Method0(osgUtil::RenderBin::StateGraphList &, getStateGraphList);
I_Method0(const osgUtil::RenderBin::StateGraphList &, getStateGraphList);
I_Method0(osgUtil::RenderBin::RenderBinList &, getRenderBinList);
I_Method0(const osgUtil::RenderBin::RenderBinList &, getRenderBinList);
I_Method0(osgUtil::RenderBin::RenderLeafList &, getRenderLeafList);
I_Method0(const osgUtil::RenderBin::RenderLeafList &, getRenderLeafList);
I_Method2(osgUtil::RenderBin *, find_or_insert, IN, int, binNum, IN, const std::string &, binName);
I_Method1(void, addRenderGraph, IN, osgUtil::RenderGraph *, rg);
I_Method1(void, addStateGraph, IN, osgUtil::StateGraph *, rg);
I_Method0(void, sort);
I_Method0(void, sortImplementation);
I_Method1(void, setSortMode, IN, osgUtil::RenderBin::SortMode, mode);
@@ -86,16 +86,16 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderBin)
I_Method1(bool, getStats, IN, osgUtil::Statistics *, primStats);
I_Method1(void, getPrims, IN, osgUtil::Statistics *, primStats);
I_Method2(bool, getPrims, IN, osgUtil::Statistics *, primStats, IN, int, nbin);
I_Method0(void, copyLeavesFromRenderGraphListToRenderLeafList);
I_Method0(void, copyLeavesFromStateGraphListToRenderLeafList);
I_ReadOnlyProperty(int, BinNum);
I_Property(osgUtil::RenderBin::DrawCallback *, DrawCallback);
I_ReadOnlyProperty(osgUtil::RenderBin *, Parent);
I_ReadOnlyProperty(osgUtil::RenderBin::RenderBinList &, RenderBinList);
I_ReadOnlyProperty(osgUtil::RenderBin::RenderGraphList &, RenderGraphList);
I_ReadOnlyProperty(osgUtil::RenderBin::RenderLeafList &, RenderLeafList);
I_Property(osgUtil::RenderBin::SortCallback *, SortCallback);
I_Property(osgUtil::RenderBin::SortMode, SortMode);
I_ReadOnlyProperty(osgUtil::RenderStage *, Stage);
I_ReadOnlyProperty(osgUtil::RenderBin::StateGraphList &, StateGraphList);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::RenderBin::DrawCallback)
@@ -124,7 +124,7 @@ END_REFLECTOR
STD_MAP_REFLECTOR(std::map< int COMMA osg::ref_ptr< osgUtil::RenderBin > >);
STD_VECTOR_REFLECTOR(std::vector< osgUtil::RenderGraph * >);
STD_VECTOR_REFLECTOR(std::vector< osgUtil::RenderLeaf * >);
STD_VECTOR_REFLECTOR(std::vector< osgUtil::StateGraph * >);

26
src/osgWrappers/osgUtil/SceneView.cpp
View File

@@ -23,9 +23,9 @@
#include <osg/Vec4>
#include <osg/Viewport>
#include <osgUtil/CullVisitor>
#include <osgUtil/RenderGraph>
#include <osgUtil/RenderStage>
#include <osgUtil/SceneView>
#include <osgUtil/StateGraph>
// Must undefine IN and OUT macros defined in Windows headers
#ifdef IN
@@ -130,15 +130,15 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView)
I_Method1(void, setCollectOccludersVisitor, IN, osg::CollectOccludersVisitor *, cov);
I_Method0(osg::CollectOccludersVisitor *, getCollectOccludersVisitor);
I_Method0(const osg::CollectOccludersVisitor *, getCollectOccludersVisitor);
I_Method1(void, setRenderGraph, IN, osgUtil::RenderGraph *, rg);
I_Method0(osgUtil::RenderGraph *, getRenderGraph);
I_Method0(const osgUtil::RenderGraph *, getRenderGraph);
I_Method1(void, setRenderGraphLeft, IN, osgUtil::RenderGraph *, rg);
I_Method0(osgUtil::RenderGraph *, getRenderGraphLeft);
I_Method0(const osgUtil::RenderGraph *, getRenderGraphLeft);
I_Method1(void, setRenderGraphRight, IN, osgUtil::RenderGraph *, rg);
I_Method0(osgUtil::RenderGraph *, getRenderGraphRight);
I_Method0(const osgUtil::RenderGraph *, getRenderGraphRight);
I_Method1(void, setStateGraph, IN, osgUtil::StateGraph *, rg);
I_Method0(osgUtil::StateGraph *, getStateGraph);
I_Method0(const osgUtil::StateGraph *, getStateGraph);
I_Method1(void, setStateGraphLeft, IN, osgUtil::StateGraph *, rg);
I_Method0(osgUtil::StateGraph *, getStateGraphLeft);
I_Method0(const osgUtil::StateGraph *, getStateGraphLeft);
I_Method1(void, setStateGraphRight, IN, osgUtil::StateGraph *, rg);
I_Method0(osgUtil::StateGraph *, getStateGraphRight);
I_Method0(const osgUtil::StateGraph *, getStateGraphRight);
I_Method1(void, setRenderStage, IN, osgUtil::RenderStage *, rs);
I_Method0(osgUtil::RenderStage *, getRenderStage);
I_Method0(const osgUtil::RenderStage *, getRenderStage);
@@ -198,14 +198,14 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView)
I_Property(osg::StateSet *, LocalStateSet);
I_Property(bool, PrioritizeTextures);
I_Property(const osg::Matrixd &, ProjectionMatrix);
I_Property(osgUtil::RenderGraph *, RenderGraph);
I_Property(osgUtil::RenderGraph *, RenderGraphLeft);
I_Property(osgUtil::RenderGraph *, RenderGraphRight);
I_Property(osgUtil::RenderStage *, RenderStage);
I_Property(osgUtil::RenderStage *, RenderStageLeft);
I_Property(osgUtil::RenderStage *, RenderStageRight);
I_Property(osg::Node *, SceneData);
I_Property(osg::State *, State);
I_Property(osgUtil::StateGraph *, StateGraph);
I_Property(osgUtil::StateGraph *, StateGraphLeft);
I_Property(osgUtil::StateGraph *, StateGraphRight);
I_Property(osg::NodeVisitor *, UpdateVisitor);
I_Property(const osg::Matrixd &, ViewMatrix);
I_Property(osg::Viewport *, Viewport);

40
src/osgWrappers/osgUtil/RenderGraph.cpp → src/osgWrappers/osgUtil/StateGraph.cpp
View File

@@ -11,8 +11,8 @@
#include <osg/Referenced>
#include <osg/StateSet>
#include <osgUtil/RenderGraph>
#include <osgUtil/RenderLeaf>
#include <osgUtil/StateGraph>
// Must undefine IN and OUT macros defined in Windows headers
#ifdef IN
@@ -26,15 +26,15 @@ BEGIN_VALUE_REFLECTOR(osgUtil::LeafDepthSortFunctor)
I_Constructor0();
END_REFLECTOR
TYPE_NAME_ALIAS(std::map< const osg::StateSet * COMMA osg::ref_ptr< osgUtil::RenderGraph > >, osgUtil::RenderGraph::ChildList);
TYPE_NAME_ALIAS(std::map< const osg::StateSet * COMMA osg::ref_ptr< osgUtil::StateGraph > >, osgUtil::StateGraph::ChildList);
TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::RenderLeaf > >, osgUtil::RenderGraph::LeafList);
TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::RenderLeaf > >, osgUtil::StateGraph::LeafList);
BEGIN_OBJECT_REFLECTOR(osgUtil::RenderGraph)
BEGIN_OBJECT_REFLECTOR(osgUtil::StateGraph)
I_BaseType(osg::Referenced);
I_Constructor0();
I_Constructor2(IN, osgUtil::RenderGraph *, parent, IN, const osg::StateSet *, stateset);
I_Method0(osgUtil::RenderGraph *, cloneType);
I_Constructor2(IN, osgUtil::StateGraph *, parent, IN, const osg::StateSet *, stateset);
I_Method0(osgUtil::StateGraph *, cloneType);
I_Method1(void, setUserData, IN, osg::Referenced *, obj);
I_Method0(osg::Referenced *, getUserData);
I_Method0(const osg::Referenced *, getUserData);
@@ -46,25 +46,13 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderGraph)
I_Method0(void, reset);
I_Method0(void, clean);
I_Method0(void, prune);
I_Method1(osgUtil::RenderGraph *, find_or_insert, IN, const osg::StateSet *, stateset);
I_Method1(osgUtil::StateGraph *, find_or_insert, IN, const osg::StateSet *, stateset);
I_Method1(void, addLeaf, IN, osgUtil::RenderLeaf *, leaf);
I_ReadOnlyProperty(float, AverageDistance);
I_ReadOnlyProperty(float, MinimumDistance);
I_Property(osg::Referenced *, UserData);
END_REFLECTOR
BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::RenderGraph >)
I_Constructor0();
I_Constructor1(IN, osgUtil::RenderGraph *, t);
I_Constructor1(IN, const osg::ref_ptr< osgUtil::RenderGraph > &, rp);
I_Method0(bool, valid);
I_Method0(osgUtil::RenderGraph *, get);
I_Method0(const osgUtil::RenderGraph *, get);
I_Method0(osgUtil::RenderGraph *, take);
I_Method0(osgUtil::RenderGraph *, release);
I_ReadOnlyProperty(osgUtil::RenderGraph *, );
END_REFLECTOR
BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::RenderLeaf >)
I_Constructor0();
I_Constructor1(IN, osgUtil::RenderLeaf *, t);
@@ -77,7 +65,19 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::RenderLeaf >)
I_ReadOnlyProperty(osgUtil::RenderLeaf *, );
END_REFLECTOR
STD_MAP_REFLECTOR(std::map< const osg::StateSet * COMMA osg::ref_ptr< osgUtil::RenderGraph > >);
BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgUtil::StateGraph >)
I_Constructor0();
I_Constructor1(IN, osgUtil::StateGraph *, t);
I_Constructor1(IN, const osg::ref_ptr< osgUtil::StateGraph > &, rp);
I_Method0(bool, valid);
I_Method0(osgUtil::StateGraph *, get);
I_Method0(const osgUtil::StateGraph *, get);
I_Method0(osgUtil::StateGraph *, take);
I_Method0(osgUtil::StateGraph *, release);
I_ReadOnlyProperty(osgUtil::StateGraph *, );
END_REFLECTOR
STD_MAP_REFLECTOR(std::map< const osg::StateSet * COMMA osg::ref_ptr< osgUtil::StateGraph > >);
STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgUtil::RenderLeaf > >);