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

A patch from Frederic Bouvier to correct a naming problem caused bu Curts work. This gets FlightGear/SimGear compiling again

Browse Source
This commit is contained in:
ehofman
2003-05-16 08:51:24 +00:00
parent cb7589cc95
commit 1f3947ea4c
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
simgear/scene/material/mat.cxx
View File

@@ -40,7 +40,7 @@ SG_USING_STD(map);
#include <simgear/math/sg_random.h>
#include <simgear/misc/sg_path.hxx>
#include <simgear/misc/sgstream.hxx>
#include <simgear/scene/model/loader.hxx>
#include <simgear/scene/model/modellib.hxx>
#include "mat.hxx"

2
simgear/scene/material/mat.hxx
View File

@@ -38,7 +38,7 @@
#include <plib/ssg.h>
#include <simgear/props/props.hxx>
#include <simgear/scene/model/loader.hxx>
#include <simgear/scene/model/modellib.hxx>
#include "matmodel.hxx"

10
simgear/scene/material/matmodel.cxx
View File

@@ -40,7 +40,7 @@ SG_USING_STD(map);
#include <simgear/math/sg_random.h>
#include <simgear/misc/sg_path.hxx>
#include <simgear/misc/sgstream.hxx>
#include <simgear/scene/model/loader.hxx>
#include <simgear/scene/model/modellib.hxx>
#include "matmodel.hxx"
@@ -117,7 +117,7 @@ SGMatModel::~SGMatModel ()
}
int
SGMatModel::get_model_count( SGModelLoader *loader,
SGMatModel::get_model_count( SGModelLib *loader,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec )
@@ -127,7 +127,7 @@ SGMatModel::get_model_count( SGModelLoader *loader,
}
inline void
SGMatModel::load_models ( SGModelLoader *loader,
SGMatModel::load_models ( SGModelLib *loader,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec )
@@ -164,7 +164,7 @@ SGMatModel::load_models ( SGModelLoader *loader,
ssgEntity *
SGMatModel::get_model( int index,
SGModelLoader *loader,
SGModelLib *loader,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec )
@@ -174,7 +174,7 @@ SGMatModel::get_model( int index,
}
ssgEntity *
SGMatModel::get_random_model( SGModelLoader *loader,
SGMatModel::get_random_model( SGModelLib *loader,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec )

10
simgear/scene/material/matmodel.hxx
View File

@@ -36,7 +36,7 @@
#include <plib/ssg.h>
#include <simgear/props/props.hxx>
#include <simgear/scene/model/loader.hxx>
#include <simgear/scene/model/modellib.hxx>
SG_USING_STD(string);
@@ -71,7 +71,7 @@ public:
*
* @return The number of variant models.
*/
int get_model_count( SGModelLoader *loader,
int get_model_count( SGModelLib *loader,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec );
@@ -84,7 +84,7 @@ public:
* @return The model.
*/
ssgEntity *get_model( int index,
SGModelLoader *loader,
SGModelLib *loader,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec );
@@ -95,7 +95,7 @@ public:
*
* @return A randomly select model from the variants.
*/
ssgEntity *get_random_model( SGModelLoader *loader,
ssgEntity *get_random_model( SGModelLib *loader,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec );
@@ -132,7 +132,7 @@ private:
* This class uses lazy loading so that models won't be held
* in memory for materials that are never referenced.
*/
void load_models( SGModelLoader *loader,
void load_models( SGModelLib *loader,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec );