@crystaldesign/real-time-viewer 24.11.0-beta.41 → 24.11.0-beta.42
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/build/esm/index.js
CHANGED
|
@@ -62,8 +62,9 @@ function GetCameraControls(camera) {
|
|
|
62
62
|
if (!sceneStore.doRenderControlLoop) return;
|
|
63
63
|
uistore.onMove();
|
|
64
64
|
var stopRender = true;
|
|
65
|
-
var
|
|
66
|
-
var
|
|
65
|
+
var delta = sceneStore.scene.getEngine().getDeltaTime();
|
|
66
|
+
var deltaCamPos = targetCameraPosition.subtract(camera.position).multiplyByFloats(delta / 100, delta / 100, delta / 100);
|
|
67
|
+
var deltaTarget = sceneStore.cameraTargetPosition.subtract(camera.target).multiplyByFloats(delta / 100, delta / 100, delta / 100);
|
|
67
68
|
if (Math.abs(deltaCamPos.x) + Math.abs(deltaCamPos.y) + Math.abs(deltaCamPos.z) > 0.01) {
|
|
68
69
|
camera.position = camera.position.addInPlaceFromFloats(deltaCamPos.x, deltaCamPos.y, deltaCamPos.z);
|
|
69
70
|
camera.setTarget(sceneStore.cameraTargetPosition);
|
|
@@ -97,8 +98,8 @@ function GetCameraControls(camera) {
|
|
|
97
98
|
var localUp = Vector3.TransformNormal(Vector3.Up(), camera.getWorldMatrix());
|
|
98
99
|
localRight = localRight.normalize();
|
|
99
100
|
localUp = localUp.normalize();
|
|
100
|
-
targetCameraPosition = targetCameraPosition.add(localUp.scale(deltaY
|
|
101
|
-
targetCameraPosition = targetCameraPosition.add(localRight.scale(deltaX
|
|
101
|
+
targetCameraPosition = targetCameraPosition.add(localUp.scale(deltaY));
|
|
102
|
+
targetCameraPosition = targetCameraPosition.add(localRight.scale(-deltaX));
|
|
102
103
|
var newCalculatedTarget = targetCameraPosition.add(camera.getForwardRay().direction.scale(Vector3.Distance(targetCameraPosition, sceneStore.cameraTargetPosition)));
|
|
103
104
|
sceneStore.cameraTargetPosition = newCalculatedTarget;
|
|
104
105
|
if (newCalculatedTarget.x > maxCamPosition.x) {
|
|
@@ -186,8 +187,7 @@ function GetCameraControls(camera) {
|
|
|
186
187
|
function onMouseMoveTarget(event) {
|
|
187
188
|
var deltaX = event.movementX || event.mozMovementX || event.webkitMovementX || 0;
|
|
188
189
|
var deltaY = event.movementY || event.mozMovementY || event.webkitMovementY || 0;
|
|
189
|
-
|
|
190
|
-
moveTarget(deltaX * deltaTime * 0.05, deltaY * deltaTime * 0.05);
|
|
190
|
+
moveTarget(deltaX * 0.002, deltaY * 0.002);
|
|
191
191
|
sceneStore.doRenderControlLoop = true;
|
|
192
192
|
}
|
|
193
193
|
var onTouchStart = function onTouchStart(ev) {
|
|
@@ -208,11 +208,11 @@ function GetCameraControls(camera) {
|
|
|
208
208
|
//move target
|
|
209
209
|
var diffX = ev.touches[0].pageX + ev.touches[1].pageX - (previousTouch.touches[0].pageX + previousTouch.touches[1].pageX);
|
|
210
210
|
var diffY = ev.touches[0].pageY + ev.touches[1].pageY - (previousTouch.touches[0].pageY + previousTouch.touches[1].pageY);
|
|
211
|
-
moveTarget(diffX * 0.
|
|
211
|
+
moveTarget(diffX * 0.002, diffY * 0.002);
|
|
212
212
|
// zoom
|
|
213
213
|
var dist = Math.hypot(ev.touches[0].pageX - ev.touches[1].pageX, ev.touches[0].pageY - ev.touches[1].pageY);
|
|
214
214
|
var distChange = dist - initDistance;
|
|
215
|
-
moveCameraAwayFromTarget(-distChange *
|
|
215
|
+
moveCameraAwayFromTarget(-distChange * 0.01);
|
|
216
216
|
sceneStore.doRenderControlLoop = true;
|
|
217
217
|
initDistance = dist;
|
|
218
218
|
}
|
|
@@ -225,9 +225,8 @@ function GetCameraControls(camera) {
|
|
|
225
225
|
if (ev.ctrlKey) {
|
|
226
226
|
add = 0.06;
|
|
227
227
|
}
|
|
228
|
-
var
|
|
229
|
-
|
|
230
|
-
moveCameraAwayFromTarget(value);
|
|
228
|
+
var value = ev.deltaY > 0 ? add : -add;
|
|
229
|
+
moveCameraAwayFromTarget(value * 2);
|
|
231
230
|
sceneStore.doRenderControlLoop = true;
|
|
232
231
|
}
|
|
233
232
|
function onDoubleClick() {}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/controls/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAE1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAG9D,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/controls/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAE1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAG9D,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,eAAe,qBA+OxD;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,KAAK,IAAI,CAAC;CACrG;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,IAAI,EACd,QAAQ,EAAE,OAAO,EAAE,EACnB,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,KAAK,IAAI;yBA+CvG,MAAM,WAAW,MAAM,YAAY,MAAM,sBAAsB,MAAM;EA4BlG"}
|