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

Replaced use of unsigned int/enum mask combinations with int/enum mask combinations to avoid the need for casting enums to unsigned ints,

Browse Source 
and to avoid associated warnings.

Update wrappers to reflect these changes.
This commit is contained in:
Robert Osfield
2010-03-05 12:55:08 +00:00
parent 273420bb1c
commit 86f491e649
16 changed files with 84 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/osgSim/ObjectRecordData
View File

@@ -52,15 +52,12 @@ class ObjectRecordData : public osg::Object
META_Object( osgSim, ObjectRecordData );
enum Flags
{
DONT_DISPLAY_IN_DAYLIGHT = 0x80000000u >> 0,
DONT_DISPLAY_AT_DUSK = 0x80000000u >> 1,
DONT_DISPLAY_AT_NIGHT = 0x80000000u >> 2,
DONT_ILLUMINATE = 0x80000000u >> 3,
FLAT_SHADED = 0x80000000u >> 4,
GROUPS_SHADOW_OBJECT = 0x80000000u >> 5
};
static const unsigned int DONT_DISPLAY_IN_DAYLIGHT = 0x80000000u >> 0;
static const unsigned int DONT_DISPLAY_AT_DUSK = 0x80000000u >> 1;
static const unsigned int DONT_DISPLAY_AT_NIGHT = 0x80000000u >> 2;
static const unsigned int DONT_ILLUMINATE = 0x80000000u >> 3;
static const unsigned int FLAT_SHADED = 0x80000000u >> 4;
static const unsigned int GROUPS_SHADOW_OBJECT = 0x80000000u >> 5;
unsigned int _flags;
short _relativePriority;

14
include/osgSim/SphereSegment
View File

@@ -194,10 +194,10 @@ public:
@param dm Bitmask specifying which parts of the sphere segment should be drawn.
@see DrawMask
*/
void setDrawMask(DrawMask dm);
void setDrawMask(int dm);
/** Get the DrawMask */
DrawMask getDrawMask() const { return _drawMask; }
int getDrawMask() const { return _drawMask; }
/** Set the color of the surface. */
void setSurfaceColor(const osg::Vec4& c);
@@ -305,11 +305,11 @@ private:
int _density;
// Draw details
DrawMask _drawMask;
osg::Vec4 _surfaceColor;
osg::Vec4 _spokeColor;
osg::Vec4 _edgeLineColor;
osg::Vec4 _planeColor;
int _drawMask;
osg::Vec4 _surfaceColor;
osg::Vec4 _spokeColor;
osg::Vec4 _edgeLineColor;
osg::Vec4 _planeColor;
};
}