[Animation] Remove DefaultAugmentation from Duration

See: dotnet/fsharp#16282
aardvark-platform · Jul 18, 2024 · 6d4cc7b · 6d4cc7b
1 parent 45c1453
commit 6d4cc7b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/Aardvark.UI.Primitives/Animation/Core/Time.fs b/src/Aardvark.UI.Primitives/Animation/Core/Time.fs
@@ -4,20 +4,13 @@ open Aardvark.Base
 
 [<Struct>]
 [<RequireQualifiedAccess>]
-[<DefaultAugmentation(false)>]
 type Duration =
     | Finite of MicroTime
     | Infinite
 
     member x.IsZero =
         match x with | Duration.Finite t -> t.IsZero | _ -> false
 
-    member x.IsFinite =
-        match x with | Duration.Finite _ -> true | _ -> false
-
-    member x.IsInfinite =
-        not x.IsFinite
-
     static member inline (*) (x : Duration, y : ^Value) =
         match x with
         | Finite d -> Finite (d * y)
@@ -111,8 +104,8 @@ module Duration =
     let inline ofMinutes (us : ^Minutes)           = Duration.Finite <| MicroTime.FromMinutes(float us)
 
     let isZero (d : Duration) = d.IsZero
-    let isFinite (d : Duration) = d.IsFinite
-    let isInfinite (d : Duration) = d.IsInfinite
+    let isFinite (d : Duration) = match d with | Duration.Finite _ -> true | _ -> false
+    let isInfinite (d : Duration) = not <| isFinite d
 
     let ofLocalTime = function
         | LocalTime.Offset o -> Duration.Finite o

diff --git a/src/Aardvark.UI.Primitives/Animation/Types/Groups.fs b/src/Aardvark.UI.Primitives/Animation/Types/Groups.fs
@@ -33,7 +33,7 @@ module private Groups =
 
         let apply (localTime : LocalTime) =
             let d = animation.Duration
-            if d.IsFinite then
+            if Duration.isFinite d then
                 LocalTime.max (d * animation.DistanceTime(localTime))
             else
                 localTime