@react-shimeji/core 0.3.6 → 0.3.7

package/dist/index.js

@@ -1600,9 +1600,6 @@ function environmentRectangle(bounds) {
 }
 var PLATFORM_NEARBY_DISTANCE = 400;
 var PLATFORM_EDGE_TOLERANCE = 2;
-var MASCOT_HITBOX_MAX_WIDTH = 32;
-var MASCOT_HITBOX_MAX_HEIGHT = 64;
-var MASCOT_COLLISION_LOOKAHEAD = 4;
 var IE_BEHAVIOR_NAME_PATTERN = /wall|climb|crawl|壁|登|よじ/i;
 function isIEBehavior(behavior) {
   return behavior.conditions.some((condition) => /activeIE/i.test(condition)) || behavior.name.includes("IE") || behavior.name.includes("\uFF29\uFF25") || IE_BEHAVIOR_NAME_PATTERN.test(behavior.name) || behavior.actionName !== void 0 && (behavior.actionName.includes("IE") || behavior.actionName.includes("\uFF29\uFF25") || IE_BEHAVIOR_NAME_PATTERN.test(behavior.actionName));
@@ -1669,7 +1666,7 @@ var Mascot = class {
   random;
   forceInitialFall;
   /** Advances behavior, animation, physics, and rendering by one clock tick. */
-  tick(deltaMs, bounds, platforms = [], siblings = []) {
+  tick(deltaMs, bounds, platforms = []) {
     if (this.destroyed) return;
     this.platforms = platforms;
     try {
@@ -1677,7 +1674,7 @@ var Mascot = class {
       this.accumulatedMs += Math.max(0, deltaMs);
       while (this.accumulatedMs >= this.frameDuration && !this.destroyed) {
         this.accumulatedMs -= this.frameDuration;
-        this.legacyTick(bounds, platforms, siblings);
+        this.legacyTick(bounds, platforms);
       }
     } catch (error) {
       this.callbacks.error(error instanceof Error ? error : new Error(String(error)));
@@ -1690,25 +1687,6 @@ var Mascot = class {
   snapshot() {
     return { ...this.state };
   }
-  /** Returns the mascot's compact, feet-aligned behavioral collision box. */
-  collisionBox() {
-    const sprite = this.spec.sprites[this.state.sprite];
-    const spriteWidth = typeof sprite === "object" && sprite.width !== void 0 ? sprite.width : 128;
-    const spriteHeight = typeof sprite === "object" && sprite.height !== void 0 ? sprite.height : 128;
-    const width = Math.min(spriteWidth, MASCOT_HITBOX_MAX_WIDTH);
-    const height = Math.min(spriteHeight, MASCOT_HITBOX_MAX_HEIGHT);
-    const anchorX = this.state.lookRight ? spriteWidth - this.state.anchorX : this.state.anchorX;
-    const visualLeft = this.state.x - anchorX;
-    const visualTop = this.state.y - this.state.anchorY;
-    return {
-      id: this.id,
-      positionX: this.state.x,
-      x: visualLeft + (spriteWidth - width) / 2,
-      y: visualTop + spriteHeight - height,
-      width,
-      height
-    };
-  }
   /** Removes listeners, DOM nodes, and object URLs owned by this mascot. */
   destroy() {
     if (this.destroyed) return;
@@ -1737,13 +1715,12 @@ var Mascot = class {
       if (!this.startBehavior(this.createEnvironment(bounds, platforms), bounds, platforms)) return;
     }
   }
-  legacyTick(bounds, platforms, siblings) {
+  legacyTick(bounds, platforms) {
     this.ensureBehavior(bounds, platforms, false);
     if (!this.currentBehavior) return;
     const previous = { x: this.state.x, y: this.state.y };
     const result = this.actions.step(this.createEnvironment(bounds, platforms), bounds, platforms);
     if (this.destroyed) return;
-    this.avoidSiblingCollision(previous, bounds, platforms, siblings);
     if (result === "lost-ground") {
       this.state.dragging = false;
       this.actions.cancel();
@@ -1761,48 +1738,6 @@ var Mascot = class {
       if (this.currentBehavior) this.startBehavior(this.createEnvironment(bounds, platforms), bounds, platforms);
     }
   }
-  avoidSiblingCollision(previous, bounds, platforms, siblings) {
-    const dx = this.state.x - previous.x;
-    if (this.state.dragging || dx === 0 || this.state.y !== previous.y) return;
-    const onHorizontalSurface = isOnFloor(previous, bounds, platforms) || isOnTop(previous, bounds) || platforms.some((platform) => isOnBottom(previous, platform));
-    if (!onHorizontalSurface) return;
-    const currentBox = this.collisionBox();
-    const offsetX = currentBox.x - this.state.x;
-    const previousBox = { ...currentBox, x: previous.x + offsetX };
-    const movingRight = dx > 0;
-    const sweptLeft = Math.min(previousBox.x, currentBox.x) - (movingRight ? 0 : MASCOT_COLLISION_LOOKAHEAD);
-    const sweptRight = Math.max(previousBox.x + previousBox.width, currentBox.x + currentBox.width) + (movingRight ? MASCOT_COLLISION_LOOKAHEAD : 0);
-    const overlappingSiblings = siblings.filter((sibling) => {
-      if (sibling.id === this.id) return false;
-      const overlapsVertically = currentBox.y < sibling.y + sibling.height && sibling.y < currentBox.y + currentBox.height;
-      const overlapsHorizontally = previousBox.x < sibling.x + sibling.width && sibling.x < previousBox.x + previousBox.width;
-      return overlapsVertically && (overlapsHorizontally || sibling.positionX === previous.x);
-    });
-    if (overlappingSiblings.length > 0) {
-      const coincidentIds = [
-        this.id,
-        ...overlappingSiblings.filter((sibling) => sibling.positionX === previous.x).map((sibling) => sibling.id)
-      ].sort();
-      const escapeRight = coincidentIds.length > 1 ? coincidentIds.indexOf(this.id) >= coincidentIds.length / 2 : overlappingSiblings.reduce((sum, sibling) => sum + sibling.positionX, 0) / overlappingSiblings.length < previous.x;
-      if (movingRight !== escapeRight) {
-        this.state.x = previous.x;
-        this.state.vx = 0;
-        this.state.lookRight = !this.state.lookRight;
-      }
-      return;
-    }
-    const collision = siblings.some((sibling) => {
-      if (sibling.id === this.id) return false;
-      const isAhead = movingRight ? sibling.positionX > previous.x : sibling.positionX < previous.x;
-      const overlapsVertically = currentBox.y < sibling.y + sibling.height && sibling.y < currentBox.y + currentBox.height;
-      const crossesHorizontally = sweptLeft <= sibling.x + sibling.width && sibling.x <= sweptRight;
-      return isAhead && overlapsVertically && crossesHorizontally;
-    });
-    if (!collision) return;
-    this.state.x = previous.x;
-    this.state.vx = 0;
-    this.state.lookRight = !this.state.lookRight;
-  }
   isOutsideVisibleBounds(bounds) {
     const sprite = this.spec.sprites[this.state.sprite];
     const width = typeof sprite === "object" && "width" in sprite && sprite.width !== void 0 ? sprite.width : 128;
@@ -2225,8 +2160,7 @@ var ShimejiEngine = class {
     const delta = Math.max(0, Math.min(rawDelta, this.options.maxDeltaTime));
     const { bounds, platforms } = this.readFrameGeometry();
     const mascots = [...this.mascots.values()];
-    const collisionBoxes = mascots.map((mascot) => mascot.collisionBox());
-    for (const mascot of mascots) mascot.tick(delta, bounds, platforms, collisionBoxes);
+    for (const mascot of mascots) mascot.tick(delta, bounds, platforms);
     this.emitState();
     this.animationFrame = this.container.ownerDocument.defaultView?.requestAnimationFrame(this.onAnimationFrame);
   };