@judah-silva/rnacanvas 0.0.3 → 0.0.5

package/dist/index.d.mts

@@ -104,7 +104,6 @@ interface userData {
  */
 declare class Motif extends Group<Residue> {
     userData: userData;
-    private _quat;
     constructor(name: string);
     addChild(child: Residue): void;
     setPosition(x: number, y: number, z: number): void;
@@ -113,7 +112,6 @@ declare class Motif extends Group<Residue> {
     rotateByQuaternion(quat: Quat): void;
     setQuaternion(quat: Quat): void;
     multiplyScalar(scalar: number): void;
-    private _nanCheck;
     get uuid(): string;
     get quat(): Quat;
     get scale(): number;

package/dist/index.d.ts

@@ -104,7 +104,6 @@ interface userData {
  */
 declare class Motif extends Group<Residue> {
     userData: userData;
-    private _quat;
     constructor(name: string);
     addChild(child: Residue): void;
     setPosition(x: number, y: number, z: number): void;
@@ -113,7 +112,6 @@ declare class Motif extends Group<Residue> {
     rotateByQuaternion(quat: Quat): void;
     setQuaternion(quat: Quat): void;
     multiplyScalar(scalar: number): void;
-    private _nanCheck;
     get uuid(): string;
     get quat(): Quat;
     get scale(): number;

package/dist/index.js

@@ -218,12 +218,10 @@ var Matrix4 = class {
 // src/3D/Motif.ts
 var Motif = class extends Group {
   userData;
-  _quat;
   constructor(name) {
     const tempEngine = new import_core5.NullEngine();
     const tempScene = new import_core5.Scene(tempEngine);
     super(name, tempScene);
-    this._quat = new Quat();
     this.userData = {
       atomInfo: [],
       fileName: ""
@@ -251,20 +249,18 @@ var Motif = class extends Group {
       axis.y,
       axis.z
     ), angle, import_core5.Space.WORLD);
-    this._nanCheck();
   }
   rotateByQuaternion(quat) {
     if (this._node.rotationQuaternion === null) {
       this._node.rotationQuaternion = this._node.rotation.toQuaternion();
     }
     quat.quaternion.multiplyToRef(this._node.rotationQuaternion, this._node.rotationQuaternion);
-    this._nanCheck();
   }
   setQuaternion(quat) {
     if (this._node.rotationQuaternion === null) {
       this._node.rotationQuaternion = this._node.rotation.toQuaternion();
     }
-    this._quat.setToQuaternion(quat.quaternion);
+    this._node.rotationQuaternion.set(quat.x, quat.y, quat.z, quat.w);
   }
   multiplyScalar(scalar) {
     this._node.scaling = new import_core5.Vector3(
@@ -273,12 +269,6 @@ var Motif = class extends Group {
       this._node.scaling.z * scalar
     );
   }
-  _nanCheck() {
-    if (Number.isNaN(this._quat.quaternion.w) || Number.isNaN(this._quat.quaternion.x) || Number.isNaN(this._quat.quaternion.y) || Number.isNaN(this._quat.quaternion.z)) {
-      this._quat.setToQuaternion(import_core5.Quaternion.Identity());
-      throw new Error(`Quaternion is NaN for motif ${this._node.name}`);
-    }
-  }
   get uuid() {
     return this._node.uniqueId.toString();
   }
@@ -286,8 +276,7 @@ var Motif = class extends Group {
     if (this._node.rotationQuaternion === null) {
       this._node.rotationQuaternion = this._node.rotation.toQuaternion();
     }
-    this._quat.setToQuaternion(this._node.rotationQuaternion);
-    return this._quat;
+    return new Quat().setToQuaternion(this._node.rotationQuaternion);
   }
   get scale() {
     return this._node.scaling.x;
@@ -1174,7 +1163,7 @@ function Canvas({
   const [kabschRMSD, setKabschRMSD] = (0, import_react.useState)([]);
   const [lockedMotifIds, setLockedMotifIds] = (0, import_react.useState)([]);
   const addMotif = (motif) => {
-    if (selectedMotifIds.has(motif.uuid)) {
+    if (selectedMotifMeshState.current.has(motif)) {
       return;
     }
     const newSet = /* @__PURE__ */ new Set();
@@ -1187,12 +1176,13 @@ function Canvas({
     selectedMotifMeshState.current.add(motif);
   };
   const removeMotif = (motif) => {
-    if (!selectedMotifIds.has(motif.uuid)) {
+    if (!selectedMotifMeshState.current.has(motif)) {
       return;
     }
+    console.log("removing motif: ", motif);
     selectedMotifMeshState.current.delete(motif);
     setSelectedmotifIds((prevState) => {
-      const newState = prevState;
+      const newState = new Set(prevState);
       newState.delete(motif.uuid);
       return newState;
     });
@@ -1328,13 +1318,15 @@ function Canvas({
     if (!event.rotationAxis.equals(Vec3.Zero) || !event.translationDirection.equals(Vec3.Zero)) {
       return;
     }
-    if (!/^[0-9]$/.test(event.key)) {
+    if (!/^[1-9]$/.test(event.key) || Number(event.key) > motifs.length) {
       return;
     }
     const motif = motifs[Number(event.key) - 1];
     if (selectedMotifMeshState.current.has(motif)) {
+      console.log("removing motif");
       removeMotif(motif);
     } else {
+      console.log("adding motif");
       addMotif(motif);
     }
   }
@@ -1436,8 +1428,10 @@ function Canvas({
           scene.current?.add(motifMesh);
           if (motifProps[index].position) positions[index] = motifProps[index].position.clone();
           motifMesh.setPosition(positions[index].x, positions[index].y, positions[index].z);
-          if (motifProps[index].rotation) motifMesh.quat.setToQuaternion(motifProps[index].rotation.quaternion);
-          motifMesh.multiplyScalar(canvasRef.current.width / 250);
+          if (motifProps[index].rotation) motifMesh.setQuaternion(motifProps[index].rotation);
+          let scale = canvasRef.current.width / 250;
+          if (motifProps[index].scale) scale = motifProps[index].scale;
+          motifMesh.multiplyScalar(scale);
         });
         const eventManager = scene.current?.eventManager;
         eventManager.on(Events.EventType.OBJECT_SELECTED, onSelectMotif);

package/dist/index.mjs

@@ -27,7 +27,7 @@ var Group = class {
 };
 
 // src/3D/Motif.ts
-import { NullEngine, Quaternion as Quaternion3, Scene as Scene2, Space, Vector3 as Vector32 } from "@babylonjs/core";
+import { NullEngine, Scene as Scene2, Space, Vector3 as Vector32 } from "@babylonjs/core";
 
 // src/Math/Vec3.ts
 import { Quaternion, Vector3 } from "@babylonjs/core";
@@ -161,12 +161,10 @@ var Matrix4 = class {
 // src/3D/Motif.ts
 var Motif = class extends Group {
   userData;
-  _quat;
   constructor(name) {
     const tempEngine = new NullEngine();
     const tempScene = new Scene2(tempEngine);
     super(name, tempScene);
-    this._quat = new Quat();
     this.userData = {
       atomInfo: [],
       fileName: ""
@@ -194,20 +192,18 @@ var Motif = class extends Group {
       axis.y,
       axis.z
     ), angle, Space.WORLD);
-    this._nanCheck();
   }
   rotateByQuaternion(quat) {
     if (this._node.rotationQuaternion === null) {
       this._node.rotationQuaternion = this._node.rotation.toQuaternion();
     }
     quat.quaternion.multiplyToRef(this._node.rotationQuaternion, this._node.rotationQuaternion);
-    this._nanCheck();
   }
   setQuaternion(quat) {
     if (this._node.rotationQuaternion === null) {
       this._node.rotationQuaternion = this._node.rotation.toQuaternion();
     }
-    this._quat.setToQuaternion(quat.quaternion);
+    this._node.rotationQuaternion.set(quat.x, quat.y, quat.z, quat.w);
   }
   multiplyScalar(scalar) {
     this._node.scaling = new Vector32(
@@ -216,12 +212,6 @@ var Motif = class extends Group {
       this._node.scaling.z * scalar
     );
   }
-  _nanCheck() {
-    if (Number.isNaN(this._quat.quaternion.w) || Number.isNaN(this._quat.quaternion.x) || Number.isNaN(this._quat.quaternion.y) || Number.isNaN(this._quat.quaternion.z)) {
-      this._quat.setToQuaternion(Quaternion3.Identity());
-      throw new Error(`Quaternion is NaN for motif ${this._node.name}`);
-    }
-  }
   get uuid() {
     return this._node.uniqueId.toString();
   }
@@ -229,8 +219,7 @@ var Motif = class extends Group {
     if (this._node.rotationQuaternion === null) {
       this._node.rotationQuaternion = this._node.rotation.toQuaternion();
     }
-    this._quat.setToQuaternion(this._node.rotationQuaternion);
-    return this._quat;
+    return new Quat().setToQuaternion(this._node.rotationQuaternion);
   }
   get scale() {
     return this._node.scaling.x;
@@ -1117,7 +1106,7 @@ function Canvas({
   const [kabschRMSD, setKabschRMSD] = useState([]);
   const [lockedMotifIds, setLockedMotifIds] = useState([]);
   const addMotif = (motif) => {
-    if (selectedMotifIds.has(motif.uuid)) {
+    if (selectedMotifMeshState.current.has(motif)) {
       return;
     }
     const newSet = /* @__PURE__ */ new Set();
@@ -1130,12 +1119,13 @@ function Canvas({
     selectedMotifMeshState.current.add(motif);
   };
   const removeMotif = (motif) => {
-    if (!selectedMotifIds.has(motif.uuid)) {
+    if (!selectedMotifMeshState.current.has(motif)) {
       return;
     }
+    console.log("removing motif: ", motif);
     selectedMotifMeshState.current.delete(motif);
     setSelectedmotifIds((prevState) => {
-      const newState = prevState;
+      const newState = new Set(prevState);
       newState.delete(motif.uuid);
       return newState;
     });
@@ -1271,13 +1261,15 @@ function Canvas({
     if (!event.rotationAxis.equals(Vec3.Zero) || !event.translationDirection.equals(Vec3.Zero)) {
       return;
     }
-    if (!/^[0-9]$/.test(event.key)) {
+    if (!/^[1-9]$/.test(event.key) || Number(event.key) > motifs.length) {
       return;
     }
     const motif = motifs[Number(event.key) - 1];
     if (selectedMotifMeshState.current.has(motif)) {
+      console.log("removing motif");
       removeMotif(motif);
     } else {
+      console.log("adding motif");
       addMotif(motif);
     }
   }
@@ -1379,8 +1371,10 @@ function Canvas({
           scene.current?.add(motifMesh);
           if (motifProps[index].position) positions[index] = motifProps[index].position.clone();
           motifMesh.setPosition(positions[index].x, positions[index].y, positions[index].z);
-          if (motifProps[index].rotation) motifMesh.quat.setToQuaternion(motifProps[index].rotation.quaternion);
-          motifMesh.multiplyScalar(canvasRef.current.width / 250);
+          if (motifProps[index].rotation) motifMesh.setQuaternion(motifProps[index].rotation);
+          let scale = canvasRef.current.width / 250;
+          if (motifProps[index].scale) scale = motifProps[index].scale;
+          motifMesh.multiplyScalar(scale);
         });
         const eventManager = scene.current?.eventManager;
         eventManager.on(Events.EventType.OBJECT_SELECTED, onSelectMotif);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@judah-silva/rnacanvas",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "A 3D Canvas for displaying and interacting with custom RNA models. Powered by BabylonJS.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",