From f7166c4541559b835c3eb65b6038e9da6c25a55b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 21 Jan 2005 19:21:01 +0000 Subject: [PATCH] Fixed the input/output handling of ReferenceFrame values to be RELATIVE and ABSOLUTE rather than long original names. --- src/osgPlugins/osg/LightSource.cpp | 14 +++++++++----- src/osgPlugins/osg/Transform.cpp | 17 ++++++++++------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/osgPlugins/osg/LightSource.cpp b/src/osgPlugins/osg/LightSource.cpp index 7bbf62f45..d7b8e51b7 100644 --- a/src/osgPlugins/osg/LightSource.cpp +++ b/src/osgPlugins/osg/LightSource.cpp @@ -27,13 +27,16 @@ bool LightSource_readLocalData(Object& obj, Input& fr) LightSource& lightsource = static_cast(obj); - if (fr[0].matchWord("referenceFrame")) { - if (fr[1].matchWord("RELATIVE_TO_ABSOLUTE") || fr[1].matchWord("ABSOLUTE")) { + if (fr[0].matchWord("referenceFrame")) + { + if (fr[1].matchWord("RELATIVE_TO_ABSOLUTE") || fr[1].matchWord("ABSOLUTE")) + { lightsource.setReferenceFrame(LightSource::ABSOLUTE_RF); fr += 2; iteratorAdvanced = true; } - if (fr[1].matchWord("RELATIVE_TO_PARENTS") || fr[1].matchWord("RELATIVE")) { + if (fr[1].matchWord("RELATIVE_TO_PARENTS") || fr[1].matchWord("RELATIVE")) + { lightsource.setReferenceFrame(LightSource::RELATIVE_RF); fr += 2; iteratorAdvanced = true; @@ -57,9 +60,10 @@ bool LightSource_writeLocalData(const Object& obj, Output& fw) const LightSource& lightsource = static_cast(obj); fw.indent() << "referenceFrame "; - switch (lightsource.getReferenceFrame()) { + switch (lightsource.getReferenceFrame()) + { case LightSource::ABSOLUTE_RF: - fw << "RELATIVE_TO_ABSOLUTE\n"; + fw << "ABSOLUTE\n"; break; case LightSource::RELATIVE_RF: default: diff --git a/src/osgPlugins/osg/Transform.cpp b/src/osgPlugins/osg/Transform.cpp index cb55d494e..24d057c0a 100644 --- a/src/osgPlugins/osg/Transform.cpp +++ b/src/osgPlugins/osg/Transform.cpp @@ -25,7 +25,6 @@ RegisterDotOsgWrapperProxy g_TransformProxy DotOsgWrapper::READ_AND_WRITE ); - bool Transform_readLocalData(Object& obj, Input& fr) { bool iteratorAdvanced = false; @@ -46,16 +45,19 @@ bool Transform_readLocalData(Object& obj, Input& fr) fr +=2 ; iteratorAdvanced = true; } - - } - if (fr[0].matchWord("referenceFrame")) { - if (fr[1].matchWord("RELATIVE_TO_ABSOLUTE") || fr[1].matchWord("ABSOLUTE") ) { + } + + if (fr[0].matchWord("referenceFrame")) + { + if (fr[1].matchWord("RELATIVE_TO_ABSOLUTE") || fr[1].matchWord("ABSOLUTE") ) + { transform.setReferenceFrame(Transform::ABSOLUTE_RF); fr += 2; iteratorAdvanced = true; } - if (fr[1].matchWord("RELATIVE_TO_PARENTS") || fr[1].matchWord("RELATIVE")) { + if (fr[1].matchWord("RELATIVE_TO_PARENTS") || fr[1].matchWord("RELATIVE")) + { transform.setReferenceFrame(Transform::RELATIVE_RF); fr += 2; iteratorAdvanced = true; @@ -71,7 +73,8 @@ bool Transform_writeLocalData(const Object& obj, Output& fw) const Transform& transform = static_cast(obj); fw.indent() << "referenceFrame "; - switch (transform.getReferenceFrame()) { + switch (transform.getReferenceFrame()) + { case Transform::ABSOLUTE_RF: fw << "ABSOLUTE\n"; break;