GoodStartLabs/AI_Diplomacy
1
0
Fork 0
mirror of https://github.com/GoodStartLabs/AI_Diplomacy.git synced 2026-04-28 17:29:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #28 from Tylermarques/bugfix/panning-jumps

Browse source 
bugfix/panning jumps
This commit is contained in:
AlxAI 2025-05-13 18:53:52 -04:00 • committed by GitHub
commit 8d5aee2fd2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

42
ai_animation/src/main.ts
View file

@ -83,10 +83,10 @@ function initScene() {
function createCameraPan(): Group { function createCameraPan(): Group {
// Create a target object to store the desired camera position // Create a target object to store the desired camera position
const cameraTarget = { x: gameState.camera.position.x, y: gameState.camera.position.y, z: gameState.camera.position.z }; const cameraStart = { x: gameState.camera.position.x, y: gameState.camera.position.y, z: gameState.camera.position.z };
// Move from the starting camera position to the left side of the map // Move from the starting camera position to the left side of the map
let moveToStartSweepAnim = new Tween(cameraTarget).to({ let moveToStartSweepAnim = new Tween(cameraStart).to({
x: -400, x: -400,
y: 500, y: 500,
z: 1000 z: 1000
@ -95,9 +95,10 @@ function createCameraPan(): Group {
gameState.camera.position.lerp(new THREE.Vector3(target.x, target.y, target.z), 0.1); gameState.camera.position.lerp(new THREE.Vector3(target.x, target.y, target.z), 0.1);
}); });
let cameraSweepOperation = new Tween({ timeStep: 0 }).to({ let cameraSweepOperation = new Tween({ timeStep: 0 })
timeStep: Math.PI .to({
}, 20000) timeStep: Math.PI
}, 20000)
.onUpdate((tweenObj) => { .onUpdate((tweenObj) => {
let radius = 2200; let radius = 2200;
// Calculate the target position // Calculate the target position
@ -105,16 +106,9 @@ function createCameraPan(): Group {
const targetY = 500 + 200 * Math.sin(tweenObj.timeStep); const targetY = 500 + 200 * Math.sin(tweenObj.timeStep);
const targetZ = 1000 + 900 * Math.sin(tweenObj.timeStep); const targetZ = 1000 + 900 * Math.sin(tweenObj.timeStep);
// Update the target object gameState.camera.position.set(targetX, targetY, targetZ);
cameraTarget.x = targetX;
cameraTarget.y = targetY;
cameraTarget.z = targetZ;
// Use smooth interpolation to avoid jumps
gameState.camera.position.lerp(new THREE.Vector3(targetX, targetY, targetZ), 0.05);
}) })
// .easing(Easing.Quadratic.InOut) .easing(Easing.Quadratic.InOut).yoyo(true).repeat(Infinity);
.yoyo(true).repeat(Infinity);
moveToStartSweepAnim.chain(cameraSweepOperation); moveToStartSweepAnim.chain(cameraSweepOperation);
moveToStartSweepAnim.start(); moveToStartSweepAnim.start();
@ -134,29 +128,15 @@ function animate() {
if (gameState.isPlaying) { if (gameState.isPlaying) {
// Update the camera angle // Update the camera angle
// FIXME: This has to call the update functino twice inorder to avoid a bug in Tween.js, see here https://github.com/tweenjs/tween.js/issues/677
gameState.cameraPanAnim.update(); gameState.cameraPanAnim.update();
gameState.cameraPanAnim.update();
} else { } else {
// Manual camera controls when not in playback mode // Manual camera controls when not in playback mode
gameState.camControls.update(); gameState.camControls.update();
} }
// Instead of throwing an error, smoothly interpolate if jump is too large
const jumpThreshold = 20;
if (Math.abs(prevPos.x - gameState.camera.position.x) > jumpThreshold ||
Math.abs(prevPos.y - gameState.camera.position.y) > jumpThreshold ||
Math.abs(prevPos.z - gameState.camera.position.z) > jumpThreshold) {
console.warn("Large camera position jump detected, smoothing transition");
// Interpolate to avoid the jump
gameState.camera.position.lerp(
new THREE.Vector3(
prevPos.x + Math.sign(gameState.camera.position.x - prevPos.x) * jumpThreshold,
gameState.camera.position.y,
gameState.camera.position.z
),
0.5
);
}
// Check if all animations are complete // Check if all animations are complete
if (gameState.unitAnimations.length > 0) { if (gameState.unitAnimations.length > 0) {
// Filter out completed animations // Filter out completed animations