Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/lws/SceneLoader.cpp
- Timestamp:
- 03/21/12 18:36:20 (15 months ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osgPlugins/lws/SceneLoader.cpp
r11514 r13041 44 44 osg::Quat rotate_ypr(const osg::Vec3 &ypr, const osg::Vec3 pivot_rot = osg::Vec3(0, 0, 0)) 45 45 { 46 osg::Quat Q1(ypr.z(), osg::Vec3(0, -1, 0)); 46 osg::Quat Q1(ypr.z(), osg::Vec3(0, -1, 0)); 47 47 osg::Quat Q2(ypr.y(), osg::Vec3(-1, 0, 0)); 48 48 osg::Quat Q3(ypr.x(), osg::Vec3(0, 0, -1)); 49 osg::Quat Q4(pivot_rot.z(), osg::Vec3(0, -1, 0)); 49 osg::Quat Q4(pivot_rot.z(), osg::Vec3(0, -1, 0)); 50 50 osg::Quat Q5(pivot_rot.y(), osg::Vec3(-1, 0, 0)); 51 51 osg::Quat Q6(pivot_rot.x(), osg::Vec3(0, 0, -1)); … … 63 63 str.erase(str.size()-1); 64 64 } 65 65 66 66 } 67 67 … … 224 224 std::string filename; 225 225 std::getline(iss, filename); 226 227 // trim any trailing control characters. 226 227 // trim any trailing control characters. 228 228 trim(filename); 229 229 230 if (!filename.empty()) 230 if (!filename.empty()) 231 231 { 232 232 233 233 234 234 osg::ref_ptr<osg::Group> objnode; … … 259 259 so.name = oss.str(); 260 260 so.layer_node = objnode->getChild(layer-1); 261 if (so.layer_node.valid()) { 261 if (so.layer_node.valid()) { 262 262 scene_objects_.push_back(so); 263 263 } … … 319 319 if (name == "Envelope") { 320 320 if (((capture_obj_motion_ && !scene_objects_.empty()) || 321 (capture_cam_motion_ && !scene_cameras_.empty())) && 321 (capture_cam_motion_ && !scene_cameras_.empty())) && 322 322 (data.size() >= 2)) { 323 323
