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

Avoid the non const SGVec*::osg() method.

Browse Source 
Modified Files:
 	SGTranslateTransform.cxx SGScaleTransform.cxx
 	SGRotateTransform.cxx
This commit is contained in:
frohlich
2009-09-03 20:13:24 +00:00
committed by Tim Moore
parent 67b9cba4d3
commit e71f3790ce
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
simgear/scene/model/SGRotateTransform.cxx
View File

@@ -142,21 +142,21 @@ bool RotateTransform_readLocalData(osg::Object& obj, osgDB::Input& fr)
SGRotateTransform& rot = static_cast<SGRotateTransform&>(obj);
if (fr[0].matchWord("center")) {
++fr;
SGVec3d center;
if (fr.readSequence(center.osg()))
osg::Vec3d center;
if (fr.readSequence(center))
fr += 3;
else
return false;
rot.setCenter(center);
rot.setCenter(SGVec3d(center));
}
if (fr[0].matchWord("axis")) {
++fr;
SGVec3d axis;
if (fr.readSequence(axis.osg()))
osg::Vec3d axis;
if (fr.readSequence(axis))
fr += 3;
else
return false;
rot.setCenter(axis);
rot.setCenter(SGVec3d(axis));
}
if (fr[0].matchWord("angle")) {
++fr;

12
simgear/scene/model/SGScaleTransform.cxx
View File

@@ -107,21 +107,21 @@ bool ScaleTransform_readLocalData(osg::Object& obj, osgDB::Input& fr)
SGScaleTransform& scale = static_cast<SGScaleTransform&>(obj);
if (fr[0].matchWord("center")) {
++fr;
SGVec3d center;
if (fr.readSequence(center.osg()))
osg::Vec3d center;
if (fr.readSequence(center))
fr += 3;
else
return false;
scale.setCenter(center);
scale.setCenter(SGVec3d(center));
}
if (fr[0].matchWord("scaleFactor")) {
++fr;
SGVec3d scaleFactor;
if (fr.readSequence(scaleFactor.osg()))
osg::Vec3d scaleFactor;
if (fr.readSequence(scaleFactor))
fr += 3;
else
return false;
scale.setScaleFactor(scaleFactor);
scale.setScaleFactor(SGVec3d(scaleFactor));
}
return true;
}

6
simgear/scene/model/SGTranslateTransform.cxx
View File

@@ -84,12 +84,12 @@ bool TranslateTransform_readLocalData(osg::Object& obj, osgDB::Input& fr)
if (fr[0].matchWord("axis")) {
++fr;
SGVec3d axis;
if (fr.readSequence(axis.osg()))
osg::Vec3d axis;
if (fr.readSequence(axis))
fr += 3;
else
return false;
trans.setAxis(axis);
trans.setAxis(SGVec3d(axis));
}
if (fr[0].matchWord("value")) {
++fr;