@shapediver/viewer.rendering-engine.camera-engine 1.9.0 → 1.10.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CameraEngine.d.ts","sourceRoot":"","sources":["../../src/implementation/CameraEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"CameraEngine.d.ts","sourceRoot":"","sources":["../../src/implementation/CameraEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAiI,MAAM,oCAAoC,CAAA;AAElM,OAAO,EAAE,OAAO,EAAE,MAAM,mDAAmD,CAAA;AAC3E,OAAO,EAAE,GAAG,EAAE,MAAM,gCAAgC,CAAA;AAEpD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AACvE,OAAO,EAAE,cAAc,IAAI,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAUlE,qBAAa,YAAa,YAAW,aAAa;IAwBlC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAU,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAW,OAAO,CAAC,QAAQ,CAAC,eAAe;IArBnH,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAElB;IACP,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAEvC;IACP,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA4D;IACzF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6C;IACrE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqE;IACrG,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA4D;IACzF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkE;IAEjG,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,gBAAgB,CAAkB;IAE1C,SAAS,CAAC,YAAY,EAAE,GAAG,CAAa;gBAMX,SAAS,EAAE,MAAM,EAAmB,OAAO,EAAE,OAAO,EAAmB,eAAe,EAAE,cAAc;IAgBnI,IAAW,MAAM,IAAI,MAAM,GAAG,IAAI,CAEjC;IAED,IAAW,OAAO,IAAI;QAClB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KACxB,CAEA;IAMM,oBAAoB,IAAI,IAAI;IAK5B,aAAa;IAqBb,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAM9B,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM;IAgCnD,sBAAsB,IAAI,IAAI;IAK9B,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAWjC,YAAY;CA8GtB"}
|
|
@@ -69,9 +69,8 @@ class CameraEngine {
|
|
|
69
69
|
createCamera(type, id) {
|
|
70
70
|
const cameraId = id || this._uuidGenerator.create();
|
|
71
71
|
if (this._cameras[cameraId]) {
|
|
72
|
-
const error = new viewer_shared_services_1.
|
|
73
|
-
this._logger.
|
|
74
|
-
throw error;
|
|
72
|
+
const error = new viewer_shared_services_1.ShapeDiverViewerCameraError(`CameraEngine.createCamera: Camera (${type}) with this id (${cameraId}) already exists.`);
|
|
73
|
+
throw this._logger.handleError(viewer_shared_services_1.LOGGINGTOPIC.CAMERA, `CameraEngine.createCamera`, error);
|
|
75
74
|
}
|
|
76
75
|
if (ICameraEngine_1.CAMERATYPE.ORTHOGRAPHIC === type) {
|
|
77
76
|
const camera = new OrthographicCamera_1.OrthographicCamera(this._viewerId, cameraId, this._canvas.canvasElement);
|
|
@@ -117,99 +116,100 @@ class CameraEngine {
|
|
|
117
116
|
}
|
|
118
117
|
saveSettings() {
|
|
119
118
|
this._settingsEngine.settings.camera.cameraId = this._camera ? this._camera.id : 'standard';
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
},
|
|
155
|
-
|
|
156
|
-
center: { x: controls.spherePositionRestriction.center[0], y: controls.spherePositionRestriction.center[1], z: controls.spherePositionRestriction.center[2] },
|
|
157
|
-
radius: controls.spherePositionRestriction.radius,
|
|
158
|
-
},
|
|
119
|
+
this._settingsEngine.settings.camera.cameras = {};
|
|
120
|
+
if (!this._camera)
|
|
121
|
+
return;
|
|
122
|
+
const camera = this._camera;
|
|
123
|
+
if (camera.type === ICameraEngine_1.CAMERATYPE.PERSPECTIVE) {
|
|
124
|
+
const controls = camera.controls;
|
|
125
|
+
this._settingsEngine.camera.cameras[camera.id] = {
|
|
126
|
+
autoAdjust: camera.autoAdjust,
|
|
127
|
+
cameraMovementDuration: camera.cameraMovementDuration,
|
|
128
|
+
enableCameraControls: camera.enableCameraControls,
|
|
129
|
+
revertAtMouseUp: camera.revertAtMouseUp,
|
|
130
|
+
revertAtMouseUpDuration: camera.revertAtMouseUpDuration,
|
|
131
|
+
zoomExtentsFactor: camera.zoomExtentsFactor,
|
|
132
|
+
position: { x: camera.defaultPosition[0], y: camera.defaultPosition[1], z: camera.defaultPosition[2] },
|
|
133
|
+
target: { x: camera.defaultTarget[0], y: camera.defaultTarget[1], z: camera.defaultTarget[2] },
|
|
134
|
+
type: camera.type,
|
|
135
|
+
fov: camera.fov,
|
|
136
|
+
controls: {
|
|
137
|
+
autoRotationSpeed: controls.autoRotationSpeed,
|
|
138
|
+
damping: controls.damping,
|
|
139
|
+
enableAutoRotation: controls.enableAutoRotation,
|
|
140
|
+
enableKeyPan: controls.enableKeyPan,
|
|
141
|
+
enablePan: controls.enablePan,
|
|
142
|
+
enableRotation: controls.enableRotation,
|
|
143
|
+
enableZoom: controls.enableZoom,
|
|
144
|
+
input: controls.input,
|
|
145
|
+
keyPanSpeed: controls.keyPanSpeed,
|
|
146
|
+
movementSmoothness: controls.movementSmoothness,
|
|
147
|
+
rotationSpeed: controls.rotationSpeed,
|
|
148
|
+
panSpeed: controls.panSpeed,
|
|
149
|
+
zoomSpeed: controls.zoomSpeed,
|
|
150
|
+
restrictions: {
|
|
151
|
+
position: {
|
|
152
|
+
cube: {
|
|
153
|
+
min: { x: controls.cubePositionRestriction.min[0], y: controls.cubePositionRestriction.min[1], z: controls.cubePositionRestriction.min[2] },
|
|
154
|
+
max: { x: controls.cubePositionRestriction.max[0], y: controls.cubePositionRestriction.max[1], z: controls.cubePositionRestriction.max[2] },
|
|
159
155
|
},
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
max: { x: controls.cubeTargetRestriction.max[0], y: controls.cubeTargetRestriction.max[1], z: controls.cubeTargetRestriction.max[2] },
|
|
164
|
-
},
|
|
165
|
-
sphere: {
|
|
166
|
-
center: { x: controls.sphereTargetRestriction.center[0], y: controls.sphereTargetRestriction.center[1], z: controls.sphereTargetRestriction.center[2] },
|
|
167
|
-
radius: controls.sphereTargetRestriction.radius,
|
|
168
|
-
},
|
|
156
|
+
sphere: {
|
|
157
|
+
center: { x: controls.spherePositionRestriction.center[0], y: controls.spherePositionRestriction.center[1], z: controls.spherePositionRestriction.center[2] },
|
|
158
|
+
radius: controls.spherePositionRestriction.radius,
|
|
169
159
|
},
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
this._settingsEngine.camera.cameras[camera.id].target.y === camera.defaultTarget[1] &&
|
|
184
|
-
this._settingsEngine.camera.cameras[camera.id].target.z === camera.defaultTarget[2])) {
|
|
185
|
-
camera.defaultPosition = gl_matrix_1.vec3.clone(camera.position);
|
|
186
|
-
camera.defaultTarget = gl_matrix_1.vec3.clone(camera.target);
|
|
160
|
+
},
|
|
161
|
+
target: {
|
|
162
|
+
cube: {
|
|
163
|
+
min: { x: controls.cubeTargetRestriction.min[0], y: controls.cubeTargetRestriction.min[1], z: controls.cubeTargetRestriction.min[2] },
|
|
164
|
+
max: { x: controls.cubeTargetRestriction.max[0], y: controls.cubeTargetRestriction.max[1], z: controls.cubeTargetRestriction.max[2] },
|
|
165
|
+
},
|
|
166
|
+
sphere: {
|
|
167
|
+
center: { x: controls.sphereTargetRestriction.center[0], y: controls.sphereTargetRestriction.center[1], z: controls.sphereTargetRestriction.center[2] },
|
|
168
|
+
radius: controls.sphereTargetRestriction.radius,
|
|
169
|
+
},
|
|
170
|
+
},
|
|
171
|
+
rotation: controls.rotationRestriction,
|
|
172
|
+
zoom: controls.zoomRestriction,
|
|
187
173
|
}
|
|
188
174
|
}
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
enablePan: controls.enablePan,
|
|
204
|
-
enableZoom: controls.enableZoom,
|
|
205
|
-
input: controls.input,
|
|
206
|
-
keyPanSpeed: controls.keyPanSpeed,
|
|
207
|
-
movementSmoothness: controls.movementSmoothness,
|
|
208
|
-
panSpeed: controls.panSpeed,
|
|
209
|
-
zoomSpeed: controls.zoomSpeed,
|
|
210
|
-
}
|
|
211
|
-
};
|
|
175
|
+
};
|
|
176
|
+
}
|
|
177
|
+
else {
|
|
178
|
+
if (this._settingsEngine.camera.cameras[camera.id]) {
|
|
179
|
+
const previousDirection = this._settingsEngine.camera.cameras[camera.id].type;
|
|
180
|
+
if (previousDirection !== camera.type && (this._settingsEngine.camera.cameras[camera.id].position.x === camera.defaultPosition[0] &&
|
|
181
|
+
this._settingsEngine.camera.cameras[camera.id].position.y === camera.defaultPosition[1] &&
|
|
182
|
+
this._settingsEngine.camera.cameras[camera.id].position.z === camera.defaultPosition[2] &&
|
|
183
|
+
this._settingsEngine.camera.cameras[camera.id].target.x === camera.defaultTarget[0] &&
|
|
184
|
+
this._settingsEngine.camera.cameras[camera.id].target.y === camera.defaultTarget[1] &&
|
|
185
|
+
this._settingsEngine.camera.cameras[camera.id].target.z === camera.defaultTarget[2])) {
|
|
186
|
+
camera.defaultPosition = gl_matrix_1.vec3.clone(camera.position);
|
|
187
|
+
camera.defaultTarget = gl_matrix_1.vec3.clone(camera.target);
|
|
188
|
+
}
|
|
212
189
|
}
|
|
190
|
+
const controls = camera.controls;
|
|
191
|
+
this._settingsEngine.camera.cameras[camera.id] = {
|
|
192
|
+
autoAdjust: camera.autoAdjust,
|
|
193
|
+
cameraMovementDuration: camera.cameraMovementDuration,
|
|
194
|
+
enableCameraControls: camera.enableCameraControls,
|
|
195
|
+
revertAtMouseUp: camera.revertAtMouseUp,
|
|
196
|
+
revertAtMouseUpDuration: camera.revertAtMouseUpDuration,
|
|
197
|
+
zoomExtentsFactor: camera.zoomExtentsFactor,
|
|
198
|
+
position: { x: camera.defaultPosition[0], y: camera.defaultPosition[1], z: camera.defaultPosition[2] },
|
|
199
|
+
target: { x: camera.defaultTarget[0], y: camera.defaultTarget[1], z: camera.defaultTarget[2] },
|
|
200
|
+
type: camera.direction,
|
|
201
|
+
controls: {
|
|
202
|
+
damping: controls.damping,
|
|
203
|
+
enableKeyPan: controls.enableKeyPan,
|
|
204
|
+
enablePan: controls.enablePan,
|
|
205
|
+
enableZoom: controls.enableZoom,
|
|
206
|
+
input: controls.input,
|
|
207
|
+
keyPanSpeed: controls.keyPanSpeed,
|
|
208
|
+
movementSmoothness: controls.movementSmoothness,
|
|
209
|
+
panSpeed: controls.panSpeed,
|
|
210
|
+
zoomSpeed: controls.zoomSpeed,
|
|
211
|
+
}
|
|
212
|
+
};
|
|
213
213
|
}
|
|
214
214
|
}
|
|
215
215
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CameraEngine.js","sourceRoot":"","sources":["../../src/implementation/CameraEngine.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"CameraEngine.js","sourceRoot":"","sources":["../../src/implementation/CameraEngine.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shapediver/viewer.rendering-engine.camera-engine",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.10.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -36,15 +36,15 @@
|
|
|
36
36
|
"testEnvironment": "node"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@shapediver/viewer.rendering-engine.canvas-engine": "^1.
|
|
39
|
+
"@shapediver/viewer.rendering-engine.canvas-engine": "^1.10.1",
|
|
40
40
|
"@shapediver/viewer.settings": "*",
|
|
41
|
-
"@shapediver/viewer.shared.math": "^1.
|
|
42
|
-
"@shapediver/viewer.shared.services": "^1.
|
|
43
|
-
"@shapediver/viewer.shared.types": "^1.
|
|
41
|
+
"@shapediver/viewer.shared.math": "^1.10.1",
|
|
42
|
+
"@shapediver/viewer.shared.services": "^1.10.1",
|
|
43
|
+
"@shapediver/viewer.shared.types": "^1.10.1",
|
|
44
44
|
"@tweenjs/tween.js": "^18.6.4",
|
|
45
45
|
"detect-it": "4.0.1",
|
|
46
46
|
"gl-matrix": "3.3.0",
|
|
47
47
|
"tsyringe": "^4.5.0"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "513c269ddfe0719331a605a9c62de0b8a64328fd"
|
|
50
50
|
}
|