hans/wolf_dart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor coordinate system

Browse Source 
Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com>
This commit is contained in:
Hans Kokx
2026-03-14 00:49:31 +01:00
parent 5c9dafbbdf
commit 46712370a4
8 changed files with 83 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/features/entities/enemies/brown_guard.dart
View File

@@ -1,6 +1,6 @@
import 'dart:math' as math;
import 'package:wolf_dart/classes/linear_coordinates.dart';
import 'package:wolf_dart/classes/coordinate_2d.dart';
import 'package:wolf_dart/features/entities/enemies/enemy.dart';
import 'package:wolf_dart/features/entities/entity.dart';
@@ -56,19 +56,20 @@ class BrownGuard extends Enemy {
@override
void update({
required int elapsedMs,
required LinearCoordinates player,
required Coordinate2D playerPosition,
required bool Function(int x, int y) isWalkable,
required void Function(int damage) onDamagePlayer,
}) {
// 1. Wake up logic
if (state == EntityState.idle && hasLineOfSight(player, isWalkable)) {
if (state == EntityState.idle &&
hasLineOfSight(playerPosition, isWalkable)) {
state = EntityState.patrolling;
lastActionTime = elapsedMs;
}
// 2. Pre-calculate angles (needed for almost all states)
double dx = player.x - x;
double dy = player.y - y;
double dx = playerPosition.x - x;
double dy = playerPosition.y - y;
double distance = math.sqrt(dx * dx + dy * dy);
double angleToPlayer = math.atan2(dy, dx);
@@ -107,7 +108,7 @@ class BrownGuard extends Enemy {
spriteIndex = 58 + (walkFrame * 8) + octant;
// Shooting transition
if (distance < 5.0 && elapsedMs - lastActionTime > 2000) {
if (hasLineOfSight(player, isWalkable)) {
if (hasLineOfSight(playerPosition, isWalkable)) {
state = EntityState.shooting;
lastActionTime = elapsedMs;
_hasFiredThisCycle = false;

10
lib/features/entities/enemies/dog.dart
View File

@@ -1,6 +1,6 @@
import 'dart:math' as math;
import 'package:wolf_dart/classes/linear_coordinates.dart';
import 'package:wolf_dart/classes/coordinate_2d.dart';
import 'package:wolf_dart/features/entities/enemies/enemy.dart';
import 'package:wolf_dart/features/entities/entity.dart';
@@ -49,12 +49,12 @@ class Dog extends Enemy {
@override
void update({
required int elapsedMs,
required LinearCoordinates player,
required Coordinate2D playerPosition,
required bool Function(int x, int y) isWalkable,
required void Function(int damage) onDamagePlayer,
}) {
if (state == EntityState.idle) {
if (hasLineOfSight(player, isWalkable)) {
if (hasLineOfSight(playerPosition, isWalkable)) {
state = EntityState.patrolling;
lastActionTime = elapsedMs;
}
@@ -65,8 +65,8 @@ class Dog extends Enemy {
state == EntityState.shooting) {
// "Shooting" here means biting
double dx = player.x - x;
double dy = player.y - y;
double dx = playerPosition.x - x;
double dy = playerPosition.y - y;
double distance = math.sqrt(dx * dx + dy * dy);
double angleToPlayer = math.atan2(dy, dx);

12
lib/features/entities/enemies/enemy.dart
View File

@@ -1,6 +1,6 @@
import 'dart:math' as math;
import 'package:wolf_dart/classes/linear_coordinates.dart';
import 'package:wolf_dart/classes/coordinate_2d.dart';
import 'package:wolf_dart/features/entities/entity.dart';
abstract class Enemy extends Entity {
@@ -58,11 +58,11 @@ abstract class Enemy extends Entity {
// The enemy can now check its own line of sight!
bool hasLineOfSight(
LinearCoordinates player,
Coordinate2D playerPosition,
bool Function(int x, int y) isWalkable,
) {
double dx = player.x - x;
double dy = player.y - y;
double dx = playerPosition.x - x;
double dy = playerPosition.y - y;
double distance = math.sqrt(dx * dx + dy * dy);
// 1. FOV Check
@@ -94,7 +94,7 @@ abstract class Enemy extends Entity {
// The weapon asks the enemy if it is unobstructed from the shooter
bool hasLineOfSightFrom(
LinearCoordinates source,
Coordinate2D source,
double sourceAngle,
double distance,
bool Function(int x, int y) isWalkable,
@@ -112,7 +112,7 @@ abstract class Enemy extends Entity {
void update({
required int elapsedMs,
required LinearCoordinates player,
required Coordinate2D playerPosition,
required bool Function(int x, int y) isWalkable,
required void Function(int damage) onDamagePlayer,
});