X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscene%2Fmodel%2Fplacement.cxx;h=c1a7d83badf1a4000dcad9e6df4f1b450949f1f4;hb=32a6bd78d8bf143f40922f1a0bc7a88ea7706a7d;hp=e7d4d384eace32440b6b52f1a5f87ac24d54f880;hpb=f5769627e4c51f73916decddd7605479f58b6a0e;p=simgear.git

diff --git a/simgear/scene/model/placement.cxx b/simgear/scene/model/placement.cxx
index e7d4d384..c1a7d83b 100644
--- a/simgear/scene/model/placement.cxx
+++ b/simgear/scene/model/placement.cxx
@@ -7,15 +7,11 @@
 #include <simgear_config.h>
 #endif
 
-#include <simgear/compiler.h>
-
-#include <simgear/scene/util/SGSceneUserData.hxx>
-
-#include "location.hxx"
-#include "placementtrans.hxx"
-
 #include "placement.hxx"
 
+#include <simgear/compiler.h>
+#include <simgear/scene/util/OsgMath.hxx>
+#include <simgear/scene/util/SGSceneUserData.hxx>
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -28,77 +24,68 @@ SGModelPlacement::SGModelPlacement () :
     _pitch_deg(0),
     _heading_deg(0),
     _selector(new osg::Switch),
-    _transform(new SGPlacementTransform),
-    _location(new SGLocation)
+    _transform(new osg::PositionAttitudeTransform)
 {
+    _selector->addChild(_transform.get());
 }
 
 SGModelPlacement::~SGModelPlacement ()
 {
-  delete _location;
 }
 
 void
 SGModelPlacement::init( osg::Node * model )
 {
+  // remove previous models (in case of reinit)
+  _transform->removeChild(0, _transform->getNumChildren());
   if (model != 0) {
       _transform->addChild(model);
   }
-  _selector->addChild(_transform.get());
   _selector->setValue(0, 1);
 }
 
 void
-SGModelPlacement::update()
+SGModelPlacement::add( osg::Node* model )
 {
-  _location->setPosition( _position.getLongitudeDeg(),
-                          _position.getLatitudeDeg(),
-                          _position.getElevationFt() );
-  _location->setOrientation( _roll_deg, _pitch_deg, _heading_deg );
-
-  const sgVec4 *t = _location->getTransformMatrix();
-  SGMatrixd rotation;
-  for (unsigned i = 0; i < 4; ++i)
-    for (unsigned j = 0; j < 4; ++j)
-      rotation(i, j) = t[j][i];
-  SGVec3d pos(_location->get_absolute_view_pos());
-  _transform->setTransform(pos, rotation);
+    if (model != 0) {
+        _transform->addChild(model);
+    }
 }
 
-bool
-SGModelPlacement::getVisible () const
+void SGModelPlacement::clear()
 {
-  return _selector->getValue(0);
+    _selector = NULL;
+    _transform = NULL;
 }
 
 void
-SGModelPlacement::setVisible (bool visible)
+SGModelPlacement::update()
 {
-  _selector->setValue(0, visible);
-}
+  // The cartesian position
+  SGVec3d position = SGVec3d::fromGeod(_position);
+  _transform->setPosition(toOsg(position));
 
-void
-SGModelPlacement::setLongitudeDeg (double lon_deg)
-{
-  _position.setLongitudeDeg(lon_deg);
-}
+  // The orientation, composed from the horizontal local orientation and the
+  // orientation wrt the horizontal local frame
+  SGQuatd orient = SGQuatd::fromLonLat(_position);
+  orient *= SGQuatd::fromYawPitchRollDeg(_heading_deg, _pitch_deg, _roll_deg);
+  // Convert to the scenegraph orientation where we just rotate around
+  // the y axis 180 degrees.
+  orient *= SGQuatd::fromRealImag(0, SGVec3d(0, 1, 0));
 
-void
-SGModelPlacement::setLatitudeDeg (double lat_deg)
-{
-  _position.setLatitudeDeg(lat_deg);
+  _transform->setAttitude(toOsg(orient));
 }
 
-void
-SGModelPlacement::setElevationFt (double elev_ft)
+bool
+SGModelPlacement::getVisible () const
 {
-  _position.setElevationFt(elev_ft);
+  return _selector->getValue(0);
 }
 
 void
-SGModelPlacement::setPosition (double lon_deg, double lat_deg, double elev_ft)
+SGModelPlacement::setVisible (bool visible)
 {
-  _position = SGGeod::fromDegFt(lon_deg, lat_deg, elev_ft);
+  _selector->setValue(0, visible);
 }
 
 void
@@ -140,24 +127,31 @@ SGModelPlacement::setOrientation (const SGQuatd& orientation)
   orientation.getEulerDeg(_heading_deg, _pitch_deg, _roll_deg);
 }
 
+void
+SGModelPlacement::setReferenceTime(const double& referenceTime)
+{
+  SGSceneUserData* userData;
+  userData = SGSceneUserData::getOrCreateSceneUserData(_transform.get());
+  SGSceneUserData::Velocity* vel = userData->getOrCreateVelocity();
+  vel->referenceTime = referenceTime;
+}
+
 void
 SGModelPlacement::setBodyLinearVelocity(const SGVec3d& linear)
 {
   SGSceneUserData* userData;
-  userData = SGSceneUserData::getOrCreateSceneUserData(_transform);
+  userData = SGSceneUserData::getOrCreateSceneUserData(_transform.get());
   SGSceneUserData::Velocity* vel = userData->getOrCreateVelocity();
-  SGQuatd orientation = SGQuatd::fromAngleAxisDeg(180, SGVec3d(0, 1, 0));
-  vel->linear = orientation.backTransform(linear);
+  vel->linear = SGVec3d(-linear[0], linear[1], -linear[2]);
 }
 
 void
 SGModelPlacement::setBodyAngularVelocity(const SGVec3d& angular)
 {
   SGSceneUserData* userData;
-  userData = SGSceneUserData::getOrCreateSceneUserData(_transform);
+  userData = SGSceneUserData::getOrCreateSceneUserData(_transform.get());
   SGSceneUserData::Velocity* vel = userData->getOrCreateVelocity();
-  SGQuatd orientation = SGQuatd::fromAngleAxisDeg(180, SGVec3d(0, 1, 0));
-  vel->angular = orientation.backTransform(angular);
+  vel->angular = SGVec3d(-angular[0], angular[1], -angular[2]);
 }
 
 // end of model.cxx