Merge e_bike + gps into develop #7

Merged
math-pixel merged 23 commits from feat/gps into develop 2026-05-28 05:55:19 +00:00
2 changed files with 23 additions and 15 deletions
Showing only changes of commit 047c58678b - Show all commits
+12 -15
View File
@@ -1,4 +1,4 @@
import { useRef } from "react";
import { useEffect, useRef } from "react";
import * as THREE from "three";
import { useFrame } from "@react-three/fiber";
import { InteractableObject } from "@/components/three/interaction/InteractableObject";
@@ -40,21 +40,18 @@ export function Ebike({ position }: EbikeProps): React.JSX.Element {
const model = useClonedObject(scene);
const movementMode = useGameStore((state) => state.player.movementMode);
useFrame(() => {
if (groupRef.current) {
if (movementMode === "ebike") {
// Follow player physical position (capsule end)
const playerPos = (window as any).playerPos || [0, 10, 0];
groupRef.current.position.set(playerPos[0], playerPos[1] - PLAYER_EYE_HEIGHT, playerPos[2]);
useEffect(() => {
(window as any).ebikeVisualGroup = groupRef;
return () => {
(window as any).ebikeVisualGroup = null;
};
}, []);
// Match the e-bike's actual physical steering heading
const angle = (window as any).ebikeAngle || 0;
groupRef.current.rotation.set(0, angle, 0);
} else {
// Reset to original position
groupRef.current.position.set(...position);
groupRef.current.rotation.set(0, 0, 0);
}
useFrame(() => {
if (groupRef.current && movementMode !== "ebike") {
// Reset to original position
groupRef.current.position.set(...position);
groupRef.current.rotation.set(0, 0, 0);
}
});
+11
View File
@@ -357,6 +357,17 @@ export function PlayerController({
const yawRad = THREE.MathUtils.degToRad(EBIKE_CAMERA_TRANSFORM.rotation[1]) + ebikeAngle.current;
const rollRad = THREE.MathUtils.degToRad(EBIKE_CAMERA_TRANSFORM.rotation[2]);
camera.rotation.set(pitchRad, yawRad, rollRad, "YXZ");
// Synchronize visual e-bike mesh position and rotation instantly to eliminate 1-frame follow latency jitter!
const ebikeVisual = (window as any).ebikeVisualGroup?.current;
if (ebikeVisual) {
ebikeVisual.position.set(
capsule.current.end.x,
capsule.current.end.y - PLAYER_EYE_HEIGHT,
capsule.current.end.z
);
ebikeVisual.rotation.set(0, ebikeAngle.current, 0);
}
} else {
camera.position.copy(capsule.current.end);
}