Skip to content

Commit

Permalink
Make player bounce on asteroids and walls
Browse files Browse the repository at this point in the history
  • Loading branch information
@dylanlangston
dylanlangston committed Jan 3, 2024
1 parent e906617 commit 3849466
Show file tree
Hide file tree
Showing 4 changed files with 118 additions and 7 deletions.
5 changes: 5 additions & 0 deletions src/Models/Meteor.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@ pub const Meteor = struct {
self.position,
self.radius,
)) {
self.active = false;

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

Shared.Sound.Play(.Explosion);
return MeteorStatus{ .collide = true };
}

Expand Down
4 changes: 4 additions & 0 deletions src/Models/Player.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,17 @@ pub const Player = struct {

// Collision logic: player vs walls
if (self.position.x > screenSize.x - halfShipHeight) {
self.rotation = std.math.radiansToDegrees(f32, std.math.pi * 2 - std.math.degreesToRadians(f32, self.rotation));
return PlayerStatus{ .collide = true };
} else if (self.position.x < halfShipHeight) {
self.rotation = std.math.radiansToDegrees(f32, std.math.pi * 2 - std.math.degreesToRadians(f32, self.rotation));
return PlayerStatus{ .collide = true };
}
if (self.position.y > screenSize.y - halfShipHeight) {
self.rotation = std.math.radiansToDegrees(f32, std.math.pi - std.math.degreesToRadians(f32, self.rotation));
return PlayerStatus{ .collide = true };
} else if (self.position.y < halfShipHeight) {
self.rotation = std.math.radiansToDegrees(f32, std.math.pi - std.math.degreesToRadians(f32, self.rotation));
return PlayerStatus{ .collide = true };
}

Expand Down
113 changes: 107 additions & 6 deletions src/ViewModels/AsteroidsViewModel.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ pub const AsteroidsViewModel = Shared.View.ViewModel.Create(
pub const MAX_SHIELD: u8 = 50;

// Variables
pub var shieldLevel: u8 = MAX_SHIELD;
var nextShieldLevel: u8 = MAX_SHIELD;
pub var shieldLevel: i16 = MAX_SHIELD;
var nextShieldLevel: i16 = MAX_SHIELD;

pub const screenSize: raylib.Vector2 = raylib.Vector2.init(3200, 1800);

Expand Down Expand Up @@ -160,7 +160,7 @@ pub const AsteroidsViewModel = Shared.View.ViewModel.Create(
// Update Player
switch (player.Update(&shoot, &aliens, &alien_shoot, screenSize, halfShipHeight)) {
.collide => {
shieldLevel = 0;
nextShieldLevel -= 1;
},
.shot => {
nextShieldLevel -= 5;
Expand Down Expand Up @@ -227,7 +227,44 @@ pub const AsteroidsViewModel = Shared.View.ViewModel.Create(
NewAlien();
},
.collide => {
shieldLevel = 0;
if (bigMeteors[i].position.x > player.collider.x - halfShipHeight) {
player.rotation = std.math.radiansToDegrees(f32, std.math.pi * 2 - std.math.degreesToRadians(f32, player.rotation));
} else if (bigMeteors[i].position.x < halfShipHeight) {
player.rotation = std.math.radiansToDegrees(f32, std.math.pi * 2 - std.math.degreesToRadians(f32, player.rotation));
}
if (bigMeteors[i].position.y > player.collider.y - halfShipHeight) {
player.rotation = std.math.radiansToDegrees(f32, std.math.pi - std.math.degreesToRadians(f32, player.rotation));
} else if (bigMeteors[i].position.y < halfShipHeight) {
player.rotation = std.math.radiansToDegrees(f32, std.math.pi - std.math.degreesToRadians(f32, player.rotation));
}

bigMeteorsCount -= 1;

for (0..2) |_| {
mediumMeteors[@intCast(midMeteorsCount)].position = raylib.Vector2.init(
bigMeteors[i].position.x,
bigMeteors[i].position.y,
);

if (@rem(midMeteorsCount, 2) == 0) {
mediumMeteors[@intCast(midMeteorsCount)].speed = raylib.Vector2.init(
@cos(std.math.degreesToRadians(f32, player.rotation)) * Meteor.METEORS_SPEED * -1,
@sin(std.math.degreesToRadians(f32, player.rotation)) * Meteor.METEORS_SPEED * -1,
);
} else {
mediumMeteors[@intCast(midMeteorsCount)].speed = raylib.Vector2.init(
@cos(std.math.degreesToRadians(f32, player.rotation)) * Meteor.METEORS_SPEED,
@sin(std.math.degreesToRadians(f32, player.rotation)) * Meteor.METEORS_SPEED,
);
}

mediumMeteors[@intCast(midMeteorsCount)].active = true;
midMeteorsCount += 1;
}

NewAlien();

nextShieldLevel -= 10;
},
}
}
Expand Down Expand Up @@ -265,7 +302,44 @@ pub const AsteroidsViewModel = Shared.View.ViewModel.Create(
NewAlien();
},
.collide => {
shieldLevel = 0;
if (mediumMeteors[i].position.x > player.collider.x) {
player.rotation = std.math.radiansToDegrees(f32, std.math.pi * 2 - std.math.degreesToRadians(f32, player.rotation));
} else if (mediumMeteors[i].position.x < player.collider.x) {
player.rotation = std.math.radiansToDegrees(f32, std.math.pi * 2 - std.math.degreesToRadians(f32, player.rotation));
}
if (mediumMeteors[i].position.y > player.collider.y) {
player.rotation = std.math.radiansToDegrees(f32, std.math.pi - std.math.degreesToRadians(f32, player.rotation));
} else if (mediumMeteors[i].position.y < player.collider.y) {
player.rotation = std.math.radiansToDegrees(f32, std.math.pi - std.math.degreesToRadians(f32, player.rotation));
}

midMeteorsCount -= 1;

for (0..2) |_| {
smallMeteors[@intCast(smallMeteorsCount)].position = raylib.Vector2.init(
mediumMeteors[i].position.x,
mediumMeteors[i].position.y,
);

if (@rem(smallMeteorsCount, 2) == 0) {
smallMeteors[@intCast(smallMeteorsCount)].speed = raylib.Vector2.init(
@cos(std.math.degreesToRadians(f32, player.rotation)) * Meteor.METEORS_SPEED * -1,
@sin(std.math.degreesToRadians(f32, player.rotation)) * Meteor.METEORS_SPEED * -1,
);
} else {
smallMeteors[@intCast(smallMeteorsCount)].speed = raylib.Vector2.init(
@cos(std.math.degreesToRadians(f32, player.rotation)) * Meteor.METEORS_SPEED,
@sin(std.math.degreesToRadians(f32, player.rotation)) * Meteor.METEORS_SPEED,
);
}

smallMeteors[@intCast(smallMeteorsCount)].active = true;
smallMeteorsCount += 1;
}

NewAlien();

nextShieldLevel -= 8;
},
}
}
Expand All @@ -292,7 +366,34 @@ pub const AsteroidsViewModel = Shared.View.ViewModel.Create(
NewAlien();
},
.collide => {
shieldLevel = 0;
if (smallMeteors[i].position.x > player.collider.x) {
player.rotation = std.math.radiansToDegrees(f32, std.math.pi * 2 - std.math.degreesToRadians(f32, player.rotation));
} else if (smallMeteors[i].position.x < player.collider.x) {
player.rotation = std.math.radiansToDegrees(f32, std.math.pi * 2 - std.math.degreesToRadians(f32, player.rotation));
}
if (smallMeteors[i].position.y > player.collider.y) {
player.rotation = std.math.radiansToDegrees(f32, std.math.pi - std.math.degreesToRadians(f32, player.rotation));
} else if (smallMeteors[i].position.y < player.collider.y) {
player.rotation = std.math.radiansToDegrees(f32, std.math.pi - std.math.degreesToRadians(f32, player.rotation));
}

smallMeteorsCount -= 1;
smallMeteorsDestroyedCount += 1;

// After 4 small meteors are destroyed, create two big ones (until the max meteors is reached)
for (0..2) |_| {
if (bigMeteorsCount < MAX_BIG_METEORS and smallMeteorsDestroyedCount / 4 >= 1) {
bigMeteors[@intCast(bigMeteorsCount)].RandomizePositionAndSpeed(player, screenSize, true);
bigMeteors[@intCast(bigMeteorsCount)].active = true;

smallMeteorsDestroyedCount -= 4;
bigMeteorsCount += 1;
}
}

NewAlien();

nextShieldLevel -= 6;
},
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/Views/AsteroidsView.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,9 @@ fn DrawWithCamera() Shared.View.Views {
Shared.Color.Gray.Dark,
);

var scoreBuffer: [64]u8 = undefined;
Shared.Helpers.DrawTextRightAligned(
std.fmt.allocPrintZ(Shared.GetAllocator(), "Score: {}", .{vm.score}) catch "Score Unknown!",
std.fmt.bufPrintZ(&scoreBuffer, "Score: {}", .{vm.score}) catch "Score Unknown!",
Shared.Color.Blue.Light,
onePixelScaled * 10,
screenWidth - (5 * onePixelScaled),
Expand Down

0 comments on commit 3849466

Please sign in to comment.