Fixed Reflection regression.

Making MountFacets use UpdateCount rather than TickTime. Former-commit-id: 87b5be7
bryanedds · Oct 4, 2015 · 342d564 · 342d564
1 parent 3012dbd
commit 342d564
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Nu/Nu/Nu/Reflection.fs b/Nu/Nu/Nu/Reflection.fs
@@ -341,7 +341,7 @@ module Reflection =
     /// Read facet names from an xml node.
     let readFacetNames (node : XmlNode) =
         let facetNames = node.InnerText
-        AlgebraicDescriptor.convertFromString facetNames typeof<string Set> :?> string list
+        AlgebraicDescriptor.convertFromString facetNames typeof<string Set> :?> string Set
 
     /// Try to read just the target's OptOverlayName from Xml.
     let tryReadOptOverlayNameToTarget (targetNode : XmlNode) target =

diff --git a/Nu/Nu/Nu/WorldDispatchers.fs b/Nu/Nu/Nu/WorldDispatchers.fs
@@ -20,8 +20,8 @@ module MountFacetModule =
         member this.SetPositionLocal (value : Vector2) world = this.UpdateXtension (fun xtension -> xtension?PositionLocal <- value) world
         member this.GetDepthLocal world : single = (this.GetXtension world)?DepthLocal
         member this.SetDepthLocal (value : single) world = this.UpdateXtension (fun xtension -> xtension?DepthLocal <- value) world
-        member private this.GetMountChangeTimeNp world : int64 = (this.GetXtension world)?MountChangeTimeNp
-        member private this.SetMountChangeTimeNp (value : int64) world = this.UpdateXtension (fun xtension -> xtension?MountChangeTimeNp <- value) world
+        member private this.GetMountUpdateCountNp world : int64 = (this.GetXtension world)?MountUpdateCountNp
+        member private this.SetMountUpdateCountNp (value : int64) world = this.UpdateXtension (fun xtension -> xtension?MountUpdateCountNp <- value) world
         member private this.GetMountUnsubscribeNp world : World -> World = (this.GetXtension world)?MountUnsubscribeNp
         member private this.SetMountUnsubscribeNp (value : World -> World) world = this.UpdateXtension (fun xtension -> xtension?MountUnsubscribeNp <- value) world
 
@@ -32,15 +32,15 @@ module MountFacetModule =
             let entity = event_.Subscriber : Entity
             let target = event_.Publisher :?> Entity
             let transform = target.GetTransform world
-            let tickTime = World.getTickTime world
+            let updateCount = World.getUpdateCount world
             if  transform <> target.GetTransform event_.Data.OldWorld &&
-                tickTime <> entity.GetMountChangeTimeNp world then
+                updateCount <> entity.GetMountUpdateCountNp world then
                 let transform =
                     { transform with
                         Position = transform.Position + entity.GetPositionLocal world
                         Depth = transform.Depth + entity.GetDepthLocal world }
                 let world = entity.SetTransform transform world
-                let world = entity.SetMountChangeTimeNp tickTime world
+                let world = entity.SetMountUpdateCountNp updateCount world
                 (Cascade, world)
             else (Cascade, world)
 
@@ -58,7 +58,7 @@ module MountFacetModule =
              define? OptMountRelation (None : Entity Relation option)
              define? PositionLocal Vector2.Zero
              define? DepthLocal 0.0f
-             define? MountChangeTimeNp 0L
+             define? MountUpdateCountNp Int64.MinValue
              define? MountUnsubscribeNp (id : World -> World)]
 
         override facet.Register (entity, world) =