@mml-io/3d-web-client-core 0.21.4 → 0.21.6

package/build/character/LocalController.d.ts

@@ -50,7 +50,6 @@ export declare class LocalController {
     private vectorDown;
     private rotationOffset;
     private azimuthalAngle;
-    private tempMatrix;
     private tempSegment;
     private tempQuaternion;
     private tempEuler;

package/build/collisions/CollisionsManager.d.ts

@@ -26,7 +26,7 @@ export declare class CollisionsManager {
     private collisionTrigger;
     private previouslyCollidingElements;
     constructor(scene: Scene);
-    raycastFirst(ray: Ray): [number, Vector3, CollisionMeshState] | null;
+    raycastFirst(ray: Ray, maximumDistance?: number | null): [number, Vector3, CollisionMeshState, Vector3] | null;
     private createCollisionMeshState;
     addMeshesGroup(group: Group, mElement?: MElement): void;
     updateMeshesGroup(group: Group): void;

package/build/index.js

@@ -1533,7 +1533,7 @@ var Character = class extends Group {
 import { Euler as Euler2, Group as Group2, Quaternion as Quaternion5, Vector3 as Vector39 } from "three";
 
 // src/character/LocalController.ts
-import { Euler, Line3, Matrix4, Quaternion as Quaternion2, Ray, Raycaster as Raycaster2, Vector3 as Vector36 } from "three";
+import { Euler, Line3, Quaternion as Quaternion2, Ray, Raycaster as Raycaster2, Vector3 as Vector36 } from "three";
 
 // src/tweakpane/blades/characterControlsFolder.ts
 var characterControllerValues = {
@@ -1752,7 +1752,6 @@ var LocalController = class {
     this.vectorDown = new Vector36(0, -1, 0);
     this.rotationOffset = 0;
     this.azimuthalAngle = 0;
-    this.tempMatrix = new Matrix4();
     this.tempSegment = new Line3();
     this.tempQuaternion = new Quaternion2();
     this.tempEuler = new Euler();
@@ -1949,13 +1948,25 @@ var LocalController = class {
         this.config.character.rotation.setFromQuaternion(asQuaternion);
       }
     }
-    this.config.character.updateMatrixWorld();
     const avatarSegment = this.tempSegment;
     avatarSegment.copy(this.capsuleInfo.segment);
-    avatarSegment.start.applyMatrix4(this.config.character.matrixWorld).applyMatrix4(this.tempMatrix);
-    avatarSegment.end.applyMatrix4(this.config.character.matrixWorld).applyMatrix4(this.tempMatrix);
+    avatarSegment.start.add(this.config.character.position);
+    avatarSegment.end.add(this.config.character.position);
     const positionBeforeCollisions = this.tempVector.copy(avatarSegment.start);
     this.config.collisionsManager.applyColliders(avatarSegment, this.capsuleInfo.radius);
+    const capsuleLength = this.capsuleInfo.segment.end.y - this.capsuleInfo.segment.start.y + this.capsuleInfo.radius * 2;
+    this.rayCaster.set(avatarSegment.start, this.vectorDown);
+    const endIgnoreLength = 0.1;
+    this.rayCaster.ray.origin.y += -this.capsuleInfo.radius + capsuleLength - endIgnoreLength;
+    const withinCapsuleRayHit = this.config.collisionsManager.raycastFirst(
+      this.rayCaster.ray,
+      capsuleLength - endIgnoreLength * 2
+    );
+    if (withinCapsuleRayHit !== null) {
+      const rayHitPosition = withinCapsuleRayHit[3];
+      avatarSegment.start.copy(rayHitPosition);
+      avatarSegment.start.y += this.capsuleInfo.radius;
+    }
     this.config.character.position.copy(avatarSegment.start);
     const deltaCollisionPosition = avatarSegment.start.sub(positionBeforeCollisions);
     this.characterOnGround = deltaCollisionPosition.y > 0;
@@ -2892,7 +2903,7 @@ var envOptions = {
   },
   fog: {
     fogNear: { min: 0, max: 80, step: 1 },
-    fogFar: { min: 81, max: 300, step: 1 }
+    fogFar: { min: 0, max: 300, step: 1 }
   }
 };
 var EnvironmentFolder = class {
@@ -5395,9 +5406,6 @@ var Composer = class {
     this.renderer.toneMapping = rendererValues.toneMapping;
     this.renderer.toneMappingExposure = rendererValues.exposure;
     this.environmentConfiguration = environmentConfiguration;
-    this.updateSkyboxAndEnvValues();
-    this.updateAmbientLightValues();
-    this.setFog();
     this.effectComposer = new EffectComposer2(this.renderer, {
       frameBufferType: HalfFloatType2
     });
@@ -5436,6 +5444,9 @@ var Composer = class {
     if ((_a = environmentConfiguration == null ? void 0 : environmentConfiguration.postProcessing) == null ? void 0 : _a.bloomIntensity) {
       extrasValues.bloom = environmentConfiguration.postProcessing.bloomIntensity;
     }
+    this.updateSkyboxAndEnvValues();
+    this.updateAmbientLightValues();
+    this.updateFogValues();
     this.bloomEffect = new BloomEffect({
       intensity: extrasValues.bloom
     });
@@ -5526,6 +5537,7 @@ var Composer = class {
     this.updateSkyboxAndEnvValues();
     this.updateAmbientLightValues();
     this.updateSunValues();
+    this.updateFogValues();
   }
   setupTweakPane(tweakPane) {
     tweakPane.setupRenderPane(
@@ -5714,6 +5726,10 @@ var Composer = class {
     fileInput.click();
   }
   setFog() {
+    if (envValues.fog.fogFar === 0) {
+      this.scene.fog = null;
+      return;
+    }
     const fogColor = new Color7().setRGB(
       envValues.fog.fogColor.r,
       envValues.fog.fogColor.g,
@@ -5754,6 +5770,21 @@ var Composer = class {
       (_i = this.sun) == null ? void 0 : _i.setPolarAngle(this.environmentConfiguration.sun.polarAngle * (Math.PI / 180));
     }
   }
+  updateFogValues() {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+    if (typeof ((_b = (_a = this.environmentConfiguration) == null ? void 0 : _a.fog) == null ? void 0 : _b.fogNear) === "number") {
+      envValues.fog.fogNear = this.environmentConfiguration.fog.fogNear;
+    }
+    if (typeof ((_d = (_c = this.environmentConfiguration) == null ? void 0 : _c.fog) == null ? void 0 : _d.fogFar) === "number") {
+      envValues.fog.fogFar = this.environmentConfiguration.fog.fogFar;
+    }
+    if (typeof ((_g = (_f = (_e = this.environmentConfiguration) == null ? void 0 : _e.fog) == null ? void 0 : _f.fogColor) == null ? void 0 : _g.r) === "number" && typeof ((_j = (_i = (_h = this.environmentConfiguration) == null ? void 0 : _h.fog) == null ? void 0 : _i.fogColor) == null ? void 0 : _j.g) === "number" && typeof ((_m = (_l = (_k = this.environmentConfiguration) == null ? void 0 : _k.fog) == null ? void 0 : _l.fogColor) == null ? void 0 : _m.b) === "number") {
+      envValues.fog.fogColor.r = this.environmentConfiguration.fog.fogColor.r;
+      envValues.fog.fogColor.g = this.environmentConfiguration.fog.fogColor.g;
+      envValues.fog.fogColor.b = this.environmentConfiguration.fog.fogColor.b;
+    }
+    this.setFog();
+  }
   updateSkyboxAndEnvValues() {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
     if (typeof ((_b = (_a = this.environmentConfiguration) == null ? void 0 : _a.envMap) == null ? void 0 : _b.intensity) === "number") {
@@ -5805,7 +5836,7 @@ var Composer = class {
 
 // src/time/TimeManager.ts
 import { Clock } from "three";
-var TimeManager = class {
+var _TimeManager = class _TimeManager {
   constructor() {
     this.clock = new Clock();
     this.roundMagnitude = 2e5;
@@ -5823,8 +5854,12 @@ var TimeManager = class {
     this.fps = 0;
     this.averageFPS = 0;
   }
+  // 100ms
   update() {
     this.rawDeltaTime = this.clock.getDelta();
+    if (this.rawDeltaTime > _TimeManager.maxDeltaTime) {
+      this.rawDeltaTime = _TimeManager.maxDeltaTime;
+    }
     this.frame++;
     this.time += this.rawDeltaTime;
     this.deltaTimes.push(this.rawDeltaTime);
@@ -5847,6 +5882,8 @@ var TimeManager = class {
     }
   }
 };
+_TimeManager.maxDeltaTime = 0.1;
+var TimeManager = _TimeManager;
 
 // src/collisions/CollisionsManager.ts
 import { MMLCollisionTrigger } from "@mml-io/mml-web";
@@ -5923,10 +5960,11 @@ var CollisionsManager = class {
     this.scene = scene;
     this.collisionTrigger = MMLCollisionTrigger.init();
   }
-  raycastFirst(ray) {
+  raycastFirst(ray, maximumDistance = null) {
     let minimumDistance = null;
     let minimumHit = null;
-    let minimumNormal = new Vector316();
+    let minimumNormal = null;
+    let minimumPoint = null;
     for (const [, collisionMeshState] of this.collisionMeshState) {
       this.tempRay.copy(ray).applyMatrix4(this.tempMatrix.copy(collisionMeshState.matrix).invert());
       const hit = collisionMeshState.meshBVH.raycastFirst(this.tempRay, DoubleSide);
@@ -5935,17 +5973,24 @@ var CollisionsManager = class {
         this.tempSegment.end.copy(hit.point);
         this.tempSegment.applyMatrix4(collisionMeshState.matrix);
         const dist = this.tempSegment.distance();
-        if (minimumDistance === null || dist < minimumDistance) {
+        if ((maximumDistance === null || dist < maximumDistance) && (minimumDistance === null || dist < minimumDistance)) {
           minimumDistance = dist;
           minimumHit = collisionMeshState;
+          if (minimumNormal === null) {
+            minimumNormal = new Vector316();
+          }
+          if (minimumPoint === null) {
+            minimumPoint = new Vector316();
+          }
           minimumNormal = (hit.normal ? minimumNormal.copy(hit.normal) : minimumNormal).applyQuaternion(this.tempQuaternion.setFromRotationMatrix(collisionMeshState.matrix)).normalize();
+          minimumPoint = minimumPoint.copy(hit.point).applyMatrix4(collisionMeshState.matrix);
         }
       }
     }
-    if (minimumDistance === null || minimumNormal === null || minimumHit === null) {
+    if (minimumDistance === null || minimumNormal === null || minimumHit === null || minimumPoint === null) {
       return null;
     }
-    return [minimumDistance, minimumNormal, minimumHit];
+    return [minimumDistance, minimumNormal, minimumHit, minimumPoint];
   }
   createCollisionMeshState(group, trackCollisions) {
     const geometries = [];