fixed #442, put line that updates view in viewer back in

removed debug output, commented unused function
pro3d-space · Nov 6, 2024 · 0be0364 · 0be0364
1 parent 7e2d961
commit 0be0364
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/src/PRo3D.Core/SequencedBookmarks/BookmarkAnimations.fs b/src/PRo3D.Core/SequencedBookmarks/BookmarkAnimations.fs
@@ -324,28 +324,29 @@ module BookmarkAnimations =
     //    let m = {m with originalSceneState = Some (Optic.get lenses.sceneState_ outerModel)}
     //    outerModel, m
 
-    let smoothPathAllBookmarks (m : SequencedBookmarks)
-                               (lenses : BookmarkLenses<'a>)
-                               (outerModel      : 'a) =
-        let bookmarks = orderedLoadedBookmarks m
-        let animation =
-            bookmarks
-            |> smoothBookmarkPath m.animationSettings.smoothingFactor.value
-            |> List.ofArray
-            |> List.map (Animation.onStart (fun name x m -> 
-                                                    Log.line "selected bm %s" x.name
-                                                    Optic.set lenses.selectedBookmark_ (Some x.key) m
-                                    ))
-                |> Animation.path
-        let animation = 
-            animation
-            |> addGlobalAttributes m lenses outerModel
+    /// This function does no work with focal length therefore it is not in use
+    //let smoothPathAllBookmarks (m : SequencedBookmarks)
+    //                           (lenses : BookmarkLenses<'a>)
+    //                           (outerModel      : 'a) =
+    //    let bookmarks = orderedLoadedBookmarks m
+    //    let animation =
+    //        bookmarks
+    //        |> smoothBookmarkPath m.animationSettings.smoothingFactor.value
+    //        |> List.ofArray
+    //        |> List.map (Animation.onStart (fun name x m -> 
+    //                                                Log.line "selected bm %s" x.name
+    //                                                Optic.set lenses.selectedBookmark_ (Some x.key) m
+    //                                ))
+    //            |> Animation.path
+    //    let animation = 
+    //        animation
+    //        |> addGlobalAttributes m lenses outerModel
 
-        let outerModel =
-            outerModel 
-            |> Animator.createAndStart AnimationSlot.camera animation
-        //let m = {m with savedSceneState = Some (Optic.get lenses.sceneState_ outerModel)}
-        outerModel, m
+    //    let outerModel =
+    //        outerModel 
+    //        |> Animator.createAndStart AnimationSlot.camera animation
+    //    //let m = {m with savedSceneState = Some (Optic.get lenses.sceneState_ outerModel)}
+    //    outerModel, m
 
     let pathWithPausing (m : SequencedBookmarks)
                         (lenses : BookmarkLenses<'a>)

diff --git a/src/PRo3D.Viewer/Viewer/ViewerLenses.fs b/src/PRo3D.Viewer/Viewer/ViewerLenses.fs
@@ -107,7 +107,6 @@ module ViewerLenses =
                                 or delete and create new bookmark."
                     let newState = {state with stateSurfaces = m.scene.surfacesModel.surfaces}
                     BookmarkUtils.getValidState newState
-            Log.line "m.origin = %s, state.origin = %s" (string m.scene.referenceSystem.origin)  (string state.stateReferenceSystem.origin)
             let scaleBars = // check scale bars; using old segments for performance reasons
                 if haveSameKeys state.stateScaleBars.scaleBars
                                 m.scene.scaleBars.scaleBars then 
@@ -227,8 +226,6 @@ module ViewerLenses =
         ),
         (fun sb m ->
             let update (sb : SequencedBookmarkModel) = 
-                // update camera to bookmark's camera
-                //let m = Optic.set _view sb.cameraView m
 
                 // update the scene state if the bookmark contains one
                 let inline updateSceneState sb m =
@@ -266,6 +263,8 @@ module ViewerLenses =
                         | None ->
                             m
                     | None ->
+                        //update camera to bookmark's camera
+                        let m = Optic.set _view sb.cameraView m
                         m
 
                 m