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

From Paul Obermeier, "Please find enclosed some changed OSG header files.

Browse Source 
The changes are more or less just beautifications
(when looked at them from the C++ view), but make
wrapping OSG with SWIG easier.
I have tested the changes with both 2.8.1-rc4 and the
current head and would appreciate to incorporate the
changes in both branches.

Here is a description of the changes:

osg/BoundingSphere:
   Use the following typedef (like used in BoundingBox)
       typedef typename VT::value_type value_type;
   instead of
       typedef typename vec_type::value_type value_type;

   SWIG reports errors on the latter construct.
   Also makes it consistent with BoundingBox.


osg/Vec4ub:
   Consistent use of "value_type" throughout the file.


osg/Vec?b:
   Consistent use of "value_type" throughout the files.

   Also changed
       typedef char value_type;
   to
       typedef signed char value_type;

   In the case of a simple "char", SWIG assumes a string.
   Using "signed char" instead of "char" does not change
   the behaviour of the class."
This commit is contained in:
Robert Osfield
2009-05-18 14:53:11 +00:00
parent d4ec341573
commit 0c345e76d4
9 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgWrappers/osg/Vec2b.cpp
View File

@@ -22,7 +22,7 @@
#include <osg/io_utils>
TYPE_NAME_ALIAS(char, osg::Vec2b::value_type)
TYPE_NAME_ALIAS(signed char, osg::Vec2b::value_type)
BEGIN_VALUE_REFLECTOR(osg::Vec2b)
I_ReaderWriter(osgIntrospection::StdReaderWriter<reflected_type>); // user-defined
@@ -31,8 +31,8 @@ BEGIN_VALUE_REFLECTOR(osg::Vec2b)
I_Constructor0(____Vec2b,
"",
"");
I_Constructor2(IN, char, r, IN, char, g,
____Vec2b__char__char,
I_Constructor2(IN, osg::Vec2b::value_type, r, IN, osg::Vec2b::value_type, g,
____Vec2b__value_type__value_type,
"",
"");
I_Method0(osg::Vec2b::value_type *, ptr,

2
src/osgWrappers/osg/Vec3b.cpp
View File

@@ -22,7 +22,7 @@
#include <osg/io_utils>
TYPE_NAME_ALIAS(char, osg::Vec3b::value_type)
TYPE_NAME_ALIAS(signed char, osg::Vec3b::value_type)
BEGIN_VALUE_REFLECTOR(osg::Vec3b)
I_ReaderWriter(osgIntrospection::StdReaderWriter<reflected_type>); // user-defined

2
src/osgWrappers/osg/Vec4b.cpp
View File

@@ -22,7 +22,7 @@
#include <osg/io_utils>
TYPE_NAME_ALIAS(char, osg::Vec4b::value_type)
TYPE_NAME_ALIAS(signed char, osg::Vec4b::value_type)
BEGIN_VALUE_REFLECTOR(osg::Vec4b)
I_ReaderWriter(osgIntrospection::StdReaderWriter<reflected_type>); // user-defined

44
src/osgWrappers/osg/Vec4ub.cpp
View File

@@ -35,59 +35,59 @@ BEGIN_VALUE_REFLECTOR(osg::Vec4ub)
____Vec4ub__value_type__value_type__value_type__value_type,
"",
"");
I_Method0(unsigned char *, ptr,
I_Method0(osg::Vec4ub::value_type *, ptr,
Properties::NON_VIRTUAL,
__unsigned_char_P1__ptr,
__value_type_P1__ptr,
"",
"");
I_Method0(const unsigned char *, ptr,
I_Method0(const osg::Vec4ub::value_type *, ptr,
Properties::NON_VIRTUAL,
__C5_unsigned_char_P1__ptr,
__C5_value_type_P1__ptr,
"",
"");
I_Method4(void, set, IN, unsigned char, r, IN, unsigned char, g, IN, unsigned char, b, IN, unsigned char, a,
I_Method4(void, set, IN, osg::Vec4ub::value_type, r, IN, osg::Vec4ub::value_type, g, IN, osg::Vec4ub::value_type, b, IN, osg::Vec4ub::value_type, a,
Properties::NON_VIRTUAL,
__void__set__unsigned_char__unsigned_char__unsigned_char__unsigned_char,
__void__set__value_type__value_type__value_type__value_type,
"",
"");
I_Method0(unsigned char &, r,
I_Method0(osg::Vec4ub::value_type &, r,
Properties::NON_VIRTUAL,
__unsigned_char_R1__r,
__value_type_R1__r,
"",
"");
I_Method0(unsigned char &, g,
I_Method0(osg::Vec4ub::value_type &, g,
Properties::NON_VIRTUAL,
__unsigned_char_R1__g,
__value_type_R1__g,
"",
"");
I_Method0(unsigned char &, b,
I_Method0(osg::Vec4ub::value_type &, b,
Properties::NON_VIRTUAL,
__unsigned_char_R1__b,
__value_type_R1__b,
"",
"");
I_Method0(unsigned char &, a,
I_Method0(osg::Vec4ub::value_type &, a,
Properties::NON_VIRTUAL,
__unsigned_char_R1__a,
__value_type_R1__a,
"",
"");
I_Method0(unsigned char, r,
I_Method0(osg::Vec4ub::value_type, r,
Properties::NON_VIRTUAL,
__unsigned_char__r,
__value_type__r,
"",
"");
I_Method0(unsigned char, g,
I_Method0(osg::Vec4ub::value_type, g,
Properties::NON_VIRTUAL,
__unsigned_char__g,
__value_type__g,
"",
"");
I_Method0(unsigned char, b,
I_Method0(osg::Vec4ub::value_type, b,
Properties::NON_VIRTUAL,
__unsigned_char__b,
__value_type__b,
"",
"");
I_Method0(unsigned char, a,
I_Method0(osg::Vec4ub::value_type, a,
Properties::NON_VIRTUAL,
__unsigned_char__a,
__value_type__a,
"",
"");
END_REFLECTOR