@p100-web/core-three 100.1.5 → 100.1.7
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/ThreeEngine.d.ts.map +1 -1
- package/dist/ThreeEngine.js +3 -3
- package/dist/ThreeEngine.js.map +1 -1
- package/dist/three/FreeCameraControls.d.ts +2 -2
- package/dist/three/FreeCameraControls.d.ts.map +1 -1
- package/dist/three/FreeCameraControls.js +3 -3
- package/dist/three/FreeCameraControls.js.map +1 -1
- package/dist/three/OrbitCameraControls.d.ts +4 -1
- package/dist/three/OrbitCameraControls.d.ts.map +1 -1
- package/dist/three/OrbitCameraControls.js +43 -9
- package/dist/three/OrbitCameraControls.js.map +1 -1
- package/dist/three/VrCameraControls.d.ts +2 -2
- package/dist/three/VrCameraControls.d.ts.map +1 -1
- package/dist/three/VrCameraControls.js +3 -1
- package/dist/three/VrCameraControls.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ThreeEngine.d.ts","sourceRoot":"","sources":["../src/ThreeEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,KAAK,eAAe,EACpB,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,MAAM,EACX,KAAK,QAAQ,EACb,KAAK,OAAO,EACZ,oBAAoB,EACpB,WAAW,EACZ,MAAM,gBAAgB,CAAC;AAKxB,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAIlD,OAAO,gBAAgB,MAAM,2BAA2B,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,WAAY,YAAW,OAAO;IACjD,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,QAAQ,CAA4B;gBAEhC,gBAAgB,EAAE,iBAAiB;IAI/C,aAAa,IAAI,MAAM;IAIvB,cAAc,IAAI,WAAW;IAQ7B,mBAAmB,IAAI,gBAAgB;IAQvC,sBAAsB,CAAC,OAAO,EAAE,WAAW,GAAG,QAAQ;IAatD,WAAW,CACT,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,oBAAoB,GAC7B,WAAW;IAKd,SAAS,IAAI,WAAW,GAAG,IAAI;IAQ/B,iBAAiB,CAAC,OAAO,EAAE,WAAW,GAAG,cAAc;IAQvD,mBAAmB,CACjB,OAAO,EAAE,WAAW,EACpB,cAAc,EAAE,eAAe,GAAG,IAAI,GACrC,eAAe,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"ThreeEngine.d.ts","sourceRoot":"","sources":["../src/ThreeEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,KAAK,eAAe,EACpB,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,MAAM,EACX,KAAK,QAAQ,EACb,KAAK,OAAO,EACZ,oBAAoB,EACpB,WAAW,EACZ,MAAM,gBAAgB,CAAC;AAKxB,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAIlD,OAAO,gBAAgB,MAAM,2BAA2B,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,WAAY,YAAW,OAAO;IACjD,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,QAAQ,CAA4B;gBAEhC,gBAAgB,EAAE,iBAAiB;IAI/C,aAAa,IAAI,MAAM;IAIvB,cAAc,IAAI,WAAW;IAQ7B,mBAAmB,IAAI,gBAAgB;IAQvC,sBAAsB,CAAC,OAAO,EAAE,WAAW,GAAG,QAAQ;IAatD,WAAW,CACT,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,oBAAoB,GAC7B,WAAW;IAKd,SAAS,IAAI,WAAW,GAAG,IAAI;IAQ/B,iBAAiB,CAAC,OAAO,EAAE,WAAW,GAAG,cAAc;IAQvD,mBAAmB,CACjB,OAAO,EAAE,WAAW,EACpB,cAAc,EAAE,eAAe,GAAG,IAAI,GACrC,eAAe,GAAG,IAAI;IAmBzB,kBAAkB,IAAI,OAAO,CAAC,cAAc,CAAC;IAQ7C,OAAO,CAAC,YAAY,CAAiC;IAErD,cAAc;IAId,gBAAgB,CAAC,OAAO,EAAE,WAAW,GAAG,gBAAgB;IAQxD,QAAQ,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM;CAUvC"}
|
package/dist/ThreeEngine.js
CHANGED
|
@@ -60,13 +60,13 @@ export default class ThreeEngine {
|
|
|
60
60
|
return null;
|
|
61
61
|
const pcanvas = context.getPCanvas();
|
|
62
62
|
if (cameraSettings.type === 0) {
|
|
63
|
-
return new FreeCameraControls(context, pcanvas, cameraSettings
|
|
63
|
+
return new FreeCameraControls(context, pcanvas, cameraSettings);
|
|
64
64
|
}
|
|
65
65
|
else if (cameraSettings.type === 1) {
|
|
66
|
-
return new OrbitCameraControls(context, pcanvas, cameraSettings
|
|
66
|
+
return new OrbitCameraControls(context, pcanvas, cameraSettings);
|
|
67
67
|
}
|
|
68
68
|
else if (cameraSettings.type === 2) {
|
|
69
|
-
return new VrCameraControls(context, pcanvas, cameraSettings
|
|
69
|
+
return new VrCameraControls(context, pcanvas, cameraSettings);
|
|
70
70
|
}
|
|
71
71
|
else {
|
|
72
72
|
context.error("Unknown controls: " + cameraSettings.type);
|
package/dist/ThreeEngine.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ThreeEngine.js","sourceRoot":"","sources":["../src/ThreeEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,WAAW,GACZ,MAAM,gBAAgB,CAAC;AACxB,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,mBAAmB,MAAM,6BAA6B,CAAC;AAC9D,OAAO,gBAAgB,MAAM,0BAA0B,CAAC;AACxD,OAAO,WAAW,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAE3D,OAAO,gBAAgB,MAAM,2BAA2B,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,WAAW;IAI9B,YAAY,gBAAmC;QAFvC,aAAQ,GAAuB,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"ThreeEngine.js","sourceRoot":"","sources":["../src/ThreeEngine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import ThreeCanvas from "../ThreeCanvas";
|
|
2
2
|
import { PerspectiveCamera } from "three";
|
|
3
|
-
import { GameContext, PVector3, type ICameraControls } from "@p100-web/core";
|
|
3
|
+
import { GameContext, ICameraSettings, PVector3, type ICameraControls } from "@p100-web/core";
|
|
4
4
|
export default class FreeCameraControls implements ICameraControls {
|
|
5
5
|
camera: PerspectiveCamera | null;
|
|
6
6
|
domElement: HTMLElement | null;
|
|
@@ -10,7 +10,7 @@ export default class FreeCameraControls implements ICameraControls {
|
|
|
10
10
|
private enabled;
|
|
11
11
|
target: PVector3;
|
|
12
12
|
private _coordinates;
|
|
13
|
-
constructor(context: GameContext, pcanvas: ThreeCanvas,
|
|
13
|
+
constructor(context: GameContext, pcanvas: ThreeCanvas, settings: ICameraSettings);
|
|
14
14
|
dispose(): void;
|
|
15
15
|
getPosition(): PVector3;
|
|
16
16
|
setPosition(position: PVector3): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FreeCameraControls.d.ts","sourceRoot":"","sources":["../../src/three/FreeCameraControls.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAW,iBAAiB,EAAW,MAAM,OAAO,CAAC;AAC5D,OAAO,EAEL,WAAW,EACX,QAAQ,EAER,KAAK,eAAe,EACrB,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,kBAAmB,YAAW,eAAe;IAChE,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACjC,UAAU,EAAE,WAAW,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACxC,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,EAAE,MAAM,CAAK;IACnB,OAAO,CAAC,OAAO,CAAS;IAExB,MAAM,EAAE,QAAQ,CAAsB;IAEtC,OAAO,CAAC,YAAY,CAA2B;gBAG7C,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"FreeCameraControls.d.ts","sourceRoot":"","sources":["../../src/three/FreeCameraControls.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAW,iBAAiB,EAAW,MAAM,OAAO,CAAC;AAC5D,OAAO,EAEL,WAAW,EACX,eAAe,EACf,QAAQ,EAER,KAAK,eAAe,EACrB,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,kBAAmB,YAAW,eAAe;IAChE,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACjC,UAAU,EAAE,WAAW,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACxC,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,EAAE,MAAM,CAAK;IACnB,OAAO,CAAC,OAAO,CAAS;IAExB,MAAM,EAAE,QAAQ,CAAsB;IAEtC,OAAO,CAAC,YAAY,CAA2B;gBAG7C,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,eAAe;IAgC3B,OAAO;IAqBP,WAAW;IAIX,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAI9B,SAAS,CAAC,MAAM,EAAE,QAAQ;IAI1B,mBAAmB,IAAI,QAAQ;IAK/B,SAAS;IAIT,YAAY;IAIZ,MAAM;IAIN,OAAO;IAcP,gBAAgB,aAKd;IAEF,aAAa,GAAI,OAAO,GAAG,UAKzB;IAEF,OAAO,GAAI,OAAO,GAAG,UAqBnB;IAEF,aAAa,GAAI,OAAO,GAAG,UAkBzB;IAEF,WAAW,aAWT;IAEF,WAAW,UAAS;IAEpB,aAAa,GAAI,OAAO,GAAG,UAsBzB;IAMF,cAAc,IAAI,IAAI;CACvB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Matrix4, Vector3 } from "three";
|
|
2
2
|
import { Coordinates, PVector3, Workers, } from "@p100-web/core";
|
|
3
3
|
export default class FreeCameraControls {
|
|
4
|
-
constructor(context, pcanvas,
|
|
4
|
+
constructor(context, pcanvas, settings) {
|
|
5
5
|
this.button = 0;
|
|
6
6
|
this.enabled = false;
|
|
7
7
|
this.target = new PVector3(null);
|
|
@@ -108,8 +108,8 @@ export default class FreeCameraControls {
|
|
|
108
108
|
// position.z *= -1;
|
|
109
109
|
// target.z *= -1;
|
|
110
110
|
}
|
|
111
|
-
this.setPosition(position);
|
|
112
|
-
this.setTarget(target);
|
|
111
|
+
this.setPosition(settings.position);
|
|
112
|
+
this.setTarget(settings.target);
|
|
113
113
|
this.lookAtTarget();
|
|
114
114
|
this.enable();
|
|
115
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FreeCameraControls.js","sourceRoot":"","sources":["../../src/three/FreeCameraControls.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAqB,OAAO,EAAE,MAAM,OAAO,CAAC;AAC5D,OAAO,EACL,WAAW,
|
|
1
|
+
{"version":3,"file":"FreeCameraControls.js","sourceRoot":"","sources":["../../src/three/FreeCameraControls.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,10 @@ export default class OrbitCameraControls extends OrbitControls implements ICamer
|
|
|
8
8
|
private _marker;
|
|
9
9
|
private _wasDown;
|
|
10
10
|
private _inverted;
|
|
11
|
-
constructor(context: GameContext, pcanvas: ThreeCanvas,
|
|
11
|
+
constructor(context: GameContext, pcanvas: ThreeCanvas, settings: ICameraSettings);
|
|
12
|
+
private disposeMarkers;
|
|
13
|
+
private disposeMarker;
|
|
14
|
+
private showMarker;
|
|
12
15
|
dispose(): void;
|
|
13
16
|
onContextMenu: (event: any) => void;
|
|
14
17
|
enable(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrbitCameraControls.d.ts","sourceRoot":"","sources":["../../src/three/OrbitCameraControls.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"OrbitCameraControls.d.ts","sourceRoot":"","sources":["../../src/three/OrbitCameraControls.ts"],"names":[],"mappings":"AAWA,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EACL,WAAW,EACX,QAAQ,EACR,KAAK,eAAe,EAEpB,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAgBxB,MAAM,CAAC,OAAO,OAAO,mBACnB,SAAQ,aACR,YAAW,eAAe;IAE1B,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,QAAQ,CAAc;IAE9B,OAAO,CAAC,OAAO,CAAqB;IAEpC,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,SAAS,CAAS;gBAGxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,eAAe;IAgD3B,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,UAAU;IAkClB,OAAO;IAYP,aAAa,GAAI,OAAO,GAAG,UAGzB;IAEF,MAAM;IASN,OAAO;IASP,OAAO,CAAC,WAAW,CAGjB;IAEF,OAAO,CAAC,SAAS,CAKf;IAEF,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IA2CnC,OAAO,GAAI,OAAO,MAAM,UAUtB;IAMF,mBAAmB,IAAI,QAAQ;IAI/B,SAAS;IAIT,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAI9B,WAAW;IAIX,SAAS,CAAC,MAAM,EAAE,QAAQ;IAM1B,YAAY;IAQZ,OAAO,CAAC,KAAK,CAAK;IAElB,cAAc,IAAI,IAAI;IAKtB,eAAe,IAAI,IAAI;IAKvB,OAAO,CAAC,SAAS,CA4Bf;IAEF,OAAO,CAAC,OAAO,CA0Bb;IAMF,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,GAAG,IAAI;CAqB/D"}
|
|
@@ -15,9 +15,10 @@ const forward = new Vector3();
|
|
|
15
15
|
const right = new Vector3();
|
|
16
16
|
const up = new Vector3(0, 1, 0);
|
|
17
17
|
export default class OrbitCameraControls extends OrbitControls {
|
|
18
|
-
constructor(context, pcanvas,
|
|
18
|
+
constructor(context, pcanvas, settings) {
|
|
19
19
|
const camera = pcanvas.getThreeCamera();
|
|
20
20
|
super(camera, pcanvas.getCanvasElement());
|
|
21
|
+
this._marker = null;
|
|
21
22
|
this._wasDown = false;
|
|
22
23
|
this._inverted = false;
|
|
23
24
|
this.onContextMenu = (event) => {
|
|
@@ -105,7 +106,8 @@ export default class OrbitCameraControls extends OrbitControls {
|
|
|
105
106
|
this._context = context;
|
|
106
107
|
this._pcanvas = pcanvas;
|
|
107
108
|
this._camera = camera;
|
|
108
|
-
this.minDistance =
|
|
109
|
+
this.minDistance = settings.minDistance;
|
|
110
|
+
this.maxDistance = settings.maxDistance;
|
|
109
111
|
// Set start position
|
|
110
112
|
if (this._inverted) {
|
|
111
113
|
// position = position.clone();
|
|
@@ -115,11 +117,11 @@ export default class OrbitCameraControls extends OrbitControls {
|
|
|
115
117
|
// position.x *= -1;
|
|
116
118
|
// target.x *= -1;
|
|
117
119
|
}
|
|
118
|
-
camera.position.copy(position);
|
|
119
|
-
this.target.copy(target);
|
|
120
|
-
if (damping > 0) {
|
|
120
|
+
camera.position.copy(settings.position);
|
|
121
|
+
this.target.copy(settings.target);
|
|
122
|
+
if (settings.damping > 0) {
|
|
121
123
|
this.enableDamping = true;
|
|
122
|
-
this.dampingFactor = damping;
|
|
124
|
+
this.dampingFactor = settings.damping;
|
|
123
125
|
}
|
|
124
126
|
else {
|
|
125
127
|
this.enableDamping = false;
|
|
@@ -131,6 +133,24 @@ export default class OrbitCameraControls extends OrbitControls {
|
|
|
131
133
|
RIGHT: MOUSE.ROTATE, // RMB = rotate
|
|
132
134
|
};
|
|
133
135
|
}
|
|
136
|
+
if (settings.showTarget) {
|
|
137
|
+
this.showMarker();
|
|
138
|
+
}
|
|
139
|
+
this.enable();
|
|
140
|
+
}
|
|
141
|
+
disposeMarkers() {
|
|
142
|
+
if (this._marker !== null) {
|
|
143
|
+
this.disposeMarker(this._marker.children[0]);
|
|
144
|
+
this.disposeMarker(this._marker);
|
|
145
|
+
this._marker = null;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
disposeMarker(node) {
|
|
149
|
+
const material = node.material;
|
|
150
|
+
material.dispose();
|
|
151
|
+
node.removeFromParent();
|
|
152
|
+
}
|
|
153
|
+
showMarker() {
|
|
134
154
|
// Geometry
|
|
135
155
|
const geometry = new SphereGeometry(0.025, 16, 16);
|
|
136
156
|
const visibleMat = new MeshBasicMaterial({
|
|
@@ -144,7 +164,7 @@ export default class OrbitCameraControls extends OrbitControls {
|
|
|
144
164
|
const occludedMat = new MeshBasicMaterial({
|
|
145
165
|
color: 0xffffff,
|
|
146
166
|
transparent: true,
|
|
147
|
-
opacity: 0.
|
|
167
|
+
opacity: 0.25,
|
|
148
168
|
depthTest: true,
|
|
149
169
|
depthWrite: false,
|
|
150
170
|
depthFunc: GreaterDepth,
|
|
@@ -153,12 +173,15 @@ export default class OrbitCameraControls extends OrbitControls {
|
|
|
153
173
|
occludedMarker.name = "CameraTargetMarkerOccluded";
|
|
154
174
|
// Parent it like in Babylon
|
|
155
175
|
visibleMarker.add(occludedMarker);
|
|
156
|
-
|
|
176
|
+
this._context
|
|
177
|
+
.getPCanvas()
|
|
178
|
+
.getThreeRootNode()
|
|
179
|
+
.add(visibleMarker);
|
|
157
180
|
this._marker = visibleMarker;
|
|
158
|
-
this.enable();
|
|
159
181
|
}
|
|
160
182
|
dispose() {
|
|
161
183
|
this.enabled = false;
|
|
184
|
+
this.disposeMarkers();
|
|
162
185
|
this.removeEventListener("start", this.startMoving);
|
|
163
186
|
this.removeEventListener("end", this.endMoving);
|
|
164
187
|
this._pcanvas.setCameraUpdate(null);
|
|
@@ -248,6 +271,8 @@ export default class OrbitCameraControls extends OrbitControls {
|
|
|
248
271
|
// Editor
|
|
249
272
|
//
|
|
250
273
|
updateSettings(field, settings) {
|
|
274
|
+
this.minDistance = settings.minDistance;
|
|
275
|
+
this.maxDistance = settings.maxDistance;
|
|
251
276
|
if (field === "camera.damping") {
|
|
252
277
|
const damping = settings.damping;
|
|
253
278
|
if (damping > 0) {
|
|
@@ -258,6 +283,15 @@ export default class OrbitCameraControls extends OrbitControls {
|
|
|
258
283
|
this.enableDamping = false;
|
|
259
284
|
}
|
|
260
285
|
}
|
|
286
|
+
else if (field === "camera.showTarget") {
|
|
287
|
+
const showTarget = settings.showTarget;
|
|
288
|
+
if (!showTarget) {
|
|
289
|
+
this.disposeMarkers();
|
|
290
|
+
}
|
|
291
|
+
else {
|
|
292
|
+
this.showMarker();
|
|
293
|
+
}
|
|
294
|
+
}
|
|
261
295
|
}
|
|
262
296
|
}
|
|
263
297
|
function isUserTyping() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrbitCameraControls.js","sourceRoot":"","sources":["../../src/three/OrbitCameraControls.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,cAAc,EACd,IAAI,EACJ,iBAAiB,EACjB,KAAK,
|
|
1
|
+
{"version":3,"file":"OrbitCameraControls.js","sourceRoot":"","sources":["../../src/three/OrbitCameraControls.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import ThreeCanvas from "../ThreeCanvas";
|
|
2
2
|
import { PerspectiveCamera } from "three";
|
|
3
|
-
import { GameContext, PVector3, type ICameraControls } from "@p100-web/core";
|
|
3
|
+
import { GameContext, ICameraSettings, PVector3, type ICameraControls } from "@p100-web/core";
|
|
4
4
|
export default class VrCameraControls implements ICameraControls {
|
|
5
5
|
camera: PerspectiveCamera | null;
|
|
6
6
|
domElement: HTMLElement | null;
|
|
@@ -9,7 +9,7 @@ export default class VrCameraControls implements ICameraControls {
|
|
|
9
9
|
private enabled;
|
|
10
10
|
target: PVector3;
|
|
11
11
|
private _coordinates;
|
|
12
|
-
constructor(context: GameContext, pcanvas: ThreeCanvas,
|
|
12
|
+
constructor(context: GameContext, pcanvas: ThreeCanvas, settings: ICameraSettings);
|
|
13
13
|
dispose(): void;
|
|
14
14
|
enable(): void;
|
|
15
15
|
disable(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VrCameraControls.d.ts","sourceRoot":"","sources":["../../src/three/VrCameraControls.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAuB,MAAM,OAAO,CAAC;AAC/D,OAAO,EAEL,WAAW,EACX,QAAQ,EACR,KAAK,eAAe,EACrB,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,gBAAiB,YAAW,eAAe;IAC9D,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACjC,UAAU,EAAE,WAAW,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACxC,MAAM,EAAE,MAAM,CAAK;IACnB,OAAO,CAAC,OAAO,CAAS;IACxB,MAAM,EAAE,QAAQ,CAAsB;IAEtC,OAAO,CAAC,YAAY,CAA2B;gBAG7C,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"VrCameraControls.d.ts","sourceRoot":"","sources":["../../src/three/VrCameraControls.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAuB,MAAM,OAAO,CAAC;AAC/D,OAAO,EAEL,WAAW,EACX,eAAe,EACf,QAAQ,EACR,KAAK,eAAe,EACrB,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,gBAAiB,YAAW,eAAe;IAC9D,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACjC,UAAU,EAAE,WAAW,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACxC,MAAM,EAAE,MAAM,CAAK;IACnB,OAAO,CAAC,OAAO,CAAS;IACxB,MAAM,EAAE,QAAQ,CAAsB;IAEtC,OAAO,CAAC,YAAY,CAA2B;gBAG7C,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,eAAe;IAmC3B,OAAO;IAoBP,MAAM;IAIN,OAAO;IAcP,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAI9B,WAAW;IAIX,SAAS,CAAC,MAAM,EAAE,QAAQ;IAI1B,mBAAmB,IAAI,QAAQ;IAK/B,SAAS;IAIT,YAAY;IAQZ,YAAY;IAOZ,gBAAgB,aAKd;IAEF,aAAa,GAAI,OAAO,GAAG,UAKzB;IAEF,aAAa,GAAI,OAAO,GAAG,UAYzB;IAEF,WAAW,aAOT;IAEF,aAAa,GAAI,OAAO,GAAG,UAOzB;IAMF,cAAc,IAAI,IAAI;CACvB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Quaternion, Vector3 } from "three";
|
|
2
2
|
import { Coordinates, PVector3, } from "@p100-web/core";
|
|
3
3
|
export default class VrCameraControls {
|
|
4
|
-
constructor(context, pcanvas,
|
|
4
|
+
constructor(context, pcanvas, settings) {
|
|
5
5
|
this.button = 0;
|
|
6
6
|
this.enabled = false;
|
|
7
7
|
this.target = new PVector3(null);
|
|
@@ -59,6 +59,8 @@ export default class VrCameraControls {
|
|
|
59
59
|
this.domElement.addEventListener("pointerdown", this.onPointerDown);
|
|
60
60
|
this.domElement.addEventListener("pointercancel", this.onPointerUp);
|
|
61
61
|
document.body.addEventListener("mouseleave", this.onDomElementExit);
|
|
62
|
+
let position = settings.position;
|
|
63
|
+
let target = settings.target;
|
|
62
64
|
// Set start position
|
|
63
65
|
if (this._coordinates !== Coordinates.RightHanded) {
|
|
64
66
|
position = position.clone();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VrCameraControls.js","sourceRoot":"","sources":["../../src/three/VrCameraControls.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,UAAU,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC/D,OAAO,EACL,WAAW,
|
|
1
|
+
{"version":3,"file":"VrCameraControls.js","sourceRoot":"","sources":["../../src/three/VrCameraControls.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@p100-web/core-three",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "100.1.
|
|
4
|
+
"version": "100.1.7",
|
|
5
5
|
"author": "Peter Drugge",
|
|
6
6
|
"license": "ISC",
|
|
7
7
|
"description": "",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"typescript": "^5.4.2"
|
|
12
12
|
},
|
|
13
13
|
"peerDependencies": {
|
|
14
|
-
"@p100-web/core": "^100.1.
|
|
14
|
+
"@p100-web/core": "^100.1.7",
|
|
15
15
|
"three": "^0.179.1",
|
|
16
16
|
"troika-three-text": "^0.52.4",
|
|
17
17
|
"@tweenjs/tween.js": "^25.0.0"
|