mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-20 23:53:13 +09:00
Smooth keyboard movement
This commit is contained in:
1 parent
cfc1b7687e
commit
3f06bd0993
1 file changed
+59
-22
@@ -19,14 +19,6 @@ interface SurfaceForceData {
|
|||||||
forces: string[];
|
forces: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
interface ChunkData {
|
|
||||||
surface: string;
|
|
||||||
force: string;
|
|
||||||
chunkX: number;
|
|
||||||
chunkY: number;
|
|
||||||
imageData: ImageData;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ViewState {
|
interface ViewState {
|
||||||
centerX: number;
|
centerX: number;
|
||||||
centerY: number;
|
centerY: number;
|
||||||
@@ -77,6 +69,9 @@ export default function CanvasMinimapPage() {
|
|||||||
const isDraggingRef = useRef<boolean>(false);
|
const isDraggingRef = useRef<boolean>(false);
|
||||||
const lastMousePosRef = useRef<{ x: number; y: number } | null>(null);
|
const lastMousePosRef = useRef<{ x: number; y: number } | null>(null);
|
||||||
|
|
||||||
|
// Refs for tracking pressed movement keys for smooth movement at 60fps
|
||||||
|
const keysPressed = useRef<Set<string>>(new Set());
|
||||||
|
|
||||||
const control = useContext(ControlContext);
|
const control = useContext(ControlContext);
|
||||||
|
|
||||||
// Load instance bounds on component mount
|
// Load instance bounds on component mount
|
||||||
@@ -106,21 +101,16 @@ export default function CanvasMinimapPage() {
|
|||||||
// Set up keyboard and mouse event listeners
|
// Set up keyboard and mouse event listeners
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const handleKeyDown = (e: KeyboardEvent) => {
|
const handleKeyDown = (e: KeyboardEvent) => {
|
||||||
const moveSpeed = 50 / viewState.zoomLevel;
|
const key = e.key.toLowerCase();
|
||||||
|
|
||||||
switch (e.key.toLowerCase()) {
|
// Track movement keys for smooth animation
|
||||||
case 'w':
|
if (['w', 'a', 's', 'd'].includes(key)) {
|
||||||
setViewState(prev => ({ ...prev, centerY: prev.centerY - moveSpeed }));
|
keysPressed.current.add(key);
|
||||||
break;
|
return;
|
||||||
case 's':
|
}
|
||||||
setViewState(prev => ({ ...prev, centerY: prev.centerY + moveSpeed }));
|
|
||||||
break;
|
// Handle zoom keys immediately (not animated)
|
||||||
case 'a':
|
switch (key) {
|
||||||
setViewState(prev => ({ ...prev, centerX: prev.centerX - moveSpeed }));
|
|
||||||
break;
|
|
||||||
case 'd':
|
|
||||||
setViewState(prev => ({ ...prev, centerX: prev.centerX + moveSpeed }));
|
|
||||||
break;
|
|
||||||
case '+':
|
case '+':
|
||||||
case '=': // Handle both + and = key (since + requires shift)
|
case '=': // Handle both + and = key (since + requires shift)
|
||||||
setViewState(prev => ({
|
setViewState(prev => ({
|
||||||
@@ -140,6 +130,20 @@ export default function CanvasMinimapPage() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleKeyUp = (e: KeyboardEvent) => {
|
||||||
|
const key = e.key.toLowerCase();
|
||||||
|
|
||||||
|
// Remove movement keys when released
|
||||||
|
if (['w', 'a', 's', 'd'].includes(key)) {
|
||||||
|
keysPressed.current.delete(key);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleBlur = () => {
|
||||||
|
// Clear all pressed keys when window loses focus to prevent stuck keys
|
||||||
|
keysPressed.current.clear();
|
||||||
|
};
|
||||||
|
|
||||||
const handleWheel = (e: WheelEvent) => {
|
const handleWheel = (e: WheelEvent) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
const direction = e.deltaY > 0 ? 'down' : 'up';
|
const direction = e.deltaY > 0 ? 'down' : 'up';
|
||||||
@@ -149,6 +153,8 @@ export default function CanvasMinimapPage() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
document.addEventListener('keydown', handleKeyDown);
|
document.addEventListener('keydown', handleKeyDown);
|
||||||
|
document.addEventListener('keyup', handleKeyUp);
|
||||||
|
window.addEventListener('blur', handleBlur);
|
||||||
const canvasElement = canvasRef.current;
|
const canvasElement = canvasRef.current;
|
||||||
if (canvasElement) {
|
if (canvasElement) {
|
||||||
canvasElement.addEventListener('wheel', handleWheel, { passive: false });
|
canvasElement.addEventListener('wheel', handleWheel, { passive: false });
|
||||||
@@ -156,6 +162,8 @@ export default function CanvasMinimapPage() {
|
|||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
document.removeEventListener('keydown', handleKeyDown);
|
document.removeEventListener('keydown', handleKeyDown);
|
||||||
|
document.removeEventListener('keyup', handleKeyUp);
|
||||||
|
window.removeEventListener('blur', handleBlur);
|
||||||
if (canvasElement) {
|
if (canvasElement) {
|
||||||
canvasElement.removeEventListener('wheel', handleWheel);
|
canvasElement.removeEventListener('wheel', handleWheel);
|
||||||
}
|
}
|
||||||
@@ -450,6 +458,35 @@ export default function CanvasMinimapPage() {
|
|||||||
const canvas = canvasRef.current;
|
const canvas = canvasRef.current;
|
||||||
if (!canvas) return;
|
if (!canvas) return;
|
||||||
|
|
||||||
|
// Apply smooth WASD movement
|
||||||
|
if (keysPressed.current.size > 0) {
|
||||||
|
// Adjust base speed for 60fps
|
||||||
|
const moveSpeed = 20 / viewState.zoomLevel;
|
||||||
|
let deltaX = 0;
|
||||||
|
let deltaY = 0;
|
||||||
|
|
||||||
|
// Calculate movement delta based on currently pressed keys
|
||||||
|
if (keysPressed.current.has('w')) deltaY -= moveSpeed;
|
||||||
|
if (keysPressed.current.has('s')) deltaY += moveSpeed;
|
||||||
|
if (keysPressed.current.has('a')) deltaX -= moveSpeed;
|
||||||
|
if (keysPressed.current.has('d')) deltaX += moveSpeed;
|
||||||
|
|
||||||
|
// Reduce speed if moving diagonally
|
||||||
|
if (deltaX !== 0 && deltaY !== 0) {
|
||||||
|
deltaX *= 0.7071; // sqrt(2) / 2
|
||||||
|
deltaY *= 0.7071;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Apply movement if any keys are pressed
|
||||||
|
if (deltaX !== 0 || deltaY !== 0) {
|
||||||
|
setViewState(prev => ({
|
||||||
|
...prev,
|
||||||
|
centerX: prev.centerX + deltaX,
|
||||||
|
centerY: prev.centerY + deltaY
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const ctx = canvas.getContext('2d') as CanvasRenderingContext2D;
|
const ctx = canvas.getContext('2d') as CanvasRenderingContext2D;
|
||||||
ctx.imageSmoothingEnabled = false;
|
ctx.imageSmoothingEnabled = false;
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user