Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/bin/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,20 @@ fn main() {
);

let end_scene = init_end_scene("src/bin/resources/game_over.jpg", None);
// let end_scene = init_end_scene("src/bin/resources/game_over.jpg", Some(4000));
let mut engine = init_engine(scene, end_scene, WIDTH, HEIGHT);

let main_pos_arc = engine.main_pos.clone();
let end_scene_flag = engine.is_end_scene_active.clone();
let mut prev_x = 0;
std::thread::spawn(move || {
loop {
let (x, y) = *main_pos_arc.read().unwrap();
println!("position of main object is ({}, {})", x, y);
if x > 150 {
if x > 150 && prev_x <= 150 {
end_scene_flag.store(true, std::sync::atomic::Ordering::SeqCst);
}
prev_x = x;
}
});

Expand Down
16 changes: 4 additions & 12 deletions src/engine/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,6 @@ impl Engine for GameEngine {
let main_pos_arc = self.main_pos.clone();

let is_end_scene_active = self.is_end_scene_active.clone();
let start_scene = self
.render
.read()
.unwrap()
.scene_manager
.active_scene
.clone();
let new_background = renderer
.read()
.unwrap()
Expand All @@ -157,11 +150,10 @@ impl Engine for GameEngine {
thread::sleep(Duration::from_millis(50));
};

//dbg!("Producer has started");

let screen_size = (WIDTH * HEIGHT) as usize;
loop {
if is_end_scene_active.load(Ordering::SeqCst) {
let prev_scene = renderer.read().unwrap().scene_manager.active_scene.clone();
let prev_background = renderer
.write()
.unwrap()
Expand Down Expand Up @@ -200,15 +192,15 @@ impl Engine for GameEngine {
}
}
renderer.write().unwrap().scene_manager = SceneManager::new(
start_scene.clone(),
renderer.read().unwrap().scene_manager.end_scene.clone(),
prev_scene,
EndScene::new(new_background.clone(), timeout_ms),
);
renderer
.write()
.unwrap()
.set_background(prev_background)
.unwrap();
is_end_scene_active.store(true, std::sync::atomic::Ordering::SeqCst);
is_end_scene_active.store(false, std::sync::atomic::Ordering::SeqCst);
}
/*let vector_move = match *key_pressed_clone.read().unwrap() {
Some(KeyCode::KeyW) => (0, 1),
Expand Down