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

Renamed osg::CameraNode to osg::Camera, cleaned up osg::View.

Browse Source 
Added beginnings of new osgViewer::Scene,View,Viewer,CompositeViewer and GraphicsWindowProxy files.
This commit is contained in:
Robert Osfield
2006-11-27 14:52:07 +00:00
parent b82e521444
commit fd2ffeb310
110 changed files with 2257 additions and 1466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@
#include <osg/Billboard>
#include <osg/BoundingBox>
#include <osg/CameraNode>
#include <osg/Camera>
#include <osg/ClearNode>
#include <osg/ClipNode>
#include <osg/Drawable>
@@ -124,8 +124,8 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::CullVisitor)
__void__apply__osg_ClearNode_R1,
"",
"");
I_Method1(void, apply, IN, osg::CameraNode &, node,
__void__apply__osg_CameraNode_R1,
I_Method1(void, apply, IN, osg::Camera &, node,
__void__apply__osg_Camera_R1,
"",
"");
I_Method1(void, apply, IN, osg::OccluderNode &, node,

6
src/osgWrappers/osgUtil/IntersectVisitor.cpp
View File

@@ -11,7 +11,7 @@
#include <osgIntrospection/Attributes>
#include <osg/Billboard>
#include <osg/CameraNode>
#include <osg/Camera>
#include <osg/Drawable>
#include <osg/Geode>
#include <osg/Group>
@@ -280,8 +280,8 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::PickVisitor)
__void__apply__osg_Projection_R1,
"",
"");
I_Method1(void, apply, IN, osg::CameraNode &, camera,
__void__apply__osg_CameraNode_R1,
I_Method1(void, apply, IN, osg::Camera &, camera,
__void__apply__osg_Camera_R1,
"",
"");
END_REFLECTOR

6
src/osgWrappers/osgUtil/IntersectionVisitor.cpp
View File

@@ -11,7 +11,7 @@
#include <osgIntrospection/Attributes>
#include <osg/Billboard>
#include <osg/CameraNode>
#include <osg/Camera>
#include <osg/Drawable>
#include <osg/Geode>
#include <osg/Group>
@@ -152,8 +152,8 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::IntersectionVisitor)
__void__apply__osg_Projection_R1,
"",
"");
I_Method1(void, apply, IN, osg::CameraNode &, camera,
__void__apply__osg_CameraNode_R1,
I_Method1(void, apply, IN, osg::Camera &, camera,
__void__apply__osg_Camera_R1,
"",
"");
I_SimpleProperty(osgUtil::Intersector *, Intersector,

4
src/osgWrappers/osgUtil/Optimizer.cpp
View File

@@ -442,6 +442,10 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveRedundantNodesVisitor)
__void__apply__osg_Transform_R1,
"",
"");
I_Method1(bool, isOperationPermissible, IN, osg::Node &, node,
__bool__isOperationPermissible__osg_Node_R1,
"",
"");
I_Method0(void, removeRedundantNodes,
__void__removeRedundantNodes,
"",

33
src/osgWrappers/osgUtil/RenderStage.cpp
View File

@@ -10,7 +10,7 @@
#include <osgIntrospection/StaticMethodInfo>
#include <osgIntrospection/Attributes>
#include <osg/CameraNode>
#include <osg/Camera>
#include <osg/ColorMask>
#include <osg/CopyOp>
#include <osg/FrameBufferObject>
@@ -150,16 +150,16 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage)
__int__getClearStencil,
"Get the clear color. ",
"");
I_Method1(void, setCameraNode, IN, osg::CameraNode *, camera,
__void__setCameraNode__osg_CameraNode_P1,
I_Method1(void, setCamera, IN, osg::Camera *, camera,
__void__setCamera__osg_Camera_P1,
"",
"");
I_Method0(osg::CameraNode *, getCameraNode,
__osg_CameraNode_P1__getCameraNode,
I_Method0(osg::Camera *, getCamera,
__osg_Camera_P1__getCamera,
"",
"");
I_Method0(const osg::CameraNode *, getCameraNode,
__C5_osg_CameraNode_P1__getCameraNode,
I_Method0(const osg::Camera *, getCamera,
__C5_osg_Camera_P1__getCamera,
"",
"");
I_Method1(void, setCameraRequiresSetUp, IN, bool, flag,
@@ -306,9 +306,13 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage)
__bool__getStats__Statistics_R1,
"Extract stats for current draw list. ",
"");
I_SimpleProperty(osg::CameraNode *, CameraNode,
__osg_CameraNode_P1__getCameraNode,
__void__setCameraNode__osg_CameraNode_P1);
I_Method2(void, attach, IN, osg::Camera::BufferComponent, buffer, IN, osg::Image *, image,
__void__attach__osg_Camera_BufferComponent__osg_Image_P1,
"",
"");
I_SimpleProperty(osg::Camera *, Camera,
__osg_Camera_P1__getCamera,
__void__setCamera__osg_Camera_P1);
I_SimpleProperty(bool, CameraRequiresSetUp,
__bool__getCameraRequiresSetUp,
__void__setCameraRequiresSetUp__bool);
@@ -368,3 +372,12 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage)
__void__setViewport__osg_Viewport_P1);
END_REFLECTOR
BEGIN_VALUE_REFLECTOR(osgUtil::RenderStage::Attachment)
I_Constructor0(____Attachment,
"",
"");
I_PublicMemberProperty(osg::ref_ptr< osg::Image >, _image);
I_PublicMemberProperty(GLenum, _imageReadPixelFormat);
I_PublicMemberProperty(GLenum, _imageReadPixelDataType);
END_REFLECTOR

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

@@ -10,7 +10,7 @@
#include <osgIntrospection/StaticMethodInfo>
#include <osgIntrospection/Attributes>
#include <osg/CameraNode>
#include <osg/Camera>
#include <osg/CollectOccludersVisitor>
#include <osg/DisplaySettings>
#include <osg/FrameStamp>
@@ -76,16 +76,16 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView)
__void__setDefaults__unsigned_int,
"Set scene view to use default global state, light, camera and render visitor. ",
"");
I_Method1(void, setCamera, IN, osg::CameraNode *, camera,
__void__setCamera__osg_CameraNode_P1,
I_Method1(void, setCamera, IN, osg::Camera *, camera,
__void__setCamera__osg_Camera_P1,
"Set the camera used to represent the camera view of this SceneView. ",
"");
I_Method0(osg::CameraNode *, getCamera,
__osg_CameraNode_P1__getCamera,
I_Method0(osg::Camera *, getCamera,
__osg_Camera_P1__getCamera,
"Get the camera used to represent the camera view of this SceneView. ",
"");
I_Method0(const osg::CameraNode *, getCamera,
__C5_osg_CameraNode_P1__getCamera,
I_Method0(const osg::Camera *, getCamera,
__C5_osg_Camera_P1__getCamera,
"Get the const camera used to represent the camera view of this SceneView. ",
"");
I_Method1(void, setSceneData, IN, osg::Node *, node,
@@ -583,9 +583,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView)
I_SimpleProperty(int, ActiveUniforms,
__int__getActiveUniforms,
__void__setActiveUniforms__int);
I_SimpleProperty(osg::CameraNode *, Camera,
__osg_CameraNode_P1__getCamera,
__void__setCamera__osg_CameraNode_P1);
I_SimpleProperty(osg::Camera *, Camera,
__osg_Camera_P1__getCamera,
__void__setCamera__osg_Camera_P1);
I_SimpleProperty(const osg::Vec4 &, ClearColor,
__C5_osg_Vec4_R1__getClearColor,
__void__setClearColor__C5_osg_Vec4_R1);