@vived/app 2.9.0 → 2.11.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.
Files changed (50) hide show
  1. package/lib/Entities/FocusCamera.d.ts +70 -0
  2. package/lib/Entities/FocusCamera.js +243 -0
  3. package/lib/Entities/KeyboardInput.d.ts +6 -8
  4. package/lib/Entities/KeyboardInput.js +29 -52
  5. package/lib/Entities/MouseInput.js +5 -1
  6. package/lib/Entities/OrbitCamera.d.ts +59 -0
  7. package/lib/Entities/OrbitCamera.js +173 -4
  8. package/lib/Entities/TouchInput.d.ts +6 -0
  9. package/lib/Entities/TouchInput.js +36 -0
  10. package/lib/Entities/index.d.ts +1 -1
  11. package/lib/Entities/index.js +1 -1
  12. package/lib/Interface/Controllers/makeAppHandler.d.ts +1 -1
  13. package/lib/Interface/Controllers/makeAppHandler.js +12 -10
  14. package/lib/PresentationManagers/FocusCameraPM.d.ts +14 -0
  15. package/lib/PresentationManagers/FocusCameraPM.js +31 -0
  16. package/lib/PresentationManagers/index.d.ts +1 -1
  17. package/lib/PresentationManagers/index.js +1 -1
  18. package/lib/UseCases/FocusCamera/BumpDollyFocusCamera.d.ts +16 -0
  19. package/lib/UseCases/FocusCamera/BumpDollyFocusCamera.js +63 -0
  20. package/lib/UseCases/FocusCamera/LerpFocusCamera.d.ts +36 -0
  21. package/lib/UseCases/FocusCamera/LerpFocusCamera.js +71 -0
  22. package/lib/UseCases/FocusCamera/PinchDollyFocusCamera.d.ts +10 -0
  23. package/lib/UseCases/FocusCamera/PinchDollyFocusCamera.js +35 -0
  24. package/lib/UseCases/FocusCamera/PixelDollyFocusCamera.d.ts +10 -0
  25. package/lib/UseCases/FocusCamera/PixelDollyFocusCamera.js +36 -0
  26. package/lib/UseCases/FocusCamera/PixelOrbitFocusCamera.d.ts +10 -0
  27. package/lib/UseCases/FocusCamera/PixelOrbitFocusCamera.js +24 -0
  28. package/lib/UseCases/FocusCamera/PixelPlanePanFocusCamera.d.ts +10 -0
  29. package/lib/UseCases/FocusCamera/PixelPlanePanFocusCamera.js +32 -0
  30. package/lib/UseCases/FocusCamera/SerializeFocusCamera.d.ts +22 -0
  31. package/lib/UseCases/FocusCamera/SerializeFocusCamera.js +81 -0
  32. package/lib/UseCases/FocusCamera/index.d.ts +7 -0
  33. package/lib/UseCases/FocusCamera/index.js +19 -0
  34. package/lib/UseCases/OrbitCamera/LerpOrbitCamera.d.ts +36 -0
  35. package/lib/UseCases/OrbitCamera/LerpOrbitCamera.js +71 -0
  36. package/lib/UseCases/OrbitCamera/PixelDolly_OrbitCamera.d.ts +9 -0
  37. package/lib/UseCases/OrbitCamera/PixelDolly_OrbitCamera.js +31 -0
  38. package/lib/UseCases/OrbitCamera/PixelPlanePan_OrbitCamera.d.ts +10 -0
  39. package/lib/UseCases/OrbitCamera/PixelPlanePan_OrbitCamera.js +31 -0
  40. package/lib/UseCases/OrbitCamera/SerializeOrbitCamera.d.ts +22 -0
  41. package/lib/UseCases/OrbitCamera/SerializeOrbitCamera.js +81 -0
  42. package/lib/UseCases/OrbitCamera/index.d.ts +4 -0
  43. package/lib/UseCases/OrbitCamera/index.js +16 -0
  44. package/lib/UseCases/index.d.ts +1 -2
  45. package/lib/UseCases/index.js +1 -2
  46. package/lib/Utilities/LengthConverters.d.ts +4 -0
  47. package/lib/Utilities/LengthConverters.js +21 -0
  48. package/lib/Utilities/index.d.ts +1 -0
  49. package/lib/Utilities/index.js +1 -0
  50. package/package.json +1 -1
@@ -8,11 +8,108 @@ function makeOrbitCamera() {
8
8
  exports.makeOrbitCamera = makeOrbitCamera;
9
9
  class OrbitCameraImp {
10
10
  constructor() {
11
+ this.farClip = 100;
12
+ this.nearClip = 0.01;
13
+ this.defaultAlpha = 0;
14
+ this.defaultBeta = 30;
15
+ this.defaultRadius = 8;
16
+ this.defaultTarget = _1.Vector3.Zero();
17
+ this.orbitPixelSensitivity = 0.5;
18
+ this.dollyPixelSensitivity = 0.01;
19
+ this.dollyRollSensitivity = 0.001;
20
+ this.dollyPinchSensitivity = 0.005;
21
+ this.limitRadius = false;
22
+ this.minRadius = 0;
23
+ this.maxRadius = 0;
24
+ this.limitAlpha = false;
25
+ this.minAlpha = 0;
26
+ this.maxAlpha = 0;
27
+ this.limitBeta = false;
28
+ this.minBeta = 0;
29
+ this.maxBeta = 0;
30
+ this.limitTarget = false;
31
+ this.maxTargetPosition = _1.Vector3.Zero();
32
+ this.minTargetPosition = _1.Vector3.Zero();
11
33
  this.observers = new _1.ObserverList();
12
34
  this.memoizedAlpha = new _1.MemoizedNumber(0, this.observers.notify);
13
35
  this.memoizedBeta = new _1.MemoizedNumber(0, this.observers.notify);
14
36
  this.memoizedRadius = new _1.MemoizedNumber(1, this.observers.notify);
15
37
  this.memoizedTarget = new _1.MemoizedVector3(_1.Vector3.Zero(), this.observers.notify);
38
+ this.setRadiusLimits = (min, max) => {
39
+ if (min < 0) {
40
+ throw new Error("[Orbit Camera] Mininum Radius must be greater >= 0");
41
+ }
42
+ if (max < min) {
43
+ throw new Error("[Orbit Camera] Max radius must be >= min radius");
44
+ }
45
+ this.maxRadius = max;
46
+ this.minRadius = min;
47
+ this.limitRadius = true;
48
+ this.radius = this.radius;
49
+ };
50
+ this.clearRadiusLimits = () => {
51
+ this.maxRadius = 0;
52
+ this.minRadius = 0;
53
+ this.limitRadius = false;
54
+ };
55
+ this.setAlphaLimits = (min, max) => {
56
+ if (min > max) {
57
+ throw new Error("[Orbit Camera] Max alpha must be >= min alpha");
58
+ }
59
+ if (min < -180) {
60
+ throw new Error("[Orbit Camera] Min alpha must be >= -180");
61
+ }
62
+ if (max > 180) {
63
+ throw new Error("[Orbit Camera] Max alpha must be <= 180");
64
+ }
65
+ this.maxAlpha = max;
66
+ this.minAlpha = min;
67
+ this.limitAlpha = true;
68
+ this.alpha = this.alpha;
69
+ };
70
+ this.clearAlphaLimits = () => {
71
+ this.maxAlpha = 0;
72
+ this.minAlpha = 0;
73
+ this.limitAlpha = false;
74
+ };
75
+ this.setBetaLimits = (min, max) => {
76
+ if (min > max) {
77
+ throw new Error("[Orbit Camera] Max beta must be >= min beta");
78
+ }
79
+ if (min < -180) {
80
+ throw new Error("[Orbit Camera] Min beta must be >= -180");
81
+ }
82
+ if (max > 180) {
83
+ throw new Error("[Orbit Camera] Max beta must be <= 180");
84
+ }
85
+ this.maxBeta = max;
86
+ this.minBeta = min;
87
+ this.limitBeta = true;
88
+ this.beta = this.beta;
89
+ };
90
+ this.clearBetaLimits = () => {
91
+ this.maxBeta = 0;
92
+ this.minBeta = 0;
93
+ this.limitBeta = false;
94
+ };
95
+ this.setTargetLimits = (min, max) => {
96
+ const minArray = min.asArray();
97
+ const maxArray = max.asArray();
98
+ for (let i = 0; i < 3; i++) {
99
+ if (minArray[i] > maxArray[i]) {
100
+ throw new Error("[Orbit Camera] Min target must be less than the max target");
101
+ }
102
+ }
103
+ this.maxTargetPosition = max;
104
+ this.minTargetPosition = min;
105
+ this.limitTarget = true;
106
+ this.target = this.target;
107
+ };
108
+ this.clearTargetLimits = () => {
109
+ this.maxTargetPosition = _1.Vector3.Zero();
110
+ this.minTargetPosition = _1.Vector3.Zero();
111
+ this.limitTarget = false;
112
+ };
16
113
  this.registerLerp = (lerper) => {
17
114
  if (this.currentLerp) {
18
115
  this.currentLerp.cancelLerp();
@@ -27,6 +124,52 @@ class OrbitCameraImp {
27
124
  (_a = this.currentLerp) === null || _a === void 0 ? void 0 : _a.cancelLerp();
28
125
  this.currentLerp = undefined;
29
126
  };
127
+ this.applyData = (data) => {
128
+ if (data.defaultAlpha !== undefined) {
129
+ this.defaultAlpha = data.defaultAlpha;
130
+ }
131
+ if (data.defaultBeta !== undefined) {
132
+ this.defaultBeta = data.defaultBeta;
133
+ }
134
+ if (data.defaultRadius !== undefined) {
135
+ this.defaultRadius = data.defaultRadius;
136
+ }
137
+ if (data.defaultTarget !== undefined) {
138
+ const { x, y, z } = data.defaultTarget;
139
+ this.defaultTarget = new _1.Vector3(x, y, z);
140
+ }
141
+ if (data.nearClip !== undefined) {
142
+ this.nearClip = data.nearClip;
143
+ }
144
+ if (data.farClip !== undefined) {
145
+ this.farClip = data.farClip;
146
+ }
147
+ if (data.alphaLimit !== undefined) {
148
+ this.setAlphaLimits(data.alphaLimit.min, data.alphaLimit.max);
149
+ }
150
+ if (data.betaLimit !== undefined) {
151
+ this.setBetaLimits(data.betaLimit.min, data.betaLimit.max);
152
+ }
153
+ if (data.radiusLimit !== undefined) {
154
+ this.setRadiusLimits(data.radiusLimit.min, data.radiusLimit.max);
155
+ }
156
+ if (data.targetLimit !== undefined) {
157
+ const { max, min } = data.targetLimit;
158
+ this.setTargetLimits(new _1.Vector3(min.x, min.y, min.z), new _1.Vector3(max.x, max.y, max.z));
159
+ }
160
+ if (data.dollyRollSensitivity !== undefined) {
161
+ this.dollyRollSensitivity = data.dollyRollSensitivity;
162
+ }
163
+ if (data.dollyPixelSensitivity !== undefined) {
164
+ this.dollyPixelSensitivity = data.dollyPixelSensitivity;
165
+ }
166
+ if (data.dollyPinchSensitivity !== undefined) {
167
+ this.dollyPinchSensitivity = data.dollyPinchSensitivity;
168
+ }
169
+ if (data.orbitPixelSensitivity !== undefined) {
170
+ this.orbitPixelSensitivity = data.orbitPixelSensitivity;
171
+ }
172
+ };
30
173
  this.addObserver = (observer) => {
31
174
  this.observers.add(observer);
32
175
  };
@@ -38,25 +181,51 @@ class OrbitCameraImp {
38
181
  return this.memoizedAlpha.val;
39
182
  }
40
183
  set alpha(val) {
41
- this.memoizedAlpha.val = this.clampAngle(val);
184
+ let clampedVal = this.clampAngle(val);
185
+ if (this.limitAlpha) {
186
+ clampedVal = Math.min(clampedVal, this.maxAlpha);
187
+ clampedVal = Math.max(clampedVal, this.minAlpha);
188
+ }
189
+ this.memoizedAlpha.val = clampedVal;
42
190
  }
43
191
  get beta() {
44
192
  return this.memoizedBeta.val;
45
193
  }
46
194
  set beta(val) {
47
- this.memoizedBeta.val = this.clampAngle(val);
195
+ let clampedVal = this.clampAngle(val);
196
+ if (this.limitBeta) {
197
+ clampedVal = Math.min(clampedVal, this.maxBeta);
198
+ clampedVal = Math.max(clampedVal, this.minBeta);
199
+ }
200
+ this.memoizedBeta.val = clampedVal;
48
201
  }
49
202
  get radius() {
50
203
  return this.memoizedRadius.val;
51
204
  }
52
205
  set radius(val) {
53
- this.memoizedRadius.val = val < 0 ? 0 : val;
206
+ let clampedVal = Math.max(val, 0);
207
+ if (this.limitRadius) {
208
+ clampedVal = Math.min(clampedVal, this.maxRadius);
209
+ clampedVal = Math.max(clampedVal, this.minRadius);
210
+ }
211
+ this.memoizedRadius.val = clampedVal;
54
212
  }
55
213
  get target() {
56
214
  return this.memoizedTarget.getVector();
57
215
  }
58
216
  set target(val) {
59
- this.memoizedTarget.setVector(val);
217
+ const targetVals = val.asArray();
218
+ if (this.limitTarget) {
219
+ const maxVals = this.maxTargetPosition.asArray();
220
+ const minVals = this.minTargetPosition.asArray();
221
+ for (let i = 0; i < 3; i++) {
222
+ let v = targetVals[i];
223
+ v = Math.min(v, maxVals[i]);
224
+ v = Math.max(v, minVals[i]);
225
+ targetVals[i] = v;
226
+ }
227
+ }
228
+ this.memoizedTarget.setVector(new _1.Vector3(targetVals[0], targetVals[1], targetVals[2]));
60
229
  }
61
230
  clampAngle(angle) {
62
231
  const isNegative = angle < 0 ? true : false;
@@ -1,3 +1,4 @@
1
+ import { Vector2 } from ".";
1
2
  export interface TouchController {
2
3
  onTouchStart?: (e: TouchEvent) => void;
3
4
  onTouchMove?: (e: TouchEvent) => void;
@@ -6,8 +7,13 @@ export interface TouchController {
6
7
  }
7
8
  export interface TouchInput {
8
9
  eventElement: HTMLElement | undefined;
10
+ eventElementBounds?: DOMRect;
9
11
  setEventElement: (eventElement: HTMLElement) => void;
10
12
  clearInputElement: () => void;
13
+ updateInputElementBounds: () => void;
14
+ getTouchOffsetPosition: (touch: Touch) => Vector2;
15
+ getDistatnceBetweenTouches: (touch1: Touch, touch2: Touch) => number;
16
+ getTouchsCenter: (touches: TouchList) => Vector2;
11
17
  registerController: (controller: TouchController) => void;
12
18
  removeController: (controller: TouchController) => void;
13
19
  }
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.makeTouchInput = void 0;
4
+ const _1 = require(".");
4
5
  function makeTouchInput() {
5
6
  return new TouchInputImp();
6
7
  }
@@ -9,6 +10,40 @@ class TouchInputImp {
9
10
  constructor() {
10
11
  this.controllers = [];
11
12
  this._eventElement = undefined;
13
+ this.updateInputElementBounds = () => {
14
+ if (!this._eventElement)
15
+ return;
16
+ this.eventElementBounds = this._eventElement.getBoundingClientRect(); // Expensive so we cache
17
+ };
18
+ this.getTouchOffsetPosition = (touch) => {
19
+ if (!this.eventElementBounds) {
20
+ console.warn("No target bounds");
21
+ return _1.Vector2.Zero();
22
+ }
23
+ const x = touch.clientX - this.eventElementBounds.x;
24
+ const y = touch.clientY - this.eventElementBounds.y;
25
+ return new _1.Vector2(x, y);
26
+ };
27
+ this.getDistatnceBetweenTouches = (touch1, touch2) => {
28
+ const t1 = this.getTouchOffsetPosition(touch1);
29
+ const t2 = this.getTouchOffsetPosition(touch2);
30
+ const delta = t2.subtract(t1);
31
+ return delta.magnitued;
32
+ };
33
+ this.getTouchsCenter = (touches) => {
34
+ const touchCount = touches.length;
35
+ if (touchCount === 0)
36
+ return _1.Vector2.Zero();
37
+ let sumX = 0;
38
+ let sumY = 0;
39
+ for (let i = 0; i < touchCount; i++) {
40
+ const touch = touches[i];
41
+ const touchPos = this.getTouchOffsetPosition(touch);
42
+ sumX += touchPos.x;
43
+ sumY += touchPos.y;
44
+ }
45
+ return new _1.Vector2(sumX / touches.length, sumY / touches.length);
46
+ };
12
47
  this.setEventElement = (eventElement) => {
13
48
  if (this._eventElement)
14
49
  this.clearInputElement();
@@ -16,6 +51,7 @@ class TouchInputImp {
16
51
  eventElement.addEventListener("touchmove", this.onTouchMove, false);
17
52
  eventElement.addEventListener("touchend", this.onTouchEnd, false);
18
53
  eventElement.addEventListener("touchcancel", this.onTouchCancel, false);
54
+ this.eventElementBounds = eventElement.getBoundingClientRect();
19
55
  this._eventElement = eventElement;
20
56
  };
21
57
  this.onTouchStart = (e) => {
@@ -10,7 +10,7 @@ export * from "./MemoizedString";
10
10
  export * from "./MemoizedVector2";
11
11
  export * from "./MemoizedVector3";
12
12
  export * from "./ObserverList";
13
- export * from "./OrbitCamera";
13
+ export * from "./FocusCamera";
14
14
  export * from "./ParametricLine";
15
15
  export * from "./ParametricPlane";
16
16
  export * from "./StateMachine";
@@ -22,7 +22,7 @@ __exportStar(require("./MemoizedString"), exports);
22
22
  __exportStar(require("./MemoizedVector2"), exports);
23
23
  __exportStar(require("./MemoizedVector3"), exports);
24
24
  __exportStar(require("./ObserverList"), exports);
25
- __exportStar(require("./OrbitCamera"), exports);
25
+ __exportStar(require("./FocusCamera"), exports);
26
26
  __exportStar(require("./ParametricLine"), exports);
27
27
  __exportStar(require("./ParametricPlane"), exports);
28
28
  __exportStar(require("./StateMachine"), exports);
@@ -9,4 +9,4 @@ export interface AppHandlerFunctions {
9
9
  setState: (finalState: string, duration?: number) => void;
10
10
  setDevicePreview: (x: number, y: number) => void;
11
11
  }
12
- export declare function makeAppHandler(functions: AppHandlerFunctions): Handler;
12
+ export declare function makeAppHandler(functions: AppHandlerFunctions, verbose?: boolean): Handler;
@@ -2,7 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.makeAppHandler = exports.appPayloadVersions = void 0;
4
4
  const app_host_boundary_1 = require("@vived/app-host-boundary");
5
- const verbose = false;
6
5
  exports.appPayloadVersions = {
7
6
  disposeApp: 1,
8
7
  setDevicePreview: 1,
@@ -12,10 +11,13 @@ exports.appPayloadVersions = {
12
11
  stopApp: 1,
13
12
  setState: 2,
14
13
  };
15
- function makeAppHandler(functions) {
14
+ function makeAppHandler(functions, verbose = false) {
16
15
  const handler = (request) => {
16
+ if (verbose) {
17
+ console.log(request);
18
+ }
17
19
  switch (request.type) {
18
- case app_host_boundary_1.SHOW_BABYLON_INSPECTOR:
20
+ case 'SHOW_BABYLON_INSPECTOR':
19
21
  if (request.version === exports.appPayloadVersions.showBabylonInspector) {
20
22
  const payload = request.payload;
21
23
  functions.showBabylonInspector(payload.showBabylonInspector);
@@ -24,7 +26,7 @@ function makeAppHandler(functions) {
24
26
  throw new app_host_boundary_1.UnsupportedRequestVerion(request.type, request.version);
25
27
  }
26
28
  break;
27
- case app_host_boundary_1.SET_IS_AUTHORING:
29
+ case 'SET_IS_AUTHORING':
28
30
  if (request.version === exports.appPayloadVersions.setIsAuthoring) {
29
31
  const payload = request.payload;
30
32
  functions.setIsAuthoring(payload.isAuthoring);
@@ -33,7 +35,7 @@ function makeAppHandler(functions) {
33
35
  throw new app_host_boundary_1.UnsupportedRequestVerion(request.type, request.version);
34
36
  }
35
37
  break;
36
- case app_host_boundary_1.DISPOSE_APP:
38
+ case 'DISPOSE_APP':
37
39
  if (request.version === exports.appPayloadVersions.disposeApp) {
38
40
  functions.disposeApp();
39
41
  }
@@ -41,7 +43,7 @@ function makeAppHandler(functions) {
41
43
  throw new app_host_boundary_1.UnsupportedRequestVerion(request.type, request.version);
42
44
  }
43
45
  break;
44
- case app_host_boundary_1.STOP_APP:
46
+ case 'STOP_APP':
45
47
  if (request.version === exports.appPayloadVersions.stopApp) {
46
48
  functions.stopApp();
47
49
  }
@@ -49,7 +51,7 @@ function makeAppHandler(functions) {
49
51
  throw new app_host_boundary_1.UnsupportedRequestVerion(request.type, request.version);
50
52
  }
51
53
  break;
52
- case app_host_boundary_1.SET_DEVICE_PREVIEW:
54
+ case 'SET_DEVICE_PREVIEW':
53
55
  if (request.version === exports.appPayloadVersions.setDevicePreview) {
54
56
  const payload = request.payload;
55
57
  functions.setDevicePreview(payload.x, payload.y);
@@ -58,7 +60,7 @@ function makeAppHandler(functions) {
58
60
  throw new app_host_boundary_1.UnsupportedRequestVerion(request.type, request.version);
59
61
  }
60
62
  break;
61
- case app_host_boundary_1.START_APP:
63
+ case 'START_APP':
62
64
  if (request.version === exports.appPayloadVersions.startApp) {
63
65
  const payload = request.payload;
64
66
  functions.startApp(payload.container);
@@ -67,7 +69,7 @@ function makeAppHandler(functions) {
67
69
  throw new app_host_boundary_1.UnsupportedRequestVerion(request.type, request.version);
68
70
  }
69
71
  break;
70
- case app_host_boundary_1.SET_APP_STATE:
72
+ case 'SET_APP_STATE':
71
73
  if (request.version === exports.appPayloadVersions.setState) {
72
74
  const payload = request.payload;
73
75
  functions.setState(payload.finalState, payload.duration);
@@ -76,7 +78,7 @@ function makeAppHandler(functions) {
76
78
  throw new app_host_boundary_1.UnsupportedRequestVerion(request.type, request.version);
77
79
  }
78
80
  break;
79
- case app_host_boundary_1.GET_APP_PAYLOAD_VERSIONS:
81
+ case 'GET_APP_PAYLOAD_VERSION':
80
82
  if (request.version === 1) {
81
83
  const payload = request.payload;
82
84
  payload.callback(exports.appPayloadVersions);
@@ -0,0 +1,14 @@
1
+ import { FocusCamera, Vector3 } from "../Entities";
2
+ export interface FocusCameraVM {
3
+ alphaEuler: Vector3;
4
+ betaEuler: Vector3;
5
+ cameraLocalPosition: Vector3;
6
+ target: Vector3;
7
+ }
8
+ export declare class FocusCameraPM {
9
+ private orbitCam;
10
+ private view;
11
+ dispose(): void;
12
+ private doUpdateView;
13
+ constructor(orbitCamera: FocusCamera, view: (vm: FocusCameraVM) => void);
14
+ }
@@ -0,0 +1,31 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.FocusCameraPM = void 0;
4
+ const Entities_1 = require("../Entities");
5
+ const Utilities_1 = require("../Utilities");
6
+ class FocusCameraPM {
7
+ constructor(orbitCamera, view) {
8
+ this.doUpdateView = () => {
9
+ const { alpha, beta, radius, target } = this.orbitCam;
10
+ const alphaRadians = Utilities_1.degreesToRadians(alpha);
11
+ const alphaEuler = new Entities_1.Vector3(0, alphaRadians, 0);
12
+ const betaRadians = Utilities_1.degreesToRadians(beta);
13
+ const betaEuler = new Entities_1.Vector3(betaRadians, 0, 0);
14
+ const cameraLocalPosition = new Entities_1.Vector3(0, 0, -radius);
15
+ this.view({
16
+ alphaEuler,
17
+ betaEuler,
18
+ cameraLocalPosition,
19
+ target,
20
+ });
21
+ };
22
+ this.orbitCam = orbitCamera;
23
+ this.view = view;
24
+ this.doUpdateView();
25
+ this.orbitCam.addObserver(this.doUpdateView);
26
+ }
27
+ dispose() {
28
+ this.orbitCam.removeObserver(this.doUpdateView);
29
+ }
30
+ }
31
+ exports.FocusCameraPM = FocusCameraPM;
@@ -3,4 +3,4 @@ export * from "./IsAuthoringPM";
3
3
  export * from "./ShowBabylonInspectorPM";
4
4
  export * from "./HasRedoPM";
5
5
  export * from "./HasUndoPM";
6
- export * from "./OrbitCameraPM";
6
+ export * from "./FocusCameraPM";
@@ -15,4 +15,4 @@ __exportStar(require("./IsAuthoringPM"), exports);
15
15
  __exportStar(require("./ShowBabylonInspectorPM"), exports);
16
16
  __exportStar(require("./HasRedoPM"), exports);
17
17
  __exportStar(require("./HasUndoPM"), exports);
18
- __exportStar(require("./OrbitCameraPM"), exports);
18
+ __exportStar(require("./FocusCameraPM"), exports);
@@ -0,0 +1,16 @@
1
+ import { FocusCamera, Vector3 } from "../../Entities";
2
+ export declare class BumpDollyFocusCamera {
3
+ private focusCamera;
4
+ bumpDurationMS: number;
5
+ bumpLerp: (percent: number) => number;
6
+ bumpAmount: number;
7
+ private interval?;
8
+ private chrono;
9
+ private delta;
10
+ private initialRadius;
11
+ private finalRadius;
12
+ private pickPoint?;
13
+ private onTick;
14
+ bump(direction: "IN" | "OUT", target?: Vector3): void;
15
+ constructor(focusCamera: FocusCamera);
16
+ }
@@ -0,0 +1,63 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.BumpDollyFocusCamera = void 0;
4
+ class BumpDollyFocusCamera {
5
+ constructor(focusCamera) {
6
+ this.focusCamera = focusCamera;
7
+ this.bumpDurationMS = 500;
8
+ this.bumpLerp = (p) => {
9
+ return p;
10
+ }; // Linear
11
+ this.bumpAmount = 0.1;
12
+ this.chrono = 0;
13
+ this.delta = 10;
14
+ this.initialRadius = 0;
15
+ this.finalRadius = 0;
16
+ this.onTick = () => {
17
+ this.chrono = this.chrono + this.delta;
18
+ let nomralizedTime = this.chrono / this.bumpDurationMS;
19
+ if (nomralizedTime > 1) {
20
+ nomralizedTime = 1;
21
+ }
22
+ const percent = this.bumpLerp(nomralizedTime);
23
+ const range = this.finalRadius - this.initialRadius;
24
+ const currentRadius = this.focusCamera.radius;
25
+ this.focusCamera.radius = this.initialRadius + range * percent;
26
+ if (this.pickPoint !== undefined) {
27
+ const percentChange = this.focusCamera.radius / currentRadius;
28
+ const pickToTarget = this.focusCamera.target.subtract(this.pickPoint);
29
+ const newLength = pickToTarget.magnitued * percentChange;
30
+ pickToTarget.setLength(newLength);
31
+ const newTargetPos = this.pickPoint.add(pickToTarget);
32
+ this.focusCamera.target = newTargetPos;
33
+ }
34
+ if (nomralizedTime >= 1 && this.interval) {
35
+ this.focusCamera.radius = this.finalRadius;
36
+ clearInterval(this.interval);
37
+ this.interval = undefined;
38
+ this.pickPoint = undefined;
39
+ }
40
+ };
41
+ }
42
+ bump(direction, target) {
43
+ let delta = this.bumpAmount;
44
+ if (direction === "IN") {
45
+ delta *= -1;
46
+ }
47
+ this.initialRadius = this.focusCamera.radius;
48
+ if (this.interval) {
49
+ clearInterval(this.interval);
50
+ this.interval = undefined;
51
+ this.finalRadius = this.finalRadius + delta;
52
+ }
53
+ else {
54
+ this.finalRadius = this.initialRadius + delta;
55
+ }
56
+ this.chrono = 0;
57
+ this.pickPoint = target;
58
+ this.interval = setInterval(() => {
59
+ this.onTick();
60
+ }, 10);
61
+ }
62
+ }
63
+ exports.BumpDollyFocusCamera = BumpDollyFocusCamera;
@@ -0,0 +1,36 @@
1
+ import { FocusCamera } from "../../Entities";
2
+ export interface LerpFocusCameraParameters {
3
+ duration: number;
4
+ finalRadius?: number;
5
+ finalBeta?: number;
6
+ finalAlpha?: number;
7
+ finalTarget?: {
8
+ x: number;
9
+ y: number;
10
+ z: number;
11
+ };
12
+ onComplete?: () => void;
13
+ onAbort?: () => void;
14
+ }
15
+ export declare class LerpFocusCamera {
16
+ get isLerping(): boolean;
17
+ private _isLerping;
18
+ private focusCamera;
19
+ private easeFn;
20
+ private lerpDuration;
21
+ private lerpRadius;
22
+ private lerpBeta;
23
+ private lerpAlpha;
24
+ private lerpX;
25
+ private lerpY;
26
+ private lerpZ;
27
+ private onComplete?;
28
+ private onAbort?;
29
+ private interval;
30
+ private chrono;
31
+ private delta;
32
+ cancelLerp: () => void;
33
+ private onTick;
34
+ constructor(focusCamera: FocusCamera, easeFn: (normalizedTime: number) => number, parameters: LerpFocusCameraParameters);
35
+ private makeLerpNumber;
36
+ }
@@ -0,0 +1,71 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.LerpFocusCamera = void 0;
4
+ const Entities_1 = require("../../Entities");
5
+ class LerpFocusCamera {
6
+ constructor(focusCamera, easeFn, parameters) {
7
+ var _a, _b, _c;
8
+ this._isLerping = false;
9
+ this.chrono = 0;
10
+ this.delta = 10;
11
+ this.cancelLerp = () => {
12
+ if (!this._isLerping)
13
+ return;
14
+ clearInterval(this.interval);
15
+ if (this.onAbort) {
16
+ this.onAbort();
17
+ }
18
+ this._isLerping = false;
19
+ };
20
+ this.onTick = () => {
21
+ this.chrono = this.chrono + this.delta / 1000;
22
+ let nomralizedTime = this.chrono / this.lerpDuration;
23
+ if (nomralizedTime > 1) {
24
+ nomralizedTime = 1;
25
+ }
26
+ const percent = this.easeFn(nomralizedTime);
27
+ this.focusCamera.radius = this.lerpRadius(percent);
28
+ this.focusCamera.beta = this.lerpBeta(percent);
29
+ this.focusCamera.alpha = this.lerpAlpha(percent);
30
+ const x = this.lerpX(percent);
31
+ const y = this.lerpY(percent);
32
+ const z = this.lerpZ(percent);
33
+ this.focusCamera.target = new Entities_1.Vector3(x, y, z);
34
+ if (nomralizedTime >= 1) {
35
+ clearInterval(this.interval);
36
+ if (this.onComplete) {
37
+ this.onComplete();
38
+ }
39
+ this._isLerping = false;
40
+ this.focusCamera.lerpCompleted();
41
+ }
42
+ };
43
+ this.focusCamera = focusCamera;
44
+ this.easeFn = easeFn;
45
+ this.lerpDuration = parameters.duration;
46
+ this.onComplete = parameters.onComplete;
47
+ this.onAbort = parameters.onAbort;
48
+ this.lerpRadius = this.makeLerpNumber(this.focusCamera.radius, parameters.finalRadius);
49
+ this.lerpBeta = this.makeLerpNumber(this.focusCamera.beta, parameters.finalBeta);
50
+ this.lerpAlpha = this.makeLerpNumber(this.focusCamera.alpha, parameters.finalAlpha);
51
+ this.lerpX = this.makeLerpNumber(this.focusCamera.target.x, (_a = parameters.finalTarget) === null || _a === void 0 ? void 0 : _a.x);
52
+ this.lerpY = this.makeLerpNumber(this.focusCamera.target.y, (_b = parameters.finalTarget) === null || _b === void 0 ? void 0 : _b.y);
53
+ this.lerpZ = this.makeLerpNumber(this.focusCamera.target.z, (_c = parameters.finalTarget) === null || _c === void 0 ? void 0 : _c.z);
54
+ this.interval = setInterval(() => {
55
+ this.onTick();
56
+ }, this.delta);
57
+ this.focusCamera.registerLerp(this);
58
+ this._isLerping = true;
59
+ }
60
+ get isLerping() {
61
+ return this._isLerping;
62
+ }
63
+ makeLerpNumber(initial, final) {
64
+ const actualFinal = final !== null && final !== void 0 ? final : initial;
65
+ return function Lerp(percent) {
66
+ const range = actualFinal - initial;
67
+ return initial + range * percent;
68
+ };
69
+ }
70
+ }
71
+ exports.LerpFocusCamera = LerpFocusCamera;
@@ -0,0 +1,10 @@
1
+ import { FocusCamera, Vector3 } from "../../Entities";
2
+ export declare class PinchDollyFocusCamera {
3
+ private focusCamera;
4
+ sensitivity: number;
5
+ private previousDistanceBetweenTouches;
6
+ private pickPoint?;
7
+ doDolly: (distanceBetweenTouches: number) => void;
8
+ initializeDolly: (distanceBetweenTouches: number, pickPoint?: Vector3 | undefined) => void;
9
+ constructor(focusCamera: FocusCamera);
10
+ }