FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make use of optimized matrix multiplication routines in osg.

Browse Source 
Modified Files:
	simgear/scene/model/SGTranslateTransform.cxx
This commit is contained in:
frohlich
2009-03-30 18:42:45 +02:00
committed by Tim Moore
parent 403d9b6ac1
commit 45f653167d
1 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/SGTranslateTransform.cxx
+4 -22
View File
@@ -29,16 +29,6 @@
#include "SGTranslateTransform.hxx" #include "SGTranslateTransform.hxx"
static inline void
set_translation (osg::Matrix &matrix, double position_m, const SGVec3d &axis)
{
SGVec3d xyz = axis * position_m;
matrix.makeIdentity();
matrix(3, 0) = xyz[0];
matrix(3, 1) = xyz[1];
matrix(3, 2) = xyz[2];
}
SGTranslateTransform::SGTranslateTransform() : SGTranslateTransform::SGTranslateTransform() :
_axis(0, 0, 0), _axis(0, 0, 0),
_value(0) _value(0)
@@ -59,13 +49,9 @@ SGTranslateTransform::computeLocalToWorldMatrix(osg::Matrix& matrix,
osg::NodeVisitor* nv) const osg::NodeVisitor* nv) const
{ {
if (_referenceFrame == RELATIVE_RF) { if (_referenceFrame == RELATIVE_RF) {
osg::Matrix tmp; matrix.preMultTranslate((_value*_axis).osg());
set_translation(tmp, _value, _axis);
matrix.preMult(tmp);
} else { } else {
osg::Matrix tmp; matrix.setTrans((_value*_axis).osg());
set_translation(tmp, _value, _axis);
matrix = tmp;
} }
return true; return true;
} }
@@ -75,13 +61,9 @@ SGTranslateTransform::computeWorldToLocalMatrix(osg::Matrix& matrix,
osg::NodeVisitor* nv) const osg::NodeVisitor* nv) const
{ {
if (_referenceFrame == RELATIVE_RF) { if (_referenceFrame == RELATIVE_RF) {
osg::Matrix tmp; matrix.postMultTranslate((-_value*_axis).osg());
set_translation(tmp, -_value, _axis);
matrix.postMult(tmp);
} else { } else {
osg::Matrix tmp; matrix.setTrans((-_value*_axis).osg());
set_translation(tmp, -_value, _axis);
matrix = tmp;
} }
return true; return true;
} }