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

Tweaks to try and fix VS6.0 problems.

Browse Source
This commit is contained in:
Robert Osfield
2006-07-06 15:00:51 +00:00
parent df2d0e1ceb
commit ee1b6a5dd6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgPlugins/lwo/Surface.cpp
View File

@@ -285,21 +285,21 @@ osg::Group *Surface::apply(osg::Geometry *geo, const VertexMap_map *texture_maps
}
}
for (VertexMap_binding_map::const_iterator i=texmap_bindings.begin(); i!=texmap_bindings.end(); ++i)
for (VertexMap_binding_map::const_iterator vi=texmap_bindings.begin(); vi!=texmap_bindings.end(); ++vi)
{
for (VertexMap_map::const_iterator j=texture_maps->begin(); j!=texture_maps->end(); ++j)
{
if (j->first == i->first)
if (j->first == vi->first)
{
if (geo->getTexCoordArray(i->second) != 0)
if (geo->getTexCoordArray(vi->second) != 0)
{
osg::notify(osg::WARN) << "Warning: lwosg::Surface: explicing binding of texture map '" << i->first << "' to texunit " << i->second << " will replace existing texture map" << std::endl;
osg::notify(osg::WARN) << "Warning: lwosg::Surface: explicing binding of texture map '" << vi->first << "' to texunit " << vi->second << " will replace existing texture map" << std::endl;
}
geo->setTexCoordArray(i->second, j->second->asVec2Array(num_points));
geo->setTexCoordArray(vi->second, j->second->asVec2Array(num_points));
}
else
{
osg::notify(osg::WARN) << "Warning: lwosg::Surface: explicit binding of texture map '" << i->first << "' to texunit " << i->second << " was requested but there is no such map in this LWO file" << std::endl;
osg::notify(osg::WARN) << "Warning: lwosg::Surface: explicit binding of texture map '" << vi->first << "' to texunit " << vi->second << " was requested but there is no such map in this LWO file" << std::endl;
}
}
}