Skip to content

Commit

Permalink
stop clone on score 10
Browse files Browse the repository at this point in the history
  • Loading branch information
@RGGH
RGGH committed Nov 14, 2024
1 parent 9b34458 commit 7bdfad2
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 70 deletions.
9 changes: 9 additions & 0 deletions src/image_utils.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,12 @@ pub fn draw_raindrop(buffer: &mut Vec<u32>, width: u32, height: u32, drop: &Rain
}
}
}

// Helper function to check collision between two rectangles
pub fn is_collision(rect1: (u32, u32, u32, u32), rect2: (u32, u32, u32, u32)) -> bool {
let (x1, y1, w1, h1) = rect1;
let (x2, y2, w2, h2) = rect2;

x1 < x2 + w2 && x1 + w1 > x2 && y1 < y2 + h2 && y1 + h1 > y2
}

101 changes: 31 additions & 70 deletions src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use minifb::{Key, Window, WindowOptions};
use rand::Rng;
use std::time::Instant;

use image_utils::{convert_to_mono, draw_raindrop, draw_square};
use image_utils::{convert_to_mono, draw_raindrop, draw_square, is_collision};

mod image_utils;

Expand All @@ -28,14 +28,10 @@ fn main() {

// Load both the mono and original backgrounds
let image_data = include_bytes!("background.png");
let original_background =
image::load_from_memory(image_data).expect("Failed to load original image");

let original_background = image::load_from_memory(image_data).expect("Failed to load original image");
let mono_background = convert_to_mono(image_data);

let (width, height) = image::load_from_memory(image_data)
.expect("Failed to load image")
.dimensions();
let (width, height) = original_background.dimensions();
let width = width as u32;
let height = height as u32;

Expand All @@ -44,38 +40,36 @@ fn main() {
width as usize,
height as usize,
WindowOptions::default(),
)
.expect("Unable to create window");
).expect("Unable to create window");

let mut square_x = width / 2 - SQUARE_SIZE / 2;
let mut square_y = height / 2 - SQUARE_SIZE / 2;
let mut current_square_size = SQUARE_SIZE;

// Initialize raindrops: they start falling from the top with staggered start times
let mut raindrops: Vec<Raindrop> = (0..NUM_DROPS)
.map(|i| Raindrop {
x: rand::thread_rng().gen_range(0..width - DROP_SIZE),
y: 0,
start_time: Instant::now() + std::time::Duration::from_secs_f32(i as f32 * DROP_DELAY), // Staggered start times
last_update: Instant::now(), // Set initial update time
start_time: Instant::now() + std::time::Duration::from_secs_f32(i as f32 * DROP_DELAY),
last_update: Instant::now(),
})
.collect();

let color_background = {
let mut buffer = vec![0; (width * height) as usize];
for (x, y, pixel) in original_background.pixels() {
let Rgba([r, g, b, a]) = pixel;
buffer[(y * width + x) as usize] =
(a as u32) << 24 | (r as u32) << 16 | (g as u32) << 8 | b as u32;
}
buffer
};

while window.is_open() && !window.is_key_down(Key::Escape) {
let mut buffer = if use_mono_background {
mono_background.clone()
let buffer: &mut Vec<u32> = if use_mono_background {
&mut mono_background.clone()
} else {
// Draw the original image when score is 10 or more
let (width, height) = original_background.dimensions();
let mut buffer = vec![0; (width * height) as usize];

for (x, y, pixel) in original_background.pixels() {
let Rgba([r, g, b, a]) = pixel;
buffer[(y * width + x) as usize] =
(a as u32) << 24 | (r as u32) << 16 | (g as u32) << 8 | b as u32;
}

buffer
&mut color_background.clone()
};

// Handle input to move the square
Expand All @@ -94,15 +88,11 @@ fn main() {

// Handle space bar to grow the square
if window.is_key_down(Key::Space) {
// Save the current square size
let old_size = current_square_size;
current_square_size = SQUARE_SIZE + SQUARE_SIZE_STEP;

// Adjust position to keep the square growing around its center
square_x -= (current_square_size - old_size) / 2;
square_y -= (current_square_size - old_size) / 2;
} else {
// Only reset the size, not the position
current_square_size = SQUARE_SIZE;
}

Expand All @@ -114,70 +104,41 @@ fn main() {
square_y = height - current_square_size;
}

// Draw the square on the background buffer
draw_square(
&mut buffer,
width,
height,
square_x,
square_y,
current_square_size,
);
draw_square(buffer, width, height, square_x, square_y, current_square_size);

// Update raindrop positions and draw them with staggered start
for drop in raindrops.iter_mut() {
if drop.start_time.elapsed().as_secs_f32() > 0.0 {
// Only move the raindrop if it0xFFFFFFFFs start time has passed
if drop.y < height - DROP_SIZE
&& drop.last_update.elapsed().as_secs_f32() > DROP_SPEED
{
// Update the position of the raindrop at a slower rate (controlled by DROP_SPEED)
if drop.y < height - DROP_SIZE && drop.last_update.elapsed().as_secs_f32() > DROP_SPEED {
drop.y += 1;
drop.last_update = Instant::now(); // Update the last update time
drop.last_update = Instant::now();
}
}
// Check for collision with the square
let drop_rect = (drop.x, drop.y, DROP_SIZE, DROP_SIZE);
let square_rect = (square_x, square_y, current_square_size, current_square_size);
if is_collision(drop_rect, square_rect) {
score += 1; // Increment score
drop.y = 0; // Reset raindrop to the top
drop.x = rand::thread_rng().gen_range(0..width - DROP_SIZE); // Randomize x position
score += 1;
drop.y = 0;
drop.x = rand::thread_rng().gen_range(0..width - DROP_SIZE);
}

// Draw the raindrop
draw_raindrop(&mut buffer, width, height, drop);
draw_raindrop(buffer, width, height, drop);
}

// Reset raindrops that have stuck at the bottom to the top for the next cycle
for drop in raindrops.iter_mut() {
if drop.y == height - DROP_SIZE {
drop.y = 0; // Reset to top
drop.x = rand::thread_rng().gen_range(0..width - DROP_SIZE); // Randomize position
drop.y = 0;
drop.x = rand::thread_rng().gen_range(0..width - DROP_SIZE);
}
}

// Clear the console and print the square coordinates
print!("\x1B[2J\x1B[1;1H"); // Clears the terminal screen
print!("\x1B[2J\x1B[1;1H");
println!("Square Position - x: {}, y: {}", square_x, square_y);

// Display the score on the console
println!("Score: {}", score);

if score >= 10 && use_mono_background {
use_mono_background = false;
}

window
.update_with_buffer(&buffer, width as usize, height as usize)
.expect("Failed to update window buffer");
window.update_with_buffer(&buffer, width as usize, height as usize).expect("Failed to update window buffer");
}
}


// Helper function to check collision between two rectangles
fn is_collision(rect1: (u32, u32, u32, u32), rect2: (u32, u32, u32, u32)) -> bool {
let (x1, y1, w1, h1) = rect1;
let (x2, y2, w2, h2) = rect2;

x1 < x2 + w2 && x1 + w1 > x2 && y1 < y2 + h2 && y1 + h1 > y2
}

0 comments on commit 7bdfad2

Please sign in to comment.