From 2ab30dd1b8c5d709c82c5ed5f9a42bf91208dcd9 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 3 Aug 2007 16:08:36 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/GraphicsContext.cpp | 27 ++++++++++++++++++------- src/osgWrappers/osg/View.cpp | 2 +- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/osgWrappers/osg/GraphicsContext.cpp b/src/osgWrappers/osg/GraphicsContext.cpp index 5d2151894..e7d6f1f64 100644 --- a/src/osgWrappers/osg/GraphicsContext.cpp +++ b/src/osgWrappers/osg/GraphicsContext.cpp @@ -419,23 +419,36 @@ BEGIN_VALUE_REFLECTOR(osg::GraphicsContext::ScreenIdentifier) I_Constructor0(____ScreenIdentifier, "", ""); - I_Constructor1(IN, unsigned int, in_screenNum, + I_Constructor1(IN, int, in_screenNum, Properties::NON_EXPLICIT, - ____ScreenIdentifier__unsigned_int, + ____ScreenIdentifier__int, "", ""); - I_Constructor3(IN, const std::string &, in_hostName, IN, unsigned int, in_displayNum, IN, unsigned int, in_screenNum, - ____ScreenIdentifier__C5_std_string_R1__unsigned_int__unsigned_int, + I_Constructor3(IN, const std::string &, in_hostName, IN, int, in_displayNum, IN, int, in_screenNum, + ____ScreenIdentifier__C5_std_string_R1__int__int, "", ""); I_Method0(std::string, displayName, Properties::NON_VIRTUAL, __std_string__displayName, - "", + "Return the display name in the form hostName::displayNum:screenNum. ", ""); + I_Method0(void, readDISPLAY, + Properties::NON_VIRTUAL, + __void__readDISPLAY, + "Read the DISPLAY environmental variable, and set the ScreenIdentifier accordingly. ", + ""); + I_Method1(void, setScreenIdentifier, IN, const std::string &, displayName, + Properties::NON_VIRTUAL, + __void__setScreenIdentifier__C5_std_string_R1, + "Set the screenIndentifier from the displayName string. ", + ""); + I_SimpleProperty(const std::string &, ScreenIdentifier, + 0, + __void__setScreenIdentifier__C5_std_string_R1); I_PublicMemberProperty(std::string, hostName); - I_PublicMemberProperty(unsigned int, displayNum); - I_PublicMemberProperty(unsigned int, screenNum); + I_PublicMemberProperty(int, displayNum); + I_PublicMemberProperty(int, screenNum); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::GraphicsContext::Traits) diff --git a/src/osgWrappers/osg/View.cpp b/src/osgWrappers/osg/View.cpp index e880f06fb..3a574de1c 100644 --- a/src/osgWrappers/osg/View.cpp +++ b/src/osgWrappers/osg/View.cpp @@ -169,7 +169,7 @@ BEGIN_OBJECT_REFLECTOR(osg::View) __void__updateSlave__unsigned_int, "", ""); - I_ProtectedMethod1(osg::GraphicsOperation *, createRenderer, IN, osg::Camera *, camera, + I_ProtectedMethod1(osg::GraphicsOperation *, createRenderer, IN, osg::Camera *, x, Properties::VIRTUAL, Properties::NON_CONST, __osg_GraphicsOperation_P1__createRenderer__osg_Camera_P1,