Update of /cvsroot/simspark/simspark/spark/oxygen/sceneserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv26653
Modified Files:
Tag: projectx
transform.cpp
Log Message:
merge from HEAD
Index: transform.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/transform.cpp,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** transform.cpp 18 Feb 2006 19:48:06 -0000 1.2
--- transform.cpp 17 Jun 2007 07:57:25 -0000 1.2.4.1
***************
*** 85,90 ****
mOldLocalTransform = mLocalTransform;
! mLocalTransform = transform;
! parent->SetWorldTransform(mIdentityMatrix);
}
--- 85,91 ----
mOldLocalTransform = mLocalTransform;
! mLocalTransform = (parent->GetWorldTransform());
! mLocalTransform.InvertMatrix();
! mLocalTransform = mLocalTransform * transform;
}
***************
*** 98,101 ****
--- 99,107 ----
}
+ const salt::Vector3f& Transform::GetLocalPos()
+ {
+ return mLocalTransform.Pos();
+ }
+
void Transform::SetLocalRotationRad(const salt::Vector3f &rot)
{
|
