Better "destroy" for particles and ribbons

4eb0da · May 2, 2022 · 8e471f1 · 8e471f1
1 parent c6fffdc
commit 8e471f1
Show file tree

Hide file tree

Showing 5 changed files with 380 additions and 323 deletions.
diff --git a/docs/preview/preview.ts b/docs/preview/preview.ts
@@ -594,7 +594,7 @@ function initDragDrop () {
 
 
     function setTextures (textures) {
-        let promises: Promise<void>[] = [];
+        const promises: Promise<void>[] = [];
 
         for (const texture of model.Textures) {
             if (texture.Image) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "war3-model",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Warcraft 3 model parser, generator, convertor and previewer",
   "keywords": [
     "warcraft3",

diff --git a/renderer/modelRenderer.ts b/renderer/modelRenderer.ts
@@ -6,8 +6,8 @@ import {vec3, quat, mat3, mat4} from 'gl-matrix';
 import parseDds from 'parse-dds';
 import {mat4fromRotationOrigin, getShader, isWebGL2} from './util';
 import {ModelInterp} from './modelInterp';
-import {ParticlesController} from './particles';
 import {RendererData, NodeWrapper} from './rendererData';
+import {ParticlesController} from './particles';
 import {RibbonsController} from './ribbons';
 
 // actually, all is number
@@ -338,6 +338,15 @@ export class ModelRenderer {
     }
 
     public destroy (): void {
+        if (this.particlesController) {
+            this.particlesController.destroy();
+            this.particlesController = null;
+        }
+        if (this.ribbonsController) {
+            this.ribbonsController.destroy();
+            this.ribbonsController = null;
+        }
+
         if (this.skeletonShaderProgram) {
             if (this.skeletonVertexShader) {
                 this.gl.detachShader(this.skeletonShaderProgram, this.skeletonVertexShader);
@@ -369,7 +378,7 @@ export class ModelRenderer {
         }
     }
 
-    public initGL (glContext: WebGLRenderingContext): void {
+    public initGL (glContext: WebGL2RenderingContext | WebGLRenderingContext): void {
         this.gl = glContext;
         // Max bones + MV + P
         this.softwareSkinning = this.gl.getParameter(this.gl.MAX_VERTEX_UNIFORM_VECTORS) < 4 * (MAX_NODES + 2);
@@ -380,8 +389,8 @@ export class ModelRenderer {
         );
         this.initShaders();
         this.initBuffers();
-        ParticlesController.initGL(glContext);
-        RibbonsController.initGL(glContext);
+        this.particlesController.initGL(glContext);
+        this.ribbonsController.initGL(glContext);
     }
 
     public setTextureImage (path: string, img: HTMLImageElement, flags: TextureFlags): void {