From 06ad036da1846752a353c477fb58e66d149a933a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 14 Jul 2007 17:16:09 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/GraphicsThread.cpp | 2 +- src/osgWrappers/osg/RenderInfo.cpp | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/osgWrappers/osg/GraphicsThread.cpp b/src/osgWrappers/osg/GraphicsThread.cpp index 933cd65fa..0370f5f1e 100644 --- a/src/osgWrappers/osg/GraphicsThread.cpp +++ b/src/osgWrappers/osg/GraphicsThread.cpp @@ -31,7 +31,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::BarrierOperation) I_DeclaringFile("osg/GraphicsThread"); - I_BaseType(osg::GraphicsOperation); + I_BaseType(osg::Operation); I_BaseType(OpenThreads::Barrier); I_ConstructorWithDefaults2(IN, int, numThreads, , IN, osg::BarrierOperation::PreBlockOp, op, osg::BarrierOperation::NO_OPERATION, ____BarrierOperation__int__PreBlockOp, diff --git a/src/osgWrappers/osg/RenderInfo.cpp b/src/osgWrappers/osg/RenderInfo.cpp index 3937598d3..88bc427a9 100644 --- a/src/osgWrappers/osg/RenderInfo.cpp +++ b/src/osgWrappers/osg/RenderInfo.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -72,6 +73,21 @@ BEGIN_VALUE_REFLECTOR(osg::RenderInfo) __C5_View_P1__getView, "", ""); + I_Method1(void, pushCamera, IN, osg::Camera *, camera, + Properties::NON_VIRTUAL, + __void__pushCamera__Camera_P1, + "", + ""); + I_Method0(void, popCamera, + Properties::NON_VIRTUAL, + __void__popCamera, + "", + ""); + I_Method0(osg::Camera *, getCurrentCamera, + Properties::NON_VIRTUAL, + __Camera_P1__getCurrentCamera, + "", + ""); I_Method1(void, setUserData, IN, osg::Referenced *, userData, Properties::NON_VIRTUAL, __void__setUserData__Referenced_P1, @@ -90,6 +106,9 @@ BEGIN_VALUE_REFLECTOR(osg::RenderInfo) I_SimpleProperty(unsigned int, ContextID, __unsigned_int__getContextID, 0); + I_SimpleProperty(osg::Camera *, CurrentCamera, + __Camera_P1__getCurrentCamera, + 0); I_SimpleProperty(osg::State *, State, __State_P1__getState, __void__setState__State_P1);