@judah-silva/rnacanvas 0.0.2 → 0.0.4

package/dist/index.d.mts

@@ -60,10 +60,16 @@ declare class Quat {
     private _quaternion;
     constructor();
     rotateByQuaternion(quaternion: Quat): void;
-    setToQuaternion(quaternion: Nullable<Quaternion>): void;
+    setToQuaternion(quaternion: Nullable<Quaternion>): this;
     setFromMatrix(matrix: Matrix4): this;
     setFromEuler(eulerAngle: Vec3): this;
+    setFromValues(w: number, x: number, y: number, z: number): this;
+    toArray(): number[];
     get quaternion(): Quaternion;
+    get w(): number;
+    get x(): number;
+    get y(): number;
+    get z(): number;
 }
 
 declare class Vec3 {
@@ -98,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;
@@ -107,9 +112,9 @@ 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;
     get position(): Vec3;
 }
 
@@ -383,6 +388,7 @@ interface MotifProps {
     locked: boolean;
     position?: Vec3;
     rotation?: Quat;
+    scale?: number;
 }
 /**
  * ________________________________________________________________________________________________

package/dist/index.d.ts

@@ -60,10 +60,16 @@ declare class Quat {
     private _quaternion;
     constructor();
     rotateByQuaternion(quaternion: Quat): void;
-    setToQuaternion(quaternion: Nullable<Quaternion>): void;
+    setToQuaternion(quaternion: Nullable<Quaternion>): this;
     setFromMatrix(matrix: Matrix4): this;
     setFromEuler(eulerAngle: Vec3): this;
+    setFromValues(w: number, x: number, y: number, z: number): this;
+    toArray(): number[];
     get quaternion(): Quaternion;
+    get w(): number;
+    get x(): number;
+    get y(): number;
+    get z(): number;
 }
 
 declare class Vec3 {
@@ -98,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;
@@ -107,9 +112,9 @@ 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;
     get position(): Vec3;
 }
 
@@ -383,6 +388,7 @@ interface MotifProps {
     locked: boolean;
     position?: Vec3;
     rotation?: Quat;
+    scale?: number;
 }
 /**
  * ________________________________________________________________________________________________

package/dist/index.js

@@ -145,7 +145,8 @@ var Quat = class {
     if (quaternion === null) {
       throw new Error("Cannot set to null quaternion");
     }
-    this._quaternion = quaternion;
+    this.setFromValues(quaternion.w, quaternion.x, quaternion.y, quaternion.z);
+    return this;
   }
   setFromMatrix(matrix) {
     this._quaternion = import_core3.Quaternion.FromRotationMatrix(matrix.matrix);
@@ -155,9 +156,30 @@ var Quat = class {
     this._quaternion = import_core3.Quaternion.FromEulerAngles(eulerAngle.x, eulerAngle.y, eulerAngle.z);
     return this;
   }
+  setFromValues(w, x, y, z) {
+    this._quaternion.set(x, y, z, w);
+    return this;
+  }
+  toArray() {
+    const quatArr = [];
+    this._quaternion.toArray(quatArr);
+    return quatArr;
+  }
   get quaternion() {
     return this._quaternion;
   }
+  get w() {
+    return this._quaternion.w;
+  }
+  get x() {
+    return this._quaternion.x;
+  }
+  get y() {
+    return this._quaternion.y;
+  }
+  get z() {
+    return this._quaternion.z;
+  }
 };
 
 // src/Math/Matrix4.ts
@@ -196,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: ""
@@ -229,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(
@@ -251,18 +269,17 @@ 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();
   }
   get quat() {
-    this._quat.setToQuaternion(this._node.rotationQuaternion);
-    return this._quat;
+    if (this._node.rotationQuaternion === null) {
+      this._node.rotationQuaternion = this._node.rotation.toQuaternion();
+    }
+    return new Quat().setToQuaternion(this._node.rotationQuaternion);
+  }
+  get scale() {
+    return this._node.scaling.x;
   }
   get position() {
     return new Vec3(
@@ -1405,11 +1422,13 @@ function Canvas({
       });
       if (scene.current.children.size !== motifs.length) {
         motifs.forEach((motifMesh, index) => {
-          if (motifProps[index].position) positions[index] = motifProps[index].position;
+          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.setQuaternion(motifProps[index].rotation);
-          motifMesh.multiplyScalar(canvasRef.current.width / 250);
-          scene.current?.add(motifMesh);
+          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";
@@ -88,7 +88,8 @@ var Quat = class {
     if (quaternion === null) {
       throw new Error("Cannot set to null quaternion");
     }
-    this._quaternion = quaternion;
+    this.setFromValues(quaternion.w, quaternion.x, quaternion.y, quaternion.z);
+    return this;
   }
   setFromMatrix(matrix) {
     this._quaternion = Quaternion2.FromRotationMatrix(matrix.matrix);
@@ -98,9 +99,30 @@ var Quat = class {
     this._quaternion = Quaternion2.FromEulerAngles(eulerAngle.x, eulerAngle.y, eulerAngle.z);
     return this;
   }
+  setFromValues(w, x, y, z) {
+    this._quaternion.set(x, y, z, w);
+    return this;
+  }
+  toArray() {
+    const quatArr = [];
+    this._quaternion.toArray(quatArr);
+    return quatArr;
+  }
   get quaternion() {
     return this._quaternion;
   }
+  get w() {
+    return this._quaternion.w;
+  }
+  get x() {
+    return this._quaternion.x;
+  }
+  get y() {
+    return this._quaternion.y;
+  }
+  get z() {
+    return this._quaternion.z;
+  }
 };
 
 // src/Math/Matrix4.ts
@@ -139,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: ""
@@ -172,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(
@@ -194,18 +212,17 @@ 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();
   }
   get quat() {
-    this._quat.setToQuaternion(this._node.rotationQuaternion);
-    return this._quat;
+    if (this._node.rotationQuaternion === null) {
+      this._node.rotationQuaternion = this._node.rotation.toQuaternion();
+    }
+    return new Quat().setToQuaternion(this._node.rotationQuaternion);
+  }
+  get scale() {
+    return this._node.scaling.x;
   }
   get position() {
     return new Vec3(
@@ -1348,11 +1365,13 @@ function Canvas({
       });
       if (scene.current.children.size !== motifs.length) {
         motifs.forEach((motifMesh, index) => {
-          if (motifProps[index].position) positions[index] = motifProps[index].position;
+          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.setQuaternion(motifProps[index].rotation);
-          motifMesh.multiplyScalar(canvasRef.current.width / 250);
-          scene.current?.add(motifMesh);
+          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.2",
+  "version": "0.0.4",
   "description": "A 3D Canvas for displaying and interacting with custom RNA models. Powered by BabylonJS.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",