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

From Mike Weiblen, added GLSL datatypes mat2 and mat3 to osg::Uniform, with .osg and .ive support

Browse Source
This commit is contained in:
Robert Osfield
2005-06-08 10:36:56 +00:00
parent f87d09b64d
commit e0cf176590
5 changed files with 277 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osgPlugins/ive/Uniform.cpp
View File

@@ -100,12 +100,16 @@ void Uniform::write(DataOutputStream* out){
}
case(osg::Uniform::FLOAT_MAT2):
{
osg::notify(osg::WARN)<<"Warning : type mat2 not supported for reading."<<std::endl;
osg::Matrix2 m2;
get(m2);
for(int i=0; i<4; ++i) out->writeFloat(m2[i]);
break;
}
case(osg::Uniform::FLOAT_MAT3):
{
osg::notify(osg::WARN)<<"Warning : type mat3 not supported for reading."<<std::endl;
osg::Matrix3 m3;
get(m3);
for(int i=0; i<9; ++i) out->writeFloat(m3[i]);
break;
}
case(osg::Uniform::FLOAT_MAT4):
@@ -117,7 +121,7 @@ void Uniform::write(DataOutputStream* out){
}
default:
{
osg::notify(osg::WARN)<<"Warning : uniform "<<getType()<<"type not supported for reading."<<std::endl;
osg::notify(osg::WARN)<<"Warning : uniform "<<getType()<<"type not supported for writing."<<std::endl;
break;
}
}
@@ -202,12 +206,16 @@ void Uniform::read(DataInputStream* in)
}
case(osg::Uniform::FLOAT_MAT2):
{
osg::notify(osg::WARN)<<"Warning : type mat2 not supported for reading."<<std::endl;
osg::Matrix2 m2;
for(int i=0; i<9; ++i) m2[i]=in->readFloat();
set(m2);
break;
}
case(osg::Uniform::FLOAT_MAT3):
{
osg::notify(osg::WARN)<<"Warning : type mat3 not supported for reading."<<std::endl;
osg::Matrix3 m3;
for(int i=0; i<9; ++i) m3[i]=in->readFloat();
set(m3);
break;
}
case(osg::Uniform::FLOAT_MAT4):

30
src/osgPlugins/osg/Uniform.cpp
View File

@@ -140,12 +140,27 @@ bool Uniform_readLocalData(Object& obj, Input& fr)
}
case(osg::Uniform::FLOAT_MAT2):
{
osg::notify(osg::WARN)<<"Warning : type mat2 not supported for reading."<<std::endl;
osg::Matrix2 value;
if (fr[0].getFloat(value[0]) && fr[1].getFloat(value[1]) &&
fr[2].getFloat(value[2]) && fr[3].getFloat(value[3]))
{
uniform.set(value);
fr+=4;
iteratorAdvanced = true;
}
break;
}
case(osg::Uniform::FLOAT_MAT3):
{
osg::notify(osg::WARN)<<"Warning : type mat3 not supported for reading."<<std::endl;
osg::Matrix3 value;
if (fr[0].getFloat(value[0]) && fr[1].getFloat(value[1]) && fr[2].getFloat(value[2]) &&
fr[3].getFloat(value[3]) && fr[4].getFloat(value[4]) && fr[5].getFloat(value[5]) &&
fr[6].getFloat(value[6]) && fr[7].getFloat(value[7]) && fr[8].getFloat(value[8]))
{
uniform.set(value);
fr+=9;
iteratorAdvanced = true;
}
break;
}
case(osg::Uniform::FLOAT_MAT4):
@@ -237,12 +252,19 @@ bool Uniform_writeLocalData(const Object& obj,Output& fw)
}
case(osg::Uniform::FLOAT_MAT2):
{
osg::notify(osg::WARN)<<"Warning : type mat2 not supported for writing."<<std::endl;
osg::Matrix2 value;
uniform.get(value);
fw << value[0]<<" "<<value[1]<<" "
<<value[2]<<" "<<value[3];
break;
}
case(osg::Uniform::FLOAT_MAT3):
{
osg::notify(osg::WARN)<<"Warning : type mat3 not supported for writing."<<std::endl;
osg::Matrix3 value;
uniform.get(value);
fw << value[0]<<" "<<value[1]<<" "<<value[2]<<" "
<<value[3]<<" "<<value[4]<<" "<<value[5]<<" "
<<value[6]<<" "<<value[7]<<" "<<value[8];
break;
}
case(osg::Uniform::FLOAT_MAT4):