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

From Marco Jez, moved color matrix IO code across to using Marix.h so it

Browse Source 
handles float's double's properly.
This commit is contained in:
Robert Osfield 2003-09-10 11:21:56 +00:00
parent 2586bd5d1c
commit 252da5e5f9
1 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/osgPlugins/osg/ColorMatrix.cpp
View File

@ -4,6 +4,8 @@
#include <osgDB/Input>
#include <osgDB/Output>
#include "Matrix.h"
using namespace osg;
using namespace osgDB;
@ -24,44 +26,13 @@ RegisterDotOsgWrapperProxy g_ColorMatrixProxy
bool ColorMatrix_readLocalData(Object& obj, Input& fr)
{
bool iteratorAdvanced = false;
ColorMatrix& colorMatrix = static_cast<ColorMatrix&>(obj);
bool matched = true;
for(int k=0;k<16 && matched;++k)
{
matched = fr[k].isFloat();
}
if (matched)
{
Matrix& matrix = colorMatrix.getMatrix();
int k=0;
for(int i=0;i<4;++i)
{
for(int j=0;j<4;++j)
{
fr[k].getFloat(matrix(i,j));
k++;
}
}
fr += 16;
iteratorAdvanced = true;
}
return iteratorAdvanced;
return readMatrix(colorMatrix.getMatrix(), fr);
}
bool ColorMatrix_writeLocalData(const Object& obj, Output& fw)
{
const ColorMatrix& colorMatrix = static_cast<const ColorMatrix&>(obj);
const Matrix& matrix = colorMatrix.getMatrix();
fw.indent() << matrix(0,0) << " " << matrix(0,1) << " " << matrix(0,2) << " " << matrix(0,3) << std::endl;
fw.indent() << matrix(1,0) << " " << matrix(1,1) << " " << matrix(1,2) << " " << matrix(1,3) << std::endl;
fw.indent() << matrix(2,0) << " " << matrix(2,1) << " " << matrix(2,2) << " " << matrix(2,3) << std::endl;
fw.indent() << matrix(3,0) << " " << matrix(3,1) << " " << matrix(3,2) << " " << matrix(3,3) << std::endl;
return true;
return writeMatrix(colorMatrix.getMatrix(), fw);
}