Skip to content

Commit

Permalink
test gameplay
Browse files Browse the repository at this point in the history
  • Loading branch information
@stutxo
stutxo committed Apr 7, 2024
1 parent 32fd93d commit 5533ec7
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 20 deletions.
4 changes: 2 additions & 2 deletions docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ <h1 style="text-align: center; color: #333;">blockwars.gg</h1>
<script>
//This is a base64 encoded WebAssembly binary, it is 33% bigger than the original .wasm binary, im just testing it out.
// Base64WasmStart
const base64Wasm = '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';
const base64Wasm = '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';
// Base64WasmEnd
const canvas = document.getElementById('canvas');

Expand All @@ -125,6 +125,7 @@ <h1 style="text-align: center; color: #333;">blockwars.gg</h1>
2: [255, 0, 255, 255], // Magenta //Target Teleporter
3: [0, 255, 255, 255], // Cyan //Teleporter
4: [255, 165, 0, 255], // Orange //Completed Teleporter
5: [255, 0, 0, 255], // Red //Player
};
const blockHeightInput = document.getElementById('block-input');

Expand Down Expand Up @@ -337,7 +338,6 @@ <h1 style="text-align: center; color: #333;">blockwars.gg</h1>
for (var i = 0; i < hexString.length; i += 2) {
byteArray.push(parseInt(hexString.slice(i, i + 2), 16));
}
console.log(byteArray);
return byteArray;
}
}
Expand Down
144 changes: 126 additions & 18 deletions src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,20 @@ use core::ptr;
const WIDTH: u8 = 255;
const HEIGHT: u8 = 255;

const MAX_TELEPORT: usize = 10;
const TELEPORT_SIZE: u8 = 5;
const TELEPORT_SPEED: f32 = 15.;

const TELEPORT_NONE: core::option::Option<(f32, f32, f32)> = None;
static mut TELEPORT: [Option<(f32, f32, f32)>; MAX_TELEPORT] = [TELEPORT_NONE; MAX_TELEPORT];

const MAX_TELEPORT: usize = 10;
const TELEPORT_SIZE: u8 = 5;
const TELEPORT_SPEED: f32 = 20.;
const MAX_ENEMY: usize = 20;
const ENEMY_HEIGHT: u8 = 5;
const ENEMY_WIDTH: u8 = 5;

const GRID_WIDTH: usize = (WIDTH as usize) / TELEPORT_SIZE as usize;
const GRID_HEIGHT: usize = (HEIGHT as usize) / TELEPORT_SIZE as usize;
const ENEMY_SPEED: f32 = 20.;

static mut ENEMY: [(f32, f32, f32, f32); MAX_ENEMY] = [(0., 0., 0., 0.); MAX_ENEMY];

#[no_mangle]
static mut INPUT: [u8; 1] = [0; 1];
Expand All @@ -29,16 +34,18 @@ static mut SEED: [u32; 32] = [0; 32];
#[inline]
#[no_mangle]
unsafe extern "C" fn blockwars() {
DRAW.iter_mut().for_each(|b| *b = 0);
if RESET[0] == 1 {
RESET[0] = 0;
INPUT[0] = 0;
spawn_tele(&mut *ptr::addr_of_mut!(TELEPORT), SEED);
DRAW.iter_mut().for_each(|b| *b = 0);
spawn_enemy(&mut *ptr::addr_of_mut!(ENEMY), SEED);
} else {
frame_safe(
&mut *ptr::addr_of_mut!(DRAW),
&mut *ptr::addr_of_mut!(TELEPORT),
&mut *ptr::addr_of_mut!(INPUT),
&mut *ptr::addr_of_mut!(ENEMY),
);
}
}
Expand All @@ -49,31 +56,33 @@ fn frame_safe(
draw: &mut [u32; 255 * 255],
teleporters: &mut [Option<(f32, f32, f32)>; MAX_TELEPORT],
input: &mut [u8; 1],
enemies: &mut [(f32, f32, f32, f32); MAX_ENEMY],
) {
update_tele_pos(teleporters, input);
render_frame(draw, teleporters);
if input[0] == 1 {
move_player(teleporters, input);
check_collision(teleporters, enemies);
}
move_enemy(enemies);
render_frame(draw, teleporters, enemies);
}

#[inline]
fn spawn_tele(teleporters: &mut [Option<(f32, f32, f32)>; MAX_TELEPORT], rng: [u32; 32]) {
let teleporter_size = TELEPORT_SIZE as usize;
let max_index_x = GRID_WIDTH - 1;
let max_index_y = GRID_HEIGHT - 1;
let max_index_x = WIDTH as usize - ENEMY_WIDTH as usize;
let max_index_y = HEIGHT as usize - ENEMY_HEIGHT as usize;

let raw_random_value = rng[30] ^ rng[31];
let scaled_random_value = (raw_random_value % 7) + 3;

let num_teleporters = scaled_random_value as usize;

for i in 0..num_teleporters {
let random_value_x = rng[i] ^ rng[31 - i];
let random_value_x = rng[i] ^ rng[(31 - i) % rng.len()];

let mut x = (random_value_x as usize % max_index_x) * teleporter_size;
x = x.min((WIDTH as usize) - teleporter_size);
let x = random_value_x % max_index_x as u32;

let random_value_y = rng[i] ^ rng[30 - i];
let mut y = (random_value_y as usize % max_index_y) * teleporter_size;
y = y.min((HEIGHT as usize) - teleporter_size);
let random_value_y = rng[i] ^ rng[(30 - i) % rng.len()];
let y = random_value_y % max_index_y as u32;

teleporters[i] = Some((
x as f32,
Expand All @@ -92,7 +101,57 @@ fn spawn_tele(teleporters: &mut [Option<(f32, f32, f32)>; MAX_TELEPORT], rng: [u
}

#[inline]
fn update_tele_pos(teleporters: &mut [Option<(f32, f32, f32)>; MAX_TELEPORT], input: &mut [u8; 1]) {
fn spawn_enemy(enemies: &mut [(f32, f32, f32, f32); MAX_ENEMY], rng: [u32; 32]) {
let max_index_x = WIDTH as usize - ENEMY_WIDTH as usize;
let max_index_y = HEIGHT as usize - ENEMY_HEIGHT as usize;

for i in 0..MAX_ENEMY {
let random_value_x = rng[i] ^ rng[(31 - i) % rng.len()];

let x = random_value_x % max_index_x as u32 + 20;

let random_value_y = rng[i] ^ rng[(30 - i) % rng.len()];

let y = random_value_y % max_index_y as u32 + 20;

let raw_random_value = rng[i] ^ rng[31];
let scaled_random_value = (raw_random_value % 5) + 1;

enemies[i] = (x as f32, y as f32, scaled_random_value as f32, 0.);
}
}

#[inline]
fn move_enemy(enemies: &mut [(f32, f32, f32, f32); MAX_ENEMY]) {
for enemy in enemies.iter_mut() {
let (x, y, state, count) = enemy;
let movement_count = 30.0; // Number of steps to move in one direction

if *count >= movement_count {
*state = match *state {
1.0 => 2.0, // After moving right, move up
2.0 => 3.0, // After moving up, move left
3.0 => 4.0, // After moving left, move down
4.0 => 1.0, // After moving down, move right again
_ => 1.0, // Default to moving right if state is unknown
};
*count = 1.0; // Reset count after changing direction
} else {
*count += 1.0; // Increment count for each step in the current direction
}

match *state {
1.0 => *x += 1.0, // Move right
2.0 => *y -= 1.0, // Move up (assuming y decreases as you go up)
3.0 => *x -= 1.0, // Move left
4.0 => *y += 1.0, // Move down
_ => (),
}
}
}

#[inline]
fn move_player(teleporters: &mut [Option<(f32, f32, f32)>; MAX_TELEPORT], input: &mut [u8; 1]) {
if input[0] == 1 {
if let Some((current, target)) = find_teleporter_targets(teleporters) {
if let (Some(current_pos), Some(target_pos)) =
Expand Down Expand Up @@ -169,17 +228,60 @@ fn find_teleporter_targets(
Some((current_index, next_target_index))
}

fn check_collision(
teleporters: &mut [Option<(f32, f32, f32)>; MAX_TELEPORT],
enemies: &mut [(f32, f32, f32, f32); MAX_ENEMY],
) {
// Iterate over teleporters and enemies to check for collisions
for teleporter in teleporters.iter_mut() {
if let Some((tele_x, tele_y, tele_state)) = teleporter {
if *tele_state == 1.0 {
// Check if the teleporter is in the specified state
for enemy in enemies.iter_mut() {
let (mut enemy_x, mut enemy_y, _, _) = *enemy;

// Determine the horizontal and vertical distances between the teleporter and enemy centers
let horizontal_distance = if tele_x > &mut enemy_x {
*tele_x - enemy_x
} else {
enemy_x - *tele_x
};
let vertical_distance = if tele_y > &mut enemy_y {
*tele_y - enemy_y
} else {
enemy_y - *tele_y
};

// Determine the combined half-widths and half-heights
let combined_half_width = TELEPORT_SIZE as f32 / 2.0 + ENEMY_WIDTH as f32 / 2.0;
let combined_half_height =
TELEPORT_SIZE as f32 / 2.0 + ENEMY_HEIGHT as f32 / 2.0;

// Check if the teleporter and enemy overlap
if horizontal_distance < combined_half_width
&& vertical_distance < combined_half_height
{
*tele_state = 0.0;
}
}
}
}
}
}

#[inline]
fn render_frame(
draw: &mut [u32; 255 * 255],
teleporters: &mut [Option<(f32, f32, f32)>; MAX_TELEPORT],
enemies: &mut [(f32, f32, f32, f32); MAX_ENEMY],
) {
let mut draw_rect = |x: f32, y: f32, width: u8, height: u8, state: u32| {
for dy in 0..height {
for dx in 0..width {
let index =
(y + f32::from(dy)) as usize * WIDTH as usize + (x + f32::from(dx)) as usize;
if index < draw.len() {
draw[index] = 0;
draw[index] = state;
}
}
Expand All @@ -194,6 +296,12 @@ fn render_frame(
}
}
}
for enemy in enemies.iter() {
let (x, y, enemy_state, _) = enemy;
if *enemy_state == state as f32 {
draw_rect(*x, *y, ENEMY_WIDTH, ENEMY_HEIGHT, 5);
}
}
}
}

Expand Down

0 comments on commit 5533ec7

Please sign in to comment.