From a8550e6536cf943e6c73d2628b4d2b98d5f47d0b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 12 May 2005 20:03:55 +0000 Subject: [PATCH] Fixed pairing of write and read of Matrixd --- src/osgPlugins/ive/MatrixTransform.cpp | 70 +++++++++++++------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/osgPlugins/ive/MatrixTransform.cpp b/src/osgPlugins/ive/MatrixTransform.cpp index ca7f00d3d..88462f6e5 100644 --- a/src/osgPlugins/ive/MatrixTransform.cpp +++ b/src/osgPlugins/ive/MatrixTransform.cpp @@ -1,15 +1,15 @@ /********************************************************************** * - * FILE: MatrixTransform.cpp + * FILE: MatrixTransform.cpp * - * DESCRIPTION: Read/Write osg::MatrixTransform in binary format to disk. + * DESCRIPTION: Read/Write osg::MatrixTransform in binary format to disk. * - * CREATED BY: Auto generated by iveGenerated - * and later modified by Rune Schmidt Jensen. + * CREATED BY: Auto generated by iveGenerated + * and later modified by Rune Schmidt Jensen. * - * HISTORY: Created 17.3.2003 + * HISTORY: Created 17.3.2003 * - * Copyright 2003 VR-C + * Copyright 2003 VR-C **********************************************************************/ #include "Exception.h" @@ -19,40 +19,40 @@ using namespace ive; void MatrixTransform::write(DataOutputStream* out){ - // Write MatrixTransform's identification. - out->writeInt(IVEMATRIXTRANSFORM); + // Write MatrixTransform's identification. + out->writeInt(IVEMATRIXTRANSFORM); - // If the osg class is inherited by any other class we should also write this to file. - osg::Group* group = dynamic_cast(this); - if(group){ - ((ive::Group*)(group))->write(out); - } - else - throw Exception("MatrixTransform::write(): Could not cast this osg::MatrixTransform to an osg::Group."); + // If the osg class is inherited by any other class we should also write this to file. + osg::Group* group = dynamic_cast(this); + if(group){ + ((ive::Group*)(group))->write(out); + } + else + throw Exception("MatrixTransform::write(): Could not cast this osg::MatrixTransform to an osg::Group."); - // Write MatrixTransform's properties. - out->writeMatrixf(getMatrix()); + // Write MatrixTransform's properties. + out->writeMatrixd(getMatrix()); } void MatrixTransform::read(DataInputStream* in){ - // Read MatrixTransform's identification. - int id = in->peekInt(); - if(id == IVEMATRIXTRANSFORM){ - // Code to read MatrixTransform's properties. - id = in->readInt(); - // If the osg class is inherited by any other class we should also read this from file. - osg::Group* group = dynamic_cast(this); - if(group){ - ((ive::Group*)(group))->read(in); - } - else - throw Exception("MatrixTransform::read(): Could not cast this osg::MatrixTransform to an osg::Group."); + // Read MatrixTransform's identification. + int id = in->peekInt(); + if(id == IVEMATRIXTRANSFORM){ + // Code to read MatrixTransform's properties. + id = in->readInt(); + // If the osg class is inherited by any other class we should also read this from file. + osg::Group* group = dynamic_cast(this); + if(group){ + ((ive::Group*)(group))->read(in); + } + else + throw Exception("MatrixTransform::read(): Could not cast this osg::MatrixTransform to an osg::Group."); - // Read matrix - setMatrix(in->readMatrixd()); - } - else{ - throw Exception("MatrixTransform::read(): Expected MatrixTransform identification"); - } + // Read matrix + setMatrix(in->readMatrixd()); + } + else{ + throw Exception("MatrixTransform::read(): Expected MatrixTransform identification"); + } }