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

Various additions to better support view dependent overlay node, and updated wrappers

Browse Source
This commit is contained in:
Robert Osfield
2007-05-19 13:43:38 +00:00
parent e3747b1004
commit e37ec98748
8 changed files with 446 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgWrappers/osg/Plane.cpp
View File

@@ -178,6 +178,11 @@ BEGIN_VALUE_REFLECTOR(osg::Plane)
__int__intersect__C5_std_vectorT1_Vec3__R1,
"intersection test between plane and vertex list return 1 if the bs is completely above plane, return 0 if the bs intersects the plane, return -1 if the bs is completely below the plane. ",
"");
I_Method1(int, intersect, IN, const std::vector< osg::Vec3d > &, vertices,
Properties::NON_VIRTUAL,
__int__intersect__C5_std_vectorT1_Vec3d__R1,
"intersection test between plane and vertex list return 1 if the bs is completely above plane, return 0 if the bs intersects the plane, return -1 if the bs is completely below the plane. ",
"");
I_Method1(int, intersect, IN, const osg::BoundingSphere &, bs,
Properties::NON_VIRTUAL,
__int__intersect__C5_BoundingSphere_R1,
@@ -203,3 +208,5 @@ BEGIN_VALUE_REFLECTOR(osg::Plane)
0);
END_REFLECTOR
STD_VECTOR_REFLECTOR(std::vector< osg::Vec3d >)

8
src/osgWrappers/osg/Polytope.cpp
View File

@@ -57,6 +57,11 @@ BEGIN_VALUE_REFLECTOR(osg::Polytope)
__void__setToUnitFrustum__bool__bool,
"Create a Polytope which is a cube, centered at 0,0,0, with sides of 2 units. ",
"");
I_Method1(void, setToBoundingBox, IN, const osg::BoundingBox &, bb,
Properties::NON_VIRTUAL,
__void__setToBoundingBox__C5_BoundingBox_R1,
"Create a Polytope which is a equivilant to BoundingBox. ",
"");
I_Method2(void, setAndTransformProvidingInverse, IN, const osg::Polytope &, pt, IN, const osg::Matrix &, matrix,
Properties::NON_VIRTUAL,
__void__setAndTransformProvidingInverse__C5_Polytope_R1__C5_osg_Matrix_R1,
@@ -207,6 +212,9 @@ BEGIN_VALUE_REFLECTOR(osg::Polytope)
I_SimpleProperty(osg::Polytope::ClippingMask, ResultMask,
__ClippingMask__getResultMask,
__void__setResultMask__ClippingMask);
I_SimpleProperty(const osg::BoundingBox &, ToBoundingBox,
0,
__void__setToBoundingBox__C5_BoundingBox_R1);
END_REFLECTOR
BEGIN_VALUE_REFLECTOR(osg::fast_back_stack< osg::Polytope::ClippingMask >)

11
src/osgWrappers/osgGA/EventQueue.cpp
View File

@@ -10,6 +10,7 @@
#include <osgIntrospection/StaticMethodInfo>
#include <osgIntrospection/Attributes>
#include <osg/Referenced>
#include <osg/Timer>
#include <osgGA/EventQueue>
#include <osgGA/GUIEventAdapter>
@@ -241,6 +242,16 @@ BEGIN_OBJECT_REFLECTOR(osgGA::EventQueue)
__C5_GUIEventAdapter_P1__getCurrentEventState,
"",
"");
I_Method1(void, userEvent, IN, osg::Referenced *, userEventData,
Properties::NON_VIRTUAL,
__void__userEvent__osg_Referenced_P1,
"Method for adapting user defined events. ",
"");
I_Method2(void, userEvent, IN, osg::Referenced *, userEventData, IN, double, time,
Properties::NON_VIRTUAL,
__void__userEvent__osg_Referenced_P1__double,
"Method for adapting user defined events with specified event time. ",
"");
I_SimpleProperty(osgGA::GUIEventAdapter *, CurrentEventState,
__GUIEventAdapter_P1__getCurrentEventState,
0);

39
src/osgWrappers/osgGA/GUIEventAdapter.cpp
View File

@@ -10,6 +10,8 @@
#include <osgIntrospection/StaticMethodInfo>
#include <osgIntrospection/Attributes>
#include <osg/CopyOp>
#include <osg/Object>
#include <osgGA/GUIEventAdapter>
// Must undefine IN and OUT macros defined in Windows headers
@@ -43,6 +45,7 @@ BEGIN_ENUM_REFLECTOR(osgGA::GUIEventAdapter::EventType)
I_EnumLabel(osgGA::GUIEventAdapter::PEN_PROXIMITY_LEAVE);
I_EnumLabel(osgGA::GUIEventAdapter::CLOSE_WINDOW);
I_EnumLabel(osgGA::GUIEventAdapter::QUIT_APPLICATION);
I_EnumLabel(osgGA::GUIEventAdapter::USER);
END_REFLECTOR
BEGIN_ENUM_REFLECTOR(osgGA::GUIEventAdapter::KeySymbol)
@@ -209,15 +212,39 @@ BEGIN_ENUM_REFLECTOR(osgGA::GUIEventAdapter::TabletPointerType)
END_REFLECTOR
BEGIN_OBJECT_REFLECTOR(osgGA::GUIEventAdapter)
I_BaseType(osg::Referenced);
I_BaseType(osg::Object);
I_Constructor0(____GUIEventAdapter,
"",
"");
I_Constructor1(IN, const osgGA::GUIEventAdapter &, rhs,
Properties::NON_EXPLICIT,
____GUIEventAdapter__C5_GUIEventAdapter_R1,
"",
"");
I_ConstructorWithDefaults2(IN, const osgGA::GUIEventAdapter &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY,
____GUIEventAdapter__C5_GUIEventAdapter_R1__C5_osg_CopyOp_R1,
"",
"");
I_Method0(osg::Object *, cloneType,
Properties::VIRTUAL,
__osg_Object_P1__cloneType,
"Clone the type of an object, with Object* return type. ",
"Must be defined by derived classes. ");
I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop,
Properties::VIRTUAL,
__osg_Object_P1__clone__C5_osg_CopyOp_R1,
"Clone an object, with Object* return type. ",
"Must be defined by derived classes. ");
I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj,
Properties::VIRTUAL,
__bool__isSameKindAs__C5_osg_Object_P1,
"",
"");
I_Method0(const char *, libraryName,
Properties::VIRTUAL,
__C5_char_P1__libraryName,
"return the name of the object's library. ",
"Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. ");
I_Method0(const char *, className,
Properties::VIRTUAL,
__C5_char_P1__className,
"return the name of the object's class type. ",
"Must be defined by derived classes. ");
I_Method1(void, setHandled, IN, bool, handled,
Properties::NON_VIRTUAL,
__void__setHandled__bool,

2
src/osgWrappers/osgSim/ElevationSlice.cpp
View File

@@ -106,7 +106,5 @@ END_REFLECTOR
STD_PAIR_REFLECTOR(std::pair< double COMMA double >)
STD_VECTOR_REFLECTOR(std::vector< osg::Vec3d >)
STD_VECTOR_REFLECTOR(std::vector< osgSim::ElevationSlice::DistanceHeight >)