From f769e9d94923d359bdb502d7ab77aa92d547e04b Mon Sep 17 00:00:00 2001 From: bryanedds Date: Sun, 5 Apr 2015 17:04:23 -0400 Subject: [PATCH] Put overlay stuff into a single file. Former-commit-id: 0a832015a7f63d2656acf7b15ae1391a878f6c9f --- Nu/Nu/Nu/Nu.fsproj | 3 +-- Nu/Nu/Nu/{Overlayer.fs => Overlay.fs} | 22 +++++++++++++++++++++- Nu/Nu/Nu/OverlayRouter.fs | 24 ------------------------ 3 files changed, 22 insertions(+), 27 deletions(-) rename Nu/Nu/Nu/{Overlayer.fs => Overlay.fs} (94%) delete mode 100644 Nu/Nu/Nu/OverlayRouter.fs diff --git a/Nu/Nu/Nu/Nu.fsproj b/Nu/Nu/Nu/Nu.fsproj index 2195af4bf9..e80bb93bd7 100644 --- a/Nu/Nu/Nu/Nu.fsproj +++ b/Nu/Nu/Nu/Nu.fsproj @@ -66,8 +66,7 @@ - - + diff --git a/Nu/Nu/Nu/Overlayer.fs b/Nu/Nu/Nu/Overlay.fs similarity index 94% rename from Nu/Nu/Nu/Overlayer.fs rename to Nu/Nu/Nu/Overlay.fs index 91a4280136..288635a705 100644 --- a/Nu/Nu/Nu/Overlayer.fs +++ b/Nu/Nu/Nu/Overlay.fs @@ -198,4 +198,24 @@ module Overlayer = ignore <| overlays.DocumentElement.AppendChild imported // make overlay - { Overlays = overlays } \ No newline at end of file + { Overlays = overlays } + +[] +module OverlayRouterModule = + + /// Maps from dispatcher names to opt overlay names. + type OverlayRouter = Map + +[] +module OverlayRouter = + + /// Make an OverlayRouter. + let make dispatchers userRoutes = + let router = + Map.fold + (fun overlayRouter _ dispatcher -> + let dispatcherName = (dispatcher.GetType ()).Name + Map.add dispatcherName (Some dispatcherName) overlayRouter) + Map.empty + dispatchers + Map.addMany userRoutes router \ No newline at end of file diff --git a/Nu/Nu/Nu/OverlayRouter.fs b/Nu/Nu/Nu/OverlayRouter.fs deleted file mode 100644 index 10d75ea8dd..0000000000 --- a/Nu/Nu/Nu/OverlayRouter.fs +++ /dev/null @@ -1,24 +0,0 @@ -// Nu Game Engine. -// Copyright (C) Bryan Edds, 2013-2015. - -namespace Nu - -[] -module OverlayRouterModule = - - /// Maps from dispatcher names to opt overlay names. - type OverlayRouter = Map - -[] -module OverlayRouter = - - /// Make an OverlayRouter. - let make dispatchers userRoutes = - let router = - Map.fold - (fun overlayRouter _ dispatcher -> - let dispatcherName = (dispatcher.GetType ()).Name - Map.add dispatcherName (Some dispatcherName) overlayRouter) - Map.empty - dispatchers - Map.addMany userRoutes router \ No newline at end of file