ported viewer to rendering 5.5

pro3d-space · Oct 2, 2024 · 89ca5c6 · 89ca5c6
1 parent fd4a6a5
commit 89ca5c6
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 105 deletions.
diff --git a/src/PRo3D.Viewer/AnnotationRendering.fs b/src/PRo3D.Viewer/AnnotationRendering.fs
diff --git a/src/PRo3D.Viewer/InitialViewerModel.fs b/src/PRo3D.Viewer/InitialViewerModel.fs
@@ -14,10 +14,10 @@ open PRo3D.Core.SequencedBookmarks
 
 open PRo3D.Navigation2
 open Aardvark.UI
-open Aardvark.UI.Anewmation
+open Aardvark.UI.Animation
 open Aardvark.UI.Primitives
 open Aardvark.UI.Trafos
-open Aardvark.UI.Animation
+open Aardvark.UI.Animation.Deprecated
 open Aardvark.Rendering
 
 module Viewer =
@@ -168,7 +168,7 @@ module Viewer =
             renderingUrl        = renderingUrl       
             numberOfSamples     = numberOfSamples    
             screenshotDirectory = screenshotDirectory
-            animator            = Anewmation.Animator.initial animatorLens
+            animator            = Animation.Animator.initial animatorLens
 
             provenanceModel = ProvenanceModel.invalid
 

diff --git a/src/PRo3D.Viewer/LensConfigs.fs b/src/PRo3D.Viewer/LensConfigs.fs
diff --git a/src/PRo3D.Viewer/Models/Lenses.fs b/src/PRo3D.Viewer/Models/Lenses.fs
@@ -1,6 +1,6 @@
 namespace PRo3D
 
-open Aardvark.UI
+open Aardvark.UI.Primitives
 open PRo3D.Core
 
 open Aether

diff --git a/src/PRo3D.Viewer/PRo3D.Viewer.fsproj b/src/PRo3D.Viewer/PRo3D.Viewer.fsproj
@@ -54,10 +54,6 @@
     <Compile Include="Bookmarks.fs" />
     <Compile Include="TraverseApp.fs" />
     <Compile Include="Scene.fs" />
-
-    <Compile Include="LensConfigs.fs" />
-
-    <Compile Include="AnnotationRendering.fs" />
     <Compile Include="Viewer\Viewer-Utils.fs" />
     <Compile Include="Viewer\ViewerGUI.fs" />
     <Compile Include="Viewer\Viewer-IO.fs" />

diff --git a/src/PRo3D.Viewer/Program.fs b/src/PRo3D.Viewer/Program.fs
@@ -11,11 +11,7 @@ open System.Collections.Generic
 
 open Aardvark.Base
 open Aardvark.Application.Slim
-open Aardvark.SceneGraph.Opc
 open Aardvark.UI
-open Aardvark.VRVis
-open Aardvark.VRVis.Opc
-open Aardvark.GeoSpatial.Opc
 open OpcViewer.Base
 open Aardvark.Rendering
 
@@ -45,6 +41,7 @@ open FSharp.Data.Adaptive
 open System.Reflection
 open System.Runtime.InteropServices
 
+open Aardvark.GeoSpatial.Opc.Load
 
 type EmbeddedRessource = EmbeddedRessource
 
@@ -478,11 +475,6 @@ let main argv =
                 height 800
                 debug true
                 title titlestr
-
-
-                windowoptions {|  minWidth = 180; minHeight = 180; title = titlestr;|}
-                hideDock true
-                autoclose true
             }
 
     finally

diff --git a/src/PRo3D.Viewer/ProvenanceApp.fs b/src/PRo3D.Viewer/ProvenanceApp.fs
@@ -14,8 +14,8 @@ open Aardvark.UI.Primitives
 
 open PRo3D.Navigation
 open PRo3D.Viewer
-open Aardvark.UI.Anewmation
 open Aardvark.UI.Animation
+open Aardvark.UI.Animation.Deprecated
 
 module ProvenanceApp =
 

diff --git a/src/PRo3D.Viewer/RemoteApi.fs b/src/PRo3D.Viewer/RemoteApi.fs
@@ -14,6 +14,7 @@ open PRo3D.Core
 open System.IO
 open Aardvark.Base
 open FSharp.Data.Adaptive
+open Aardvark.Data.Opc
 
 
 module RemoteApi =
@@ -211,9 +212,9 @@ module RemoteApi =
                 let patchHierarchies = 
                     opcs |> Seq.collect (fun scene -> 
                         scene.patchHierarchies
-                        |> Seq.map Aardvark.Prinziple.Prinziple.registerIfZipped
+                        |> Seq.map Prinziple.register
                         |> Seq.map (fun x -> 
-                            Aardvark.SceneGraph.Opc.PatchHierarchy.load PRo3D.Base.Serialization.binarySerializer.Pickle PRo3D.Base.Serialization.binarySerializer.UnPickle (Aardvark.SceneGraph.Opc.OpcPaths x), x
+                            Aardvark.Data.Opc.PatchHierarchy.load PRo3D.Base.Serialization.binarySerializer.Pickle PRo3D.Base.Serialization.binarySerializer.UnPickle (Aardvark.Data.Opc.OpcPaths x), x
                         )
                     )
                     |> Seq.toList
@@ -225,25 +226,6 @@ module RemoteApi =
         member x.ApplyGraphAndGetCheckpointState(sceneAsJson : string, drawingAsJson : string, 
                                                  p : Option<ProvenanceModel.Thoth.CyDescription>, activeNode : Option<string>) : Model * ViewerIO.SerializedModel =
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
             let nopSendQueue = new System.Collections.Concurrent.BlockingCollection<_>()
             let nopMailbox = new MessagingMailbox(fun _ -> async { return () })
             let mutable currentModel = x.FullModel.Current.GetValue()
@@ -252,18 +234,6 @@ module RemoteApi =
             let emit (msg : ViewerAction) = emitTopLevel (ViewerAnimationAction.ViewerMessage msg)
 
 
-
-
-
-
-
-
-
-
-
-
-
-
             let setScene = ViewerAction.LoadSerializedScene sceneAsJson
             let setDrawing = ViewerAction.LoadSerializedDrawingModel drawingAsJson
             setScene |> emit

diff --git a/src/PRo3D.Viewer/Scene.fs b/src/PRo3D.Viewer/Scene.fs
@@ -4,7 +4,7 @@ open System
 open System.IO
 open Aardvark.Base
 open FSharp.Data.Adaptive
-open Aardvark.SceneGraph.Opc
+open Aardvark.Data.Opc
 open Aardvark.UI.Primitives
 open Aardvark.Rendering
 

diff --git a/src/PRo3D.Viewer/TraverseApp.fs b/src/PRo3D.Viewer/TraverseApp.fs
@@ -4,6 +4,7 @@ open System
 open System.IO
 open Aardvark.Base
 open Aardvark.UI
+open Aardvark.UI.Primitives
 open Chiron
 open PRo3D.Base.Annotation.GeoJSON
 open PRo3D.Base

diff --git a/src/PRo3D.Viewer/Viewer-Model.fs b/src/PRo3D.Viewer/Viewer-Model.fs
@@ -9,9 +9,9 @@ open Aardvark.UI.Primitives
 open Aardvark.Application
 open Aardvark.SceneGraph
 open Aardvark.UI.Trafos
-open Aardvark.UI.Animation
+open Aardvark.UI.Animation.Deprecated
 open Aardvark.Rendering
-open Aardvark.UI.Anewmation
+open Aardvark.UI.Animation
 
 open PRo3D
 open PRo3D.Base
@@ -581,7 +581,7 @@ type Model = {
     screenshotDirectory  : string
 
     [<NonAdaptive>]
-    animator             : Anewmation.Animator<Model>
+    animator             : Animation.Animator<Model>
 
     provenanceModel      : ProvenanceModel
 } 

diff --git a/src/PRo3D.Viewer/Viewer/SnapshotSg.fs b/src/PRo3D.Viewer/Viewer/SnapshotSg.fs
@@ -23,7 +23,7 @@ open Aardvark.UI.Trafos
 open Aardvark.UI.Animation
 open Aardvark.Application
 
-open Aardvark.SceneGraph.Opc
+open Aardvark.Data.Opc
 open Aardvark.SceneGraph.SgPrimitives.Sg
 open Aardvark.VRVis
 

diff --git a/src/PRo3D.Viewer/Viewer/Viewer-Utils.fs b/src/PRo3D.Viewer/Viewer/Viewer-Utils.fs
@@ -4,23 +4,14 @@ open System
 open System.IO
 
 open Aardvark.Base
-open Aardvark.Base.Geometry
 open FSharp.Data.Adaptive
 open FSharp.Data.Adaptive.Operators
 open FShade
-open Aardvark.Rendering.Effects
 open Aardvark.Rendering
 open Aardvark.SceneGraph
 open Aardvark.UI
 open Aardvark.UI.Primitives
 open Aardvark.UI.Trafos
-open Aardvark.UI.Animation
-open Aardvark.Rendering.Text
-
-
-open Aardvark.SceneGraph.Opc
-open Aardvark.SceneGraph.SgPrimitives.Sg
-open Aardvark.GeoSpatial.Opc
 open OpcViewer.Base
 
 open PRo3D
@@ -31,6 +22,7 @@ open PRo3D.Viewer
 open PRo3D.SimulatedViews
 
 open Adaptify.FSharp.Core
+open Aardvark.GeoSpatial.Opc
 
 module ViewerUtils =    
     type Self = Self
@@ -205,7 +197,7 @@ module ViewerUtils =
     let getLodParameters 
         (surf:aval<AdaptiveSurface>) 
         (refsys:AdaptiveReferenceSystem) 
-        (frustum : aval<Frustum>) =
+        (frustum : aval<Frustum>) : aval<LodParameters> =
         adaptive {
             let! s = surf
             let! frustum = frustum 

diff --git a/src/PRo3D.Viewer/Viewer/Viewer.fs b/src/PRo3D.Viewer/Viewer/Viewer.fs
@@ -23,7 +23,7 @@ open Aardvark.UI.Trafos
 open Aardvark.UI.Animation
 open Aardvark.Application
 
-open Aardvark.SceneGraph.Opc
+open Aardvark.Data.Opc
 open Aardvark.SceneGraph.SgPrimitives.Sg
 open Aardvark.VRVis
 
@@ -48,6 +48,7 @@ open Aether
 open Aether.Operators
 open Chiron 
 open PRo3D.Core.Surface
+open Aardvark.UI.Animation.Deprecated
 
 type UserFeedback<'a> = {
     id      : string
@@ -656,7 +657,7 @@ module ViewerApp =
                 m, scenePath
 
             let m =
-                Anewmation.Animator.update (Anewmation.AnimatorMessage.RealTimeTick) m
+                Animation.Animator.update (Animation.AnimatorMessage.RealTimeTick) m
 
             match msg with
             | SequencedBookmarksAction.StopRecording -> 
@@ -1639,7 +1640,7 @@ module ViewerApp =
             //| _ -> 
             //    ()
 
-            Anewmation.Animator.update msg m   
+            Animation.Animator.update msg m   
 
         | ProvenanceMessage msg -> 
             ProvenanceApp.update msg m
@@ -1714,7 +1715,7 @@ module ViewerApp =
                 )] |> AttributeMap.mapAttributes (AttributeValue.map ViewerMessage)
                 //onResize  (fun s -> OnResize(s,id))
             AttributeMap.ofList [
-                onEvent "onRendered" [] (fun _ -> AnewmationMessage Anewmation.AnimatorMessage.RealTimeTick)                    
+                onEvent "onRendered" [] (fun _ -> AnewmationMessage Animation.AnimatorMessage.RealTimeTick)                    
             ] 
         ]            
 
@@ -2071,7 +2072,7 @@ module ViewerApp =
         unionMany [drawing; animation; nav; m.scene.feedbackThreads; sBookmarks]
             |> ThreadPool.map ViewerMessage
             |> ThreadPool.union (
-                Anewmation.Animator.threads m.animator 
+                Animation.Animator.threads m.animator 
                                     |> ThreadPool.map AnewmationMessage)
 
     let loadWaypoints m = 

diff --git a/src/PRo3D.Viewer/Viewer/ViewerGUI.fs b/src/PRo3D.Viewer/Viewer/ViewerGUI.fs
@@ -1,32 +1,17 @@
 namespace PRo3D.Viewer
 
-open Aardvark.Service
 
 open System
-open System.Diagnostics
 open System.IO
 open System.Runtime.InteropServices
 
 
 open Aardvark.Base
-open Aardvark.Base.Geometry
-open Aardvark.Service
 open FSharp.Data.Adaptive
-open FSharp.Data.Adaptive.Operators
 open Aardvark.Rendering
-open Aardvark.SceneGraph
 open Aardvark.UI
 open Aardvark.UI.Operators
 open Aardvark.UI.Primitives
-open Aardvark.Rendering.Text
-
-open Aardvark.SceneGraph.Opc
-open Aardvark.SceneGraph.SgPrimitives.Sg
-open Aardvark.VRVis
-
-open MBrace.FsPickler
-open System.IO
-
 open PRo3D
 open PRo3D.Base
 open PRo3D.Base.Annotation

diff --git a/src/PRo3D.Viewer/Viewer/ViewerLenses.fs b/src/PRo3D.Viewer/Viewer/ViewerLenses.fs
@@ -19,6 +19,7 @@ open PRo3D.Bookmarkings
 open PRo3D.Viewer
 open Aether
 open Aether.Operators
+open Aardvark.UI.Animation.Deprecated
 
 module ViewerLenses =
     // surfaces