← Back to branch summary

~ubuntu-branches/debian/experimental/openscenegraph/experimental

« back to all changes in this revision

Viewing changes to OpenSceneGraph/src/osgPlugins/lws/SceneLoader.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alberto Luaces
  • Date: 2011-01-29 11:36:29 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20110129113629-qisrm2kdqlurc7t3
Tags: 2.9.11-1
http://bugs.debian.org/592420
* Removed bug-555869-ftbfs_with_binutils_gold.dpatch since upstream has
  already taken care of the issue.
* Removed bug-528229.dpatch since the pkgconfig files are now also split
  in upstream.
* Removed explicit dependency on GLU.
* Upstream no longer includes osgIntrospection (Closes: #592420).
* Disabled zip plugin as its implementation stores an embedded copy of
  zlib.
* Enabled Qt support. Thanks James Goppert.
* Enabled SVG and PDF plugins. Thanks James Goppert.

Show diffs side-by-side

added added

removed removed

Lines of Context:
OpenSceneGraph/src/osgPlugins/lws/SceneLoader.cpp
140
140
                osg::Vec3 pos(options_.csf->fix_point(j->second.position));
141
141
                //const osg::Vec3 &ypr = j->second.ypr;
142
142
                osg::AnimationPath::ControlPoint cp(pos, osg::Quat(osg::PI_2, osg::Vec3(1, 0, 0)) * rotate_ypr(j->second.ypr), j->second.scale);
143
 
                osg::notify(osg::NOTICE)<<"scale = "<<j->second.scale<<std::endl;
 
143
                OSG_NOTICE<<"scale = "<<j->second.scale<<std::endl;
144
144
                ap->insert(j->first, cp);
145
145
            }
146
146
            camera_animations_.push_back(ap.get());
192
192
                }
193
193
                parent->addChild(pat.get());
194
194
            } else {
195
 
                osg::notify(osg::WARN) << "Warning: lwosg::SceneLoader: invalid parent" << std::endl;
 
195
                OSG_WARN << "Warning: lwosg::SceneLoader: invalid parent" << std::endl;
196
196
            }
197
197
        }
198
198
    }
237
237
 
238
238
            if (i == objects_.end()) {
239
239
 
240
 
                osg::notify(osg::NOTICE) << "Loading object \"" << filename << "\"" << std::endl;
 
240
                OSG_NOTICE << "Loading object \"" << filename << "\"" << std::endl;
241
241
 
242
242
                objnode = dynamic_cast<osg::Group *>(osgDB::readNodeFile(filename));
243
243
                if (!objnode.valid()) return false;
249
249
            }
250
250
 
251
251
            if (layer > objnode->getNumChildren()) {
252
 
                osg::notify(osg::WARN) << "Warning: lwosg::SceneLoader: layer " << layer << " does not exist in object " << filename << std::endl;
 
252
                OSG_WARN << "Warning: lwosg::SceneLoader: layer " << layer << " does not exist in object " << filename << std::endl;
253
253
                return 0;
254
254
            }
255
255