Changeset 423 for binary-improvements2/MapRendering/src/MapRenderer.cs

Timestamp:

Mar 28, 2023, 8:08:01 PM (20 months ago)

Author:

alloc

Message:

Fixed: MapRenderer always enabled

File:

• binary-improvements2/MapRendering/src/MapRenderer.cs (modified) (2 diffs)

binary-improvements2/MapRendering/src/MapRenderer.cs

@@ -43 +43 @@
                 }
 
+                public static bool HasInstance => instance != null;
+
                 public static MapRenderer Instance => instance ??= new MapRenderer ();
 
@@ -50 +52 @@
 
                 public static void Shutdown () {
-                        if (Instance == null) {
+                        if (instance == null) {
                                 return;
                         }
 
-                        Instance.shutdown = true;
+                        instance.shutdown = true;
                         
-                        if (Instance.renderCoroutineRef != null) {
-                                ThreadManager.StopCoroutine (Instance.renderCoroutineRef);
-                                Instance.renderCoroutineRef = null;
-                        }
+                        if (instance.renderCoroutineRef != null) {
+                                ThreadManager.StopCoroutine (instance.renderCoroutineRef);
+                                instance.renderCoroutineRef = null;
+                        }
+
+                        instance = null;
                 }
 
                 public static void RenderSingleChunk (Chunk _chunk) {
-                        if (renderingEnabled && Instance != null) {
-                                // TODO: Replace with regular thread and a blocking queue / set
-                                ThreadPool.UnsafeQueueUserWorkItem (_o => {
-                                        try {
-                                                if (Instance.renderingFullMap) {
+                        if (!renderingEnabled || instance == null) {
+                                return;
+                        }
+
+                        // TODO: Replace with regular thread and a blocking queue / set
+                        ThreadPool.UnsafeQueueUserWorkItem (_o => {
+                                try {
+                                        if (instance.renderingFullMap) {
+                                                return;
+                                        }
+
+                                        lock (lockObject) {
+                                                Chunk c = (Chunk) _o;
+                                                Vector3i cPos = c.GetWorldPos ();
+                                                Vector2i cPos2 = new Vector2i (cPos.x / Constants.MapChunkSize,
+                                                        cPos.z / Constants.MapChunkSize);
+
+                                                ushort[] mapColors = c.GetMapColors ();
+                                                if (mapColors == null) {
                                                         return;
                                                 }
 
-                                                lock (lockObject) {
-                                                        Chunk c = (Chunk) _o;
-                                                        Vector3i cPos = c.GetWorldPos ();
-                                                        Vector2i cPos2 = new Vector2i (cPos.x / Constants.MapChunkSize,
-                                                                cPos.z / Constants.MapChunkSize);
-
-                                                        ushort[] mapColors = c.GetMapColors ();
-                                                        if (mapColors == null) {
-                                                                return;
-                                                        }
-
-                                                        Color32[] realColors =
-                                                                new Color32[Constants.MapChunkSize * Constants.MapChunkSize];
-                                                        for (int iColors = 0; iColors < mapColors.Length; iColors++) {
-                                                                realColors [iColors] = shortColorToColor32 (mapColors [iColors]);
-                                                        }
-
-                                                        Instance.dirtyChunks [cPos2] = realColors;
-
-                                                        //Log.Out ("Add Dirty: " + cPos2);
+                                                Color32[] realColors =
+                                                        new Color32[Constants.MapChunkSize * Constants.MapChunkSize];
+                                                for (int iColors = 0; iColors < mapColors.Length; iColors++) {
+                                                        realColors [iColors] = shortColorToColor32 (mapColors [iColors]);
                                                 }
-                                        } catch (Exception e) {
-                                                Log.Out ($"Exception in MapRendering.RenderSingleChunk(): {e}");
-                                        }
-                                }, _chunk);
-                        }
+
+                                                instance.dirtyChunks [cPos2] = realColors;
+
+                                                //Log.Out ("Add Dirty: " + cPos2);
+                                        }
+                                } catch (Exception e) {
+                                        Log.Out ($"Exception in MapRendering.RenderSingleChunk(): {e}");
+                                }
+                        }, _chunk);
                 }