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

Merge branch 'maint' into next

Browse Source
This commit is contained in:
Tim Moore
2009-05-18 00:34:06 +02:00
parent 03bfd829da 7dc9eba2d0
commit 7e7ce2f38e
13 changed files with 56 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
simgear/debug/logtest.cxx
View File

@@ -1,5 +1,5 @@
#include <string>
#include "Debug/logstream.hxx"
#include <simgear/debug/logstream.hxx>
class Test {

6
simgear/io/tcp_server.cxx
View File

@@ -12,6 +12,7 @@ class TcpServer
{
public:
TcpServer();
~TcpServer();
bool open();
bool process();
bool close();
@@ -25,6 +26,11 @@ TcpServer::TcpServer()
channel = new SGSocket( "", "5500", "tcp" );
}
TcpServer::~TcpServer()
{
delete channel;
}
bool
TcpServer::open()
{

2
simgear/math/interpolater.hxx
View File

@@ -35,7 +35,7 @@
#include <simgear/compiler.h>
#include "simgear/structure/SGReferenced.hxx"
#include <simgear/structure/SGReferenced.hxx>
#include <map>

2
simgear/misc/tabbed_values.cxx
View File

@@ -21,10 +21,10 @@
// $Id$
#include <cstdlib>
#include <assert.h>
#include "tabbed_values.hxx"
#include "assert.h"
SGTabbedValues::SGTabbedValues(const char *line) :
_line(line)

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>

1
simgear/screen/screen-dump.cxx
View File

@@ -55,6 +55,7 @@ bool sg_glWritePPMFile(const char *filename, GLubyte *buffer, int win_width, int
ibuffer = (unsigned char *) malloc(win_width*win_height*RGB3);
if ( (fp = fopen(filename, "wb")) == NULL ) {
free(ibuffer);
printf("Warning: cannot open %s\n", filename);
return false;
}

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

2
simgear/threads/SGThread.cxx
View File

@@ -11,7 +11,7 @@
# include <sys/time.h>
#endif
#if _MSC_VER >= 1300
# include "winsock2.h"
# include <winsock2.h>
#endif
#include "SGThread.hxx"

6
simgear/timing/sg_time.cxx
View File

@@ -122,11 +122,7 @@ SGTime::SGTime() {
SGTime::~SGTime()
{
if ( tzContainer != NULL ) {
SGTimeZoneContainer *tmp = tzContainer;
tzContainer = NULL;
delete tmp;
}
delete tzContainer;
}

2
simgear/xml/xmldef.h
View File

@@ -53,7 +53,7 @@ particular environments. */
#ifdef MOZILLA
#include "nspr.h"
#include <nspr.h>
#define malloc(x) PR_Malloc(x)
#define realloc(x, y) PR_Realloc((x), (y))
#define calloc(x, y) PR_Calloc((x),(y))