From d985cb2fadc9a038a27eaa0d1d705c2df4c7f85a Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sun, 25 Apr 2021 15:10:42 -0400 Subject: [PATCH 1/2] fix texture trait --- src/items.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/items.rs b/src/items.rs index f83afd1..3866b45 100644 --- a/src/items.rs +++ b/src/items.rs @@ -1,12 +1,14 @@ -use raylib::texture::Texture2D; +use raylib::{math::Rectangle, prelude::RaylibDrawHandle, texture::Texture2D}; use serde::{Deserialize, Serialize}; +use crate::resources::GlobalResources; + pub trait ItemBase { fn get_cost(&self) -> u32; fn get_level(&self) -> u8; fn get_name(&self) -> String; fn get_description(&self) -> String; - fn get_texture(&self) -> &Texture2D; + fn get_texture(&self, draw_handle: &RaylibDrawHandle, resources: &GlobalResources, dest: Rectangle); } #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)] @@ -57,7 +59,7 @@ impl ItemBase for StunGun { return "Stun your enemies!\nJust don't point it at yourself.".to_string(); } - fn get_texture(&self) -> &Texture2D { + fn get_texture(&self, draw_handle: &RaylibDrawHandle, resources: &GlobalResources, dest: Rectangle) { todo!() } fn get_level(&self) -> u8 { @@ -109,7 +111,7 @@ impl ItemBase for AirBag { return "Its.. a bag.\nFilled with air. Duh".to_string(); } - fn get_texture(&self) -> &Texture2D { + fn get_texture(&self, draw_handle: &RaylibDrawHandle, resources: &GlobalResources, dest: Rectangle) { todo!() } fn get_level(&self) -> u8 { @@ -161,7 +163,7 @@ impl ItemBase for Flashlight { return "See better for longer".to_string(); } - fn get_texture(&self) -> &Texture2D { + fn get_texture(&self, draw_handle: &RaylibDrawHandle, resources: &GlobalResources, dest: Rectangle) { todo!() } fn get_level(&self) -> u8 { @@ -213,7 +215,7 @@ impl ItemBase for Flippers { return "Swim faster, and look stupid\nat the same time!".to_string(); } - fn get_texture(&self) -> &Texture2D { + fn get_texture(&self, draw_handle: &RaylibDrawHandle, resources: &GlobalResources, dest: Rectangle) { todo!() } fn get_level(&self) -> u8 { From 25c98de3bab5c6beefafbba6ad32dd9b27461be9 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sun, 25 Apr 2021 15:13:29 -0400 Subject: [PATCH 2/2] fix pause menu graphics --- src/logic/pausemenu.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/logic/pausemenu.rs b/src/logic/pausemenu.rs index 48a3d3d..375dec5 100644 --- a/src/logic/pausemenu.rs +++ b/src/logic/pausemenu.rs @@ -26,8 +26,11 @@ impl Screen for PauseMenuScreen { game_core: &mut GameCore, ) -> Option { let mouse_position = draw_handle.get_mouse_position(); - draw_handle.clear_background(Color::GRAY); - // TODO: Maybe we can stick some art here? + // draw_handle.clear_background(Color::GRAY); + // // TODO: Maybe we can stick some art here? + + // Render the background + draw_handle.draw_texture(&game_core.resources.shop_background, 0, 0, Color::WHITE); // If escape is pressed again, return to the previous render state if draw_handle.is_key_pressed(KeyboardKey::KEY_ESCAPE) {