update: add working wave.func

Exabyte-io · Jan 16, 2025 · 83fc6fd · 83fc6fd
1 parent 01cc463
commit 83fc6fd
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 13 deletions.
diff --git a/dist/components/ThreeDEditor.js b/dist/components/ThreeDEditor.js
@@ -791,14 +791,27 @@ class ThreeDEditor extends _react.default.Component {
       enableColorScheme: true
     }, this.renderWaveOrThreejsEditorModal()));
   }
+  doWaveFunc(funcStr) {
+    if (!this.WaveComponent || !this.WaveComponent.wave) {
+      console.error("Wave component not initialized");
+      return;
+    }
+    const {
+      wave
+    } = this.WaveComponent;
+    try {
+      // eslint-disable-next-line no-new-func
+      const func = new Function("wave", `return wave.${funcStr}`);
+      func(wave);
+      wave.render();
+    } catch (error) {
+      alert("Error executing wave function: " + error.message);
+      console.error("Error executing wave function:", error);
+    }
+  }
   handleSetCameraToFitCell() {
-    alert("Setting camera to fit cell"); // eslint-disable-line no-alert
     this.WaveComponent.wave.adjustCamerasAndOrbitControlsToCell();
-  }
-  doWaveFunc(func_str) {
-    alert("Executing function: " + func_str); // eslint-disable-line no-alert
-    const func = eval(func_str); // eslint-disable-line no-eval
-    this.WaveComponent.wave.doFunc(func);
+    this.WaveComponent.wave.rebuildScene();
   }
 }
 exports.ThreeDEditor = ThreeDEditor;

diff --git a/src/components/ThreeDEditor.jsx b/src/components/ThreeDEditor.jsx
@@ -785,15 +785,27 @@ export class ThreeDEditor extends React.Component {
         }
     };
 
-    handleSetCameraToFitCell() {
-        alert("Setting camera to fit cell"); // eslint-disable-line no-alert
-        this.WaveComponent.wave.adjustCamerasAndOrbitControlsToCell();
+    doWaveFunc(funcStr) {
+        if (!this.WaveComponent || !this.WaveComponent.wave) {
+            console.error("Wave component not initialized");
+            return;
+        }
+
+        const { wave } = this.WaveComponent;
+        try {
+            // eslint-disable-next-line no-new-func
+            const func = new Function("wave", `return wave.${funcStr}`);
+            func(wave);
+            wave.render();
+        } catch (error) {
+            alert("Error executing wave function: " + error.message);
+            console.error("Error executing wave function:", error);
+        }
     }
 
-    doWaveFunc(func_str) {
-        alert("Executing function: " + func_str); // eslint-disable-line no-alert
-        const func = eval(func_str); // eslint-disable-line no-eval
-        this.WaveComponent.wave.doFunc(func);
+    handleSetCameraToFitCell() {
+        this.WaveComponent.wave.adjustCamerasAndOrbitControlsToCell();
+        this.WaveComponent.wave.rebuildScene();
     }
 }