Frederic Bouvier:
Call sgLoad3DModel from simgear instead of duplicating code.
This commit is contained in:
ehofman
parent
dba02e35d4
commit
924e95fec2
1 changed files with 6 additions and 105 deletions
|
|
@ -9,19 +9,9 @@
|
||||||
|
|
||||||
#include <simgear/compiler.h>
|
#include <simgear/compiler.h>
|
||||||
|
|
||||||
#include <string.h> // for strcmp()
|
|
||||||
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#include <plib/sg.h>
|
|
||||||
#include <plib/ssg.h>
|
#include <plib/ssg.h>
|
||||||
#include <plib/ul.h>
|
|
||||||
|
|
||||||
#include <simgear/structure/exception.hxx>
|
|
||||||
#include <simgear/misc/sg_path.hxx>
|
|
||||||
#include <simgear/props/props.hxx>
|
#include <simgear/props/props.hxx>
|
||||||
#include <simgear/props/props_io.hxx>
|
|
||||||
#include <simgear/scene/model/animation.hxx>
|
|
||||||
#include <simgear/scene/model/model.hxx>
|
#include <simgear/scene/model/model.hxx>
|
||||||
|
|
||||||
#include "panelnode.hxx"
|
#include "panelnode.hxx"
|
||||||
|
|
@ -30,111 +20,22 @@
|
||||||
|
|
||||||
SG_USING_STD(vector);
|
SG_USING_STD(vector);
|
||||||
|
|
||||||
|
static
|
||||||
|
ssgEntity *load_panel(SGPropertyNode *n)
|
||||||
|
{
|
||||||
|
return new FGPanelNode(n);
|
||||||
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////
|
||||||
// Global functions.
|
// Global functions.
|
||||||
////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
// FIXME: should attempt to share more of the code with
|
|
||||||
// fgLoad3DModel() since these routines are almost identical with the
|
|
||||||
// exception of the panel node section.
|
|
||||||
|
|
||||||
ssgBranch *
|
ssgBranch *
|
||||||
fgLoad3DModelPanel( const string &fg_root, const string &path,
|
fgLoad3DModelPanel( const string &fg_root, const string &path,
|
||||||
SGPropertyNode *prop_root,
|
SGPropertyNode *prop_root,
|
||||||
double sim_time_sec )
|
double sim_time_sec )
|
||||||
{
|
{
|
||||||
ssgBranch * model = 0;
|
return sgLoad3DModel( fg_root, path, prop_root, sim_time_sec, load_panel );
|
||||||
SGPropertyNode props;
|
|
||||||
|
|
||||||
// Load the 3D aircraft object itself
|
|
||||||
SGPath modelpath = path;
|
|
||||||
if ( !ulIsAbsolutePathName( path.c_str() ) ) {
|
|
||||||
SGPath tmp = fg_root;
|
|
||||||
tmp.append(modelpath.str());
|
|
||||||
modelpath = tmp;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for an XML wrapper
|
|
||||||
if (modelpath.str().substr(modelpath.str().size() - 4, 4) == ".xml") {
|
|
||||||
readProperties(modelpath.str(), &props);
|
|
||||||
if (props.hasValue("/path")) {
|
|
||||||
modelpath = modelpath.dir();
|
|
||||||
modelpath.append(props.getStringValue("/path"));
|
|
||||||
} else {
|
|
||||||
if (model == 0)
|
|
||||||
model = new ssgBranch;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Assume that textures are in
|
|
||||||
// the same location as the XML file.
|
|
||||||
if (model == 0) {
|
|
||||||
ssgTexturePath((char *)modelpath.dir().c_str());
|
|
||||||
model = (ssgBranch *)ssgLoad((char *)modelpath.c_str());
|
|
||||||
if (model == 0)
|
|
||||||
throw sg_exception("Failed to load 3D model");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set up the alignment node
|
|
||||||
ssgTransform * alignmainmodel = new ssgTransform;
|
|
||||||
alignmainmodel->addKid(model);
|
|
||||||
sgMat4 res_matrix;
|
|
||||||
sgMakeOffsetsMatrix(&res_matrix,
|
|
||||||
props.getFloatValue("/offsets/heading-deg", 0.0),
|
|
||||||
props.getFloatValue("/offsets/roll-deg", 0.0),
|
|
||||||
props.getFloatValue("/offsets/pitch-deg", 0.0),
|
|
||||||
props.getFloatValue("/offsets/x-m", 0.0),
|
|
||||||
props.getFloatValue("/offsets/y-m", 0.0),
|
|
||||||
props.getFloatValue("/offsets/z-m", 0.0));
|
|
||||||
alignmainmodel->setTransform(res_matrix);
|
|
||||||
|
|
||||||
unsigned int i;
|
|
||||||
|
|
||||||
// Load panels
|
|
||||||
vector<SGPropertyNode_ptr> panel_nodes = props.getChildren("panel");
|
|
||||||
for (i = 0; i < panel_nodes.size(); i++) {
|
|
||||||
SG_LOG(SG_INPUT, SG_DEBUG, "Loading a panel");
|
|
||||||
FGPanelNode * panel = new FGPanelNode(panel_nodes[i]);
|
|
||||||
if (panel_nodes[i]->hasValue("name"))
|
|
||||||
panel->setName((char *)panel_nodes[i]->getStringValue("name"));
|
|
||||||
model->addKid(panel);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load sub-models
|
|
||||||
vector<SGPropertyNode_ptr> model_nodes = props.getChildren("model");
|
|
||||||
for (i = 0; i < model_nodes.size(); i++) {
|
|
||||||
SGPropertyNode_ptr node = model_nodes[i];
|
|
||||||
ssgTransform * align = new ssgTransform;
|
|
||||||
sgMat4 res_matrix;
|
|
||||||
sgMakeOffsetsMatrix(&res_matrix,
|
|
||||||
node->getFloatValue("offsets/heading-deg", 0.0),
|
|
||||||
node->getFloatValue("offsets/roll-deg", 0.0),
|
|
||||||
node->getFloatValue("offsets/pitch-deg", 0.0),
|
|
||||||
node->getFloatValue("offsets/x-m", 0.0),
|
|
||||||
node->getFloatValue("offsets/y-m", 0.0),
|
|
||||||
node->getFloatValue("offsets/z-m", 0.0));
|
|
||||||
align->setTransform(res_matrix);
|
|
||||||
|
|
||||||
ssgBranch * kid = sgLoad3DModel( fg_root, node->getStringValue("path"),
|
|
||||||
prop_root, sim_time_sec );
|
|
||||||
align->addKid(kid);
|
|
||||||
align->setName(node->getStringValue("name", ""));
|
|
||||||
model->addKid(align);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load animations
|
|
||||||
vector<SGPropertyNode_ptr> animation_nodes = props.getChildren("animation");
|
|
||||||
for (i = 0; i < animation_nodes.size(); i++) {
|
|
||||||
const char * name = animation_nodes[i]->getStringValue("name", 0);
|
|
||||||
vector<SGPropertyNode_ptr> name_nodes =
|
|
||||||
animation_nodes[i]->getChildren("object-name");
|
|
||||||
sgMakeAnimation( model, name, name_nodes, prop_root, animation_nodes[i],
|
|
||||||
sim_time_sec);
|
|
||||||
}
|
|
||||||
|
|
||||||
return alignmainmodel;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue