@aura3d/controls 2.0.4 → 3.0.1
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.
- package/dist/ArcballControls.d.ts +92 -0
- package/dist/ArcballControls.d.ts.map +1 -0
- package/dist/ArcballControls.js +286 -0
- package/dist/ArcballControls.js.map +1 -0
- package/dist/DragControls.d.ts +13 -0
- package/dist/DragControls.d.ts.map +1 -1
- package/dist/DragControls.js +24 -1
- package/dist/DragControls.js.map +1 -1
- package/dist/FlyControls.d.ts +9 -0
- package/dist/FlyControls.d.ts.map +1 -1
- package/dist/FlyControls.js +20 -2
- package/dist/FlyControls.js.map +1 -1
- package/dist/FocusFrame.d.ts +34 -0
- package/dist/FocusFrame.d.ts.map +1 -0
- package/dist/FocusFrame.js +82 -0
- package/dist/FocusFrame.js.map +1 -0
- package/dist/HoverOutline.d.ts +46 -0
- package/dist/HoverOutline.d.ts.map +1 -0
- package/dist/HoverOutline.js +87 -0
- package/dist/HoverOutline.js.map +1 -0
- package/dist/InteractionControls.d.ts +7 -0
- package/dist/InteractionControls.d.ts.map +1 -1
- package/dist/InteractionControls.js +12 -1
- package/dist/InteractionControls.js.map +1 -1
- package/dist/MapControls.d.ts +1 -1
- package/dist/MapControls.d.ts.map +1 -1
- package/dist/MapControls.js +3 -3
- package/dist/MapControls.js.map +1 -1
- package/dist/NativeControlTypes.d.ts +17 -0
- package/dist/NativeControlTypes.d.ts.map +1 -1
- package/dist/NativeControlTypes.js.map +1 -1
- package/dist/OrbitControls.d.ts +26 -3
- package/dist/OrbitControls.d.ts.map +1 -1
- package/dist/OrbitControls.js +48 -11
- package/dist/OrbitControls.js.map +1 -1
- package/dist/Picking.d.ts +15 -0
- package/dist/Picking.d.ts.map +1 -1
- package/dist/Picking.js +62 -23
- package/dist/Picking.js.map +1 -1
- package/dist/PointerLockControls.d.ts.map +1 -1
- package/dist/PointerLockControls.js +4 -0
- package/dist/PointerLockControls.js.map +1 -1
- package/dist/SelectionManager.d.ts +8 -0
- package/dist/SelectionManager.d.ts.map +1 -1
- package/dist/SelectionManager.js +11 -0
- package/dist/SelectionManager.js.map +1 -1
- package/dist/TrackballControls.d.ts +7 -0
- package/dist/TrackballControls.d.ts.map +1 -1
- package/dist/TrackballControls.js +21 -5
- package/dist/TrackballControls.js.map +1 -1
- package/dist/TransformControls.d.ts +8 -0
- package/dist/TransformControls.d.ts.map +1 -1
- package/dist/TransformControls.js +15 -2
- package/dist/TransformControls.js.map +1 -1
- package/dist/index.d.ts +6 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
package/dist/OrbitControls.js
CHANGED
|
@@ -29,38 +29,56 @@ export class OrbitControls {
|
|
|
29
29
|
enablePan = true;
|
|
30
30
|
enableZoom = true;
|
|
31
31
|
enableRotate = true;
|
|
32
|
+
enableDamping = false;
|
|
33
|
+
dampingFactor = 0.05;
|
|
34
|
+
zoomToCursor = false;
|
|
32
35
|
engine;
|
|
33
36
|
attachedCamera;
|
|
37
|
+
disposed = false;
|
|
34
38
|
constructor(camera, options = {}) {
|
|
35
39
|
if (!camera)
|
|
36
40
|
return;
|
|
37
41
|
this.engine = new OrbitControlsEngine(camera, options);
|
|
42
|
+
this.state.enabled = this.engine.enabled;
|
|
38
43
|
this.enablePan = this.engine.enablePan;
|
|
39
44
|
this.enableZoom = this.engine.enableZoom;
|
|
40
45
|
this.enableRotate = this.engine.enableRotate;
|
|
46
|
+
this.enableDamping = this.engine.enableDamping;
|
|
47
|
+
this.dampingFactor = this.engine.dampingFactor;
|
|
48
|
+
this.zoomToCursor = this.engine.zoomToCursor;
|
|
41
49
|
this.syncState(camera);
|
|
42
50
|
}
|
|
43
51
|
/** True when a camera is attached and motion is delegated to the real engine. */
|
|
44
52
|
get isCameraAttached() {
|
|
45
|
-
return this.engine !== undefined;
|
|
53
|
+
return this.engine !== undefined && !this.disposed;
|
|
54
|
+
}
|
|
55
|
+
/** True after `dispose()`; every mutator is a no-op past this point. */
|
|
56
|
+
get isDisposed() {
|
|
57
|
+
return this.disposed;
|
|
46
58
|
}
|
|
47
59
|
/**
|
|
48
60
|
* Drive the controls from an input snapshot. Camera-attached only; a detached
|
|
49
61
|
* instance has no camera to move and ignores the snapshot.
|
|
50
62
|
*
|
|
51
|
-
*
|
|
52
|
-
*
|
|
63
|
+
* Supply frame delta seconds here, or call update(deltaSeconds) on frames
|
|
64
|
+
* without new input. Do not call both for the same elapsed interval.
|
|
53
65
|
*/
|
|
54
|
-
applyInput(snapshot) {
|
|
66
|
+
applyInput(snapshot, deltaSeconds = 1 / 60) {
|
|
55
67
|
const engine = this.engine;
|
|
56
|
-
if (!engine)
|
|
68
|
+
if (!engine || this.disposed || !this.state.enabled)
|
|
57
69
|
return;
|
|
58
70
|
this.pushFlags(engine);
|
|
59
|
-
engine.update(snapshot);
|
|
71
|
+
engine.update(snapshot, deltaSeconds);
|
|
60
72
|
this.syncState();
|
|
61
73
|
}
|
|
74
|
+
/** Tick residual camera motion when no fresh input snapshot is available. */
|
|
75
|
+
update(deltaSeconds = 1 / 60) {
|
|
76
|
+
const before = [this.state.position.x, this.state.position.y, this.state.position.z];
|
|
77
|
+
this.applyInput(new InputSnapshot(), deltaSeconds);
|
|
78
|
+
return before.some((value, i) => value !== [this.state.position.x, this.state.position.y, this.state.position.z][i]);
|
|
79
|
+
}
|
|
62
80
|
rotate(deltaX, deltaY) {
|
|
63
|
-
if (!this.enableRotate)
|
|
81
|
+
if (this.disposed || !this.enableRotate)
|
|
64
82
|
return;
|
|
65
83
|
if (this.engine) {
|
|
66
84
|
this.pushFlags(this.engine);
|
|
@@ -72,7 +90,7 @@ export class OrbitControls {
|
|
|
72
90
|
this.state.rotation.y += deltaX;
|
|
73
91
|
}
|
|
74
92
|
pan(deltaX, deltaY) {
|
|
75
|
-
if (!this.enablePan)
|
|
93
|
+
if (this.disposed || !this.enablePan)
|
|
76
94
|
return;
|
|
77
95
|
if (this.engine) {
|
|
78
96
|
this.pushFlags(this.engine);
|
|
@@ -84,11 +102,11 @@ export class OrbitControls {
|
|
|
84
102
|
this.state.target.y += deltaY;
|
|
85
103
|
}
|
|
86
104
|
dolly(scale) {
|
|
87
|
-
if (!this.enableZoom)
|
|
105
|
+
if (this.disposed || !this.enableZoom || !Number.isFinite(scale) || scale <= 0 || scale === 1)
|
|
88
106
|
return;
|
|
89
107
|
if (this.engine) {
|
|
90
108
|
this.pushFlags(this.engine);
|
|
91
|
-
this.engine.update(new InputSnapshot({ pointer: { wheelY: scale
|
|
109
|
+
this.engine.update(new InputSnapshot({ pointer: { wheelY: Math.log(scale) / -Math.log(0.95) * 100 } }));
|
|
92
110
|
this.syncState();
|
|
93
111
|
return;
|
|
94
112
|
}
|
|
@@ -108,16 +126,29 @@ export class OrbitControls {
|
|
|
108
126
|
}
|
|
109
127
|
/** Camera-attached only; no-op when detached. */
|
|
110
128
|
saveState() {
|
|
129
|
+
if (this.disposed)
|
|
130
|
+
return;
|
|
111
131
|
this.engine?.saveState();
|
|
112
132
|
}
|
|
113
133
|
/** Camera-attached only; no-op when detached. */
|
|
114
134
|
reset() {
|
|
115
|
-
if (!this.engine)
|
|
135
|
+
if (!this.engine || this.disposed)
|
|
116
136
|
return;
|
|
117
137
|
this.engine.reset();
|
|
118
138
|
this.syncState();
|
|
119
139
|
}
|
|
140
|
+
/**
|
|
141
|
+
* F1-standard disposal: disables the instance, detaches the camera so no
|
|
142
|
+
* further mutation is possible, and delegates to the input engine (which
|
|
143
|
+
* owns zero DOM listeners — input arrives via snapshots — so nothing can
|
|
144
|
+
* leak). Idempotent.
|
|
145
|
+
*/
|
|
120
146
|
dispose() {
|
|
147
|
+
if (this.disposed)
|
|
148
|
+
return;
|
|
149
|
+
this.disposed = true;
|
|
150
|
+
this.state.enabled = false;
|
|
151
|
+
this.attachedCamera = undefined;
|
|
121
152
|
this.engine?.dispose();
|
|
122
153
|
}
|
|
123
154
|
/**
|
|
@@ -126,6 +157,8 @@ export class OrbitControls {
|
|
|
126
157
|
* update `state.target` bookkeeping.
|
|
127
158
|
*/
|
|
128
159
|
truckTarget(deltaX, deltaZ) {
|
|
160
|
+
if (this.disposed || !this.state.enabled || !Number.isFinite(deltaX) || !Number.isFinite(deltaZ))
|
|
161
|
+
return;
|
|
129
162
|
const engine = this.engine;
|
|
130
163
|
if (!engine) {
|
|
131
164
|
this.state.target.x += deltaX;
|
|
@@ -138,6 +171,10 @@ export class OrbitControls {
|
|
|
138
171
|
this.syncState();
|
|
139
172
|
}
|
|
140
173
|
pushFlags(engine) {
|
|
174
|
+
engine.enabled = this.state.enabled;
|
|
175
|
+
engine.enableDamping = this.enableDamping;
|
|
176
|
+
engine.dampingFactor = this.dampingFactor;
|
|
177
|
+
engine.zoomToCursor = this.zoomToCursor;
|
|
141
178
|
engine.enablePan = this.enablePan;
|
|
142
179
|
engine.enableZoom = this.enableZoom;
|
|
143
180
|
engine.enableRotate = this.enableRotate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrbitControls.js","sourceRoot":"","sources":["../../../../packages/controls/src/OrbitControls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,IAAI,mBAAmB,EAA6B,MAAM,eAAe,CAAC;AAC/G,OAAO,EAAE,yBAAyB,EAAgC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"OrbitControls.js","sourceRoot":"","sources":["../../../../packages/controls/src/OrbitControls.ts"],"names":[],"mappings":"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"}
|
package/dist/Picking.d.ts
CHANGED
|
@@ -33,6 +33,21 @@ export interface PickingReport {
|
|
|
33
33
|
readonly hits: readonly ThreeCompatPickResult[];
|
|
34
34
|
readonly diagnostics: PickingDiagnostics;
|
|
35
35
|
}
|
|
36
|
+
/**
|
|
37
|
+
* Sphere-based picking over `ControlObject3DLike` scene graphs.
|
|
38
|
+
*
|
|
39
|
+
* Scope notes (F4):
|
|
40
|
+
*
|
|
41
|
+
* - `SkinnedMesh` objects are pickable via the same bind-pose sphere test as
|
|
42
|
+
* static meshes (position plus `pickRadius`). Bone-deformed triangles beyond
|
|
43
|
+
* that radius are an explicit non-goal: this layer answers "which authored
|
|
44
|
+
* object did the pointer hit", not triangle-exact skinning queries.
|
|
45
|
+
* - `InstancedMesh` objects are pickable per instance: metadata
|
|
46
|
+
* `instancePositions` lists world-space instance centers, each tested as
|
|
47
|
+
* its own sphere, and a hit reports the nearest entry as
|
|
48
|
+
* `metadata.instanceId`. Without `instancePositions` the single object
|
|
49
|
+
* sphere is tested, exactly like a static mesh.
|
|
50
|
+
*/
|
|
36
51
|
export declare class Picking {
|
|
37
52
|
pick(root: ControlObject3DLike, origin?: Vector3Like, direction?: Vector3Like, options?: PickingOptions): ThreeCompatPickResult | null;
|
|
38
53
|
pickAll(root: ControlObject3DLike, origin?: Vector3Like, direction?: Vector3Like, options?: PickingOptions): readonly ThreeCompatPickResult[];
|
package/dist/Picking.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Picking.d.ts","sourceRoot":"","sources":["../../../../packages/controls/src/Picking.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAEd,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAAC;IACrC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,mBAAmB,CAAC;CACzC;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IAChD,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,mBAAmB,GAAG,SAAS,CAAC;CACtF;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,gCAAgC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzD,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CACzC;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,GAAG,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC3C,QAAQ,CAAC,IAAI,EAAE,SAAS,qBAAqB,EAAE,CAAC;IAChD,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;CAC1C;AAED,qBAAa,OAAO;IAClB,IAAI,CACF,IAAI,EAAE,mBAAmB,EACzB,MAAM,GAAE,WAAkC,EAC1C,SAAS,GAAE,WAA0C,EACrD,OAAO,GAAE,cAAmB,GAC3B,qBAAqB,GAAG,IAAI;IAI/B,OAAO,CACL,IAAI,EAAE,mBAAmB,EACzB,MAAM,GAAE,WAAkC,EAC1C,SAAS,GAAE,WAA0C,EACrD,OAAO,GAAE,cAAmB,GAC3B,SAAS,qBAAqB,EAAE;IAInC,MAAM,CACJ,IAAI,EAAE,mBAAmB,EACzB,MAAM,GAAE,WAAkC,EAC1C,SAAS,GAAE,WAA0C,EACrD,OAAO,GAAE,cAAmB,GAC3B,aAAa;
|
|
1
|
+
{"version":3,"file":"Picking.d.ts","sourceRoot":"","sources":["../../../../packages/controls/src/Picking.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAEd,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAAC;IACrC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,mBAAmB,CAAC;CACzC;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IAChD,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,mBAAmB,GAAG,SAAS,CAAC;CACtF;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,gCAAgC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzD,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CACzC;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,GAAG,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC3C,QAAQ,CAAC,IAAI,EAAE,SAAS,qBAAqB,EAAE,CAAC;IAChD,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;CAC1C;AAED;;;;;;;;;;;;;;GAcG;AACH,qBAAa,OAAO;IAClB,IAAI,CACF,IAAI,EAAE,mBAAmB,EACzB,MAAM,GAAE,WAAkC,EAC1C,SAAS,GAAE,WAA0C,EACrD,OAAO,GAAE,cAAmB,GAC3B,qBAAqB,GAAG,IAAI;IAI/B,OAAO,CACL,IAAI,EAAE,mBAAmB,EACzB,MAAM,GAAE,WAAkC,EAC1C,SAAS,GAAE,WAA0C,EACrD,OAAO,GAAE,cAAmB,GAC3B,SAAS,qBAAqB,EAAE;IAInC,MAAM,CACJ,IAAI,EAAE,mBAAmB,EACzB,MAAM,GAAE,WAAkC,EAC1C,SAAS,GAAE,WAA0C,EACrD,OAAO,GAAE,cAAmB,GAC3B,aAAa;CAoFjB"}
|
package/dist/Picking.js
CHANGED
|
@@ -1,4 +1,19 @@
|
|
|
1
1
|
import { ControlVector3, traverseControlObject } from "./NativeControlTypes.js";
|
|
2
|
+
/**
|
|
3
|
+
* Sphere-based picking over `ControlObject3DLike` scene graphs.
|
|
4
|
+
*
|
|
5
|
+
* Scope notes (F4):
|
|
6
|
+
*
|
|
7
|
+
* - `SkinnedMesh` objects are pickable via the same bind-pose sphere test as
|
|
8
|
+
* static meshes (position plus `pickRadius`). Bone-deformed triangles beyond
|
|
9
|
+
* that radius are an explicit non-goal: this layer answers "which authored
|
|
10
|
+
* object did the pointer hit", not triangle-exact skinning queries.
|
|
11
|
+
* - `InstancedMesh` objects are pickable per instance: metadata
|
|
12
|
+
* `instancePositions` lists world-space instance centers, each tested as
|
|
13
|
+
* its own sphere, and a hit reports the nearest entry as
|
|
14
|
+
* `metadata.instanceId`. Without `instancePositions` the single object
|
|
15
|
+
* sphere is tested, exactly like a static mesh.
|
|
16
|
+
*/
|
|
2
17
|
export class Picking {
|
|
3
18
|
pick(root, origin = new ControlVector3(), direction = new ControlVector3(0, 0, -1), options = {}) {
|
|
4
19
|
return this.report(root, origin, direction, options).hit;
|
|
@@ -38,30 +53,34 @@ export class Picking {
|
|
|
38
53
|
return;
|
|
39
54
|
}
|
|
40
55
|
counters.candidateObjects += 1;
|
|
41
|
-
const toObject = new ControlVector3(object.position.x - origin.x, object.position.y - origin.y, object.position.z - origin.z);
|
|
42
|
-
const distanceAlongRay = dot(toObject, normalizedDirection);
|
|
43
|
-
if (distanceAlongRay < near || distanceAlongRay > far) {
|
|
44
|
-
counters.skippedOutOfRange += 1;
|
|
45
|
-
return;
|
|
46
|
-
}
|
|
47
|
-
const closestPoint = pointOnRay(origin, normalizedDirection, distanceAlongRay);
|
|
48
|
-
const perpendicularDistance = new ControlVector3(object.position.x - closestPoint.x, object.position.y - closestPoint.y, object.position.z - closestPoint.z).length();
|
|
49
56
|
const radius = resolvePickRadius(object, metadata) + tolerance;
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
57
|
+
const instances = resolveInstanceCenters(object, metadata);
|
|
58
|
+
for (let instanceId = 0; instanceId < instances.length; instanceId += 1) {
|
|
59
|
+
const center = instances[instanceId];
|
|
60
|
+
const toCenter = new ControlVector3(center.x - origin.x, center.y - origin.y, center.z - origin.z);
|
|
61
|
+
const distanceAlongRay = dot(toCenter, normalizedDirection);
|
|
62
|
+
if (distanceAlongRay < near || distanceAlongRay > far) {
|
|
63
|
+
counters.skippedOutOfRange += 1;
|
|
64
|
+
continue;
|
|
65
|
+
}
|
|
66
|
+
const closestPoint = pointOnRay(origin, normalizedDirection, distanceAlongRay);
|
|
67
|
+
const perpendicularDistance = new ControlVector3(center.x - closestPoint.x, center.y - closestPoint.y, center.z - closestPoint.z).length();
|
|
68
|
+
if (perpendicularDistance > radius) {
|
|
69
|
+
counters.skippedMissedRadius += 1;
|
|
70
|
+
nearestMissPerpendicularDistance = Math.min(nearestMissPerpendicularDistance, perpendicularDistance);
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
const rayEntryDistance = Math.max(near, distanceAlongRay - Math.sqrt(Math.max(0, radius * radius - perpendicularDistance * perpendicularDistance)));
|
|
74
|
+
hits.push({
|
|
75
|
+
object,
|
|
76
|
+
distance: rayEntryDistance,
|
|
77
|
+
distanceAlongRay,
|
|
78
|
+
perpendicularDistance,
|
|
79
|
+
point: pointOnRay(origin, normalizedDirection, rayEntryDistance),
|
|
80
|
+
radius,
|
|
81
|
+
metadata: instances.length > 1 ? { ...metadata, instanceId } : metadata
|
|
82
|
+
});
|
|
54
83
|
}
|
|
55
|
-
const rayEntryDistance = Math.max(near, distanceAlongRay - Math.sqrt(Math.max(0, radius * radius - perpendicularDistance * perpendicularDistance)));
|
|
56
|
-
hits.push({
|
|
57
|
-
object,
|
|
58
|
-
distance: rayEntryDistance,
|
|
59
|
-
distanceAlongRay,
|
|
60
|
-
perpendicularDistance,
|
|
61
|
-
point: pointOnRay(origin, normalizedDirection, rayEntryDistance),
|
|
62
|
-
radius,
|
|
63
|
-
metadata
|
|
64
|
-
});
|
|
65
84
|
});
|
|
66
85
|
hits.sort(compareHits);
|
|
67
86
|
const hit = hits[0] ?? null;
|
|
@@ -107,7 +126,27 @@ function readUserDataMetadata(userData) {
|
|
|
107
126
|
function isPickableObject(object, metadata, options) {
|
|
108
127
|
if (metadata && options.includeNonRenderableMetadata !== false)
|
|
109
128
|
return true;
|
|
110
|
-
return object.type === "Mesh" ||
|
|
129
|
+
return object.type === "Mesh" ||
|
|
130
|
+
object.type === "SkinnedMesh" ||
|
|
131
|
+
object.type === "InstancedMesh" ||
|
|
132
|
+
object.type === "Sprite" ||
|
|
133
|
+
object.type === "Points" ||
|
|
134
|
+
object.type === "LineSegments";
|
|
135
|
+
}
|
|
136
|
+
function resolveInstanceCenters(object, metadata) {
|
|
137
|
+
const positions = metadata?.instancePositions;
|
|
138
|
+
if (!positions || positions.length === 0)
|
|
139
|
+
return [object.position];
|
|
140
|
+
return positions.map((entry) => {
|
|
141
|
+
if (Array.isArray(entry)) {
|
|
142
|
+
return {
|
|
143
|
+
x: Number(entry[0] ?? 0),
|
|
144
|
+
y: Number(entry[1] ?? 0),
|
|
145
|
+
z: Number(entry[2] ?? 0)
|
|
146
|
+
};
|
|
147
|
+
}
|
|
148
|
+
return entry;
|
|
149
|
+
});
|
|
111
150
|
}
|
|
112
151
|
function resolvePickRadius(object, metadata) {
|
|
113
152
|
const explicit = metadata?.pickRadius ?? object.pickRadius ?? readUserDataRadius(object.userData);
|
package/dist/Picking.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Picking.js","sourceRoot":"","sources":["../../../../packages/controls/src/Picking.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,qBAAqB,EAItB,MAAM,sBAAsB,CAAC;AAwC9B,MAAM,OAAO,OAAO;IAClB,IAAI,CACF,IAAyB,EACzB,SAAsB,IAAI,cAAc,EAAE,EAC1C,YAAyB,IAAI,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EACrD,UAA0B,EAAE;QAE5B,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC;IAC3D,CAAC;IAED,OAAO,CACL,IAAyB,EACzB,SAAsB,IAAI,cAAc,EAAE,EAC1C,YAAyB,IAAI,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EACrD,UAA0B,EAAE;QAE5B,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC;IAC5D,CAAC;IAED,MAAM,CACJ,IAAyB,EACzB,SAAsB,IAAI,cAAc,EAAE,EAC1C,YAAyB,IAAI,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EACrD,UAA0B,EAAE;QAE5B,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,SAAS,CAAC,CAAC;QAC9D,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,IAAI,MAAM,CAAC,iBAAiB,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC9E,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;QACtE,MAAM,IAAI,GAA4B,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG;YACf,aAAa,EAAE,CAAC;YAChB,gBAAgB,EAAE,CAAC;YACnB,gBAAgB,EAAE,CAAC;YACnB,kBAAkB,EAAE,CAAC;YACrB,eAAe,EAAE,CAAC;YAClB,iBAAiB,EAAE,CAAC;YACpB,mBAAmB,EAAE,CAAC;SACvB,CAAC;QACF,IAAI,gCAAgC,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAEhE,qBAAqB,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE;YACrC,QAAQ,CAAC,aAAa,IAAI,CAAC,CAAC;YAC5B,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,CAAC,gBAAgB,KAAK,IAAI,EAAE,CAAC;gBAClE,QAAQ,CAAC,gBAAgB,IAAI,CAAC,CAAC;gBAC/B,OAAO;YACT,CAAC;YACD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACtD,IAAI,QAAQ,EAAE,UAAU,KAAK,KAAK,EAAE,CAAC;gBACnC,QAAQ,CAAC,eAAe,IAAI,CAAC,CAAC;gBAC9B,OAAO;YACT,CAAC;YACD,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;gBACjD,QAAQ,CAAC,kBAAkB,IAAI,CAAC,CAAC;gBACjC,OAAO;YACT,CAAC;YACD,QAAQ,CAAC,gBAAgB,IAAI,CAAC,CAAC;YAC/B,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"Picking.js","sourceRoot":"","sources":["../../../../packages/controls/src/Picking.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PointerLockControls.d.ts","sourceRoot":"","sources":["../../../../packages/controls/src/PointerLockControls.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,0BAA0B,EAChC,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD;;;GAGG;AACH,qBAAa,mBAAoB,SAAQ,mBAAmB;IAC1D,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA2B;gBAEnD,MAAM,CAAC,EAAE,aAAa,EAAE,OAAO,GAAE,0BAA+B;IAS5E,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,OAAO,EAGxB;IAED,IAAI,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"PointerLockControls.d.ts","sourceRoot":"","sources":["../../../../packages/controls/src/PointerLockControls.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,0BAA0B,EAChC,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD;;;GAGG;AACH,qBAAa,mBAAoB,SAAQ,mBAAmB;IAC1D,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA2B;gBAEnD,MAAM,CAAC,EAAE,aAAa,EAAE,OAAO,GAAE,0BAA+B;IAS5E,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,OAAO,EAGxB;IAED,IAAI,IAAI,IAAI;IAKZ,MAAM,IAAI,IAAI;CAIf"}
|
|
@@ -24,9 +24,13 @@ export class PointerLockControls extends FirstPersonControls {
|
|
|
24
24
|
this.unlock();
|
|
25
25
|
}
|
|
26
26
|
lock() {
|
|
27
|
+
if (this.isDisposed)
|
|
28
|
+
return;
|
|
27
29
|
this.pointerLockDelegate.lock();
|
|
28
30
|
}
|
|
29
31
|
unlock() {
|
|
32
|
+
if (this.isDisposed)
|
|
33
|
+
return;
|
|
30
34
|
this.pointerLockDelegate.unlock();
|
|
31
35
|
}
|
|
32
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PointerLockControls.js","sourceRoot":"","sources":["../../../../packages/controls/src/PointerLockControls.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,IAAI,wBAAwB,EAEhD,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5D;;;GAGG;AACH,MAAM,OAAO,mBAAoB,SAAQ,mBAAmB;IACzC,mBAAmB,CAA2B;IAE/D,YAAY,MAAsB,EAAE,UAAsC,EAAE;QAC1E,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvB,IAAI,CAAC,mBAAmB,GAAG,IAAI,wBAAwB,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC7E,GAAG,OAAO;YACV,SAAS,EAAE,CAAC;SACb,CAAC,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,SAAS,IAAI,KAAK,CAAC,CAAC;IAC7E,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC;IACzC,CAAC;IAED,IAAI,MAAM,CAAC,KAAc;QACvB,IAAI,KAAK;YAAE,IAAI,CAAC,IAAI,EAAE,CAAC;;YAClB,IAAI,CAAC,MAAM,EAAE,CAAC;IACrB,CAAC;IAED,IAAI;QACF,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC;IACpC,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"PointerLockControls.js","sourceRoot":"","sources":["../../../../packages/controls/src/PointerLockControls.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,IAAI,wBAAwB,EAEhD,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5D;;;GAGG;AACH,MAAM,OAAO,mBAAoB,SAAQ,mBAAmB;IACzC,mBAAmB,CAA2B;IAE/D,YAAY,MAAsB,EAAE,UAAsC,EAAE;QAC1E,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvB,IAAI,CAAC,mBAAmB,GAAG,IAAI,wBAAwB,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC7E,GAAG,OAAO;YACV,SAAS,EAAE,CAAC;SACb,CAAC,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,SAAS,IAAI,KAAK,CAAC,CAAC;IAC7E,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC;IACzC,CAAC;IAED,IAAI,MAAM,CAAC,KAAc;QACvB,IAAI,KAAK;YAAE,IAAI,CAAC,IAAI,EAAE,CAAC;;YAClB,IAAI,CAAC,MAAM,EAAE,CAAC;IACrB,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO;QAC5B,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;IAED,MAAM;QACJ,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO;QAC5B,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC;IACpC,CAAC;CACF"}
|
|
@@ -14,6 +14,9 @@ export type SelectionManagerListener = (change: SelectionManagerChange) => void;
|
|
|
14
14
|
export declare class SelectionManager {
|
|
15
15
|
private readonly selectedObjects;
|
|
16
16
|
private readonly listeners;
|
|
17
|
+
private disposed;
|
|
18
|
+
/** True after `dispose()`; selection state stays re-mountable but listeners are dropped. */
|
|
19
|
+
get isDisposed(): boolean;
|
|
17
20
|
get selected(): ReadonlySet<ControlObject3DLike>;
|
|
18
21
|
current(): readonly ControlObject3DLike[];
|
|
19
22
|
select(object: ControlObject3DLike, additive?: boolean): void;
|
|
@@ -23,6 +26,11 @@ export declare class SelectionManager {
|
|
|
23
26
|
toggle(object: ControlObject3DLike, additive?: boolean): void;
|
|
24
27
|
prune(alive: (object: ControlObject3DLike) => boolean): void;
|
|
25
28
|
subscribe(listener: SelectionManagerListener): () => void;
|
|
29
|
+
/**
|
|
30
|
+
* F1-standard disposal: drops every listener and clears selection. The
|
|
31
|
+
* instance stays re-mountable (select/subscribe work again) so repeated
|
|
32
|
+
* mount/dispose cycles cannot accumulate listeners. Idempotent.
|
|
33
|
+
*/
|
|
26
34
|
dispose(): void;
|
|
27
35
|
private replace;
|
|
28
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectionManager.d.ts","sourceRoot":"","sources":["../../../../packages/controls/src/SelectionManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,QAAQ,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAClD,QAAQ,CAAC,OAAO,EAAE,SAAS,mBAAmB,EAAE,CAAC;IACjD,QAAQ,CAAC,KAAK,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC/C,QAAQ,CAAC,OAAO,EAAE,SAAS,mBAAmB,EAAE,CAAC;CAClD;AAED,MAAM,MAAM,wBAAwB,GAAG,CAAC,MAAM,EAAE,sBAAsB,KAAK,IAAI,CAAC;AAEhF;;;;GAIG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkC;IAClE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuC;
|
|
1
|
+
{"version":3,"file":"SelectionManager.d.ts","sourceRoot":"","sources":["../../../../packages/controls/src/SelectionManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,QAAQ,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAClD,QAAQ,CAAC,OAAO,EAAE,SAAS,mBAAmB,EAAE,CAAC;IACjD,QAAQ,CAAC,KAAK,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC/C,QAAQ,CAAC,OAAO,EAAE,SAAS,mBAAmB,EAAE,CAAC;CAClD;AAED,MAAM,MAAM,wBAAwB,GAAG,CAAC,MAAM,EAAE,sBAAsB,KAAK,IAAI,CAAC;AAEhF;;;;GAIG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkC;IAClE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuC;IACjE,OAAO,CAAC,QAAQ,CAAS;IAEzB,4FAA4F;IAC5F,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,QAAQ,IAAI,WAAW,CAAC,mBAAmB,CAAC,CAE/C;IAED,OAAO,IAAI,SAAS,mBAAmB,EAAE;IAIzC,MAAM,CAAC,MAAM,EAAE,mBAAmB,EAAE,QAAQ,UAAQ,GAAG,IAAI;IAO3D,QAAQ,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI;IAM3C,KAAK,IAAI,IAAI;IAIb,GAAG,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO;IAIzC,MAAM,CAAC,MAAM,EAAE,mBAAmB,EAAE,QAAQ,UAAO,GAAG,IAAI;IAQ1D,KAAK,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO,GAAG,IAAI;IAI5D,SAAS,CAAC,QAAQ,EAAE,wBAAwB,GAAG,MAAM,IAAI;IAKzD;;;;OAIG;IACH,OAAO,IAAI,IAAI;IAMf,OAAO,CAAC,OAAO;CAgBhB"}
|
package/dist/SelectionManager.js
CHANGED
|
@@ -6,6 +6,11 @@
|
|
|
6
6
|
export class SelectionManager {
|
|
7
7
|
selectedObjects = new Set();
|
|
8
8
|
listeners = new Set();
|
|
9
|
+
disposed = false;
|
|
10
|
+
/** True after `dispose()`; selection state stays re-mountable but listeners are dropped. */
|
|
11
|
+
get isDisposed() {
|
|
12
|
+
return this.disposed;
|
|
13
|
+
}
|
|
9
14
|
get selected() {
|
|
10
15
|
return this.selectedObjects;
|
|
11
16
|
}
|
|
@@ -43,7 +48,13 @@ export class SelectionManager {
|
|
|
43
48
|
this.listeners.add(listener);
|
|
44
49
|
return () => this.listeners.delete(listener);
|
|
45
50
|
}
|
|
51
|
+
/**
|
|
52
|
+
* F1-standard disposal: drops every listener and clears selection. The
|
|
53
|
+
* instance stays re-mountable (select/subscribe work again) so repeated
|
|
54
|
+
* mount/dispose cycles cannot accumulate listeners. Idempotent.
|
|
55
|
+
*/
|
|
46
56
|
dispose() {
|
|
57
|
+
this.disposed = true;
|
|
47
58
|
this.listeners.clear();
|
|
48
59
|
this.selectedObjects.clear();
|
|
49
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectionManager.js","sourceRoot":"","sources":["../../../../packages/controls/src/SelectionManager.ts"],"names":[],"mappings":"AAWA;;;;GAIG;AACH,MAAM,OAAO,gBAAgB;IACV,eAAe,GAAG,IAAI,GAAG,EAAuB,CAAC;IACjD,SAAS,GAAG,IAAI,GAAG,EAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"SelectionManager.js","sourceRoot":"","sources":["../../../../packages/controls/src/SelectionManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,13 @@ export declare class TrackballControls extends OrbitControls {
|
|
|
13
13
|
pan(deltaX: number, deltaY: number): void;
|
|
14
14
|
dolly(scale: number): void;
|
|
15
15
|
handleKey(code: TrackballKey): void;
|
|
16
|
+
/**
|
|
17
|
+
* F1-standard disposal: drains pending damping velocities through the base
|
|
18
|
+
* disposal (disables + detaches + delegates), then zeroes the residual
|
|
19
|
+
* velocities this class accumulates so a later `update()` cannot drift.
|
|
20
|
+
* Idempotent.
|
|
21
|
+
*/
|
|
22
|
+
dispose(): void;
|
|
16
23
|
update(deltaSeconds?: number): boolean;
|
|
17
24
|
}
|
|
18
25
|
//# sourceMappingURL=TrackballControls.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TrackballControls.d.ts","sourceRoot":"","sources":["../../../../packages/controls/src/TrackballControls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,YAAY,GACpB,SAAS,GACT,WAAW,GACX,WAAW,GACX,YAAY,GACZ,MAAM,GACN,MAAM,GACN,WAAW,GACX,gBAAgB,GAChB,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,CAAC;AAER,qBAAa,iBAAkB,SAAQ,aAAa;
|
|
1
|
+
{"version":3,"file":"TrackballControls.d.ts","sourceRoot":"","sources":["../../../../packages/controls/src/TrackballControls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,YAAY,GACpB,SAAS,GACT,WAAW,GACX,WAAW,GACX,YAAY,GACZ,MAAM,GACN,MAAM,GACN,WAAW,GACX,gBAAgB,GAChB,GAAG,GACH,GAAG,GACH,GAAG,GACH,GAAG,CAAC;AAER,qBAAa,iBAAkB,SAAQ,aAAa;IACzC,aAAa,UAAS;IACtB,aAAa,SAAQ;IAC9B,WAAW,SAAQ;IACnB,YAAY,SAAQ;IAEpB,OAAO,CAAC,gBAAgB,CAAwB;IAChD,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,aAAa,CAAK;IAE1B,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAMhB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAO5C,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAOzC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAMnC,SAAS,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI;IAiCnC;;;;;OAKG;IACM,OAAO,IAAI,IAAI;IAQf,MAAM,CAAC,YAAY,SAAS,GAAG,OAAO;CA+BhD"}
|
|
@@ -8,27 +8,27 @@ export class TrackballControls extends OrbitControls {
|
|
|
8
8
|
panVelocity = { x: 0, y: 0 };
|
|
9
9
|
dollyVelocity = 0;
|
|
10
10
|
roll(delta) {
|
|
11
|
-
if (!this.state.enabled || !this.enableRotate)
|
|
11
|
+
if (this.isDisposed || !this.state.enabled || !this.enableRotate)
|
|
12
12
|
return;
|
|
13
13
|
this.state.rotation.z += delta;
|
|
14
14
|
this.rotationVelocity.z += delta;
|
|
15
15
|
}
|
|
16
16
|
rotate(deltaX, deltaY) {
|
|
17
|
-
if (!this.state.enabled || !this.enableRotate)
|
|
17
|
+
if (this.isDisposed || !this.state.enabled || !this.enableRotate)
|
|
18
18
|
return;
|
|
19
19
|
super.rotate(deltaX, deltaY);
|
|
20
20
|
this.rotationVelocity.x += deltaY;
|
|
21
21
|
this.rotationVelocity.y += deltaX;
|
|
22
22
|
}
|
|
23
23
|
pan(deltaX, deltaY) {
|
|
24
|
-
if (!this.state.enabled || !this.enablePan)
|
|
24
|
+
if (this.isDisposed || !this.state.enabled || !this.enablePan)
|
|
25
25
|
return;
|
|
26
26
|
super.pan(deltaX, deltaY);
|
|
27
27
|
this.panVelocity.x += deltaX;
|
|
28
28
|
this.panVelocity.y += deltaY;
|
|
29
29
|
}
|
|
30
30
|
dolly(scale) {
|
|
31
|
-
if (!this.state.enabled || !this.enableZoom)
|
|
31
|
+
if (this.isDisposed || !this.state.enabled || !this.enableZoom)
|
|
32
32
|
return;
|
|
33
33
|
super.dolly(scale);
|
|
34
34
|
this.dollyVelocity += scale - 1;
|
|
@@ -65,8 +65,24 @@ export class TrackballControls extends OrbitControls {
|
|
|
65
65
|
break;
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
|
+
/**
|
|
69
|
+
* F1-standard disposal: drains pending damping velocities through the base
|
|
70
|
+
* disposal (disables + detaches + delegates), then zeroes the residual
|
|
71
|
+
* velocities this class accumulates so a later `update()` cannot drift.
|
|
72
|
+
* Idempotent.
|
|
73
|
+
*/
|
|
74
|
+
dispose() {
|
|
75
|
+
if (this.isDisposed)
|
|
76
|
+
return;
|
|
77
|
+
super.dispose();
|
|
78
|
+
this.rotationVelocity = { x: 0, y: 0, z: 0 };
|
|
79
|
+
this.panVelocity = { x: 0, y: 0 };
|
|
80
|
+
this.dollyVelocity = 0;
|
|
81
|
+
}
|
|
68
82
|
update(deltaSeconds = 1 / 60) {
|
|
69
|
-
if (
|
|
83
|
+
if (this.isCameraAttached)
|
|
84
|
+
return super.update(deltaSeconds);
|
|
85
|
+
if (this.isDisposed || !this.enableDamping) {
|
|
70
86
|
return false;
|
|
71
87
|
}
|
|
72
88
|
const damping = Math.max(0, Math.min(1, this.dampingFactor * deltaSeconds * 60));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TrackballControls.js","sourceRoot":"","sources":["../../../../packages/controls/src/TrackballControls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAgBhD,MAAM,OAAO,iBAAkB,SAAQ,aAAa;
|
|
1
|
+
{"version":3,"file":"TrackballControls.js","sourceRoot":"","sources":["../../../../packages/controls/src/TrackballControls.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,6 +77,7 @@ export declare class TransformControls {
|
|
|
77
77
|
private dragStartValue;
|
|
78
78
|
private accumulated;
|
|
79
79
|
private dragging;
|
|
80
|
+
private disposed;
|
|
80
81
|
constructor(options?: TransformControlsOptions);
|
|
81
82
|
attach(object: ControlObject3DLike): void;
|
|
82
83
|
detach(): void;
|
|
@@ -127,8 +128,15 @@ export declare class TransformControls {
|
|
|
127
128
|
} | undefined;
|
|
128
129
|
/** Aborts a drag without further mutation, for example on Escape or focus loss. */
|
|
129
130
|
cancelDrag(): void;
|
|
131
|
+
/** True after `dispose()`; pointer and delta entry points are no-ops past this point. */
|
|
132
|
+
get isDisposed(): boolean;
|
|
130
133
|
/** Explicit-delta mutation, retained unchanged for source compatibility. */
|
|
131
134
|
apply(delta: Vector3Like): void;
|
|
135
|
+
/**
|
|
136
|
+
* F1-standard disposal: disables the instance, clears hover/drag state,
|
|
137
|
+
* detaches the object, and owns zero DOM listeners so nothing can leak.
|
|
138
|
+
* Idempotent.
|
|
139
|
+
*/
|
|
132
140
|
dispose(): void;
|
|
133
141
|
private applyConstrainedDelta;
|
|
134
142
|
/** Which object-space axes a handle affects. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransformControls.d.ts","sourceRoot":"","sources":["../../../../packages/controls/src/TransformControls.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TransformControls.d.ts","sourceRoot":"","sources":["../../../../packages/controls/src/TransformControls.ts"],"names":[],"mappings":"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"}
|