@tomorrowevening/hermes 0.1.15 → 0.1.17

package/dist/hermes.es.js

@@ -1895,7 +1895,7 @@ class ZP extends pg {
       data: JSON.stringify({ group: e, prop: t, value: s })
     });
   }
-  addSpline(e) {
+  addSplineCurve(e) {
     setTimeout(() => {
       this.send({
         event: "addSpline",
@@ -1904,6 +1904,15 @@ class ZP extends pg {
       });
     }, 1);
   }
+  addSplineObject(e) {
+    setTimeout(() => {
+      this.send({
+        event: "addSpline",
+        target: "editor",
+        data: JSON.stringify(e)
+      });
+    }, 1);
+  }
   // Renderer
   setRenderer(e, t = null) {
     if (this.renderer = e, this.canvas = e.domElement, this.inputElement = t !== null ? t : this.canvas, !this.debug) return;
@@ -42815,13 +42824,13 @@ class kh extends Er {
   };
   addNextPt = () => {
     const e = this.draggable.children.length, t = e > 1 ? this.draggable.children[e - 1].position.clone() : new Z(), s = this.addPoint(t);
-    this.group.current?.setField("Current Point", s.position);
+    this.updateField(s.position);
   };
   removePoint = (e) => {
     if (this._transform?.object === e) {
       this._transform?.detach();
       const t = this.draggable.children[this.draggable.children.length - 1];
-      this._transform?.attach(t), this.group.current?.setField("Current Point", t.position);
+      this._transform?.attach(t), this.updateField(t.position);
     }
     di(e), this.updateSpline();
   };
@@ -42839,6 +42848,9 @@ class kh extends Er {
   updateSpline = () => {
     this.points.length < 2 || (this.curve = new ep(this.points, this.closed, this.curveType, this.tension), this.line.geometry.dispose(), this.line.geometry = new zi().setFromPoints(this.curve.getPoints(this.subdivide)), this.curvePos.position.copy(this.getPointAt(this._curvePercentage)));
   };
+  updateField(e) {
+    this.group.current?.setField("Current Point", e);
+  }
   // Handlers
   onMouseClick = (e) => {
     if (!ut.instance || !ut.instance.currentWindow || this._transform && !this._transform.getHelper().visible) return;
@@ -42847,7 +42859,7 @@ class kh extends Er {
     const i = this.raycaster.intersectObjects(this.draggable.children, !1);
     if (i.length > 0) {
       const n = i[0].object;
-      n !== this._transform?.object && (this._transform?.attach(n), this.group.current?.setField("Current Point", n.position));
+      n !== this._transform?.object && (this._transform?.attach(n), this.updateField(n.position));
     }
   };
   // Getters
@@ -42888,19 +42900,19 @@ class kh extends Er {
   updateCurrentPoint() {
     if (this._transform?.object && this.group) {
       const e = this._transform?.object;
-      e.name.search("point") > -1 && this.group.current?.setField("Current Point", e.position);
+      e.name.search("point") > -1 && this.updateField(e.position);
     }
   }
   onUpdateTransform = () => {
     this.updateCurrentPoint(), this.updateSpline();
   };
-  initDebug(e) {
-    const t = this.draggable.children;
-    this.parentGroup = e, this._transform = _t.instance.add(this.name), this._transform.camera = this._camera, this._transform.addEventListener("objectChange", this.onUpdateTransform), t.length > 0 && this._transform.attach(t[t.length - 1]), ut.instance?.helpersContainer.add(this._transform.getHelper());
-    const s = t.length > 0 ? t[t.length - 1].position : { x: 0, y: 0, z: 0 };
+  initDebug(e, t) {
+    const s = this.draggable.children;
+    this.visible = t, this.parentGroup = e, this._transform = _t.instance.add(this.name), this._transform.camera = this._camera, this._transform.addEventListener("objectChange", this.onUpdateTransform), s.length > 0 && this._transform.attach(s[s.length - 1]), ut.instance?.helpersContainer.add(this._transform.getHelper());
+    const i = s.length > 0 ? s[s.length - 1].position : { x: 0, y: 0, z: 0 };
     this.group = e.addGroup({
       title: this.name,
-      expanded: !0,
+      expanded: t,
       items: [
         {
           prop: "Closed",
@@ -43007,43 +43019,43 @@ class kh extends Er {
         {
           prop: "Current Point",
           type: "grid3",
-          value: s
+          value: i
         }
       ],
-      onUpdate: (i, n) => {
-        switch (i) {
+      onUpdate: (n, r) => {
+        switch (n) {
           case "Closed":
-            this.closed = n, this.updateSpline();
+            this.closed = r, this.updateSpline();
             break;
           case "Visible":
-            this.visible = n;
+            this.visible = r;
             break;
           case "Color":
-            this.lineMaterial.color.setStyle(n), this.draggedMat.color.setStyle(n);
+            this.lineMaterial.color.setStyle(r), this.draggedMat.color.setStyle(r);
             break;
           case "Curve":
-            this.curveType = n, this.updateSpline();
+            this.curveType = r, this.updateSpline();
             break;
           case "Draggable Scale":
-            this.draggableScale = n;
+            this.draggableScale = r;
             break;
           case "Subdivide":
-            this.subdivide = n, this.updateSpline();
+            this.subdivide = r, this.updateSpline();
             break;
           case "Tension":
-            this.tension = n, this.updateSpline();
+            this.tension = r, this.updateSpline();
             break;
           case "New Pt Offset":
-            this.offset = n;
+            this.offset = r;
             break;
           case "Curve At":
-            this.curvePos.position.copy(this.getPointAt(n));
+            this.curvePos.position.copy(this.getPointAt(r));
             break;
           case "Show Position":
-            this.curvePos.visible = n;
+            this.curvePos.visible = r;
             break;
           case "Show Points":
-            this.draggable.visible = n;
+            this.draggable.visible = r;
             break;
           case "Toggle Transform":
             this._transform && (this._transform.getHelper().visible = !this._transform.getHelper().visible);
@@ -43062,14 +43074,14 @@ class kh extends Er {
             break;
           case "Current Point":
             if (this.group.current && this._transform?.object) {
-              const r = this._transform?.object;
-              r.name.search("point") > -1 && (r.position.copy(n), this.updateSpline());
+              const o = this._transform?.object;
+              o.name.search("point") > -1 && (o.position.copy(r), this.updateSpline());
             }
             break;
         }
       }
-    }), this.draggable.children.forEach((i) => {
-      this.debugPoint(i);
+    }), this.draggable.children.forEach((n) => {
+      this.debugPoint(n);
     });
   }
   debugPoint = (e) => {
@@ -43159,12 +43171,12 @@ class rP extends Er {
   dispose() {
     this.three.removeEventListener(ce.ADD_SPLINE, this.onAddSpline), _e.removeEditorGroup(this.name);
   }
-  addSpline(e) {
-    e.draggableScale = this.defaultScale, e.hideTransform(), this.group?.current !== null && e.initDebug(this.group.current), this.add(e), this.currentSpline = e;
+  addSpline(e, t) {
+    e.draggableScale = this.defaultScale, e.hideTransform(), this.group?.current !== null && e.initDebug(this.group.current, t), this.add(e), this.currentSpline = e;
   }
   createSpline = (e = []) => {
     const t = `Spline ${Jo + 1}`, s = new kh(t, this._camera);
-    return s.addPoints(e), this.addSpline(s), Jo++, s;
+    return s.addPoints(e), this.addSpline(s, !0), Jo++, s;
   };
   createSplineFromArray = (e) => {
     const t = [];
@@ -43179,7 +43191,7 @@ class rP extends Er {
       t.push(new Z(i[0], i[1], i[2]));
     });
     const s = new kh(e.name, this._camera);
-    return s.closed = e.closed, s.subdivide = e.subdivide, s.tension = e.tension, s.type = e.type, s.addPoints(t), s.updateSpline(), this.addSpline(s), s;
+    return s.closed = e.closed, s.subdivide = e.subdivide, s.tension = e.tension, s.type = e.type, s.addPoints(t), s.updateSpline(), this.addSpline(s, !1), s;
   };
   showPoints = (e = !0) => {
     this.children.forEach((t) => {
@@ -43187,12 +43199,12 @@ class rP extends Er {
     });
   };
   onAddSpline = (e) => {
-    const t = JSON.parse(e.value), s = `Spline ${Jo + 1}`, i = [];
+    const t = JSON.parse(e.value), s = t.name !== void 0 ? t.name : `Spline ${Jo + 1}`, i = new kh(s, this.camera);
+    t.tension !== void 0 && (i.tension = t.tension), t.closed !== void 0 && (i.closed = t.closed), t.subdivide !== void 0 && (i.subdivide = t.subdivide), t.type !== void 0 && (i.curveType = t.type);
+    const n = [];
     t.points.forEach((r) => {
-      i.push(new Z(r[0], r[1], r[2]));
-    });
-    const n = new kh(s, this.camera);
-    n.addPoints(i), this.addSpline(n), Jo++;
+      n.push(new Z(r[0], r[1], r[2]));
+    }), i.addPoints(n), this.addSpline(i, !1), Jo++;
   };
   isMouseDown = !1;
   enableClickToDraw() {
@@ -43229,7 +43241,7 @@ class rP extends Er {
   onMouseMove = (e) => {
     if (!this.isMouseDown) return;
     const s = e.target.getBoundingClientRect(), i = (e.clientX - s.left) / s.width * 2 - 1, n = -((e.clientY - s.top) / s.height) * 2 + 1, r = this.mouseToSplinePos(i, n, s.width, s.height);
-    this.currentSpline?.updateLastPoint(r);
+    this.currentSpline?.updateLastPoint(r), this.currentSpline?.updateField(r);
   };
   onMouseUp = () => {
     this.isMouseDown = !1;

package/package.json

@@ -1,79 +1,79 @@
-{
-  "name": "@tomorrowevening/hermes",
-  "author": "Colin Duffy <http://tomorrowevening.com/>",
-  "description": "An extendable set of Web Tools controlled via a separate window for non-intereference with content.",
-  "license": "GPL-3.0-or-later",
-  "main": "./dist/hermes.cjs.js",
-  "module": "./dist/hermes.esm.js",
-  "types": "./types/index.d.ts",
-  "type": "module",
-  "version": "0.1.15",
-  "homepage": "https://github.com/tomorrowevening/hermes#readme",
-  "bugs": {
-    "url": "https://github.com/tomorrowevening/hermes/issues"
-  },
-  "keywords": [
-    "Editor",
-    "Remote",
-    "TheatreJS",
-    "ThreeJS"
-  ],
-  "files": [
-    "dist/hermes.es.js",
-    "dist/hermes.cjs.js",
-    "dist/hermes.css",
-    "types/**/*.d.ts"
-  ],
-  "exports": {
-    ".": {
-      "types": "./types/index.d.ts",
-      "import": "./dist/hermes.es.js",
-      "require": "./dist/hermes.cjs.js"
-    },
-    "./hermes.css": "./dist/hermes.css"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tomorrowevening/hermes.git"
-  },
-  "scripts": {
-    "server": "node server/index.mjs",
-    "clean": "rm -r dist && rm -r types",
-    "dev": "vite",
-    "declare": "tsc --declaration --emitDeclarationOnly --declarationDir types",
-    "buildLib": "yarn declare && vite build",
-    "buildExample": "vite build --config vite.config.example.ts",
-    "build": "yarn buildLib && yarn buildExample",
-    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
-    "preview": "vite preview"
-  },
-  "devDependencies": {
-    "@theatre/core": "^0.7.2",
-    "@theatre/studio": "^0.7.2",
-    "@types/react": "^18.2.15",
-    "@types/react-dom": "^18.2.7",
-    "@types/three": "^0.177.0",
-    "@typescript-eslint/eslint-plugin": "^6.4.0",
-    "@typescript-eslint/parser": "^6.4.0",
-    "@vitejs/plugin-react": "^4.0.3",
-    "camera-controls": "^2.9.0",
-    "detect-gpu": "^5.0.70",
-    "eslint": "^8.45.0",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.3",
-    "glslify": "^7.1.1",
-    "glslify-loader": "^2.0.0",
-    "path": "^0.12.7",
-    "postprocessing": "^6.37.6",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "sass": "^1.89.2",
-    "stats-gl": "^3.6.0",
-    "three": "^0.177.0",
-    "typescript": "^5.0.2",
-    "vite": "^6.3.5",
-    "vite-plugin-glsl": "1.2.1",
-    "ws": "^8.16.0"
-  }
-}
+{
+  "name": "@tomorrowevening/hermes",
+  "author": "Colin Duffy <http://tomorrowevening.com/>",
+  "description": "An extendable set of Web Tools controlled via a separate window for non-intereference with content.",
+  "license": "GPL-3.0-or-later",
+  "main": "./dist/hermes.cjs.js",
+  "module": "./dist/hermes.esm.js",
+  "types": "./types/index.d.ts",
+  "type": "module",
+  "version": "0.1.17",
+  "homepage": "https://github.com/tomorrowevening/hermes#readme",
+  "bugs": {
+    "url": "https://github.com/tomorrowevening/hermes/issues"
+  },
+  "keywords": [
+    "Editor",
+    "Remote",
+    "TheatreJS",
+    "ThreeJS"
+  ],
+  "files": [
+    "dist/hermes.es.js",
+    "dist/hermes.cjs.js",
+    "dist/hermes.css",
+    "types/**/*.d.ts"
+  ],
+  "exports": {
+    ".": {
+      "types": "./types/index.d.ts",
+      "import": "./dist/hermes.es.js",
+      "require": "./dist/hermes.cjs.js"
+    },
+    "./hermes.css": "./dist/hermes.css"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tomorrowevening/hermes.git"
+  },
+  "scripts": {
+    "server": "node server/index.mjs",
+    "clean": "rm -r dist && rm -r types",
+    "dev": "vite",
+    "declare": "tsc --declaration --emitDeclarationOnly --declarationDir types",
+    "buildLib": "yarn declare && vite build",
+    "buildExample": "vite build --config vite.config.example.ts",
+    "build": "yarn buildLib && yarn buildExample",
+    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+    "preview": "vite preview"
+  },
+  "devDependencies": {
+    "@theatre/core": "^0.7.2",
+    "@theatre/studio": "^0.7.2",
+    "@types/react": "^18.2.15",
+    "@types/react-dom": "^18.2.7",
+    "@types/three": "^0.177.0",
+    "@typescript-eslint/eslint-plugin": "^6.4.0",
+    "@typescript-eslint/parser": "^6.4.0",
+    "@vitejs/plugin-react": "^4.0.3",
+    "camera-controls": "^2.9.0",
+    "detect-gpu": "^5.0.70",
+    "eslint": "^8.45.0",
+    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-refresh": "^0.4.3",
+    "glslify": "^7.1.1",
+    "glslify-loader": "^2.0.0",
+    "path": "^0.12.7",
+    "postprocessing": "^6.37.6",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "sass": "^1.89.2",
+    "stats-gl": "^3.6.0",
+    "three": "^0.177.0",
+    "typescript": "^5.0.2",
+    "vite": "^6.3.5",
+    "vite-plugin-glsl": "1.2.1",
+    "ws": "^8.16.0"
+  }
+}

package/types/core/remote/RemoteThree.d.ts

@@ -54,7 +54,8 @@ export default class RemoteThree extends BaseRemote implements EventDispatcher<T
     addGroup(data: GroupData): void;
     removeGroup(name: string): void;
     updateGroup(group: string, prop: string, value: any): void;
-    addSpline(spline: Curve<any>): void;
+    addSplineCurve(spline: Curve<any>): void;
+    addSplineObject(spline: any): void;
     setRenderer(value: any, inputElement?: any): void;
     updateRenderer(data: any): void;
     addScene(value: Scene): void;

package/types/editor/tools/splineEditor/Spline.d.ts

@@ -35,6 +35,7 @@ export default class Spline extends Object3D {
     removeSelectedPt: () => void;
     updateLastPoint(value: Vector3): void;
     updateSpline: () => void;
+    updateField(position: Vector3): void;
     private onMouseClick;
     getPointAt(percentage: number): Vector3;
     getTangentAt(percentage: number): Vector3;
@@ -48,6 +49,6 @@ export default class Spline extends Object3D {
     set curvePercentage(value: number);
     private updateCurrentPoint;
     private onUpdateTransform;
-    initDebug(parentGroup: InspectorGroup): void;
+    initDebug(parentGroup: InspectorGroup, visible: boolean): void;
     private debugPoint;
 }

package/types/editor/tools/splineEditor/index.d.ts

@@ -19,7 +19,7 @@ export default class SplineEditor extends Object3D {
     constructor(camera: Camera, three: RemoteThree);
     initDebug(): void;
     dispose(): void;
-    addSpline(spline: Spline): void;
+    addSpline(spline: Spline, visible: boolean): void;
     createSpline: (defaultPoints?: Array<Vector3>) => Spline;
     createSplineFromArray: (points: Array<number[]>) => Spline;
     createSplineFromCatmullRom: (curve: CatmullRomCurve3) => Spline;