@tomorrowevening/hermes 0.0.128 → 0.0.130

package/package.json

@@ -7,7 +7,7 @@
   "module": "./dist/hermes.esm.js",
   "types": "./types/index.d.ts",
   "type": "module",
-  "version": "0.0.128",
+  "version": "0.0.130",
   "homepage": "https://github.com/tomorrowevening/hermes#readme",
   "bugs": {
     "url": "https://github.com/tomorrowevening/hermes/issues"
@@ -65,6 +65,8 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.3",
     "framer-motion": "^10.16.0",
+    "glslify": "^7.1.1",
+    "glslify-loader": "^2.0.0",
     "path": "^0.12.7",
     "postprocessing": "^6.36.3",
     "react": "^18.2.0",

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

@@ -2,6 +2,12 @@ import { IProject, ISheet, ISheetObject } from '@theatre/core';
 import Application from '../Application';
 import BaseRemote from './BaseRemote';
 import { BroadcastData, DataUpdateCallback, VoidCallback } from '../types';
+type KeyframeVector = {
+    position: number;
+    x: number;
+    y: number;
+    z: number;
+};
 export default class RemoteTheatre extends BaseRemote {
     project: IProject | undefined;
     sheets: Map<string, ISheet>;
@@ -17,8 +23,11 @@ export default class RemoteTheatre extends BaseRemote {
     pauseSheet(name: string, instanceId?: string): void;
     clearSheetObjects(sheetName: string): void;
     sheetObject(sheetName: string, key: string, props: any, onUpdate?: DataUpdateCallback, instanceId?: string): ISheetObject | undefined;
+    getSheetObjectKeyframes(sheetName: string, sheetObject: string, prop: string): any[];
+    getSheetObjectVectors(sheetName: string, sheetObject: string): KeyframeVector[];
     unsubscribe(sheetObject: ISheetObject): undefined;
     handleApp(app: Application, remote: BaseRemote, msg: BroadcastData): void;
     handleEditor(app: Application, remote: BaseRemote, msg: BroadcastData): void;
     handleEditorApp(app: Application, theatre: RemoteTheatre): void;
 }
+export {};

package/types/core/types.d.ts

@@ -4,6 +4,10 @@ export interface BroadcastData {
     event: EditorEvent;
     data?: any;
 }
+export type OptionInfo = {
+    title: string;
+    value: any;
+};
 export interface GroupItemData {
     type: InspectorFieldType;
     prop: string;
@@ -13,7 +17,7 @@ export interface GroupItemData {
     max?: number;
     step?: number;
     disabled?: boolean;
-    options?: any[];
+    options?: OptionInfo[];
 }
 export interface GroupData {
     title: string;

package/types/editor/multiView/InfiniteGridHelper.d.ts

@@ -1,7 +1,7 @@
-import { Mesh } from 'three';
-import InfiniteGridMaterial from './InfiniteGridMaterial';
-export default class InfiniteGridHelper extends Mesh {
-    gridMaterial: InfiniteGridMaterial;
-    constructor();
-    update(): void;
-}
+import { Mesh } from 'three';
+import InfiniteGridMaterial, { InfiniteGridProps } from './InfiniteGridMaterial';
+export default class InfiniteGridHelper extends Mesh {
+    gridMaterial: InfiniteGridMaterial;
+    constructor(props?: InfiniteGridProps);
+    update(): void;
+}

package/types/editor/multiView/InfiniteGridMaterial.d.ts

@@ -1,13 +1,12 @@
-import { Color, ShaderMaterial } from 'three';
-type InfiniteGridProps = {
-    divisions?: number;
-    scale?: number;
-    color?: Color;
-    distance?: number;
-    subgridOpacity?: number;
-    gridOpacity?: number;
-};
-export default class InfiniteGridMaterial extends ShaderMaterial {
-    constructor(props?: InfiniteGridProps);
-}
-export {};
+import { Color, ShaderMaterial } from 'three';
+export type InfiniteGridProps = {
+    divisions?: number;
+    scale?: number;
+    color?: Color;
+    distance?: number;
+    subgridOpacity?: number;
+    gridOpacity?: number;
+};
+export default class InfiniteGridMaterial extends ShaderMaterial {
+    constructor(props?: InfiniteGridProps);
+}

package/types/editor/multiView/MultiView.d.ts

@@ -1,117 +1,117 @@
-import { Component, ReactNode } from 'react';
-import { Camera, Object3D, OrthographicCamera, PerspectiveCamera, Scene, WebGLRenderer } from 'three';
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
-import RemoteThree from '@/core/remote/RemoteThree';
-import { InteractionMode, MultiViewMode } from './MultiViewData';
-import './MultiView.scss';
-type MultiViewProps = {
-    three: RemoteThree;
-    scenes: Map<string, any>;
-    onSceneSet?: (scene: Scene) => void;
-    onSceneUpdate?: (scene: Scene) => void;
-    onSceneResize?: (scene: Scene, width: number, height: number) => void;
-};
-type MultiViewState = {
-    mode: MultiViewMode;
-    modeOpen: boolean;
-    renderModeOpen: boolean;
-    interactionMode: InteractionMode;
-    interactionModeOpen: boolean;
-    lastUpdate: number;
-};
-export default class MultiView extends Component<MultiViewProps, MultiViewState> {
-    static instance: MultiView | null;
-    scene: Scene;
-    renderer?: WebGLRenderer | null;
-    currentScene?: Scene;
-    cameras: Map<string, Camera>;
-    controls: Map<string, OrbitControls>;
-    currentCamera: PerspectiveCamera | OrthographicCamera;
-    currentWindow: any;
-    private cameraHelpers;
-    private lightHelpers;
-    private helpersContainer;
-    private grid;
-    private axisHelper;
-    private interactionHelper;
-    private currentTransform?;
-    private splineEditor;
-    private depthMaterial;
-    private normalsMaterial;
-    private uvMaterial;
-    private wireframeMaterial;
-    private playing;
-    private rafID;
-    private cameraControlsRafID;
-    private width;
-    private height;
-    private sceneSet;
-    private tlCam;
-    private trCam;
-    private blCam;
-    private brCam;
-    private tlRender;
-    private trRender;
-    private blRender;
-    private brRender;
-    private cameraVisibility;
-    private lightVisibility;
-    selectedItem: Object3D | undefined;
-    private debugCamera;
-    private raycaster;
-    private pointer;
-    private cameraControls;
-    private canvasRef;
-    private containerRef;
-    private tlWindow;
-    private trWindow;
-    private blWindow;
-    private brWindow;
-    constructor(props: MultiViewProps);
-    componentDidMount(): void;
-    componentDidUpdate(prevProps: Readonly<MultiViewProps>, prevState: Readonly<MultiViewState>, snapshot?: any): void;
-    componentWillUnmount(): void;
-    render(): ReactNode;
-    private setupRenderer;
-    private setupScene;
-    private setupTools;
-    play(): void;
-    pause(): void;
-    toggleOrbitControls(value: boolean): void;
-    private update;
-    private draw;
-    private onUpdate;
-    private enable;
-    private disable;
-    private resize;
-    private sceneUpdate;
-    private addCamera;
-    private removeCamera;
-    private onMouseMove;
-    private onClick;
-    private onKey;
-    private onSetSelectedItem;
-    private updateSelectedItemHelper;
-    private onUpdateTransform;
-    private clearLightHelpers;
-    private addLightHelpers;
-    private createControls;
-    private clearCamera;
-    private killControls;
-    private assignControls;
-    private updateCamera;
-    private updateCameraControls;
-    private clearControls;
-    private saveExpandedCameraVisibility;
-    private saveExpandedLightVisibility;
-    private getSceneOverride;
-    private drawSingle;
-    private drawDouble;
-    private drawQuad;
-    get appID(): string;
-    get mode(): MultiViewMode;
-    get three(): RemoteThree;
-    get expandedCameraVisibility(): string;
-    get expandedLightVisibility(): string;
-}
-export {};
+import { Component, ReactNode } from 'react';
+import { Camera, Object3D, OrthographicCamera, PerspectiveCamera, Scene, WebGLRenderer } from 'three';
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
+import RemoteThree from '@/core/remote/RemoteThree';
+import { InteractionMode, MultiViewMode } from './MultiViewData';
+import './MultiView.scss';
+type MultiViewProps = {
+    three: RemoteThree;
+    scenes: Map<string, any>;
+    onSceneSet?: (scene: Scene) => void;
+    onSceneUpdate?: (scene: Scene) => void;
+    onSceneResize?: (scene: Scene, width: number, height: number) => void;
+};
+type MultiViewState = {
+    mode: MultiViewMode;
+    modeOpen: boolean;
+    renderModeOpen: boolean;
+    interactionMode: InteractionMode;
+    interactionModeOpen: boolean;
+    lastUpdate: number;
+};
+export default class MultiView extends Component<MultiViewProps, MultiViewState> {
+    static instance: MultiView | null;
+    scene: Scene;
+    renderer?: WebGLRenderer | null;
+    currentScene?: Scene;
+    cameras: Map<string, Camera>;
+    controls: Map<string, OrbitControls>;
+    currentCamera: PerspectiveCamera | OrthographicCamera;
+    currentWindow: any;
+    private cameraHelpers;
+    private lightHelpers;
+    private helpersContainer;
+    private grid;
+    private interactionHelper;
+    private currentTransform?;
+    private splineEditor;
+    private depthMaterial;
+    private normalsMaterial;
+    private uvMaterial;
+    private wireframeMaterial;
+    private playing;
+    private rafID;
+    private cameraControlsRafID;
+    private width;
+    private height;
+    private sceneSet;
+    private tlCam;
+    private trCam;
+    private blCam;
+    private brCam;
+    private tlRender;
+    private trRender;
+    private blRender;
+    private brRender;
+    private cameraVisibility;
+    private lightVisibility;
+    selectedItem: Object3D | undefined;
+    private debugCamera;
+    private raycaster;
+    private pointer;
+    private cameraControls;
+    private canvasRef;
+    private containerRef;
+    private tlWindow;
+    private trWindow;
+    private blWindow;
+    private brWindow;
+    constructor(props: MultiViewProps);
+    componentDidMount(): void;
+    componentDidUpdate(prevProps: Readonly<MultiViewProps>, prevState: Readonly<MultiViewState>, snapshot?: any): void;
+    componentWillUnmount(): void;
+    render(): ReactNode;
+    private setupRenderer;
+    private setupScene;
+    private setupTools;
+    play(): void;
+    pause(): void;
+    toggleOrbitControls(value: boolean): void;
+    private update;
+    private draw;
+    private onUpdate;
+    private enable;
+    private disable;
+    private resize;
+    private sceneUpdate;
+    private addCamera;
+    private removeCamera;
+    private onMouseMove;
+    private onClick;
+    private onKey;
+    private onSetSelectedItem;
+    private updateSelectedItemHelper;
+    private onUpdateTransform;
+    private clearLightHelpers;
+    private addLightHelpers;
+    private createControls;
+    private clearCamera;
+    private killControls;
+    private assignControls;
+    private updateCamera;
+    private updateCameraControls;
+    private clearControls;
+    private saveExpandedCameraVisibility;
+    private saveExpandedLightVisibility;
+    private getSceneOverride;
+    private drawTo;
+    private drawSingle;
+    private drawDouble;
+    private drawQuad;
+    get appID(): string;
+    get mode(): MultiViewMode;
+    get three(): RemoteThree;
+    get expandedCameraVisibility(): string;
+    get expandedLightVisibility(): string;
+}
+export {};

package/types/editor/sidePanel/inspector/InspectorField.d.ts

@@ -1,4 +1,5 @@
 import { KeyboardEvent } from 'react';
+import { OptionInfo } from '@/core/types';
 export type InspectorFieldType = 'string' | 'number' | 'boolean' | 'range' | 'color' | 'button' | 'image' | 'option' | 'vector2' | 'grid3' | 'grid4' | 'euler';
 export interface InspectorFieldProps {
     title: string;
@@ -9,7 +10,7 @@ export interface InspectorFieldProps {
     max?: number;
     step?: number;
     disabled?: boolean;
-    options?: any[];
+    options?: OptionInfo[];
     onChange?: (prop: string, value: any) => void;
     onKeyDown?: (evt: KeyboardEvent) => void;
 }

package/types/utils/math.d.ts

@@ -1,5 +1,9 @@
 export declare function clamp(min: number, max: number, value: number): number;
 export declare function normalize(min: number, max: number, value: number): number;
 export declare function mix(min: number, max: number, value: number): number;
+export declare function map(min1: number, max1: number, min2: number, max2: number, value: number): number;
 export declare function distance(x: number, y: number): number;
 export declare function round(value: number, precision?: number): number;
+export declare function damp(start: number, end: number, easing: number, dt: number): number;
+export declare function roundTo(value: number, digits?: number): number;
+export declare function cubicBezier(percent: number, x0: number, y0: number, x1: number, y1: number): number;