GeoData: implement trueNorth for datasets, add separate button for ephemeral sky

Author: oesterlehlrs

src/OpenCOVER/geodata/GeoData.cpp

@@ -17,12 +17,12 @@ GeoData::GeoData()
     m_context = proj_context_create();
 #endif
 
-    m_offsetRoot = new osg::PositionAttitudeTransform;
-    m_offsetRoot->setPosition(-m_projectOffset);
-    cover->getObjectsRoot()->addChild(m_offsetRoot);
+    m_transformRoot = new osg::MatrixTransform;
+    m_transformRoot->setMatrix(osg::Matrix::identity());
+    cover->getObjectsRoot()->addChild(m_transformRoot);
 
     m_terrainRoot = new osg::Group;
-    m_offsetRoot->addChild(m_terrainRoot);
+    m_transformRoot->addChild(m_terrainRoot);
 
     setProjection(GEODATA_DEFAULT_PROJECTION_PROJECT);
 }
@@ -83,9 +83,19 @@ void GeoData::setProjection(std::string_view projection)
 }
 
 void GeoData::setProjectOffset(const osg::Vec3 &projectOffset)
+{
+    setProjectTransform(projectOffset, m_projectTrueNorthDegree);
+}
+
+void GeoData::setProjectTransform(const osg::Vec3 &projectOffset, const double trueNorthDeg)
 {
     m_projectOffset = projectOffset;
-    m_offsetRoot->setPosition(-m_projectOffset);
+    m_projectTrueNorthDegree = trueNorthDeg;
+    osg::Matrix rot = osg::Matrix::rotate(osg::DegreesToRadians(-trueNorthDeg), osg::Vec3(0, 0, 1));
+    osg::Matrix trans = osg::Matrix::translate(-projectOffset);
+    m_projectTransform = trans * rot;
+    m_inverseProjectTransform = osg::Matrix::inverse(m_projectTransform);
+    m_transformRoot->setMatrix(m_projectTransform);
 }
 
 const std::string &GeoData::projection() const
@@ -96,10 +106,21 @@ const osg::Vec3 &GeoData::projectOffset() const
 {
     return m_projectOffset;
 }
-
-osg::PositionAttitudeTransform *GeoData::offsetRoot()
+const double GeoData::projectTrueNorthDegree() const
+{
+    return m_projectTrueNorthDegree;
+}
+const osg::Matrix &GeoData::projectTransform() const
+{
+    return m_projectTransform;
+}
+const osg::Matrix &GeoData::inverseProjectTransform() const
+{
+    return m_inverseProjectTransform;
+}
+osg::MatrixTransform *GeoData::transformRoot()
 {
-    return m_offsetRoot;
+    return m_transformRoot;
 }
 
 osg::Group *GeoData::terrainRoot()
@@ -120,7 +141,7 @@ osg::Vec3 GeoData::getGlobalPosition()
 
 osg::Vec3 GeoData::globalToProject(const osg::Vec3 &globalPosition) const
 {
-    return globalToReference(globalPosition) - m_projectOffset;
+    return globalToReference(globalPosition) * m_projectTransform;
 }
 
 osg::Vec3 GeoData::globalToReference(const osg::Vec3 &globalPosition) const
@@ -146,7 +167,7 @@ osg::Vec3 GeoData::projectToGlobal(const osg::Vec3 &projectPosition) const
 #ifndef HAVE_PROJ
     return projectPosition;
 #else
-    auto p = projectPosition + m_projectOffset;
+    auto p = projectPosition * m_inverseProjectTransform;
 
     PJ_COORD c;
     c.enu.e = p.x();

src/OpenCOVER/geodata/GeoData.h

@@ -37,11 +37,15 @@ class COVRGEODATAEXPORT GeoData
 
     void setProjection(std::string_view projection);
     void setProjectOffset(const osg::Vec3 &projectOffset);
+    void setProjectTransform(const osg::Vec3 &projectOffset, const double trueNorthDeg);
 
     const std::string &projection() const;
     const osg::Vec3 &projectOffset() const;
+    const double projectTrueNorthDegree() const;
+    const osg::Matrix &projectTransform() const;
+    const osg::Matrix &inverseProjectTransform() const;
 
-    osg::PositionAttitudeTransform *offsetRoot();
+    osg::MatrixTransform *transformRoot();
     osg::Group *terrainRoot();
 
     osg::Vec3 getProjectPosition();
@@ -78,8 +82,11 @@ class COVRGEODATAEXPORT GeoData
 
     std::string m_projection;
     osg::Vec3 m_projectOffset;
+    double m_projectTrueNorthDegree = 0.0;
+    osg::Matrix m_projectTransform;
+    osg::Matrix m_inverseProjectTransform;
 
-    osg::PositionAttitudeTransform *m_offsetRoot;
+    osg::MatrixTransform *m_transformRoot;
     osg::Group *m_terrainRoot;
 
 private:

src/OpenCOVER/plugins/general/GeoData/GeoDataLoader.cpp

@@ -129,6 +129,7 @@ bool GeoDataLoader::init()
             dataset.easting = entry.value<double>("", "easting")->value();
             dataset.northing = entry.value<double>("", "northing")->value();
             dataset.altitude = altitude;
+            dataset.trueNorth = trueNorth;
         }
 
         datasets.push_back(dataset);
@@ -175,7 +176,6 @@ bool GeoDataLoader::init()
                 tempEastingText = std::to_string(dataset.easting);
                 tempNorthingText = std::to_string(dataset.northing);
                 tempAltitudeText = std::to_string(dataset.altitude);
-
                 tempTrueNorthText = std::to_string(dataset.trueNorth);
             }
         }
@@ -517,19 +517,6 @@ void GeoDataLoader::message(int toWhom, int type, int length, const void *data)
         loadTerrain(messageData + 20, osg::Vec3d(0, 0, 0)); // 20= opencover://terrain/
 }
 
-void GeoDataLoader::setRootTransform(const osg::Vec3 &origin, float trueNorthDeg)
-{
-    // rootOffset = off;
-    // trueNorthDegree = trueNorthDeg;
-
-    // float trueNorthRad = osg::DegreesToRadians(trueNorthDegree);
-    // osg::Matrix trans = osg::Matrix::translate(rootOffset);
-    // osg::Matrix rot = osg::Matrix::rotate(-trueNorthRad, osg::Vec3(0, 0, 1));
-    // rootNode->setMatrix(trans * rot);
-    //
-    GeoData::instance()->setProjectOffset(origin);
-}
-
 bool GeoDataLoader::update()
 {
     if (editInteraction->isRunning())
@@ -746,7 +733,7 @@ void GeoDataLoader::applyOffset()
     }
 
     osg::Vec3 origin = osg::Vec3(originEasting, originNorthing, originAltitude);
-    setRootTransform(origin, trueNorth);
+    GeoData::instance()->setProjectTransform(origin, trueNorth);
 }
 
 std::optional<PlaceLabelGroup> GeoDataLoader::loadLabels(const std::string &file)

src/OpenCOVER/plugins/general/GeoData/GeoDataLoader.h

@@ -112,11 +112,8 @@ class GeoDataLoader : public opencover::coVRPlugin,
     ~GeoDataLoader();
 
     osg::ref_ptr<osg::Node> loadTerrain(std::string filename, osg::Vec3d localOffset);
-    void setRootTransform(const osg::Vec3 &origin, float trueNorthDeg = 0.f);
 
     static GeoDataLoader *instance();
-    osg::Vec3 rootOffset { 0.0, 0.0, 0.0 };
-    float trueNorthDegree = 0.0f;
     editTerrain *editInteraction;
 
     virtual void message(int toWhom, int type, int length, const void *data);