FGFS-4.1/simgear
3
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-05 17:01:58 +02: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
simgear/scene/model/SGRotateTransform.cxx
+6 -6
View File
@@ -142,21 +142,21 @@ bool RotateTransform_readLocalData(osg::Object& obj, osgDB::Input& fr)
SGRotateTransform& rot = static_cast<SGRotateTransform&>(obj); SGRotateTransform& rot = static_cast<SGRotateTransform&>(obj);
if (fr[0].matchWord("center")) { if (fr[0].matchWord("center")) {
++fr; ++fr;
SGVec3d center; osg::Vec3d center;
if (fr.readSequence(center.osg())) if (fr.readSequence(center))
fr += 3; fr += 3;
else else
return false; return false;
rot.setCenter(center); rot.setCenter(SGVec3d(center));
} }
if (fr[0].matchWord("axis")) { if (fr[0].matchWord("axis")) {
++fr; ++fr;
SGVec3d axis; osg::Vec3d axis;
if (fr.readSequence(axis.osg())) if (fr.readSequence(axis))
fr += 3; fr += 3;
else else
return false; return false;
rot.setCenter(axis); rot.setCenter(SGVec3d(axis));
} }
if (fr[0].matchWord("angle")) { if (fr[0].matchWord("angle")) {
++fr; ++fr;
simgear/scene/model/SGScaleTransform.cxx
+6 -6
View File
@@ -107,21 +107,21 @@ bool ScaleTransform_readLocalData(osg::Object& obj, osgDB::Input& fr)
SGScaleTransform& scale = static_cast<SGScaleTransform&>(obj); SGScaleTransform& scale = static_cast<SGScaleTransform&>(obj);
if (fr[0].matchWord("center")) { if (fr[0].matchWord("center")) {
++fr; ++fr;
SGVec3d center; osg::Vec3d center;
if (fr.readSequence(center.osg())) if (fr.readSequence(center))
fr += 3; fr += 3;
else else
return false; return false;
scale.setCenter(center); scale.setCenter(SGVec3d(center));
} }
if (fr[0].matchWord("scaleFactor")) { if (fr[0].matchWord("scaleFactor")) {
++fr; ++fr;
SGVec3d scaleFactor; osg::Vec3d scaleFactor;
if (fr.readSequence(scaleFactor.osg())) if (fr.readSequence(scaleFactor))
fr += 3; fr += 3;
else else
return false; return false;
scale.setScaleFactor(scaleFactor); scale.setScaleFactor(SGVec3d(scaleFactor));
} }
return true; return true;
} }
simgear/scene/model/SGTranslateTransform.cxx
+3 -3
View File
@@ -84,12 +84,12 @@ bool TranslateTransform_readLocalData(osg::Object& obj, osgDB::Input& fr)
if (fr[0].matchWord("axis")) { if (fr[0].matchWord("axis")) {
++fr; ++fr;
SGVec3d axis; osg::Vec3d axis;
if (fr.readSequence(axis.osg())) if (fr.readSequence(axis))
fr += 3; fr += 3;
else else
return false; return false;
trans.setAxis(axis); trans.setAxis(SGVec3d(axis));
} }
if (fr[0].matchWord("value")) { if (fr[0].matchWord("value")) {
++fr; ++fr;