X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscene%2Fmodel%2Fplacement.cxx;h=852844921f5424ede40e8297cf8c54a5a74dd926;hb=9f9c4cf32c2cf774c7febd7fe2b4e65a7d205294;hp=486113d8287eba2fcd4becbcb47b513a9753575a;hpb=704385ff0addfc53d4182ea13141c39e695e1932;p=simgear.git diff --git a/simgear/scene/model/placement.cxx b/simgear/scene/model/placement.cxx index 486113d8..85284492 100644 --- a/simgear/scene/model/placement.cxx +++ b/simgear/scene/model/placement.cxx @@ -46,7 +46,7 @@ SGModelPlacement::update() { // The cartesian position SGVec3d position = SGVec3d::fromGeod(_position); - _transform->setPosition(position.osg()); + _transform->setPosition(toOsg(position)); // The orientation, composed from the horizontal local orientation and the // orientation wrt the horizontal local frame @@ -56,7 +56,7 @@ SGModelPlacement::update() // the y axis 180 degrees. orient *= SGQuatd::fromRealImag(0, SGVec3d(0, 1, 0)); - _transform->setAttitude(orient.osg()); + _transform->setAttitude(toOsg(orient)); } bool @@ -138,7 +138,7 @@ void SGModelPlacement::setReferenceTime(const double& referenceTime) { SGSceneUserData* userData; - userData = SGSceneUserData::getOrCreateSceneUserData(_transform); + userData = SGSceneUserData::getOrCreateSceneUserData(_transform.get()); SGSceneUserData::Velocity* vel = userData->getOrCreateVelocity(); vel->referenceTime = referenceTime; } @@ -147,7 +147,7 @@ void SGModelPlacement::setBodyLinearVelocity(const SGVec3d& linear) { SGSceneUserData* userData; - userData = SGSceneUserData::getOrCreateSceneUserData(_transform); + userData = SGSceneUserData::getOrCreateSceneUserData(_transform.get()); SGSceneUserData::Velocity* vel = userData->getOrCreateVelocity(); vel->linear = SGVec3d(-linear[0], linear[1], -linear[2]); } @@ -156,7 +156,7 @@ void SGModelPlacement::setBodyAngularVelocity(const SGVec3d& angular) { SGSceneUserData* userData; - userData = SGSceneUserData::getOrCreateSceneUserData(_transform); + userData = SGSceneUserData::getOrCreateSceneUserData(_transform.get()); SGSceneUserData::Velocity* vel = userData->getOrCreateVelocity(); vel->angular = SGVec3d(-angular[0], angular[1], -angular[2]); }