a3js 1.2.0 → 1.3.0

package/dist/a3js.es.js

@@ -538,30 +538,30 @@ var rn = {
 	}
 	configColliderDescs() {
 		if (!this.objectA3) return;
-		let e = this.completeOptions, t = [];
-		this.objectA3.object3D.traverse((n) => {
-			if (Jt(n)) {
-				let r = fn(n.geometry), i = e.membership << 16 | e.filter;
-				if (r) r.colliderDesc.setCollisionGroups(i), e.collisionDetection && r.colliderDesc.setActiveEvents(G.ActiveEvents.COLLISION_EVENTS), this.colliderDescs.push(r.colliderDesc), r.colliderDesc.setRestitution(e.restitution).setFriction(e.friction), t.push(r.volume);
+		let e = this.completeOptions, t = [], n = e.membership << 16 | e.filter, r = this.transform.scale;
+		this.objectA3.object3D.traverse((i) => {
+			if (Jt(i)) {
+				let a = fn(i.geometry, r);
+				if (a) a.colliderDesc.setCollisionGroups(n), e.collisionDetection && a.colliderDesc.setActiveEvents(G.ActiveEvents.COLLISION_EVENTS), this.colliderDescs.push(a.colliderDesc), a.colliderDesc.setRestitution(e.restitution).setFriction(e.friction), t.push(a.volume);
 				else {
 					let r, a;
 					switch (e.meshCollider) {
 						case "tri_mesh":
-							r = ln(n), a = dn(n.geometry);
+							r = ln(i), a = dn(i.geometry);
 							break;
 						case "convex_hull":
-							r = un(n), a = dn(n.geometry);
+							r = un(i), a = dn(i.geometry);
 							break;
 					}
-					r && (r.setCollisionGroups(i), e.collisionDetection && r.setActiveEvents(G.ActiveEvents.COLLISION_EVENTS), r.setRestitution(e.restitution).setFriction(e.friction), this.colliderDescs.push(r), t.push(a));
+					r && (r.setCollisionGroups(n), e.collisionDetection && r.setActiveEvents(G.ActiveEvents.COLLISION_EVENTS), r.setRestitution(e.restitution).setFriction(e.friction), this.colliderDescs.push(r), t.push(a));
 				}
 			}
 		});
-		let n = t.reduce((e, t) => e + t, 0);
-		for (let r = 0; r < this.colliderDescs.length; r++) this.colliderDescs[r].setRestitution(e.restitution), this.colliderDescs[r].setFriction(e.friction), this.colliderDescs[r].setMass(e.mass * (t[r] / n));
+		let i = t.reduce((e, t) => e + t, 0);
+		for (let n = 0; n < this.colliderDescs.length; n++) this.colliderDescs[n].setRestitution(e.restitution), this.colliderDescs[n].setFriction(e.friction), this.colliderDescs[n].setMass(e.mass * (t[n] / i));
 	}
 	init(e, t) {
-		this.transform.set(e), this.objectA3 = t, this.colliderDescs = [], this.colliders = [], this.bodyDesc = this.makeBodyDesc(), this.configColliderDescs(), this.bodyDesc.setTranslation(e.loc.x, e.loc.y, e.loc.z), this.bodyDesc.setRotation(e.quat);
+		this.transform.set(e), this.objectA3 = t, this.colliderDescs = [], this.colliders = [], this.objectA3.object3D.scale.set(e.scale.x, e.scale.y, e.scale.z), this.bodyDesc = this.makeBodyDesc(), this.configColliderDescs(), this.bodyDesc.setTranslation(e.loc.x, e.loc.y, e.loc.z), this.bodyDesc.setRotation(e.quat);
 	}
 	addOneselfToPhysics(e) {
 		this.bodyDesc && (this.body = e.world.createRigidBody(this.bodyDesc), this.colliderDescs.forEach((t) => {
@@ -719,42 +719,42 @@ function dn(t) {
 	} else for (let e = 0; e < i.length; e += 9) o.set(i[e], i[e + 1], i[e + 2]), s.set(i[e + 3], i[e + 4], i[e + 5]), c.set(i[e + 6], i[e + 7], i[e + 8]), a += o.dot(s.clone().cross(c));
 	return Math.abs(a) / 6;
 }
-function fn(e) {
+function fn(e, t = new V(1, 1, 1)) {
 	if (Yt(e)) {
-		let t = e.parameters, n = typeof t?.width == "number" ? t.width / 2 : .5, r = typeof t?.height == "number" ? t.height / 2 : .5, i = typeof t?.depth == "number" ? t.depth / 2 : .5, a = .1;
+		let n = e.parameters, r = (typeof n?.width == "number" ? n.width / 2 : .5) * t.x, i = (typeof n?.height == "number" ? n.height / 2 : .5) * t.y, a = (typeof n?.depth == "number" ? n.depth / 2 : .5) * t.z, o = .1 * Math.cbrt(t.x * t.y * t.z);
 		return {
-			colliderDesc: G.ColliderDesc.roundCuboid(n - a, r - a, i - a, a),
-			volume: 2 * n * 2 * r * 2 * i
+			colliderDesc: G.ColliderDesc.roundCuboid(r - o, i - o, a - o, o),
+			volume: 2 * r * 2 * i * 2 * a
 		};
 	} else if (Xt(e)) {
-		let t = e.parameters, n = typeof t?.width == "number" ? t.width / 2 : .5, r = typeof t?.height == "number" ? t.height / 2 : .5, i = typeof t?.depth == "number" ? t.depth / 2 : .5;
+		let n = e.parameters, r = (typeof n?.width == "number" ? n.width / 2 : .5) * t.x, i = (typeof n?.height == "number" ? n.height / 2 : .5) * t.y, a = (typeof n?.depth == "number" ? n.depth / 2 : .5) * t.z;
 		return {
-			colliderDesc: G.ColliderDesc.cuboid(n, r, i),
-			volume: 2 * n * 2 * r * 2 * i
+			colliderDesc: G.ColliderDesc.cuboid(r, i, a),
+			volume: 2 * r * 2 * i * 2 * a
 		};
 	} else if (Zt(e)) {
-		let t = e.parameters, n = typeof t?.radius == "number" ? t.radius : 1;
+		let n = e.parameters, r = Math.cbrt(t.x * t.y * t.z), i = (typeof n?.radius == "number" ? n.radius : 1) * r;
 		return {
-			colliderDesc: G.ColliderDesc.ball(n),
-			volume: 4 / 3 * Math.PI * n * n * n
+			colliderDesc: G.ColliderDesc.ball(i),
+			volume: 4 / 3 * Math.PI * i * i * i
 		};
 	} else if (Qt(e)) {
-		let t = e.parameters, n = typeof t?.radius == "number" ? t.radius : 1;
+		let n = e.parameters, r = Math.cbrt(t.x * t.y * t.z), i = (typeof n?.radius == "number" ? n.radius : 1) * r;
 		return {
-			colliderDesc: G.ColliderDesc.ball(n),
-			volume: 4 / 3 * Math.PI * n * n * n
+			colliderDesc: G.ColliderDesc.ball(i),
+			volume: 4 / 3 * Math.PI * i * i * i
 		};
 	} else if ($t(e)) {
-		let t = e.parameters, n = typeof t?.radiusBottom == "number" ? t.radiusBottom : .5, r = typeof t?.height == "number" ? t.height : .5;
+		let n = e.parameters, r = Math.sqrt(t.x * t.z), i = (typeof n?.radiusBottom == "number" ? n.radiusBottom : .5) * r, a = (typeof n?.height == "number" ? n.height : .5) * t.y;
 		return {
-			colliderDesc: G.ColliderDesc.cylinder(r / 2, n),
-			volume: Math.PI * n * n * r
+			colliderDesc: G.ColliderDesc.cylinder(a / 2, i),
+			volume: Math.PI * i * i * a
 		};
 	} else if (en(e)) {
-		let t = e.parameters, n = typeof t?.radius == "number" ? t.radius : .5, r = typeof t?.height == "number" ? t.height : .5;
+		let n = e.parameters, r = Math.sqrt(t.x * t.z), i = (typeof n?.radius == "number" ? n.radius : .5) * r, a = (typeof n?.height == "number" ? n.height : .5) * t.y;
 		return {
-			colliderDesc: G.ColliderDesc.capsule(r / 2, n),
-			volume: 4 / 3 * Math.PI * n * n * n + Math.PI * n * n * r
+			colliderDesc: G.ColliderDesc.capsule(a / 2, i),
+			volume: 4 / 3 * Math.PI * i * i * i + Math.PI * i * i * a
 		};
 	}
 	return null;
@@ -12955,6 +12955,6 @@ var jo = {
 };
 customElements.define("ar-view-a3", Mo);
 //#endregion
-export { Mo as ARView, Hr as Acerola3D, Mn as Action, Nn as ActionObject, Yr as AvatarPositionController, Zr as AvatarVelocityController, Kr as BaseController, Qr as BaseView, Ht as BillboardTransformer, mo as Box, Gr as Camera, Ka as Canvas, To as CarControl, Do as CarMotion, Eo as CarTransformer, Pr as ClipMotion, jt as DefaultTransformer, En as DynamicCharacterTransformer, Kt as FollowTransformer, Wa as GLTF, Co as GameCanvas, xo as Html3D, bo as ImagePlane, Cn as KinematicCharacterTransformer, q as ObjectA3, qr as OrbitController, H as Quat, on as RapierPhysicsEngine, sn as RapierPhysicsWorld, to as SampleObject, Wr as Scene, Wt as SmoothBillboardTransformer, Pt as SmoothTransformer, Lr as Sound, ho as Sphere, yo as StandardLights, Mt as StaticTransformer, fo as Text3D, $r as ThreeCamera, po as ThreeObject, W as Transform, Ao as VRView, V as Vec3, Xa as Window, Oo as XRCamera, hn as asyncSleep, an as collisionMap, xn as deepMerge, jo as defaultARViewOptions, Ga as defaultCanvasOptions, wo as defaultCarControlOptions, Tn as defaultDynamicCharacterTransformerOptions, Gt as defaultFollowTransformerOptions, So as defaultGameCanvasOptions, Sn as defaultKinematicCharacterTransformerOptions, eo as defaultSampleObjectOptions, An as defaultSetLightShadowOptions, Nt as defaultSmoothTransformerOptions, uo as defaultText3DOptions, ko as defaultVRViewOptions, Ya as defaultWindowOptions, Dt as eulerToQuaternion, Et as getLookAtQuaternion, lo as initFont, mn as initPhysics, Ir as initSound, Va as recreateGLTFLoader };
+export { Mo as ARView, Hr as Acerola3D, Mn as Action, Nn as ActionObject, Yr as AvatarPositionController, Zr as AvatarVelocityController, Kr as BaseController, Qr as BaseView, Ht as BillboardTransformer, mo as Box, Gr as Camera, Ka as Canvas, To as CarControl, Do as CarMotion, Eo as CarTransformer, Pr as ClipMotion, jt as DefaultTransformer, En as DynamicCharacterTransformer, Kt as FollowTransformer, Wa as GLTF, Co as GameCanvas, xo as Html3D, bo as ImagePlane, Cn as KinematicCharacterTransformer, q as ObjectA3, qr as OrbitController, H as Quat, on as RapierPhysicsEngine, sn as RapierPhysicsWorld, to as SampleObject, Wr as Scene, cn as SimplePhysicsTransformer, Wt as SmoothBillboardTransformer, Pt as SmoothTransformer, Lr as Sound, ho as Sphere, yo as StandardLights, Mt as StaticTransformer, fo as Text3D, $r as ThreeCamera, po as ThreeObject, W as Transform, Ao as VRView, V as Vec3, Xa as Window, Oo as XRCamera, hn as asyncSleep, an as collisionMap, xn as deepMerge, jo as defaultARViewOptions, Ga as defaultCanvasOptions, wo as defaultCarControlOptions, Tn as defaultDynamicCharacterTransformerOptions, Gt as defaultFollowTransformerOptions, So as defaultGameCanvasOptions, Sn as defaultKinematicCharacterTransformerOptions, eo as defaultSampleObjectOptions, An as defaultSetLightShadowOptions, rn as defaultSimplePhysicsOptions, Nt as defaultSmoothTransformerOptions, uo as defaultText3DOptions, ko as defaultVRViewOptions, Ya as defaultWindowOptions, Dt as eulerToQuat, Et as getLookAtQuat, lo as initFont, mn as initPhysics, Ir as initSound, At as quatToEuler, Ot as quatToMatrix, Va as recreateGLTFLoader };
 
 //# sourceMappingURL=a3js.es.js.map