Renamed osgUtil::RenderGraph to osgUtil::StateGraph

2005-10-13 12:51:00 +00:00
parent 5d1b46d25f
commit fb524952b6
26 changed files with 209 additions and 357 deletions
--- a/VisualStudio/LANGEXT.DAT
+++ b/VisualStudio/LANGEXT.DAT
@@ -145,11 +145,10 @@ Referenced
 ReflectionMapGenerator
 Registry
 RenderBin
-RenderGraph
+StateGraph
 RenderLeaf
 RenderStage
-RenderStageLighting
-RenderToTextureStage
+PositionalStateContianer
 SceneView
 Sector
 SectorPlacer
--- a/VisualStudio/examples/osgfxbrowser/osgfxbrowser.dsp
+++ b/VisualStudio/examples/osgfxbrowser/osgfxbrowser.dsp
@@ -96,46 +96,6 @@ LINK32=link.exe
 # Begin Source File

 SOURCE=..\..\..\examples\osgfxbrowser\Frame.cpp
-DEP_CPP_FRAME=\
-	"..\..\..\Include\Osg\Array"\
-	"..\..\..\Include\Osg\BoundingBox"\
-	"..\..\..\Include\Osg\BoundingSphere"\
-	"..\..\..\include\osg\buffered_value"\
-	"..\..\..\Include\Osg\CopyOp"\
-	"..\..\..\include\osg\DisplaySettings"\
-	"..\..\..\Include\Osg\Drawable"\
-	"..\..\..\Include\Osg\Export"\
-	"..\..\..\include\osg\fast_back_stack"\
-	"..\..\..\include\osg\FrameStamp"\
-	"..\..\..\Include\Osg\Gl"\
-	"..\..\..\Include\Osg\Image"\
-	"..\..\..\include\osg\Math"\
-	"..\..\..\Include\Osg\Matrix"\
-	"..\..\..\Include\Osg\Node"\
-	"..\..\..\include\osg\NodeCallback"\
-	"..\..\..\Include\Osg\NodeVisitor"\
-	"..\..\..\Include\Osg\Object"\
-	"..\..\..\Include\Osg\Plane"\
-	"..\..\..\Include\Osg\Polytope"\
-	"..\..\..\Include\Osg\Quat"\
-	"..\..\..\include\osg\ref_ptr"\
-	"..\..\..\Include\Osg\Referenced"\
-	"..\..\..\Include\Osg\Shape"\
-	"..\..\..\Include\Osg\State"\
-	"..\..\..\Include\Osg\StateAttribute"\
-	"..\..\..\Include\Osg\StateSet"\
-	"..\..\..\Include\Osg\Texture"\
-	"..\..\..\Include\Osg\Texture2D"\
-	"..\..\..\include\osg\UByte4"\
-	"..\..\..\Include\Osg\Vec2"\
-	"..\..\..\Include\Osg\Vec3"\
-	"..\..\..\Include\Osg\Vec4"\
-	"..\..\..\include\osg\Viewport"\
-	"..\..\..\include\osgText\Export"\
-	"..\..\..\include\osgText\Font"\
-	"..\..\..\include\osgText\String"\
-	"..\..\..\include\osgText\Text"\
-	
 # End Source File
 # Begin Source File

@@ -144,128 +104,6 @@ SOURCE=..\..\..\examples\osgfxbrowser\Frame.h
 # Begin Source File

 SOURCE=..\..\..\examples\osgfxbrowser\osgfxbrowser.cpp
-DEP_CPP_OSGFX=\
-	"..\..\..\Include\Osg\AlphaFunc"\
-	"..\..\..\Include\Osg\AnimationPath"\
-	"..\..\..\Include\osg\ApplicationUsage"\
-	"..\..\..\Include\osg\ArgumentParser"\
-	"..\..\..\Include\Osg\Array"\
-	"..\..\..\Include\Osg\BlendFunc"\
-	"..\..\..\Include\Osg\BoundingBox"\
-	"..\..\..\Include\Osg\BoundingSphere"\
-	"..\..\..\include\osg\buffered_value"\
-	"..\..\..\include\osg\ClearNode"\
-	"..\..\..\Include\Osg\ColorMask"\
-	"..\..\..\Include\Osg\ConvexPlanarOccluder"\
-	"..\..\..\Include\Osg\ConvexPlanarPolygon"\
-	"..\..\..\Include\Osg\CopyOp"\
-	"..\..\..\Include\Osg\CullingSet"\
-	"..\..\..\Include\Osg\CullStack"\
-	"..\..\..\include\osg\DisplaySettings"\
-	"..\..\..\Include\Osg\Drawable"\
-	"..\..\..\Include\Osg\Export"\
-	"..\..\..\include\osg\fast_back_stack"\
-	"..\..\..\include\osg\FrameStamp"\
-	"..\..\..\Include\Osg\Geode"\
-	"..\..\..\Include\Osg\Geometry"\
-	"..\..\..\Include\Osg\Gl"\
-	"..\..\..\Include\Osg\Group"\
-	"..\..\..\Include\Osg\Image"\
-	"..\..\..\Include\Osg\Light"\
-	"..\..\..\Include\Osg\LightSource"\
-	"..\..\..\Include\Osg\LineSegment"\
-	"..\..\..\Include\Osg\Lod"\
-	"..\..\..\include\osg\Math"\
-	"..\..\..\Include\Osg\Matrix"\
-	"..\..\..\Include\Osg\MatrixTransform"\
-	"..\..\..\Include\Osg\Node"\
-	"..\..\..\include\osg\NodeCallback"\
-	"..\..\..\Include\Osg\NodeVisitor"\
-	"..\..\..\Include\Osg\Notify"\
-	"..\..\..\Include\Osg\Object"\
-	"..\..\..\Include\Osg\OccluderNode"\
-	"..\..\..\Include\Osg\PagedLOD"\
-	"..\..\..\Include\Osg\Plane"\
-	"..\..\..\Include\Osg\Polytope"\
-	"..\..\..\Include\Osg\PrimitiveSet"\
-	"..\..\..\Include\Osg\Projection"\
-	"..\..\..\Include\Osg\Quat"\
-	"..\..\..\include\osg\ref_ptr"\
-	"..\..\..\Include\Osg\Referenced"\
-	"..\..\..\Include\Osg\ShadowVolumeOccluder"\
-	"..\..\..\Include\Osg\Shape"\
-	"..\..\..\Include\Osg\State"\
-	"..\..\..\Include\Osg\StateAttribute"\
-	"..\..\..\Include\Osg\StateSet"\
-	"..\..\..\Include\Osg\TexEnv"\
-	"..\..\..\Include\Osg\Texture"\
-	"..\..\..\Include\Osg\Texture2D"\
-	"..\..\..\Include\Osg\Timer"\
-	"..\..\..\Include\Osg\Transform"\
-	"..\..\..\include\osg\UByte4"\
-	"..\..\..\Include\Osg\Vec2"\
-	"..\..\..\Include\Osg\Vec3"\
-	"..\..\..\Include\Osg\Vec4"\
-	"..\..\..\include\osg\Viewport"\
-	"..\..\..\Include\osgDB\DatabasePager"\
-	"..\..\..\Include\osgDB\Export"\
-	"..\..\..\Include\osgDB\ReadFile"\
-	"..\..\..\Include\osgDB\WriteFile"\
-	"..\..\..\include\osgFX\Effect"\
-	"..\..\..\include\osgFX\Export"\
-	"..\..\..\include\osgFX\Registry"\
-	"..\..\..\include\osgFX\Technique"\
-	"..\..\..\Include\osgGA\Export"\
-	"..\..\..\Include\osgGA\GUIActionAdapter"\
-	"..\..\..\Include\osgGA\GUIEventAdapter"\
-	"..\..\..\Include\osgGA\GUIEventHandler"\
-	"..\..\..\Include\osgGA\GUIEventHandlerVisitor"\
-	"..\..\..\Include\osgGA\KeySwitchMatrixManipulator"\
-	"..\..\..\Include\osgGA\MatrixManipulator"\
-	"..\..\..\Include\osgProducer\EventAdapter"\
-	"..\..\..\Include\osgProducer\Export"\
-	"..\..\..\Include\osgProducer\KeyboardMouseCallback"\
-	"..\..\..\include\osgProducer\OsgCameraGroup"\
-	"..\..\..\Include\osgProducer\OsgSceneHandler"\
-	"..\..\..\Include\osgProducer\Viewer"\
-	"..\..\..\include\osgText\Export"\
-	"..\..\..\include\osgText\Font"\
-	"..\..\..\include\osgText\String"\
-	"..\..\..\include\osgText\Text"\
-	"..\..\..\Include\osgUtil\CullVisitor"\
-	"..\..\..\Include\osgUtil\Export"\
-	"..\..\..\Include\osgUtil\IntersectVisitor"\
-	"..\..\..\include\osgUtil\Optimizer"\
-	"..\..\..\include\osgUtil\RenderBin"\
-	"..\..\..\include\osgUtil\RenderGraph"\
-	"..\..\..\include\osgUtil\RenderLeaf"\
-	"..\..\..\include\osgUtil\RenderStage"\
-	"..\..\..\include\osgUtil\RenderStageLighting"\
-	"..\..\..\Include\osgUtil\SceneView"\
-	
-NODEP_CPP_OSGFX=\
-	".\penthreads\barrier"\
-	".\penthreads\condition"\
-	".\penthreads\exports"\
-	".\penthreads\mutex"\
-	".\penthreads\thread"\
-	".\roducer\block"\
-	".\roducer\blockingqueue"\
-	".\roducer\camera"\
-	".\roducer\cameraconfig"\
-	".\roducer\cameragroup"\
-	".\roducer\export"\
-	".\roducer\inputarea"\
-	".\roducer\keyboard"\
-	".\roducer\keyboardmouse"\
-	".\roducer\math"\
-	".\roducer\referenced"\
-	".\roducer\refopenthread"\
-	".\roducer\rendersurface"\
-	".\roducer\timer"\
-	".\roducer\types"\
-	".\roducer\visualchooser"\
-	
 # End Source File
 # End Group
 # Begin Group "Header Files"
--- a/VisualStudio/osgUtil/osgUtil.dsp
+++ b/VisualStudio/osgUtil/osgUtil.dsp
@@ -135,7 +135,7 @@ SOURCE=..\..\src\osgUtil\RenderBin.cpp
 # End Source File
 # Begin Source File

-SOURCE=..\..\src\osgUtil\RenderGraph.cpp
+SOURCE=..\..\src\osgUtil\StateGraph.cpp
 # End Source File
 # Begin Source File

@@ -247,7 +247,7 @@ SOURCE=..\..\include\osgUtil\RenderBin
 # End Source File
 # Begin Source File

-SOURCE=..\..\include\osgUtil\RenderGraph
+SOURCE=..\..\include\osgUtil\StateGraph
 # End Source File
 # Begin Source File

--- a/VisualStudio/osgWrappers/osg/wrapper_osg.dsp
+++ b/VisualStudio/osgWrappers/osg/wrapper_osg.dsp
@@ -151,6 +151,10 @@ SOURCE=..\..\..\src\osgWrappers\osg\BufferObject.cpp
 SOURCE=..\..\..\src\osgWrappers\osg\CameraNode.cpp
 # End Source File

+# Begin Source File
+SOURCE=..\..\..\src\osgWrappers\osg\CameraView.cpp
+# End Source File
+
 # Begin Source File
 SOURCE=..\..\..\src\osgWrappers\osg\ClearNode.cpp
 # End Source File
--- a/VisualStudio/osgWrappers/osgParticle/wrapper_osgParticle.dsp
+++ b/VisualStudio/osgWrappers/osgParticle/wrapper_osgParticle.dsp
@@ -107,6 +107,14 @@ SOURCE=..\..\..\src\osgWrappers\osgParticle\AngularAccelOperator.cpp
 SOURCE=..\..\..\src\osgWrappers\osgParticle\CenteredPlacer.cpp
 # End Source File

+# Begin Source File
+SOURCE=..\..\..\src\osgWrappers\osgParticle\ConnectedParticleSystem.cpp
+# End Source File
+
+# Begin Source File
+SOURCE=..\..\..\src\osgWrappers\osgParticle\ConstantRateCounter.cpp
+# End Source File
+
 # Begin Source File
 SOURCE=..\..\..\src\osgWrappers\osgParticle\Counter.cpp
 # End Source File
@@ -219,6 +227,10 @@ SOURCE=..\..\..\src\osgWrappers\osgParticle\Shooter.cpp
 SOURCE=..\..\..\src\osgWrappers\osgParticle\SmokeEffect.cpp
 # End Source File

+# Begin Source File
+SOURCE=..\..\..\src\osgWrappers\osgParticle\SmokeTrailEffect.cpp
+# End Source File
+
 # Begin Source File
 SOURCE=..\..\..\src\osgWrappers\osgParticle\VariableRateCounter.cpp
 # End Source File
--- a/VisualStudio/osgWrappers/osgUtil/wrapper_osgUtil.dsp
+++ b/VisualStudio/osgWrappers/osgUtil/wrapper_osgUtil.dsp
@@ -143,10 +143,6 @@ SOURCE=..\..\..\src\osgWrappers\osgUtil\ReflectionMapGenerator.cpp
 SOURCE=..\..\..\src\osgWrappers\osgUtil\RenderBin.cpp
 # End Source File

-# Begin Source File
-SOURCE=..\..\..\src\osgWrappers\osgUtil\RenderGraph.cpp
-# End Source File
-
 # Begin Source File
 SOURCE=..\..\..\src\osgWrappers\osgUtil\RenderLeaf.cpp
 # End Source File
@@ -167,6 +163,10 @@ SOURCE=..\..\..\src\osgWrappers\osgUtil\Simplifier.cpp
 SOURCE=..\..\..\src\osgWrappers\osgUtil\SmoothingVisitor.cpp
 # End Source File

+# Begin Source File
+SOURCE=..\..\..\src\osgWrappers\osgUtil\StateGraph.cpp
+# End Source File
+
 # Begin Source File
 SOURCE=..\..\..\src\osgWrappers\osgUtil\Statistics.cpp
 # End Source File