fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' into durk-atc

Browse source
This commit is contained in:
Durk Talsma 2011-08-09 20:09:14 +02:00
commit b603344d69
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/AIModel/AIBase.cxx
View file

@ -225,8 +225,22 @@ bool FGAIBase::init(bool search_in_AI_path) {
else
_installed = true;
model = load3DModel(f, props);
osg::Node * mdl = SGModelLib::loadPagedModel(f, props, new FGNasalModelData(props));
model = mdl;
double aiModelMaxRange = fgGetDouble("/sim/rendering/static-lod/ai", 0.0);
if( aiModelMaxRange > 0.0 ) {
osg::LOD * lod = new osg::LOD;
lod->setName("AI-model range animation node");
lod->addChild( mdl, 0, aiModelMaxRange );
lod->setCenterMode(osg::LOD::USE_BOUNDING_SPHERE_CENTER);
lod->setRangeMode(osg::LOD::DISTANCE_FROM_EYE_POINT);
model = lod;
}
initModel(mdl);
if (model.valid() && _initialized == false) {
aip.init( model.get() );
aip.setVisible(true);
@ -266,13 +280,6 @@ void FGAIBase::initModel(osg::Node *node)
}
osg::Node* FGAIBase::load3DModel(const string &path, SGPropertyNode *prop_root)
{
model = SGModelLib::loadPagedModel(path, prop_root, new FGNasalModelData(prop_root));
initModel(model.get());
return model.get();
}
bool FGAIBase::isa( object_type otype ) {
return otype == _otype;
}

3
src/AIModel/AIBase.hxx
View file

@ -300,9 +300,6 @@ public:
inline double _getRange() { return range; };
inline double _getBearing() { return bearing; };
virtual osg::Node* load3DModel(const string &path,
SGPropertyNode *prop_root);
static bool _isNight();
string & getCallSign();

6
src/GUI/gui_funcs.cxx
View file

@ -184,17 +184,13 @@ void helpCb ()
#else // _WIN32
// Look for favorite browser
char Dummy[1024], ExecName[1024], browserParameter[1024];
char win32_name[1024];
# ifdef __CYGWIN__
cygwin32_conv_to_full_win32_path(path.c_str(),win32_name);
# else
strncpy(win32_name,path.c_str(), 1024);
# endif
Dummy[0] = 0;
FindExecutable(win32_name, Dummy, ExecName);
snprintf(browserParameter, 1024, "file:///%s", win32_name);
ShellExecute ( NULL, "open", ExecName, browserParameter, Dummy,
ShellExecute ( NULL, "open", win32_name, NULL, NULL,
SW_SHOWNORMAL ) ;
#endif