FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make SimGear compile with osg trunk

Browse Source 
Modified Files:
	simgear/scene/model/SGPagedLOD.cxx
 	simgear/scene/model/SGPagedLOD.hxx
 	simgear/scene/sky/cloud.cxx simgear/scene/sky/moon.cxx
	simgear/structure/OSGVersion.hxx
This commit is contained in:
frohlich
2009-05-16 08:13:52 +00:00
committed by Tim Moore
parent f91d96b51a
commit 7dc9eba2d0
5 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
simgear/scene/model/SGPagedLOD.cxx
View File

@@ -75,9 +75,7 @@ void SGPagedLOD::forceLoad(osgDB::DatabasePager *dbp)
setTimeStamp(childNum, 0);
double priority=1.0;
dbp->requestNodeFile(getFileName(childNum),this,priority,0,
#if SG_OSG_VERSION >= 25001
getDatabaseRequest(childNum),
#endif
_readerWriterOptions.get());
}

16
simgear/scene/model/SGPagedLOD.hxx
View File

@@ -17,7 +17,11 @@
#ifndef SGPAGEDLOD_HXX
#define SGPAGEDLOD_HXX 1
#include <simgear/structure/OSGVersion.hxx>
#include <osg/PagedLOD>
#if SG_OSG_MIN_VERSION_REQUIRED(2,9,5)
#include <osgDB/Options>
#endif
#include <osgDB/ReaderWriter>
#include <simgear/props/props.hxx>
@@ -44,19 +48,21 @@ public:
// reimplemented to notify the loading through ModelData
bool addChild(osg::Node *child);
void setReaderWriterOptions(osgDB::ReaderWriter::Options *o) {
_readerWriterOptions=o;
_readerWriterOptions->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_NONE);
void setReaderWriterOptions(osgDB::ReaderWriter::Options *options) {
_readerWriterOptions = options;
options->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_NONE);
#if SG_OSG_MIN_VERSION_REQUIRED(2,9,5)
setDatabaseOptions(options);
#endif
}
osgDB::ReaderWriter::Options * getReaderWriterOptions() {
osgDB::ReaderWriter::Options* getReaderWriterOptions() {
return _readerWriterOptions.get();
}
protected:
virtual ~SGPagedLOD();
osg::ref_ptr<osgDB::ReaderWriter::Options> _readerWriterOptions;
SGPropertyNode_ptr _props;
};
}
#endif

4
simgear/scene/sky/cloud.cxx
View File

@@ -30,6 +30,7 @@
#include <math.h>
#include <simgear/structure/OSGVersion.hxx>
#include <osg/AlphaFunc>
#include <osg/BlendFunc>
#include <osg/CullFace>
@@ -43,6 +44,9 @@
#include <osg/TextureCubeMap>
#include <osg/TexMat>
#include <osg/Fog>
#if SG_OSG_MIN_VERSION_REQUIRED(2,9,5)
#include <osgDB/Options>
#endif
#include <simgear/math/sg_random.h>
#include <simgear/misc/PathOptions.hxx>

4
simgear/scene/sky/moon.cxx
View File

@@ -32,6 +32,7 @@
#include <stdio.h>
#include <iostream>
#include <simgear/structure/OSGVersion.hxx>
#include <osg/Array>
#include <osg/AlphaFunc>
#include <osg/BlendFunc>
@@ -42,6 +43,9 @@
#include <osg/ShadeModel>
#include <osg/TexEnv>
#include <osg/Texture2D>
#if SG_OSG_MIN_VERSION_REQUIRED(2,9,5)
#include <osgDB/Options>
#endif
#include <simgear/constants.h>
#include <simgear/screen/colors.hxx>

24
simgear/structure/OSGVersion.hxx
View File

@@ -23,4 +23,28 @@
#define SG_OSG_VERSION \
((OPENSCENEGRAPH_MAJOR_VERSION*10000)\
+ (OPENSCENEGRAPH_MINOR_VERSION*1000) + OPENSCENEGRAPH_PATCH_VERSION)
#define SG_OSG_VERSION_GREATER_EQUAL(MAJOR, MINOR, PATCH) \
((OPENSCENEGRAPH_MAJOR_VERSION > (MAJOR)) || \
(OPENSCENEGRAPH_MAJOR_VERSION == (MAJOR) && \
(OPENSCENEGRAPH_MINOR_VERSION > (MINOR) || \
(OPENSCENEGRAPH_MINOR_VERSION == (MINOR) && \
OPENSCENEGRAPH_PATCH_VERSION >= (PATCH)))))
#define SG_OSG_VERSION_GREATER_THAN(MAJOR, MINOR, PATCH) \
((OPENSCENEGRAPH_MAJOR_VERSION > (MAJOR)) || \
(OPENSCENEGRAPH_MAJOR_VERSION == (MAJOR) && \
(OPENSCENEGRAPH_MINOR_VERSION > (MINOR) || \
(OPENSCENEGRAPH_MINOR_VERSION == (MINOR) && \
OPENSCENEGRAPH_PATCH_VERSION > (PATCH)))))
#define SG_OSG_VERSION_LESS_THAN(MAJOR, MINOR, PATCH) \
(!SG_OSG_VERSION_GREATER_EQUAL(MAJOR, MINOR, PATCH))
#define SG_OSG_VERSION_LESS_EQUAL(MAJOR, MINOR, PATCH) \
(!SG_OSG_VERSION_GREATER_THAN(MAJOR, MINOR, PATCH))
#define SG_OSG_MIN_VERSION_REQUIRED(MAJOR, MINOR, PATCH) \
SG_OSG_VERSION_GREATER_EQUAL(MAJOR, MINOR, PATCH)
#endif