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

I missed committing t hese changes yesterday.

Browse Source
This commit is contained in:
curt
2003-05-16 11:40:07 +00:00
parent 1f3947ea4c
commit f7a3dbc5ed
4 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,6 @@ 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/modellib.hxx>
#include "mat.hxx"

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

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

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

@@ -1,6 +1,6 @@
// matmodel.cxx -- class to handle models tied to a material property
//
// Written by Curtis Olson, started May 1998.
// Written by David Megginson, started May 1998.
//
// Copyright (C) 1998 - 2003 Curtis L. Olson - curt@flightgear.org
//
@@ -117,26 +117,26 @@ SGMatModel::~SGMatModel ()
}
int
SGMatModel::get_model_count( SGModelLib *loader,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec )
SGMatModel::get_model_count( SGModelLib *modellib,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec )
{
load_models( loader, fg_root, prop_root, sim_time_sec );
load_models( modellib, fg_root, prop_root, sim_time_sec );
return _models.size();
}
inline void
SGMatModel::load_models ( SGModelLib *loader,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec )
SGMatModel::load_models ( SGModelLib *modellib,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec )
{
// Load model only on demand
if (!_models_loaded) {
for (unsigned int i = 0; i < _paths.size(); i++) {
ssgEntity *entity = loader->load_model( fg_root, _paths[i],
prop_root, sim_time_sec );
ssgEntity *entity = modellib->load_model( fg_root, _paths[i],
prop_root, sim_time_sec );
if (entity != 0) {
// FIXME: this stuff can be handled
// in the XML wrapper as well (at least,
@@ -164,22 +164,22 @@ SGMatModel::load_models ( SGModelLib *loader,
ssgEntity *
SGMatModel::get_model( int index,
SGModelLib *loader,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec )
SGModelLib *modellib,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec )
{
load_models( loader, fg_root, prop_root, sim_time_sec ); // comment this out if preloading models
load_models( modellib, fg_root, prop_root, sim_time_sec ); // comment this out if preloading models
return _models[index];
}
ssgEntity *
SGMatModel::get_random_model( SGModelLib *loader,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec )
SGMatModel::get_random_model( SGModelLib *modellib,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec )
{
load_models( loader, fg_root, prop_root, sim_time_sec ); // comment this out if preloading models
load_models( modellib, fg_root, prop_root, sim_time_sec ); // comment this out if preloading models
int nModels = _models.size();
int index = int(sg_random() * nModels);
if (index >= nModels)

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

@@ -36,12 +36,12 @@
#include <plib/ssg.h>
#include <simgear/props/props.hxx>
#include <simgear/scene/model/modellib.hxx>
SG_USING_STD(string);
class SGMatModelGroup;
class SGModelLib;
/**
@@ -71,7 +71,7 @@ public:
*
* @return The number of variant models.
*/
int get_model_count( SGModelLib *loader,
int get_model_count( SGModelLib *modellib,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec );
@@ -84,7 +84,7 @@ public:
* @return The model.
*/
ssgEntity *get_model( int index,
SGModelLib *loader,
SGModelLib *modellib,
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( SGModelLib *loader,
ssgEntity *get_random_model( SGModelLib *modellib,
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( SGModelLib *loader,
void load_models( SGModelLib *modellib,
const string &fg_root,
SGPropertyNode *prop_root,
double sim_time_sec );