Merge pull request #987 from ThatOpen/memleak

Fix Memory Leak
ThatOpen · Aug 11, 2024 · da75e0c · da75e0c
2 parents 6761576 + b92d1ad
commit da75e0c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/examples/viewer/index.html b/examples/viewer/index.html
@@ -22,6 +22,7 @@
         <div id= "3dcontainer" style="width:100%; height: 90%;" ></div>
         <input type="button" id="runcode" value="Run Code"/>
         <input type="file" id="finput">
+        <input type="button" id="cmem" value="Clear Memory"/>
         <input type="button" id="rcode" value="Reset Editor"/>
         Log Level: <select id="logLevel">
                         <option value="6">Off</option>

diff --git a/examples/viewer/web-ifc-scene.ts b/examples/viewer/web-ifc-scene.ts
@@ -27,6 +27,10 @@ function Init3DView() {
   AnimationLoop();
 }
 
+export function ClearScene() {
+  while(scene.children.length > 0) scene.remove(scene.children[0]); 
+}
+
 export function InitBasicScene()
 {
   const directionalLight1 = new THREE.DirectionalLight(0xffeeff, 0.8);

diff --git a/examples/viewer/web-ifc-viewer.ts b/examples/viewer/web-ifc-viewer.ts
@@ -1,7 +1,7 @@
 import { IfcApplication } from './../../src/ifc-schema';
 import { IfcAPI, LogLevel,ms, Schemas, IFCUNITASSIGNMENT, IFCAXIS2PLACEMENT3D,IFCLENGTHMEASURE,IFCCARTESIANPOINT,IFCAXIS2PLACEMENT2D,IFCCIRCLEPROFILEDEF,IFCDIRECTION,IFCREAL,IFCPOSITIVELENGTHMEASURE,IFCCOLUMN,IFCEXTRUDEDAREASOLID,IFCGLOBALLYUNIQUEID,IFCLABEL,IFCIDENTIFIER } from '../../dist/web-ifc-api';
 import { IfcThree } from './web-ifc-three';
-import { Init3DView, InitBasicScene, scene } from './web-ifc-scene';
+import { Init3DView, InitBasicScene, ClearScene, scene } from './web-ifc-scene';
 import * as Monaco from 'monaco-editor';
 import * as ts_decl from "./ts_src";
 import * as ts from "typescript";
@@ -81,7 +81,9 @@ window.InitWebIfcViewer = async (monacoEditor: Monaco.editor.IStandaloneCodeEdit
   codereset.addEventListener('click', resetCode);
   const coderun = document.getElementById('runcode');
   coderun.addEventListener('click', runCode);
-   const changeLogLevelSelect = document.getElementById('logLevel');
+  const clearmem = document.getElementById('cmem');
+  clearmem.addEventListener('click', clearMem);
+  const changeLogLevelSelect = document.getElementById('logLevel');
   changeLogLevelSelect.addEventListener('change', changeLogLevel);
   Init3DView();
 };
@@ -125,6 +127,12 @@ async function resetCode() {
     location.reload();
 }
 
+async function clearMem() {
+    ClearScene();
+    ifcAPI.Dispose();
+    await ifcAPI.Init();
+}
+
 async function fileInputChanged() {
   let fileInput = <HTMLInputElement>document.getElementById('finput');
   if (fileInput.files.length == 0) return console.log('No files selected!');

diff --git a/src/ts/web-ifc-api.ts b/src/ts/web-ifc-api.ts
@@ -938,11 +938,12 @@ export class IfcAPI {
     }
 
     /**
-     * Closes all models and frees all related memory
+     * Closes all models and frees all related memory. Please note that after calling this you must call Init() again to ensure web-ifc is in a working state.
     */
     Dispose() {
         this.ifcGuidMap.clear()
         this.wasmModule.CloseAllModels();
+        this.wasmModule = undefined;
     }
 
     /**