Fix BiomeMap OD Loading lagging in MapView

Kopernicus · Oct 24, 2018 · 65bf1f2 · 65bf1f2
1 parent 8a7e0a6
commit 65bf1f2
Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/Kopernicus.OnDemand/OnDemandStorage.cs b/src/Kopernicus.OnDemand/OnDemandStorage.cs
@@ -48,7 +48,7 @@ public static class OnDemandStorage
 
             // OnDemand flags
             public static Boolean useOnDemand = true;
-            public static Boolean useOnDemandBiomes = true;
+            public static Boolean useOnDemandBiomes = false;
             public static Boolean onDemandLoadOnMissing = true;
             public static Boolean onDemandLogOnMissing = true;
             public static Int32 onDemandUnloadDelay = 10;

diff --git a/src/Kopernicus/Configuration/Loader.cs b/src/Kopernicus/Configuration/Loader.cs
@@ -96,6 +96,14 @@ public NumericParser<Boolean> useOnDemand
                 set { OnDemand.OnDemandStorage.useOnDemand = value; }
             }
 
+            // If the OnDemand Biome Systems are enabled
+            [ParserTarget("useOnDemandBiomes")]
+            public NumericParser<Boolean> useOnDemandBiomes
+            {
+                get { return OnDemand.OnDemandStorage.useOnDemandBiomes; }
+                set { OnDemand.OnDemandStorage.useOnDemandBiomes = value; }
+            }
+
             // If the OnDemand System should load missing maps
             [ParserTarget("onDemandLoadOnMissing")]
             public NumericParser<Boolean> onDemandLoadOnMissing

diff --git a/src/Kopernicus/Configuration/Parser/BuiltinTypeParsers.cs b/src/Kopernicus/Configuration/Parser/BuiltinTypeParsers.cs
@@ -193,6 +193,7 @@ public void SetFromString(String s)
             {
                 // Should we use OnDemand?
                 Boolean useOnDemand = OnDemandStorage.useOnDemand;
+                Boolean useOnDemandBiomes = OnDemandStorage.useOnDemandBiomes;
 
                 if (s.StartsWith("BUILTIN/"))
                 {
@@ -202,7 +203,7 @@ public void SetFromString(String s)
                 else
                 {
                     // are we on-demand? Don't load now.
-                    if (useOnDemand)
+                    if (useOnDemand && typeof(T) == typeof(MapSO) || useOnDemandBiomes && typeof(T) == typeof(CBAttributeMapSO))
                     {
                         if (Utility.TextureExists(s))
                         {
@@ -314,7 +315,8 @@ public void SetFromString(String s)
             {
                 // Should we use OnDemand?
                 Boolean useOnDemand = OnDemandStorage.useOnDemand;
-
+                Boolean useOnDemandBiomes = OnDemandStorage.useOnDemandBiomes;
+
                 if (s.StartsWith("BUILTIN/"))
                 {
                     s = s.Substring(8);
@@ -323,7 +325,7 @@ public void SetFromString(String s)
                 else
                 {
                     // check if OnDemand.
-                    if (useOnDemand)
+                    if (useOnDemand && typeof(T) == typeof(MapSO) || useOnDemandBiomes && typeof(T) == typeof(CBAttributeMapSO))
                     {
                         if (Utility.TextureExists(s))
                         {