@hatiolab/things-scene 10.1.70 → 10.1.72
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,6 +1,15 @@
|
|
|
1
1
|
import * as THREE from 'three';
|
|
2
2
|
import { type FigureAsset, type FigureAssetEvaluation, type FigureDriver } from '@hatiolab/figure-model';
|
|
3
3
|
import { type CompiledFigure } from './figure-compile-cache.js';
|
|
4
|
+
/** What the rig's own evaluator returns: an instance's evaluation, its values and places frozen (figure-model F1). */
|
|
5
|
+
type InstanceEvaluation = ReturnType<ReturnType<CompiledFigure['document']['evaluator']>['evaluate']>;
|
|
6
|
+
/**
|
|
7
|
+
* An evaluation as the rig dresses it: bodies with their appearance, and the places the evaluator gave -- read, never
|
|
8
|
+
* written, so they keep the evaluator's (frozen) type.
|
|
9
|
+
*/
|
|
10
|
+
export type FigureRigEvaluation = Omit<FigureAssetEvaluation, 'bindings'> & {
|
|
11
|
+
bindings: InstanceEvaluation['bindings'];
|
|
12
|
+
};
|
|
4
13
|
export interface FigureRigOptions {
|
|
5
14
|
/**
|
|
6
15
|
* A theme mapping: token → colour, replacing the asset's own snapshot where a token is present (designer's
|
|
@@ -40,6 +49,13 @@ export type FigureDraw = {
|
|
|
40
49
|
start: number;
|
|
41
50
|
count: number;
|
|
42
51
|
};
|
|
52
|
+
} | {
|
|
53
|
+
kind: 'carried';
|
|
54
|
+
object: THREE.Mesh;
|
|
55
|
+
triangles: {
|
|
56
|
+
start: number;
|
|
57
|
+
count: number;
|
|
58
|
+
};
|
|
43
59
|
};
|
|
44
60
|
export declare class FigureRig {
|
|
45
61
|
readonly group: THREE.Group<THREE.Object3DEventMap>;
|
|
@@ -49,6 +65,10 @@ export declare class FigureRig {
|
|
|
49
65
|
private readonly batches;
|
|
50
66
|
/** One merged mesh per group of still parts of one render state, by the group's key (ADR-0109). */
|
|
51
67
|
private readonly merged;
|
|
68
|
+
/** One mesh per group of moving parts carried by one pose, of one render state, by the group's key (ADR-0111). */
|
|
69
|
+
private readonly carried;
|
|
70
|
+
/** The design values and size the carried meshes were made at, by value: a pose step after either changes goes by an evaluation. */
|
|
71
|
+
private carriedAt?;
|
|
52
72
|
private static readonly matrix;
|
|
53
73
|
/** One node per place a thing is held (a seat or a grip), made when something first hangs from it. */
|
|
54
74
|
private readonly places;
|
|
@@ -90,6 +110,10 @@ export declare class FigureRig {
|
|
|
90
110
|
private planned?;
|
|
91
111
|
/** The still bodies of the last plan, kept while the bodies keep their ids. */
|
|
92
112
|
private stillOf?;
|
|
113
|
+
/** What carries each moving body of the last plan, kept while the bodies keep their ids (ADR-0111). */
|
|
114
|
+
private carriedOf?;
|
|
115
|
+
private static readonly carrierJudges;
|
|
116
|
+
private static carrierJudgeOf;
|
|
93
117
|
/** figure-model's still judgement, made once per compiled figure and shared by its rigs: it reads the asset only. */
|
|
94
118
|
private static readonly stillJudges;
|
|
95
119
|
private static stillJudgeOf;
|
|
@@ -98,7 +122,7 @@ export declare class FigureRig {
|
|
|
98
122
|
* of the old name would not go on reading it unawares). Pose steps move the meshes past it: for the values as they
|
|
99
123
|
* stand now, read \`evaluation()\`.
|
|
100
124
|
*/
|
|
101
|
-
lastEvaluation:
|
|
125
|
+
lastEvaluation: FigureRigEvaluation | null;
|
|
102
126
|
/**
|
|
103
127
|
* Where each body slot of the last evaluation is drawn, for pose steps (ADR-0108): a mesh drawn alone, or a copy of a
|
|
104
128
|
* batch at an index. Made with every evaluation, valid for its generation.
|
|
@@ -156,7 +180,7 @@ export declare class FigureRig {
|
|
|
156
180
|
*/
|
|
157
181
|
update(): void;
|
|
158
182
|
/** The values as they stand now -- an evaluation, made if pose steps moved past the last one (fresh on read). */
|
|
159
|
-
evaluation():
|
|
183
|
+
evaluation(): FigureRigEvaluation;
|
|
160
184
|
private movesMerged;
|
|
161
185
|
/** A pose step: each written body slot's matrix, the rows that moved, the places that moved. */
|
|
162
186
|
private movePoses;
|
|
@@ -168,6 +192,15 @@ export declare class FigureRig {
|
|
|
168
192
|
* the plan's, and any group the bank had no room for.
|
|
169
193
|
*/
|
|
170
194
|
private drawMerged;
|
|
195
|
+
/**
|
|
196
|
+
* The meshes for groups of moving parts carried by one pose (ADR-0111). Each part is baked at its pose to the first; the
|
|
197
|
+
* mesh stands at the first part's pose. Kept while the parts keep their shapes and those relative poses (on
|
|
198
|
+
* \`CARRIED_POSE_GRID\`), made again from the bank otherwise. Returns the bodies to draw one by one, with any group the
|
|
199
|
+
* bank had no room for.
|
|
200
|
+
*/
|
|
201
|
+
private drawCarried;
|
|
202
|
+
/** The size and design values as one key, to tell whether they changed since the carried meshes were made. */
|
|
203
|
+
private designKey;
|
|
171
204
|
/**
|
|
172
205
|
* The node a held thing hangs from at one place (`capabilities.bindings`). It is a child of the group that every
|
|
173
206
|
* update moves to the place's pose, so what hangs from it follows the part it sits on -- through the joints too --
|
|
@@ -187,10 +220,11 @@ export declare class FigureRig {
|
|
|
187
220
|
bodyAt(object: THREE.Object3D, instanceId?: number, faceIndex?: number): string | undefined;
|
|
188
221
|
/** Where a body is drawn now, or undefined when it is not (hidden, or no such body). */
|
|
189
222
|
drawOf(id: string): FigureDraw | undefined;
|
|
190
|
-
/** How the bodies are drawn now: a draw per batch, per merged group and per body drawn alone (what the grade counts). */
|
|
223
|
+
/** How the bodies are drawn now: a draw per batch, per merged group, per carried group and per body drawn alone (what the grade counts). */
|
|
191
224
|
get draws(): {
|
|
192
225
|
batches: number;
|
|
193
226
|
merged: number;
|
|
227
|
+
carried: number;
|
|
194
228
|
alone: number;
|
|
195
229
|
instances: number;
|
|
196
230
|
};
|
|
@@ -200,7 +234,7 @@ export declare class FigureRig {
|
|
|
200
234
|
*/
|
|
201
235
|
/** The inputs this rig evaluates at now: the figure's defaults, its drivers and external values, and its size. */
|
|
202
236
|
evaluationInputs(): Record<string, number>;
|
|
203
|
-
evaluate():
|
|
237
|
+
evaluate(): FigureRigEvaluation;
|
|
204
238
|
/** An evaluation's bodies with their appearance: material, visibility and segments. */
|
|
205
239
|
private dress;
|
|
206
240
|
private colourOf;
|
|
@@ -211,4 +245,5 @@ export declare class FigureRig {
|
|
|
211
245
|
drawnIds(): string[];
|
|
212
246
|
dispose(): void;
|
|
213
247
|
}
|
|
248
|
+
export {};
|
|
214
249
|
//# sourceMappingURL=figure-rig.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"figure-rig.d.ts","sourceRoot":"","sources":["../../src/figure/figure-rig.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,
|
|
1
|
+
{"version":3,"file":"figure-rig.d.ts","sourceRoot":"","sources":["../../src/figure/figure-rig.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hatiolab/things-scene",
|
|
3
|
-
"version": "10.1.
|
|
3
|
+
"version": "10.1.72",
|
|
4
4
|
"description": "A high-performance 2D/3D scene graph library for building interactive visual editors, combining HTML5 Canvas and Three.js to enable facility visualization, data-driven animations, and real-time monitoring dashboards",
|
|
5
5
|
"main": "things-scene-min.js",
|
|
6
6
|
"module": "things-scene.mjs",
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
},
|
|
92
92
|
"homepage": "https://github.com/hatiolab/things-scene#readme",
|
|
93
93
|
"dependencies": {
|
|
94
|
-
"@hatiolab/figure-model": "^0.3.
|
|
94
|
+
"@hatiolab/figure-model": "^0.3.3",
|
|
95
95
|
"@wizpanda/super-gif": "^0.0.6",
|
|
96
96
|
"dompurify": "^3.3.1",
|
|
97
97
|
"jsonata": "^1.8.6",
|