Skip to content

Commit dd63772

Browse files
authored
Grid render component fix (#7384)
* Grid force creation of render component * Removed addRender call and error if script already has render component * Replaced throw with console error * Added return back
1 parent 469e821 commit dd63772

File tree

1 file changed

+10
-19
lines changed

1 file changed

+10
-19
lines changed

scripts/esm/grid.mjs

+10-19
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,6 @@ class Grid extends Script {
137137
*/
138138
static RESOLUTION_HIGH = 2;
139139

140-
/**
141-
* @type {boolean}
142-
* @private
143-
*/
144-
_addedRender = false;
145-
146140
/**
147141
* @type {ShaderMaterial}
148142
* @private
@@ -180,15 +174,17 @@ class Grid extends Script {
180174
_resolution = Grid.RESOLUTION_HIGH;
181175

182176
initialize() {
183-
184-
// ensure the entity has a render component
185-
if (!this.entity.render) {
186-
this.entity.addComponent('render', {
187-
castShadows: false
188-
});
189-
this._addedRender = true;
177+
// check if the entity already has a render component
178+
if (this.entity.render) {
179+
console.error('The entity already has a render component.');
180+
return;
190181
}
191182

183+
// create render component
184+
this.entity.addComponent('render', {
185+
castShadows: false
186+
});
187+
192188
// create shader material
193189
this._material = new ShaderMaterial({
194190
uniqueName: 'grid-shader',
@@ -254,7 +250,6 @@ class Grid extends Script {
254250
* @private
255251
*/
256252
_set(name, value) {
257-
258253
if (!this._material) {
259254
return;
260255
}
@@ -331,11 +326,7 @@ class Grid extends Script {
331326
}
332327

333328
destroy() {
334-
this.entity.render.meshInstances = [];
335-
336-
if (this._addedRender) {
337-
this.entity.removeComponent('render');
338-
}
329+
this.entity.removeComponent('render');
339330
}
340331
}
341332

0 commit comments

Comments
 (0)