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

From Daniel Trstenjak, build fixes for Hpux 11.11, Irix 6.5, Solaris 8 and Aix

Browse Source
This commit is contained in:
Robert Osfield
2006-08-02 10:43:26 +00:00
parent 91081a0ad7
commit 553d017fd9
17 changed files with 90 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/GLU
View File

@@ -14,7 +14,7 @@
#ifndef OSG_GLU
#define OSG_GLU 1
#ifdef __APPLE__
#if defined(__APPLE__) || defined (_AIX)
#include <OpenGL/glu.h>
#define GLU_TESS_CALLBACK GLvoid (CALLBACK*)(...)
#else

8
include/osg/Math
View File

@@ -84,6 +84,10 @@
inline float atan2f(float value1, float value2) { return static_cast<float>(atan2(value1,value2)); }
#endif
#ifndef tanf
inline float tanf(float value) { return static_cast<float>(tan(value)); }
#endif
#endif
@@ -95,6 +99,10 @@
inline float floorf(float value) { return static_cast<float>(floor(value)); }
#endif
#ifndef ceilf
inline float ceilf(float value) { return static_cast<float>(ceil(value)); }
#endif
#endif
namespace osg {

8
include/osg/NodeTrackerCallback
View File

@@ -28,7 +28,13 @@ class OSG_EXPORT NodeTrackerCallback : public NodeCallback
typedef std::vector< observer_ptr<Node> > ObserveredNodePath;
void setTrackNodePath(const osg::NodePath& nodePath) { _trackNodePath.clear(); _trackNodePath.insert(_trackNodePath.begin(), nodePath.begin(),nodePath.end()); }
void setTrackNodePath(const osg::NodePath& nodePath)
{
_trackNodePath.clear();
_trackNodePath.reserve(nodePath.size());
std::copy(nodePath.begin(), nodePath.end(), std::back_inserter(_trackNodePath));
}
void setTrackNodePath(const ObserveredNodePath& nodePath) { _trackNodePath = nodePath; }
ObserveredNodePath& getTrackNodePath() { return _trackNodePath; }

5
include/osg/Texture
View File

@@ -160,8 +160,11 @@
#define GL_TEXTURE_BINDING_3D 0x806A
#endif
#ifndef GL_TEXTURE_COMPARE_MODE_ARB
#ifndef GL_DEPTH_TEXTURE_MODE_ARB
#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B
#endif
#ifndef GL_TEXTURE_COMPARE_MODE_ARB
#define GL_TEXTURE_COMPARE_MODE_ARB 0x884C
#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884D
#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884E

1
include/osgDB/ReaderWriter
View File

@@ -22,6 +22,7 @@
#include <osgDB/Export>
#include <deque>
#include <iosfwd>
namespace osgDB {

8
include/osgGA/NodeTrackerManipulator
View File

@@ -31,7 +31,13 @@ class OSGGA_EXPORT NodeTrackerManipulator : public MatrixManipulator
typedef std::vector< osg::observer_ptr<osg::Node> > ObserveredNodePath;
void setTrackNodePath(const osg::NodePath& nodePath) { _trackNodePath.clear(); _trackNodePath.insert(_trackNodePath.begin(), nodePath.begin(),nodePath.end()); }
void setTrackNodePath(const osg::NodePath& nodePath)
{
_trackNodePath.clear();
_trackNodePath.reserve(nodePath.size());
std::copy(nodePath.begin(), nodePath.end(), std::back_inserter(_trackNodePath));
}
void setTrackNodePath(const ObserveredNodePath& nodePath) { _trackNodePath = nodePath; }
ObserveredNodePath& getTrackNodePath() { return _trackNodePath; }