Skip to content

Commit

Permalink
Add Alien Ship
Browse files Browse the repository at this point in the history
  • Loading branch information
@dylanlangston
dylanlangston committed Dec 28, 2023
1 parent 6d5fe9e commit 591a3f8
Show file tree
Hide file tree
Showing 5 changed files with 356 additions and 11 deletions.
184 changes: 184 additions & 0 deletions src/Models/Alien.zig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
const std = @import("std");
const raylib = @import("raylib");
const raylib_math = @import("raylib-math");
const Shared = @import("../Shared.zig").Shared;
const Player = @import("./Player.zig").Player;
const Shoot = @import("./Shoot.zig").Shoot;

pub const Alien = struct {
position: raylib.Vector2,
speed: raylib.Vector2,
radius: f32,
rotation: f32,
active: bool,
color: raylib.Color,
frame: f32,
shouldDraw: bool = false,

const ANIMATION_SPEED_MOD = 10;
pub const ALIEN_SPEED: f32 = 5;

pub const AlienStatusType = enum {
shot,
collide,
default,
};

pub const AlienStatus = union(AlienStatusType) {
shot: Shoot,
collide: bool,
default: bool,
};

pub inline fn Update(self: *@This(), player: Player, comptime shoots: []Shoot, comptime alien_shoots: []Shoot, screenSize: raylib.Vector2) AlienStatus {
// If Active
if (self.active) {
if (self.frame > 10) {
self.frame = 0;
} else {
self.frame += raylib.getFrameTime() * ANIMATION_SPEED_MOD;
}

// Check Collision with player
if (raylib.checkCollisionCircles(
raylib.Vector2.init(
player.collider.x,
player.collider.y,
),
player.collider.z,
self.position,
self.radius,
)) {
return AlienStatus{ .collide = true };
}

// Random Motion
if (Shared.Random.Get().intRangeAtMost(u8, 0, 10) < 2) {
if (self.speed.y == 0) {
if (Shared.Random.Get().intRangeAtMost(u8, 0, 10) < 5) {
self.speed.y = ALIEN_SPEED;
} else {
self.speed.y = -ALIEN_SPEED;
}
} else {
if (Shared.Random.Get().intRangeAtMost(u8, 0, 10) > 2) {
self.speed.y = 0;
}
}
}
if (self.speed.x == 0 and self.speed.y == 0) {
self.speed.x = if (Shared.Random.Get().boolean()) -ALIEN_SPEED else ALIEN_SPEED;
} else {
if (Shared.Random.Get().intRangeAtMost(u16, 0, 200) < 1) {
self.speed.x = -self.speed.x;
}
}

// Movement
self.position.x += self.speed.x;
self.position.y += self.speed.y;

// Collision logic: meteor vs wall
if (self.position.x > screenSize.x - self.radius - 50) {
self.speed.x = -1 * self.speed.x;
self.position.x = screenSize.x - self.radius + self.speed.x - 50;
} else if (self.position.x < self.radius + 50) {
self.speed.x = -1 * self.speed.x;
self.position.x = self.radius + self.speed.x + 50;
}
if (self.position.y > screenSize.y - self.radius - 50) {
self.speed.y = -1 * self.speed.y;
self.position.y = screenSize.y - self.radius + self.speed.y - 50;
} else if (self.position.y < self.radius + 50) {
self.speed.y = -1 * self.speed.y;
self.position.y = self.radius + self.speed.y + 50;
}

// Check if shot hit
inline for (0..shoots.len) |i| {
if (shoots[i].active and raylib.checkCollisionCircles(
shoots[i].position,
shoots[i].radius,
self.position,
self.radius,
)) {
shoots[i].active = false;
shoots[i].lifeSpawn = 0;
self.active = false;

self.color = Shared.Color.Red.Base;

Shared.Sound.Play(.Explosion);

return AlienStatus{ .shot = shoots[i] };
}
}

const visibleX = self.position.x - player.position.x;
const visibleY = self.position.y - player.position.y;
if (visibleX > activeRadiusX or visibleX < -activeRadiusX) {
self.shouldDraw = false;
return AlienStatus{ .default = true };
}
if (visibleY > activeRadiusY or visibleY < -activeRadiusY) {
self.shouldDraw = false;
return AlienStatus{ .default = true };
}

self.shouldDraw = true;

// Fire Shot
if (self.frame == 0) {
// Rotate to face plater
self.rotation = std.math.radiansToDegrees(f32, raylib_math.vector2LineAngle(player.position, self.position)) - 90;

inline for (0..alien_shoots.len) |i| {
if (!alien_shoots[i].active) {
alien_shoots[i].position.x = self.position.x + @sin(std.math.degreesToRadians(
f32,
self.rotation,
)) * self.radius;
alien_shoots[i].position.y = self.position.y - @cos(std.math.degreesToRadians(
f32,
self.rotation,
)) * self.radius;
alien_shoots[i].speed.x = 1.5 * @sin(std.math.degreesToRadians(
f32,
self.rotation,
)) * ALIEN_SPEED;
alien_shoots[i].speed.y = 1.5 * @cos(std.math.degreesToRadians(
f32,
self.rotation,
)) * ALIEN_SPEED;
alien_shoots[i].active = true;
alien_shoots[i].rotation = self.rotation;

Shared.Sound.Play(.pew);

break;
}
}
}
} else {
self.shouldDraw = false;
}

return AlienStatus{ .default = true };
}

const activeRadiusX = 500;
const activeRadiusY = 325;

pub inline fn Draw(self: @This()) void {
if (!self.shouldDraw) return;

const color: raylib.Color = if (self.active) self.color else raylib.Color.fade(self.color, 0.3);

raylib.drawCircle(
@intFromFloat(self.position.x),
@intFromFloat(self.position.y),
self.radius,
color,
);
}
};
58 changes: 56 additions & 2 deletions src/Models/Meteor.zig
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
const std = @import("std");
const raylib = @import("raylib");
const raylib_math = @import("raylib-math");
const Shared = @import("../Shared.zig").Shared;
const Player = @import("./Player.zig").Player;
const Shoot = @import("./Shoot.zig").Shoot;
const Alien = @import("./Alien.zig").Alien;

pub const MeteorSprite = Shared.Sprite.init(5, .Yellow_Meteor);

Expand All @@ -29,7 +31,7 @@ pub const Meteor = struct {
default: bool,
};

pub inline fn Update(self: *@This(), player: Player, comptime shoots: []Shoot, screenSize: raylib.Vector2) MeteorStatus {
pub inline fn Update(self: *@This(), player: Player, comptime shoots: []Shoot, comptime aliens: []Alien, comptime alien_shoots: []Shoot, screenSize: raylib.Vector2) MeteorStatus {
// If Active
if (self.active) {
// Reset Frame
Expand All @@ -48,6 +50,38 @@ pub const Meteor = struct {
return MeteorStatus{ .collide = true };
}

// Check if alien will collide
inline for (0..aliens.len) |i| {
if (aliens[i].active and raylib.checkCollisionCircles(
aliens[i].position,
aliens[i].radius,
raylib.Vector2.init(
self.position.x - 10,
self.position.y - 10,
),
self.radius + 20,
)) {
aliens[i].rotation = std.math.radiansToDegrees(f32, raylib_math.vector2LineAngle(aliens[i].position, self.position)) - 90;

aliens[i].position.x = aliens[i].position.x + @sin(std.math.degreesToRadians(
f32,
aliens[i].rotation,
)) * aliens[i].radius;
aliens[i].position.y = aliens[i].position.y - @cos(std.math.degreesToRadians(
f32,
aliens[i].rotation,
)) * aliens[i].radius;
aliens[i].speed.x = @sin(std.math.degreesToRadians(
f32,
aliens[i].rotation,
)) * Alien.ALIEN_SPEED;
aliens[i].speed.y = @cos(std.math.degreesToRadians(
f32,
aliens[i].rotation,
)) * Alien.ALIEN_SPEED;
}
}

// Movement
self.position.x += self.speed.x;
self.position.y += self.speed.y;
Expand All @@ -68,7 +102,7 @@ pub const Meteor = struct {
self.position.y = self.radius + self.speed.y;
}

// Check if shot hit
// Check if player shot hit
inline for (0..shoots.len) |i| {
if (shoots[i].active and raylib.checkCollisionCircles(
shoots[i].position,
Expand All @@ -87,6 +121,26 @@ pub const Meteor = struct {
return MeteorStatus{ .shot = shoots[i] };
}
}

// Check if alien shot hit
inline for (0..alien_shoots.len) |i| {
if (alien_shoots[i].active and raylib.checkCollisionCircles(
alien_shoots[i].position,
alien_shoots[i].radius,
self.position,
self.radius,
)) {
alien_shoots[i].active = false;
alien_shoots[i].lifeSpawn = 0;
self.active = false;

self.color = Shared.Color.Red.Base;

Shared.Sound.Play(.Explosion);

return MeteorStatus{ .shot = alien_shoots[i] };
}
}
} else if (self.frame < MeteorSprite.Frames - 1) {
self.frame += raylib.getFrameTime() * ANIMATION_SPEED_MOD;
}
Expand Down
19 changes: 18 additions & 1 deletion src/Models/Player.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,17 @@ pub const Player = struct {

pub const PlayerStatusType = enum {
collide,
shot,
default,
};

pub const PlayerStatus = union(PlayerStatusType) {
collide: bool,
shot: Shoot,
default: bool,
};

pub inline fn Update(self: *@This(), comptime shoots: []Shoot, screenSize: raylib.Vector2, halfShipHeight: f32) PlayerStatus {
pub inline fn Update(self: *@This(), comptime shoots: []Shoot, comptime alien_shoots: []Shoot, screenSize: raylib.Vector2, halfShipHeight: f32) PlayerStatus {
// Player logic: rotation
if (Shared.Input.Left_Held()) {
self.rotation -= 2.5;
Expand Down Expand Up @@ -111,6 +113,21 @@ pub const Player = struct {
self.collider.y = self.position.y;
self.collider.z = 12;

// Check if alien shot hit
inline for (0..alien_shoots.len) |i| {
if (alien_shoots[i].active and raylib.checkCollisionCircles(
alien_shoots[i].position,
alien_shoots[i].radius,
self.position,
self.collider.z,
)) {
alien_shoots[i].active = false;
alien_shoots[i].lifeSpawn = 0;

return PlayerStatus{ .shot = alien_shoots[i] };
}
}

return PlayerStatus{ .default = true };
}

Expand Down
Loading

0 comments on commit 591a3f8

Please sign in to comment.