Merge pull request #564 from pro3d-space/bugs/planetsForTrafos

bugfix: rework planets for transformations

Author: LauraFritz14

PRODUCT_RELEASE_NOTES.md

@@ -1,3 +1,7 @@
+
+## 5.4.0
+- planets updates for local resSys in transforamtions
+
 ## 5.3.0-prerelease1
 - axis-ellipses added 
 - area calculation for closed polygons and ellipses included

aardium/package.json

@@ -1,7 +1,7 @@
 {
   "name": "PRo3D",
   "productName": "PRo3D.Viewer",
-  "version": "5.3.0-prerelease1",
+  "version": "5.4.0",
   "description": "PRo3D, short for Planetary Robotics 3D Viewer, is an interactive 3D visualization tool to allow planetary scientists to work with high-resolution 3D reconstructions of the Martian surface.",
   "license": "AGPL",
   "copyright": "VRVis Zentrum für Virtual Reality und Visualisierung Forschungs-GmbH",
@@ -37,8 +37,8 @@
     "run-script-os": "^1.1.1"
   },
   "build": {
-    "appId": "space.pro3d.app",  
-    "buildVersion": "${version}.0", 
+    "appId": "space.pro3d.app",
+    "buildVersion": "${version}.0",
     "extraFiles": [
       "build/build"
     ],

src/PRo3D.Core/TransformationApp.fs

@@ -67,6 +67,7 @@ module TransformationApp =
     | ImportTrafoData       of list<string>
     | SetRefSysMode         of ReferenceSystemMode
     | SetPivotMode          of PivotMode
+    | UpdatePlanetInLocalRefSys
 
 
     // calc reference system from pivot
@@ -102,9 +103,10 @@ module TransformationApp =
         let northCorrection = Trafo3d.RotationZInDegrees(refSystem.noffset.value)
 
         match refSystem.planet with
-        | Planet.Earth
-        | Planet.ENU -> 
+        | Planet.Earth ->
             Trafo3d.FromOrthoNormalBasis(V3d.IOO, V3d.OIO, V3d.OOI) * northCorrection
+        | Planet.ENU -> 
+            Trafo3d.FromOrthoNormalBasis( V3d.OIO, V3d.IOO, V3d.OOI) * northCorrection
         | Planet.Mars | Planet.Moon | Planet.Phobos | Planet.Deimos ->
             let north, up, east =
                 let north = refSystem.northO.Normalized        
@@ -118,17 +120,19 @@ module TransformationApp =
         | Planet.JPL -> 
             Trafo3d.FromOrthoNormalBasis(-V3d.IOO, V3d.OIO, -V3d.OOI) * northCorrection
         | Planet.None -> 
-            northCorrection
+            // northCorrection
+            Trafo3d.FromOrthoNormalBasis(V3d.IOO, V3d.OIO, V3d.OOI) * northCorrection
         | _ -> failwith ""
 
     let getReferenceSystemBasis_local 
         (directions : Affine3d)
         (planet : Planet) =
 
         match planet with
-        | Planet.Earth
-        | Planet.ENU -> 
+        | Planet.Earth ->
             Trafo3d.FromOrthoNormalBasis(V3d.IOO, V3d.OIO, V3d.OOI)
+        | Planet.ENU -> 
+            Trafo3d.FromOrthoNormalBasis( V3d.OIO, V3d.IOO, V3d.OOI)
         | Planet.Mars ->
             let north, up, east = getNorthUpEastFromLocalRefSys directions
             let refSysRotation = 
@@ -137,7 +141,8 @@ module TransformationApp =
         | Planet.JPL -> 
             Trafo3d.FromOrthoNormalBasis(-V3d.IOO, V3d.OIO, -V3d.OOI)
         | Planet.None -> 
-            Trafo3d(directions)
+            //Trafo3d(directions)
+            Trafo3d.FromOrthoNormalBasis(V3d.IOO, V3d.OIO, V3d.OOI)
         | _ -> failwith ""
 
     let translationFromReferenceSystemBasis
@@ -435,6 +440,13 @@ module TransformationApp =
                     p', af
                 | _ -> model.pivot, model.refSys
             { model with pivotMode = mode; pivot = pivot; refSys = af}
+        | UpdatePlanetInLocalRefSys ->
+            match model.refSys with
+            | Some rf ->
+                let af = getLocalRefSys refSys rf.Trans
+                { model with refSys = Some af}
+            | None -> model
+            
 
     module UI = 
 

src/PRo3D.Viewer/Program.fs

@@ -52,7 +52,7 @@ type Result =
       result : string;
    }
 
-let viewerVersion       = "5.0.7-prerelease1"
+let viewerVersion       = "5.4.0"
 let catchDomainErrors   = false
 
 open System.IO

src/PRo3D.Viewer/Viewer/Viewer.fs

@@ -1371,7 +1371,25 @@ module ViewerApp =
             let m = 
                 m 
                 |> Optic.set _refSystem refsystem'
-                |> SceneLoader.updateCameraUp            
+                |> SceneLoader.updateCameraUp     
+                
+            //changing the planet requires update of local reference systems
+            let m = 
+                match a with
+                | ReferenceSystemAction.SetPlanet planet ->
+                    let flat' = 
+                        m.scene.surfacesModel.surfaces.flat 
+                        |> HashMap.map (fun k v -> 
+                            let s = Leaf.toSurface v
+                            let sgSurface = m.scene.surfacesModel.sgSurfaces |> HashMap.find k 
+                            let bbCenter = sgSurface.globalBB.Center
+                            Leaf.Surfaces { 
+                                s with transformation = 
+                                            (TransformationApp.update s.transformation TransformationApp.Action.UpdatePlanetInLocalRefSys m.scene.referenceSystem bbCenter) 
+                                }
+                            )
+                    { m with scene = { m.scene with surfacesModel = { m.scene.surfacesModel with surfaces = { m.scene.surfacesModel.surfaces with flat = flat' }}}}
+                |_ -> m
 
             //changing the reference system also requires adaptation of angular measurement values
             Log.startTimed "[Viewer.fs] recalculating angular values in annos"