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

From Marco Jez, "Current version of the LWO plugin creates one Geode with a single Geometry

Browse Source 
for each Lighwave surface, in order to keep surface names (geometries can't
have names). The attached fix adds a plugin option named "COMBINE_GEODES"
that allows to place all geometries under a single Geode whenever possible,
thus offering better chances of further optimization through
osgUtil::Optimizer. The downside is that surface names are no longer stored
in the scene graph when using this option."
This commit is contained in:
Robert Osfield 2005-03-07 12:14:24 +00:00
parent d0c79ea638
commit 8993190ec7
3 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/osgPlugins/lwo/Converter.cpp
View File

@ -161,6 +161,9 @@ void Converter::build_scene_graph(Object &obj)
// create normal array
osg::ref_ptr<osg::Vec3Array> normals = j->normals()->asVec3Array(j->points()->size());
// create first geode
osg::ref_ptr<osg::Geode> geode = new osg::Geode;
for (GeometryBin_map::iterator i=bins.begin(); i!=bins.end(); ++i) {
const Surface *surface = i->first;
GeometryBin &bin = i->second;
@ -180,17 +183,18 @@ void Converter::build_scene_graph(Object &obj)
osg::notify(osg::DEBUG_INFO) << "DEBUG INFO: lwosg::Converter: \tcreating geometry for surface '" << (surface ? surface->get_name() : std::string("anonymous")) << "'\n";
osg::ref_ptr<osg::Geode> geode = new osg::Geode;
osg::ref_ptr<osg::Geometry> geo = new osg::Geometry;
geode->addDrawable(geo.get());
geo->setVertexArray(new_points.get());
geo->setNormalArray(new_normals.get());
geo->setNormalBinding(osg::Geometry::BIND_PER_VERTEX);
bool group_used = false;
if (surface) {
geode->setName(surface->get_name());
if (!options_.combine_geodes)
{
geode->setName(surface->get_name());
}
// apply surface parameters and texture/color maps according to remapping map
osg::ref_ptr<VertexMap_map> rm_texture_maps = j->texture_maps()->remap(remapping);
@ -204,14 +208,29 @@ void Converter::build_scene_graph(Object &obj)
options_.use_osgfx,
options_.force_arb_compression,
db_options_.get());
if (sgrp) {
sgrp->addChild(geode.get());
if (sgrp)
{
group_used = true;
osg::ref_ptr<osg::Geode> grp_geode = new osg::Geode;
grp_geode->setName(surface->get_name());
grp_geode->addDrawable(geo.get());
sgrp->addChild(grp_geode.get());
layer_group->addChild(sgrp);
} else {
}
}
if (!group_used)
{
geode->addDrawable(geo.get());
if (geode->getNumParents() == 0)
{
layer_group->addChild(geode.get());
}
} else {
layer_group->addChild(geode.get());
}
if (!options_.combine_geodes)
{
geode = new osg::Geode;
}
// add primitive sets to geometry

11
src/osgPlugins/lwo/Converter.h
View File

@ -30,8 +30,17 @@ namespace lwosg
bool apply_light_model;
bool use_osgfx;
bool force_arb_compression;
bool combine_geodes;
Options(): csf(new LwoCoordFixer), max_tex_units(0), apply_light_model(true), use_osgfx(false), force_arb_compression(false) {}
Options()
: csf(new LwoCoordFixer),
max_tex_units(0),
apply_light_model(true),
use_osgfx(false),
force_arb_compression(false),
combine_geodes(false)
{
}
};
Converter();

1
src/osgPlugins/lwo/ReaderWriterLWO.cpp
View File

@ -94,6 +94,7 @@ lwosg::Converter::Options ReaderWriterLWO::parse_options(const Options *options)
std::istringstream iss(options->getOptionString());
std::string opt;
while (iss >> opt) {
if (opt == "COMBINE_GEODES") conv_options.combine_geodes = true;
if (opt == "FORCE_ARB_COMPRESSION") conv_options.force_arb_compression = true;
if (opt == "USE_OSGFX") conv_options.use_osgfx = true;
if (opt == "NO_LIGHTMODEL_ATTRIBUTE") conv_options.apply_light_model = false;