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

Can now pick up items

Browse Source 
Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com>
This commit is contained in:
Hans Kokx
2026-03-13 20:27:38 +01:00
parent bca8d10964
commit 026db920b3
7 changed files with 358 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/features/renderer/raycast_painter.dart
View File

@@ -1,16 +1,15 @@
import 'dart:math' as math;
import 'package:flutter/material.dart';
import 'package:wolf_dart/classes/linear_coordinates.dart';
import 'package:wolf_dart/classes/matrix.dart';
import 'package:wolf_dart/features/entities/entity.dart';
import 'package:wolf_dart/features/player/player.dart';
import 'package:wolf_dart/features/renderer/color_palette.dart';
class RaycasterPainter extends CustomPainter {
final Matrix<int> map;
final List<Matrix<int>> textures;
final LinearCoordinates player;
final double playerAngle;
final Player player;
final double fov;
final Map<String, double> doorOffsets;
final List<Matrix<int>> sprites;
@@ -20,7 +19,6 @@ class RaycasterPainter extends CustomPainter {
required this.map,
required this.textures,
required this.player,
required this.playerAngle,
required this.fov,
required this.doorOffsets,
required this.sprites,
@@ -44,8 +42,8 @@ class RaycasterPainter extends CustomPainter {
// The 1D Z-Buffer
List<double> zBuffer = List.filled(screenWidth, 0.0);
double dirX = math.cos(playerAngle);
double dirY = math.sin(playerAngle);
double dirX = math.cos(player.angle);
double dirY = math.sin(player.angle);
double planeX = -dirY * math.tan(fov / 2);
double planeY = dirX * math.tan(fov / 2);
@@ -275,8 +273,8 @@ class RaycasterPainter extends CustomPainter {
if (side == 1) texNum += 1;
}
if (side == 0 && math.cos(playerAngle) > 0) texX = 63 - texX;
if (side == 1 && math.sin(playerAngle) < 0) texX = 63 - texX;
if (side == 0 && math.cos(player.angle) > 0) texX = 63 - texX;
if (side == 1 && math.sin(player.angle) < 0) texX = 63 - texX;
double startY = drawStart.toDouble();
double stepY = wallHeight / 64.0;
@@ -307,6 +305,6 @@ class RaycasterPainter extends CustomPainter {
@override
bool shouldRepaint(covariant RaycasterPainter oldDelegate) {
return oldDelegate.player != player ||
oldDelegate.playerAngle != playerAngle;
oldDelegate.player.angle != player.angle;
}
}

84
lib/features/renderer/renderer.dart
View File

@@ -6,10 +6,12 @@ import 'package:flutter/services.dart';
import 'package:wolf_dart/classes/linear_coordinates.dart';
import 'package:wolf_dart/classes/matrix.dart';
import 'package:wolf_dart/features/difficulty/difficulty.dart';
import 'package:wolf_dart/features/entities/collectible.dart';
import 'package:wolf_dart/features/entities/enemies/enemy.dart';
import 'package:wolf_dart/features/entities/entity.dart';
import 'package:wolf_dart/features/entities/entity_registry.dart';
import 'package:wolf_dart/features/map/wolf_map.dart';
import 'package:wolf_dart/features/player/player.dart';
import 'package:wolf_dart/features/renderer/raycast_painter.dart';
import 'package:wolf_dart/sprite_gallery.dart';
@@ -38,13 +40,11 @@ class _WolfRendererState extends State<WolfRenderer>
final double fov = math.pi / 3;
late LinearCoordinates player;
late double playerAngle;
late Player player;
bool _isLoading = true;
bool _spaceWasPressed = false;
int playerHealth = 100;
double damageFlashOpacity = 0.0;
List<Entity> entities = [];
@@ -76,17 +76,26 @@ class _WolfRendererState extends State<WolfRenderer>
// Player Spawn
if (objId >= 19 && objId <= 22) {
player = (x: x + 0.5, y: y + 0.5);
double spawnAngle = 0.0;
switch (objId) {
case 19:
playerAngle = 3 * math.pi / 2;
spawnAngle = 3 * math.pi / 2;
break;
case 20:
playerAngle = 0.0;
spawnAngle = 0.0;
break;
case 21:
playerAngle = math.pi / 2;
spawnAngle = math.pi / 2;
break;
case 22:
playerAngle = math.pi;
spawnAngle = math.pi;
break;
}
player = Player(
x: x + 0.5,
y: y + 0.5,
angle: spawnAngle,
);
} else {
Entity? newEntity = EntityRegistry.spawn(
objId,
@@ -160,7 +169,8 @@ class _WolfRendererState extends State<WolfRenderer>
}
}
}
player = nearestSafeSpot;
player.x = nearestSafeSpot.x;
player.y = nearestSafeSpot.y;
}
}
@@ -197,21 +207,21 @@ class _WolfRendererState extends State<WolfRenderer>
final pressedKeys = HardwareKeyboard.instance.logicalKeysPressed;
if (pressedKeys.contains(LogicalKeyboardKey.keyW)) {
moveStepX += math.cos(playerAngle) * moveSpeed;
moveStepY += math.sin(playerAngle) * moveSpeed;
moveStepX += math.cos(player.angle) * moveSpeed;
moveStepY += math.sin(player.angle) * moveSpeed;
}
if (pressedKeys.contains(LogicalKeyboardKey.keyS)) {
moveStepX -= math.cos(playerAngle) * moveSpeed;
moveStepY -= math.sin(playerAngle) * moveSpeed;
moveStepX -= math.cos(player.angle) * moveSpeed;
moveStepY -= math.sin(player.angle) * moveSpeed;
}
if (pressedKeys.contains(LogicalKeyboardKey.keyA)) {
playerAngle -= turnSpeed;
player.angle -= turnSpeed;
}
if (pressedKeys.contains(LogicalKeyboardKey.keyD)) {
playerAngle += turnSpeed;
player.angle += turnSpeed;
}
if (playerAngle < 0) playerAngle += 2 * math.pi;
if (playerAngle > 2 * math.pi) playerAngle -= 2 * math.pi;
if (player.angle < 0) player.angle += 2 * math.pi;
if (player.angle > 2 * math.pi) player.angle -= 2 * math.pi;
// 2. UPDATED WALL COLLISION
const double margin = 0.3;
@@ -221,7 +231,7 @@ class _WolfRendererState extends State<WolfRenderer>
: (newX - margin).toInt();
if (_isWalkable(checkX, player.y.toInt())) {
player = (x: newX, y: player.y);
player.x = newX;
}
double newY = player.y + moveStepY;
@@ -230,15 +240,15 @@ class _WolfRendererState extends State<WolfRenderer>
: (newY - margin).toInt();
if (_isWalkable(player.x.toInt(), checkY)) {
player = (x: player.x, y: newY);
player.y = newY;
}
// 3. UPDATED DOOR INTERACTION
bool isSpacePressed = pressedKeys.contains(LogicalKeyboardKey.space);
if (isSpacePressed && !_spaceWasPressed) {
int targetX = (player.x + math.cos(playerAngle)).toInt();
int targetY = (player.y + math.sin(playerAngle)).toInt();
int targetX = (player.x + math.cos(player.angle)).toInt();
int targetY = (player.y + math.sin(player.angle)).toInt();
if (targetY > 0 &&
targetY < currentLevel.length &&
@@ -256,15 +266,37 @@ class _WolfRendererState extends State<WolfRenderer>
_spaceWasPressed = isSpacePressed;
// --- 4. UPDATE ENTITY LOGIC ---
List<Entity> itemsToRemove = []; // Collect items to delete after the loop
for (Entity entity in entities) {
if (entity is Enemy) {
entity.update(
elapsedMs: elapsed.inMilliseconds,
player: player,
player: player.position,
isWalkable: _isWalkable,
onDamagePlayer: _takeDamage,
);
}
// NEW: Add Collectible Interaction Logic
else if (entity is Collectible) {
double dx = player.x - entity.x;
double dy = player.y - entity.y;
double dist = math.sqrt(dx * dx + dy * dy);
// If player is close enough to the item
if (dist < 0.5) {
if (player.tryPickup(entity)) {
itemsToRemove.add(entity);
}
}
}
}
// Remove the items that were successfully picked up
if (itemsToRemove.isNotEmpty) {
setState(() {
entities.removeWhere((e) => itemsToRemove.contains(e));
});
}
// Fade out the damage flash smoothly
@@ -277,11 +309,8 @@ class _WolfRendererState extends State<WolfRenderer>
// A helper method to handle getting shot
void _takeDamage(int damage) {
playerHealth -= damage;
damageFlashOpacity = 0.5; // Trigger the red flash
if (playerHealth <= 0) {
print("YOU DIED! (We should add a game over screen later)");
}
player.takeDamage(damage);
damageFlashOpacity = 0.5;
}
@override
@@ -310,7 +339,6 @@ class _WolfRendererState extends State<WolfRenderer>
map: currentLevel,
textures: gameMap.textures,
player: player,
playerAngle: playerAngle,
fov: fov,
doorOffsets: doorOffsets,
entities: entities,