Fixed grid enabled/disabled (playcanvas#7374)

* Fixed grid enabled/disabled * Added in cast shadows option when creating render entity * Removes render component on destroy if script added it
slimbuck · Feb 24, 2025 · 1a317d9 · 1a317d9
1 parent 79dda04
commit 1a317d9
Showing 1 changed file with 22 additions and 5 deletions.
diff --git a/scripts/esm/grid.mjs b/scripts/esm/grid.mjs
@@ -12,8 +12,6 @@ import {
     Vec2
 } from 'playcanvas';
 
-/** @import { AppBase, Entity } from 'playcanvas' */
-
 const tmpVa = new Vec2();
 
 const EPISILON = 1e-3;
@@ -139,6 +137,12 @@ class Grid extends Script {
      */
     static RESOLUTION_HIGH = 2;
 
+    /**
+     * @type {boolean}
+     * @private
+     */
+    _addedRender = false;
+
     /**
      * @type {ShaderMaterial}
      * @private
@@ -179,7 +183,10 @@ class Grid extends Script {
 
         // ensure the entity has a render component
         if (!this.entity.render) {
-            this.entity.addComponent('render');
+            this.entity.addComponent('render', {
+                castShadows: false
+            });
+            this._addedRender = true;
         }
 
         // create shader material
@@ -222,11 +229,13 @@ class Grid extends Script {
 
         // enable/disable the mesh instance
         this.on('enable', () => {
-            this.entity.render.meshInstances = [this._meshInstance];
+            this._meshInstance.visible = true;
         });
         this.on('disable', () => {
-            this.entity.render.meshInstances = [];
+            this._meshInstance.visible = false;
         });
+
+        this.on('destroy', this.destroy, this);
     }
 
     /**
@@ -320,6 +329,14 @@ class Grid extends Script {
     get resolution() {
         return this._resolution;
     }
+
+    destroy() {
+        this.entity.render.meshInstances = [];
+
+        if (this._addedRender) {
+            this.entity.removeComponent('render');
+        }
+    }
 }
 
 export { Grid };