From 1fce6cccc3a3bfa357ba5ca93269c4ef82291c79 Mon Sep 17 00:00:00 2001
From: HF <pixelplanetdev@gmail.com>
Date: Fri, 1 Apr 2022 21:13:32 +0200
Subject: [PATCH] fix flashing on refresh fix 3D canvas showing as 2D on
 refresh allow access to the 2D representation by pressing P when viewing 3D
 canvas

---
 src/reducers/canvas.js    |  4 ++--
 src/store/rendererHook.js |  9 +++++++++
 src/ui/Renderer2D.js      | 38 ++++++++++++++++++------------------
 src/ui/Renderer3D.js      | 41 +++++++++++++++++++--------------------
 4 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/src/reducers/canvas.js b/src/reducers/canvas.js
index 8c9b9fbc..5be1a2c1 100644
--- a/src/reducers/canvas.js
+++ b/src/reducers/canvas.js
@@ -272,9 +272,9 @@ export default function canvasReducer(
         size: canvasSize,
         sd: canvasStartDate,
         ident: canvasIdent,
-        v: is3D,
         colors,
       } = canvas;
+      const is3D = !!canvas.v;
       // get previous view, scale and viewscale if possible
       let viewscale = DEFAULT_SCALE;
       let scale = DEFAULT_SCALE;
@@ -336,7 +336,7 @@ export default function canvasReducer(
       }
       const canvas = canvases[canvasId];
       const clrIgnore = canvas.cli || 0;
-      const is3D = !!canvases.v;
+      const is3D = !!canvas.v;
       const {
         size: canvasSize,
         sd: canvasStartDate,
diff --git a/src/store/rendererHook.js b/src/store/rendererHook.js
index fb356ccd..ac3b1981 100644
--- a/src/store/rendererHook.js
+++ b/src/store/rendererHook.js
@@ -57,6 +57,15 @@ export default (store) => (next) => (action) => {
       break;
     }
 
+    case 'TOGGLE_HIDDEN_CANVASES': {
+      const renderer = getRenderer();
+      const { is3D } = state.canvas;
+      if (is3D) {
+        initRenderer(store, !renderer.is3D);
+      }
+      break;
+    }
+
     case 'SET_HISTORICAL_TIME': {
       const {
         historicalDate,
diff --git a/src/ui/Renderer2D.js b/src/ui/Renderer2D.js
index 536c8bcb..d2411b32 100644
--- a/src/ui/Renderer2D.js
+++ b/src/ui/Renderer2D.js
@@ -34,25 +34,25 @@ const SCALE_THREASHOLD = Math.min(
 
 
 class Renderer {
-  is3D: false;
+  is3D = false;
   //
-  canvasId: number = null;
-  chunkLoader: Object = null;
+  canvasId = null;
+  chunkLoader = null;
   //--
   centerChunk;
-  tiledScale: number;
-  tiledZoom: number;
-  hover: boolean;
+  tiledScale;
+  tiledZoom;
+  hover;
   //--
-  viewport: HTMLCanvasElement = null;
+  viewport = null;
   store;
   //--
-  forceNextRender: boolean;
-  forceNextSubrender: boolean;
-  canvas: HTMLCanvasElement;
-  lastFetch: number;
+  forceNextRender;
+  forceNextSubrender;
+  canvas;
+  lastFetch;
   //--
-  oldHistoricalTime: string;
+  oldHistoricalTime;
 
   constructor(store) {
     this.centerChunk = [null, null];
@@ -159,7 +159,7 @@ class Renderer {
     this.updateScale(this.store.getState());
   }
 
-  getColorIndexOfPixel(cx, cy, historical: boolean = false) {
+  getColorIndexOfPixel(cx, cy, historical = false) {
     if (historical) {
       const state = this.store.getState();
       const {
@@ -232,9 +232,9 @@ class Renderer {
 
 
   renderPixel(
-    i: number,
-    j: number,
-    offset: number,
+    i,
+    j,
+    offset,
     color,
     notify,
   ) {
@@ -273,9 +273,9 @@ class Renderer {
 
 
   isChunkInView(
-    cz: number,
-    cx: number,
-    cy: number,
+    cz,
+    cx,
+    cy,
   ) {
     if (cz !== this.tiledZoom) {
       return false;
diff --git a/src/ui/Renderer3D.js b/src/ui/Renderer3D.js
index e6b47073..fda141ff 100644
--- a/src/ui/Renderer3D.js
+++ b/src/ui/Renderer3D.js
@@ -1,7 +1,6 @@
 /*
  * 3D Renderer for VoxelCanvas
  *
- * @flow
  */
 
 import * as THREE from 'three';
@@ -31,27 +30,27 @@ class Renderer {
   //--
   store;
   //--
-  scene: Object;
-  camera: Object;
-  rollOverMesh: Object;
-  objects: Array<Object>;
-  loadedChunks: Array<Object>;
-  plane: Object;
-  oobGeometry: Object;
-  oobMaterial: Object;
+  scene;
+  camera;
+  rollOverMesh;
+  objects;
+  loadedChunks;
+  plane;
+  oobGeometry;
+  oobMaterial;
   //--
-  controls: Object;
-  threeRenderer: Object;
+  controls;
+  threeRenderer;
   // temp variables for mouse events
   mouse;
   mouseMoveStart;
   raycaster;
-  pressTime: number;
-  pressCdTime: number;
-  multitap: number;
+  pressTime;
+  pressCdTime;
+  multitap;
   //--
-  chunkLoader: ChunkLoader = null;
-  forceNextRender: boolean = false;
+  chunkLoader = null;
+  forceNextRender = false;
 
   constructor(store) {
     this.store = store;
@@ -274,10 +273,10 @@ class Renderer {
   }
 
   renderPixel(
-    i: number,
-    j: number,
-    offset: number,
-    color: number,
+    i,
+    j,
+    offset,
+    color,
   ) {
     const { chunkLoader } = this;
     if (chunkLoader) {
@@ -469,7 +468,7 @@ class Renderer {
     }
   }
 
-  placeVoxel(x: number, y: number, z: number, color: number = null) {
+  placeVoxel(x, y, z, color = null) {
     const {
       store,
     } = this;