package updates

aardvark-platform · Apr 26, 2021 · a384a16 · a384a16
1 parent 7944c6d
commit a384a16
Show file tree

Hide file tree

Showing 8 changed files with 123 additions and 119 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,8 @@
+### 5.1.9
+- updated FSharp.Core >= 4.7.0
+- updated to newest Base/FShade/Adaptive packages
+- removed System.Reactive
+
 ### 5.1.8
 - added argument validation for texture copying
 - added argument validation for texture download and upload

diff --git a/paket.dependencies b/paket.dependencies
@@ -4,27 +4,26 @@ source https://vrvis.myget.org/F/aardvark_public/api/v2
 
 storage: none
 
-nuget FSharp.Core                        >= 4.6.2 lowest_matching: true
+nuget FSharp.Core                        >= 4.7.0 lowest_matching: true
 nuget Microsoft.NETFramework.ReferenceAssemblies >= 1.0.0 lowest_matching: true
-nuget System.Reactive                    >= 4.3.1 lowest_matching: true
 
-nuget FSharp.Data.Adaptive               ~> 1.2.0
-nuget CSharp.Data.Adaptive               ~> 1.2.0
+nuget FSharp.Data.Adaptive               ~> 1.2.4
+nuget CSharp.Data.Adaptive               ~> 1.2.4
 
 nuget Aardvark.Base.TypeProviders        ~> 4.5.15
 
-nuget Aardvark.Base.FSharp               ~> 5.1.8
-nuget Aardvark.Base.IO                   ~> 5.1.8
-nuget Aardvark.Base.Incremental          ~> 5.1.8
-nuget Aardvark.Base.Runtime              ~> 5.1.8
-nuget Aardvark.Base.Essentials           ~> 5.1.8
-nuget Aardvark.Geometry                  ~> 5.1.8
-nuget Aardvark.Base.Tensors              ~> 5.1.8
-nuget Aardvark.PixImage.DevIL            ~> 5.1.8
+nuget Aardvark.Base.FSharp               ~> 5.1.9
+nuget Aardvark.Base.IO                   ~> 5.1.9
+nuget Aardvark.Base.Incremental          ~> 5.1.9
+nuget Aardvark.Base.Runtime              ~> 5.1.9
+nuget Aardvark.Base.Essentials           ~> 5.1.9
+nuget Aardvark.Geometry                  ~> 5.1.9
+nuget Aardvark.Base.Tensors              ~> 5.1.9
+nuget Aardvark.PixImage.DevIL            ~> 5.1.9
 
-nuget FShade.Core                        ~> 5.1.7
-nuget FShade                             ~> 5.1.7
-nuget FShade.Debug                       ~> 5.1.7
+nuget FShade.Core                        ~> 5.1.8
+nuget FShade                             ~> 5.1.8
+nuget FShade.Debug                       ~> 5.1.8
 
 nuget Unofficial.OpenVR					 ~> 1.1.0
 nuget Unofficial.Typography              ~> 0.1.0
@@ -35,7 +34,7 @@ nuget BruTile                            ~> 2.0.0-alpha1
 nuget Unofficial.LibTessDotNet           ~> 2.0.2
 nuget SharpDX.Direct3D9                  ~> 4.0.1
 nuget Unofficial.AssimpNet               ~> 4.0.5
-nuget Offler                             ~> 2.0.2
+nuget Offler                             ~> 2.0.3
 
 nuget Unofficial.OpenTK                  ~> 3.0.19
 nuget Unofficial.OpenTK.GLControl        ~> 3.0.19

diff --git a/paket.lock b/paket.lock
diff --git a/src/Aardvark.Rendering.GL/Runtime/RenderTasks.fs b/src/Aardvark.Rendering.GL/Runtime/RenderTasks.fs
@@ -50,13 +50,13 @@ module RenderTasks =
                 tags = Map.empty
             }
 
-        let beforeRender = new System.Reactive.Subjects.Subject<unit>()
-        let afterRender = new System.Reactive.Subjects.Subject<unit>()
+        let beforeRender = new Event<unit>()
+        let afterRender = new Event<unit>()
 
         member x.Resources = resources
 
-        member x.BeforeRender = beforeRender
-        member x.AfterRender = afterRender
+        member x.BeforeRender = beforeRender.Publish :> IObservable<_>
+        member x.AfterRender = afterRender.Publish :> IObservable<_>
 
         member x.StructureChanged() =
             transact (fun () -> structureChanged.MarkOutdated())
@@ -155,7 +155,7 @@ module RenderTasks =
             x.bindFbo desc
 
             renderTaskLock.Run (fun () ->
-                beforeRender.OnNext()
+                beforeRender.Trigger()
                 NativePtr.write runtimeStats V2i.Zero
 
                 queries.Begin()
@@ -165,7 +165,7 @@ module RenderTasks =
 
                 queries.End()
 
-                afterRender.OnNext()
+                afterRender.Trigger()
                 let rt = NativePtr.read runtimeStats
                 t.AddDrawCalls(rt.X, rt.Y)
             )

diff --git a/src/Aardvark.Rendering.Vulkan/Runtime/Runtime.fs b/src/Aardvark.Rendering.Vulkan/Runtime/Runtime.fs
@@ -118,7 +118,13 @@ type Runtime(device : Device, shareTextures : bool, shareBuffers : bool, debug :
     let debugSubscription =
         match debug with
         | Some debug ->
-            let res = instance.DebugMessages.Subscribe(debugMessage, debugSummary)
+            let res = 
+                instance.DebugMessages.Subscribe {
+                    new IObserver<_> with
+                        member x.OnNext(msg) = debugMessage msg
+                        member x.OnCompleted() = debugSummary()
+                        member x.OnError _ = ()
+                }
             instance.SetDebugTracingEnabled(debug.traceHandles)
             instance.RaiseDebugMessage(MessageSeverity.Information, "Enabled debug report")
             res

diff --git a/src/Aardvark.Rendering/Resources/ResourceManagement.fs b/src/Aardvark.Rendering/Resources/ResourceManagement.fs
@@ -110,7 +110,7 @@ type Resource<'h, 'v when 'v : unmanaged>(kind : ResourceKind) =
     let pointer : nativeptr<'v> = NativePtr.alloc 1
 
     let mutable refCount = 0
-    let onDispose = new System.Reactive.Subjects.Subject<unit>()
+    let onDispose = new Event<unit>()
 
     let mutable info = ResourceInfo.Zero
     let lockObj = obj()
@@ -120,7 +120,7 @@ type Resource<'h, 'v when 'v : unmanaged>(kind : ResourceKind) =
         let alreadyDisposed = Interlocked.CompareExchange(&wasDisposed,1,0)
         if alreadyDisposed = 1 then failwithf "doubleFree"
 
-        onDispose.OnNext()
+        onDispose.Trigger()
         x.Destroy handle.Value
         current <- None
         info <- ResourceInfo.Zero
@@ -154,7 +154,7 @@ type Resource<'h, 'v when 'v : unmanaged>(kind : ResourceKind) =
 
     member x.Kind = kind
 
-    member internal x.OnDispose = onDispose :> IObservable<_>
+    member internal x.OnDispose = onDispose.Publish :> IObservable<_>
 
     member private x.PerformUpdate(token : AdaptiveToken, t : RenderToken) =
         if refCount <= 0 then

diff --git a/src/Application/Aardvark.Application.Slim/Window.fs b/src/Application/Aardvark.Application.Slim/Window.fs
@@ -8,7 +8,6 @@ open OpenTK
 open OpenTK.Graphics
 open OpenTK.Platform
 open System.Threading
-open System.Reactive.Linq
 
 [<AutoOpen>]
 module private GameWindowIO =

diff --git a/src/Application/Aardvark.Application/IO/Mouse.fs b/src/Application/Aardvark.Application/IO/Mouse.fs
@@ -4,8 +4,6 @@
 open System
 open Aardvark.Base
 open FSharp.Data.Adaptive
-open System.Reactive
-open System.Reactive.Linq
 open System.Runtime.CompilerServices
 open System.Collections.Concurrent