fl-web-component 1.3.12 → 1.3.13
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/README.md +2 -0
- package/dist/fl-web-component.common.js +83 -192
- package/dist/fl-web-component.common.js.map +1 -1
- package/dist/fl-web-component.css +1 -1
- package/package.json +1 -1
- package/packages/components/com-flcanvas/index.vue +234 -327
- package/patches/camera-controls+2.9.0.patch +63 -63
|
@@ -1,63 +1,63 @@
|
|
|
1
|
-
diff --git a/node_modules/camera-controls/dist/camera-controls.module.js b/node_modules/camera-controls/dist/camera-controls.module.js
|
|
2
|
-
index 08a8fd6..76089cb 100644
|
|
3
|
-
--- a/node_modules/camera-controls/dist/camera-controls.module.js
|
|
4
|
-
+++ b/node_modules/camera-controls/dist/camera-controls.module.js
|
|
5
|
-
@@ -1395,7 +1395,7 @@ class CameraControls extends EventDispatcher {
|
|
6
|
-
* @category Methods
|
|
7
|
-
*/
|
|
8
|
-
dolly(distance, enableTransition = false) {
|
|
9
|
-
- return this.dollyTo(this._sphericalEnd.radius - distance, enableTransition);
|
|
10
|
-
+ return this.dollyTo(this._sphericalEnd.radius - distance, this.minDistance, enableTransition);
|
|
11
|
-
}
|
|
12
|
-
/**
|
|
13
|
-
* Dolly in/out camera position to given distance.
|
|
14
|
-
@@ -1403,11 +1403,11 @@ class CameraControls extends EventDispatcher {
|
|
15
|
-
* @param enableTransition Whether to move smoothly or immediately.
|
|
16
|
-
* @category Methods
|
|
17
|
-
*/
|
|
18
|
-
- dollyTo(distance, enableTransition = false) {
|
|
19
|
-
+ dollyTo(distance, minDistance, enableTransition = false) {
|
|
20
|
-
this._isUserControllingDolly = false;
|
|
21
|
-
this._lastDollyDirection = DOLLY_DIRECTION.NONE;
|
|
22
|
-
this._changedDolly = 0;
|
|
23
|
-
- return this._dollyToNoClamp(clamp(distance, this.minDistance, this.maxDistance), enableTransition);
|
|
24
|
-
+ return this._dollyToNoClamp(clamp(distance, minDistance, this.maxDistance), enableTransition);
|
|
25
|
-
}
|
|
26
|
-
_dollyToNoClamp(distance, enableTransition = false) {
|
|
27
|
-
const lastRadius = this._sphericalEnd.radius;
|
|
28
|
-
@@ -1635,7 +1635,7 @@ class CameraControls extends EventDispatcher {
|
|
29
|
-
if (isPerspectiveCamera(this._camera)) {
|
|
30
|
-
const distance = this.getDistanceToFitBox(bbSize.x, bbSize.y, bbSize.z, cover);
|
|
31
|
-
promises.push(this.moveTo(center.x, center.y, center.z, enableTransition));
|
|
32
|
-
- promises.push(this.dollyTo(distance, enableTransition));
|
|
33
|
-
+ promises.push(this.dollyTo(distance, this.minDistance, enableTransition));
|
|
34
|
-
promises.push(this.setFocalOffset(0, 0, 0, enableTransition));
|
|
35
|
-
}
|
|
36
|
-
else if (isOrthographicCamera(this._camera)) {
|
|
37
|
-
@@ -1664,7 +1664,7 @@ class CameraControls extends EventDispatcher {
|
|
38
|
-
promises.push(this.moveTo(boundingSphere.center.x, boundingSphere.center.y, boundingSphere.center.z, enableTransition));
|
|
39
|
-
if (isPerspectiveCamera(this._camera)) {
|
|
40
|
-
const distanceToFit = this.getDistanceToFitSphere(boundingSphere.radius);
|
|
41
|
-
- promises.push(this.dollyTo(distanceToFit, enableTransition));
|
|
42
|
-
+ promises.push(this.dollyTo(distanceToFit, this.minDistance, enableTransition));
|
|
43
|
-
}
|
|
44
|
-
else if (isOrthographicCamera(this._camera)) {
|
|
45
|
-
const width = this._camera.right - this._camera.left;
|
|
46
|
-
@@ -1831,7 +1831,7 @@ class CameraControls extends EventDispatcher {
|
|
47
|
-
_zColumn.multiplyScalar(cameraToPoint.z);
|
|
48
|
-
_v3A.copy(_xColumn).add(_yColumn).add(_zColumn);
|
|
49
|
-
_v3A.z = _v3A.z + distance;
|
|
50
|
-
- this.dollyTo(distance, false);
|
|
51
|
-
+ this.dollyTo(distance, Number.EPSILON, false);
|
|
52
|
-
this.setFocalOffset(-_v3A.x, _v3A.y, -_v3A.z, false);
|
|
53
|
-
this.moveTo(targetX, targetY, targetZ, false);
|
|
54
|
-
}
|
|
55
|
-
@@ -2283,7 +2283,7 @@ class CameraControls extends EventDispatcher {
|
|
56
|
-
this.moveTo(obj.target[0], obj.target[1], obj.target[2], enableTransition);
|
|
57
|
-
_sphericalA.setFromVector3(_v3A.fromArray(obj.position).sub(this._targetEnd).applyQuaternion(this._yAxisUpSpace));
|
|
58
|
-
this.rotateTo(_sphericalA.theta, _sphericalA.phi, enableTransition);
|
|
59
|
-
- this.dollyTo(_sphericalA.radius, enableTransition);
|
|
60
|
-
+ this.dollyTo(_sphericalA.radius, this.minDistance, enableTransition);
|
|
61
|
-
this.zoomTo(obj.zoom, enableTransition);
|
|
62
|
-
this.setFocalOffset(obj.focalOffset[0], obj.focalOffset[1], obj.focalOffset[2], enableTransition);
|
|
63
|
-
this._needsUpdate = true;
|
|
1
|
+
diff --git a/node_modules/camera-controls/dist/camera-controls.module.js b/node_modules/camera-controls/dist/camera-controls.module.js
|
|
2
|
+
index 08a8fd6..76089cb 100644
|
|
3
|
+
--- a/node_modules/camera-controls/dist/camera-controls.module.js
|
|
4
|
+
+++ b/node_modules/camera-controls/dist/camera-controls.module.js
|
|
5
|
+
@@ -1395,7 +1395,7 @@ class CameraControls extends EventDispatcher {
|
|
6
|
+
* @category Methods
|
|
7
|
+
*/
|
|
8
|
+
dolly(distance, enableTransition = false) {
|
|
9
|
+
- return this.dollyTo(this._sphericalEnd.radius - distance, enableTransition);
|
|
10
|
+
+ return this.dollyTo(this._sphericalEnd.radius - distance, this.minDistance, enableTransition);
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Dolly in/out camera position to given distance.
|
|
14
|
+
@@ -1403,11 +1403,11 @@ class CameraControls extends EventDispatcher {
|
|
15
|
+
* @param enableTransition Whether to move smoothly or immediately.
|
|
16
|
+
* @category Methods
|
|
17
|
+
*/
|
|
18
|
+
- dollyTo(distance, enableTransition = false) {
|
|
19
|
+
+ dollyTo(distance, minDistance, enableTransition = false) {
|
|
20
|
+
this._isUserControllingDolly = false;
|
|
21
|
+
this._lastDollyDirection = DOLLY_DIRECTION.NONE;
|
|
22
|
+
this._changedDolly = 0;
|
|
23
|
+
- return this._dollyToNoClamp(clamp(distance, this.minDistance, this.maxDistance), enableTransition);
|
|
24
|
+
+ return this._dollyToNoClamp(clamp(distance, minDistance, this.maxDistance), enableTransition);
|
|
25
|
+
}
|
|
26
|
+
_dollyToNoClamp(distance, enableTransition = false) {
|
|
27
|
+
const lastRadius = this._sphericalEnd.radius;
|
|
28
|
+
@@ -1635,7 +1635,7 @@ class CameraControls extends EventDispatcher {
|
|
29
|
+
if (isPerspectiveCamera(this._camera)) {
|
|
30
|
+
const distance = this.getDistanceToFitBox(bbSize.x, bbSize.y, bbSize.z, cover);
|
|
31
|
+
promises.push(this.moveTo(center.x, center.y, center.z, enableTransition));
|
|
32
|
+
- promises.push(this.dollyTo(distance, enableTransition));
|
|
33
|
+
+ promises.push(this.dollyTo(distance, this.minDistance, enableTransition));
|
|
34
|
+
promises.push(this.setFocalOffset(0, 0, 0, enableTransition));
|
|
35
|
+
}
|
|
36
|
+
else if (isOrthographicCamera(this._camera)) {
|
|
37
|
+
@@ -1664,7 +1664,7 @@ class CameraControls extends EventDispatcher {
|
|
38
|
+
promises.push(this.moveTo(boundingSphere.center.x, boundingSphere.center.y, boundingSphere.center.z, enableTransition));
|
|
39
|
+
if (isPerspectiveCamera(this._camera)) {
|
|
40
|
+
const distanceToFit = this.getDistanceToFitSphere(boundingSphere.radius);
|
|
41
|
+
- promises.push(this.dollyTo(distanceToFit, enableTransition));
|
|
42
|
+
+ promises.push(this.dollyTo(distanceToFit, this.minDistance, enableTransition));
|
|
43
|
+
}
|
|
44
|
+
else if (isOrthographicCamera(this._camera)) {
|
|
45
|
+
const width = this._camera.right - this._camera.left;
|
|
46
|
+
@@ -1831,7 +1831,7 @@ class CameraControls extends EventDispatcher {
|
|
47
|
+
_zColumn.multiplyScalar(cameraToPoint.z);
|
|
48
|
+
_v3A.copy(_xColumn).add(_yColumn).add(_zColumn);
|
|
49
|
+
_v3A.z = _v3A.z + distance;
|
|
50
|
+
- this.dollyTo(distance, false);
|
|
51
|
+
+ this.dollyTo(distance, Number.EPSILON, false);
|
|
52
|
+
this.setFocalOffset(-_v3A.x, _v3A.y, -_v3A.z, false);
|
|
53
|
+
this.moveTo(targetX, targetY, targetZ, false);
|
|
54
|
+
}
|
|
55
|
+
@@ -2283,7 +2283,7 @@ class CameraControls extends EventDispatcher {
|
|
56
|
+
this.moveTo(obj.target[0], obj.target[1], obj.target[2], enableTransition);
|
|
57
|
+
_sphericalA.setFromVector3(_v3A.fromArray(obj.position).sub(this._targetEnd).applyQuaternion(this._yAxisUpSpace));
|
|
58
|
+
this.rotateTo(_sphericalA.theta, _sphericalA.phi, enableTransition);
|
|
59
|
+
- this.dollyTo(_sphericalA.radius, enableTransition);
|
|
60
|
+
+ this.dollyTo(_sphericalA.radius, this.minDistance, enableTransition);
|
|
61
|
+
this.zoomTo(obj.zoom, enableTransition);
|
|
62
|
+
this.setFocalOffset(obj.focalOffset[0], obj.focalOffset[1], obj.focalOffset[2], enableTransition);
|
|
63
|
+
this._needsUpdate = true;
|