From 6458db77650c4cd4c71c62b2cecd7935d8ec8222 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 16 Dec 2008 15:58:42 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/GraphicsContext.cpp | 48 ++++++++++++++++++---- src/osgWrappers/osgDB/DatabasePager.cpp | 16 ++++---- src/osgWrappers/osgTerrain/Terrain.cpp | 19 +++++++++ src/osgWrappers/osgTerrain/TerrainTile.cpp | 2 +- 4 files changed, 69 insertions(+), 16 deletions(-) diff --git a/src/osgWrappers/osg/GraphicsContext.cpp b/src/osgWrappers/osg/GraphicsContext.cpp index 018544f35..c47593898 100644 --- a/src/osgWrappers/osg/GraphicsContext.cpp +++ b/src/osgWrappers/osg/GraphicsContext.cpp @@ -28,6 +28,8 @@ #include +TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext::ScreenSettings >, osg::GraphicsContext::ScreenSettingsList) + TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext * >, osg::GraphicsContext::GraphicsContexts) TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Operation > >, osg::GraphicsContext::OperationQueue) @@ -456,6 +458,21 @@ BEGIN_VALUE_REFLECTOR(osg::GraphicsContext::ScreenIdentifier) I_PublicMemberProperty(int, screenNum); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osg::GraphicsContext::ScreenSettings) + I_DeclaringFile("osg/GraphicsContext"); + I_Constructor0(____ScreenSettings, + "", + ""); + I_ConstructorWithDefaults4(IN, int, width, , IN, int, height, , IN, double, refreshRate, 0, IN, unsigned int, colorDepth, 0, + ____ScreenSettings__int__int__double__unsigned_int, + "", + ""); + I_PublicMemberProperty(int, width); + I_PublicMemberProperty(int, height); + I_PublicMemberProperty(double, refreshRate); + I_PublicMemberProperty(unsigned int, colorDepth); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osg::GraphicsContext::Traits) I_DeclaringFile("osg/GraphicsContext"); I_BaseType(osg::Referenced); @@ -506,19 +523,19 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext::WindowingSystemInterface) __unsigned_int__getNumScreens__C5_ScreenIdentifier_R1, "", ""); - I_Method3(void, getScreenResolution, IN, const osg::GraphicsContext::ScreenIdentifier &, screenIdentifier, IN, unsigned int &, width, IN, unsigned int &, height, + I_Method2(void, getScreenSettings, IN, const osg::GraphicsContext::ScreenIdentifier &, screenIdentifier, IN, osg::GraphicsContext::ScreenSettings &, resolution, Properties::PURE_VIRTUAL, - __void__getScreenResolution__C5_ScreenIdentifier_R1__unsigned_int_R1__unsigned_int_R1, + __void__getScreenSettings__C5_ScreenIdentifier_R1__ScreenSettings_R1, "", ""); - I_Method3(bool, setScreenResolution, IN, const osg::GraphicsContext::ScreenIdentifier &, x, IN, unsigned, int, IN, unsigned, int, + I_Method2(bool, setScreenSettings, IN, const osg::GraphicsContext::ScreenIdentifier &, x, IN, const osg::GraphicsContext::ScreenSettings &, x, Properties::VIRTUAL, - __bool__setScreenResolution__C5_ScreenIdentifier_R1__unsigned__unsigned, + __bool__setScreenSettings__C5_ScreenIdentifier_R1__C5_ScreenSettings_R1, "", ""); - I_Method2(bool, setScreenRefreshRate, IN, const osg::GraphicsContext::ScreenIdentifier &, x, IN, double, x, - Properties::VIRTUAL, - __bool__setScreenRefreshRate__C5_ScreenIdentifier_R1__double, + I_Method2(void, enumerateScreenSettings, IN, const osg::GraphicsContext::ScreenIdentifier &, screenIdentifier, IN, osg::GraphicsContext::ScreenSettingsList &, resolutionList, + Properties::PURE_VIRTUAL, + __void__enumerateScreenSettings__C5_ScreenIdentifier_R1__ScreenSettingsList_R1, "", ""); I_Method1(osg::GraphicsContext *, createGraphicsContext, IN, osg::GraphicsContext::Traits *, traits, @@ -526,6 +543,21 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext::WindowingSystemInterface) __GraphicsContext_P1__createGraphicsContext__Traits_P1, "", ""); + I_Method3(void, getScreenResolution, IN, const osg::GraphicsContext::ScreenIdentifier &, screenIdentifier, IN, unsigned int &, width, IN, unsigned int &, height, + Properties::NON_VIRTUAL, + __void__getScreenResolution__C5_ScreenIdentifier_R1__unsigned_int_R1__unsigned_int_R1, + "Gets screen resolution without using the ScreenResolution structure. ", + ""); + I_Method3(bool, setScreenResolution, IN, const osg::GraphicsContext::ScreenIdentifier &, screenIdentifier, IN, unsigned int, width, IN, unsigned int, height, + Properties::NON_VIRTUAL, + __bool__setScreenResolution__C5_ScreenIdentifier_R1__unsigned_int__unsigned_int, + "Sets screen resolution without using the ScreenSettings structure. ", + ""); + I_Method2(bool, setScreenRefreshRate, IN, const osg::GraphicsContext::ScreenIdentifier &, screenIdentifier, IN, double, refreshRate, + Properties::NON_VIRTUAL, + __bool__setScreenRefreshRate__C5_ScreenIdentifier_R1__double, + "", + ""); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Operation >) @@ -574,3 +606,5 @@ STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::Operation > >) STD_VECTOR_REFLECTOR(std::vector< osg::GraphicsContext * >) +STD_VECTOR_REFLECTOR(std::vector< osg::GraphicsContext::ScreenSettings >) + diff --git a/src/osgWrappers/osgDB/DatabasePager.cpp b/src/osgWrappers/osgDB/DatabasePager.cpp index 74380282c..598481480 100644 --- a/src/osgWrappers/osgDB/DatabasePager.cpp +++ b/src/osgWrappers/osgDB/DatabasePager.cpp @@ -217,42 +217,42 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager) I_Method1(void, setExpiryDelay, IN, double, expiryDelay, Properties::NON_VIRTUAL, __void__setExpiryDelay__double, - "Set the amount of time that a subgraph will be kept without being visited in the cull traversal before being removed. ", + "Deprecated. ", ""); I_Method0(double, getExpiryDelay, Properties::NON_VIRTUAL, __double__getExpiryDelay, - "Get the amount of time that a subgraph will be kept without being visited in the cull traversal before being removed. ", + "Deprecated. ", ""); I_Method1(void, setExpiryFrames, IN, int, expiryFrames, Properties::NON_VIRTUAL, __void__setExpiryFrames__int, - "Set the number of frames that a subgraph will be kept without being visited in the cull traversal before being removed. ", + "Deprecated. ", ""); I_Method0(int, getExpiryFrames, Properties::NON_VIRTUAL, __int__getExpiryFrames, - "Get the number of frames that a subgraph will be kept without being visited in the cull traversal before being removed. ", + "Deprecated. ", ""); I_Method1(void, setReleaseDelay, IN, double, releaseDelay, Properties::NON_VIRTUAL, __void__setReleaseDelay__double, - "Set the amount of time that a subgraph's OpenGL objects will be kept without being visited in the cull traversal before being released. ", + "Deprecated. ", ""); I_Method0(double, getReleaseDelay, Properties::NON_VIRTUAL, __double__getReleaseDelay, - "Get the amount of time that a subgraph's OpenGL objects will be kept without being visited in the cull traversal before being released. ", + "Deprecated. ", ""); I_Method1(void, setReleaseFrames, IN, int, releaseFrames, Properties::NON_VIRTUAL, __void__setReleaseFrames__int, - "Set the number of frames that a subgraph's OpenGL objects will be kept without being visited in the cull traversal before being released. ", + "Deprecated. ", ""); I_Method0(int, getReleaseFrames, Properties::NON_VIRTUAL, __int__getReleaseFrames, - "Get the number of frames that a subgraph's OpenGL objects will be kept without being visited in the cull traversal before being released. ", + "Deprecated. ", ""); I_Method1(void, setDeleteRemovedSubgraphsInDatabaseThread, IN, bool, flag, Properties::NON_VIRTUAL, diff --git a/src/osgWrappers/osgTerrain/Terrain.cpp b/src/osgWrappers/osgTerrain/Terrain.cpp index 00a33a129..518d6fc2f 100644 --- a/src/osgWrappers/osgTerrain/Terrain.cpp +++ b/src/osgWrappers/osgTerrain/Terrain.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -99,6 +100,21 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Terrain) __C5_TerrainTile_P1__getTile__C5_TileID_R1, "Get the const TerrainTile for a given TileID. ", ""); + I_Method1(void, setTerrainTechniquePrototype, IN, osgTerrain::TerrainTechnique *, technique, + Properties::NON_VIRTUAL, + __void__setTerrainTechniquePrototype__TerrainTechnique_P1, + "Set the TerrainTechnique cprototype from which TerrainTiles can clone the techniques from. ", + ""); + I_Method0(osgTerrain::TerrainTechnique *, getTerrainTechniquePrototype, + Properties::NON_VIRTUAL, + __TerrainTechnique_P1__getTerrainTechniquePrototype, + "Get the TerrainTechnique prototype. ", + ""); + I_Method0(const osgTerrain::TerrainTechnique *, getTerrainTechniquePrototype, + Properties::NON_VIRTUAL, + __C5_TerrainTechnique_P1__getTerrainTechniquePrototype, + "Get the const TerrainTechnique protype. ", + ""); I_ProtectedMethod0(void, dirtyRegisteredTiles, Properties::NON_VIRTUAL, Properties::NON_CONST, @@ -120,6 +136,9 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Terrain) I_SimpleProperty(float, SampleRatio, __float__getSampleRatio, __void__setSampleRatio__float); + I_SimpleProperty(osgTerrain::TerrainTechnique *, TerrainTechniquePrototype, + __TerrainTechnique_P1__getTerrainTechniquePrototype, + __void__setTerrainTechniquePrototype__TerrainTechnique_P1); I_SimpleProperty(float, VerticalScale, __float__getVerticalScale, __void__setVerticalScale__float); diff --git a/src/osgWrappers/osgTerrain/TerrainTile.cpp b/src/osgWrappers/osgTerrain/TerrainTile.cpp index 3b2cbe884..034c74947 100644 --- a/src/osgWrappers/osgTerrain/TerrainTile.cpp +++ b/src/osgWrappers/osgTerrain/TerrainTile.cpp @@ -104,7 +104,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainTile) __C5_TileID_R1__getTileID, "Get the TileID (layer, x,y) of the TerrainTile. ", ""); - I_Method1(void, setTerrainTechnique, IN, osgTerrain::TerrainTechnique *, TerrainTechnique, + I_Method1(void, setTerrainTechnique, IN, osgTerrain::TerrainTechnique *, terrainTechnique, Properties::NON_VIRTUAL, __void__setTerrainTechnique__TerrainTechnique_P1, "Set the TerrainTechnique. ",