#include <osg/Geode>
#include <osg/MatrixTransform>
+#include <osgDB/ReadFile>
#include <osgDB/WriteFile>
#include <osgDB/Registry>
#include <osg/Switch>
#include <simgear/props/props_io.hxx>
#include <simgear/props/condition.hxx>
#include <simgear/scene/util/SGNodeMasks.hxx>
+#include <simgear/scene/util/SGReaderWriterOptions.hxx>
#include "modellib.hxx"
-#include "SGPagedLOD.hxx"
#include "SGReaderWriterXML.hxx"
-#include "SGReaderWriterXMLOptions.hxx"
#include "animation.hxx"
#include "particles.hxx"
static osg::Node *
sgLoad3DModel_internal(const SGPath& path,
- const osgDB::ReaderWriter::Options* options,
+ const osgDB::Options* options,
SGPropertyNode *overlay = 0);
osgDB::ReaderWriter::ReadResult
SGReaderWriterXML::readNode(const std::string& fileName,
- const osgDB::ReaderWriter::Options* options) const
+ const osgDB::Options* options) const
{
osg::Node *result=0;
try {
static osg::Node *
sgLoad3DModel_internal(const SGPath& path,
- const osgDB::ReaderWriter::Options* options_,
+ const osgDB::Options* dbOptions,
SGPropertyNode *overlay)
{
if (!path.exists()) {
SG_LOG(SG_INPUT, SG_ALERT, "Failed to load file: \"" << path.str() << "\"");
return NULL;
}
-
- const SGReaderWriterXMLOptions* xmlOptions;
- xmlOptions = dynamic_cast<const SGReaderWriterXMLOptions*>(options_);
- SGSharedPtr<SGPropertyNode> prop_root;
- osg::Node *(*load_panel)(SGPropertyNode *)=0;
- osg::ref_ptr<SGModelData> data;
+ osg::ref_ptr<SGReaderWriterOptions> options;
+ options = SGReaderWriterOptions::copyOrCreate(dbOptions);
+
SGPath modelpath(path);
SGPath texturepath(path);
SGPath modelDir(modelpath.dir());
- if (xmlOptions) {
- prop_root = xmlOptions->getPropRoot();
- load_panel = xmlOptions->getLoadPanel();
- data = xmlOptions->getModelData();
- }
-
- if (!prop_root) {
+ SGSharedPtr<SGPropertyNode> prop_root = options->getPropertyNode();
+ if (!prop_root.valid())
prop_root = new SGPropertyNode;
- }
-
+ // The model data appear to be only used in the topmost model
+ osg::ref_ptr<SGModelData> data = options->getModelData();
+ options->setModelData(0);
+
osg::ref_ptr<osg::Node> model;
osg::ref_ptr<osg::Group> group;
SGPropertyNode_ptr props = new SGPropertyNode;
copyProperties(overlay, props);
if (props->hasValue("/path")) {
- modelpath = SGModelLib::findDataFile(props->getStringValue("/path"), NULL, modelDir);
+ string modelPathStr = props->getStringValue("/path");
+ modelpath = SGModelLib::findDataFile(modelPathStr, NULL, modelDir);
+ if (modelpath.isNull())
+ throw sg_io_exception("Model file not found: '" + modelPathStr + "'",
+ path.str());
+
if (props->hasValue("/texture-path")) {
- texturepath = SGModelLib::findDataFile(props->getStringValue("/texture-path"), NULL, modelDir);
+ string texturePathStr = props->getStringValue("/texture-path");
+ texturepath = SGModelLib::findDataFile(texturePathStr, NULL, modelDir);
+ if (texturepath.isNull())
+ throw sg_io_exception("Texture file not found: '" + texturePathStr + "'",
+ path.str());
}
} else {
model = new osg::Node;
// model without wrapper
}
- osg::ref_ptr<SGReaderWriterXMLOptions> options
- = new SGReaderWriterXMLOptions(*options_);
- options->setPropRoot(prop_root);
- options->setLoadPanel(load_panel);
-
// Assume that textures are in
// the same location as the XML file.
if (!model) {
texturepath = texturepath.dir();
options->setDatabasePath(texturepath.str());
- osgDB::ReaderWriter::ReadResult modelResult
- = osgDB::Registry::instance()->readNode(modelpath.str(),
- options.get());
+ osgDB::ReaderWriter::ReadResult modelResult;
+ modelResult = osgDB::readNodeFile(modelpath.str(), options.get());
if (!modelResult.validNode())
throw sg_io_exception("Failed to load 3D model:" + modelResult.message(),
modelpath.str());
SGPath submodelpath;
osg::ref_ptr<osg::Node> submodel;
- SGPath submodelPath = SGModelLib::findDataFile(sub_props->getStringValue("path"),
+ string subPathStr = sub_props->getStringValue("path");
+ SGPath submodelPath = SGModelLib::findDataFile(subPathStr,
NULL, modelDir);
- osg::ref_ptr<SGReaderWriterXMLOptions> options;
- options = new SGReaderWriterXMLOptions(*options_);
- options->setPropRoot(prop_root);
- options->setLoadPanel(load_panel);
-
+ if (submodelPath.isNull()) {
+ SG_LOG(SG_INPUT, SG_ALERT, "Failed to load file: \"" << subPathStr << "\"");
+ continue;
+ }
+
try {
submodel = sgLoad3DModel_internal(submodelPath, options.get(),
sub_props->getNode("overlay"));
} catch (const sg_exception &t) {
SG_LOG(SG_INPUT, SG_ALERT, "Failed to load submodel: " << t.getFormattedMessage()
<< "\n\tfrom:" << t.getOrigin());
+ continue;
}
osg::ref_ptr<osg::Node> submodel_final = submodel;
}
} // end of submodel loading
+ osg::Node *(*load_panel)(SGPropertyNode *) = options->getLoadPanel();
if ( load_panel ) {
// Load panels
vector<SGPropertyNode_ptr> panel_nodes = props->getChildren("panel");
}
}
- std::vector<SGPropertyNode_ptr> particle_nodes;
- particle_nodes = props->getChildren("particlesystem");
- for (unsigned i = 0; i < particle_nodes.size(); ++i) {
- if (i==0) {
- if (!texturepath.extension().empty())
- texturepath = texturepath.dir();
-
- options->setDatabasePath(texturepath.str());
+ if (dbOptions->getPluginStringData("SimGear::PARTICLESYSTEM") != "OFF") {
+ std::vector<SGPropertyNode_ptr> particle_nodes;
+ particle_nodes = props->getChildren("particlesystem");
+ for (unsigned i = 0; i < particle_nodes.size(); ++i) {
+ osg::ref_ptr<SGReaderWriterOptions> options2;
+ options2 = new SGReaderWriterOptions(*options);
+ if (i==0) {
+ if (!texturepath.extension().empty())
+ texturepath = texturepath.dir();
+
+ options2->setDatabasePath(texturepath.str());
+ }
+ group->addChild(Particles::appendParticles(particle_nodes[i],
+ prop_root,
+ options2.get()));
}
- group->addChild(Particles::appendParticles(particle_nodes[i],
- prop_root,
- options.get()));
}
std::vector<SGPropertyNode_ptr> text_nodes;
}
PropertyList effect_nodes = props->getChildren("effect");
PropertyList animation_nodes = props->getChildren("animation");
+ PropertyList light_nodes = props->getChildren("light");
// Some material animations (eventually all) are actually effects.
makeEffectAnimations(animation_nodes, effect_nodes);
{
for (unsigned i = 0; i < animation_nodes.size(); ++i)
/// OSGFIXME: duh, why not only model?????
SGAnimation::animate(group.get(), animation_nodes[i], prop_root,
- options.get());
+ options.get(), path.str(), i);
if (!needTransform && group->getNumChildren() < 2) {
model = group->getChild(0);
projects / simgear.git / blobdiff