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

Changes required for SUN Solaris port...

Browse Source
This commit is contained in:
Don BURNS
2002-03-18 21:56:00 +00:00
parent 45de7a5815
commit eb0587b5fb
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/GeoSet
View File

@@ -243,7 +243,7 @@ class SG_EXPORT GeoSet : public Drawable
/** set the colors and color indices of the geoset.*/
void setColors( Vec4 *cp, IndexPointer& ip );
/** set the color binding to the vertices/primitives/overall.*/
void setColorBinding( BindingType binding );
void setColorBinding( const BindingType binding );
inline BindingType getColorBinding() const { return _color_binding; }
/** get the number of texture coords required by the defined primitives and textures binding.*/

2
include/osg/Math
View File

@@ -7,7 +7,7 @@
#include <math.h>
#if defined(WIN32) || defined (macintosh)
#if defined(WIN32) || defined (macintosh)|| defined (sun)
#include <float.h>

8
include/osg/State
View File

@@ -116,14 +116,18 @@ class SG_EXPORT State : public Referenced
/** Get the DisplaySettings */
inline const DisplaySettings* getDisplaySettings() const { return _displaySettings.get(); }
typedef std::pair<const StateAttribute*,StateAttribute::OverrideValue> AttributePair;
typedef std::vector<AttributePair> AttributeVec;
typedef std::vector<StateAttribute::GLModeValue> ValueVec;
private:
unsigned int _contextID;
ref_ptr<FrameStamp> _frameStamp;
ref_ptr<Camera> _camera;
ref_ptr<DisplaySettings> _displaySettings;
typedef std::vector<StateAttribute::GLModeValue> ValueVec;
struct ModeStack
{
@@ -141,8 +145,6 @@ class SG_EXPORT State : public Referenced
};
typedef std::pair<const StateAttribute*,StateAttribute::OverrideValue> AttributePair;
typedef std::vector<AttributePair> AttributeVec;
struct AttributeStack
{