gered/ggdt
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add more useful methods to GeneralBitmap trait and impls

Browse source
This commit is contained in:
Gered 2023-04-14 12:19:28 -04:00
parent e0a4ea9c5b
commit babb70cf30
1 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
ggdt/src/graphics/bitmap/general.rs
View file

@ -11,6 +11,7 @@ use crate::graphics::bitmap::indexed::IndexedBitmap;
use crate::graphics::bitmap::rgb::blit::RgbaBlitMethod; use crate::graphics::bitmap::rgb::blit::RgbaBlitMethod;
use crate::graphics::bitmap::rgb::RgbaBitmap; use crate::graphics::bitmap::rgb::RgbaBitmap;
use crate::graphics::bitmap::BitmapError; use crate::graphics::bitmap::BitmapError;
use crate::graphics::font::{Font, FontRenderOpts};
use crate::graphics::Pixel; use crate::graphics::Pixel;
use crate::math::rect::Rect; use crate::math::rect::Rect;
@ -35,6 +36,12 @@ pub trait GeneralBitmap: Sized + Clone {
/// Returns the height of the bitmap in pixels. /// Returns the height of the bitmap in pixels.
fn height(&self) -> u32; fn height(&self) -> u32;
/// Returns the right x coordinate of the bitmap.
fn right(&self) -> u32;
/// Returns the bottom x coordinate of the bitmap.
fn bottom(&self) -> u32;
/// Returns the current clipping region set on this bitmap. /// Returns the current clipping region set on this bitmap.
fn clip_region(&self) -> &Rect; fn clip_region(&self) -> &Rect;
@ -81,6 +88,12 @@ pub trait GeneralBitmap: Sized + Clone {
/// Draws a filled circle formed by the center point and radius given. /// Draws a filled circle formed by the center point and radius given.
fn filled_circle(&mut self, center_x: i32, center_y: i32, radius: u32, color: Self::PixelType); fn filled_circle(&mut self, center_x: i32, center_y: i32, radius: u32, color: Self::PixelType);
/// Renders a single character using the font given.
fn print_char<T: Font>(&mut self, ch: char, x: i32, y: i32, opts: FontRenderOpts<Self::PixelType>, font: &T);
/// Renders the string of text using the font given.
fn print_string<T: Font>(&mut self, text: &str, x: i32, y: i32, opts: FontRenderOpts<Self::PixelType>, font: &T);
fn blit_region( fn blit_region(
&mut self, &mut self,
method: GeneralBlitMethod<Self::PixelType>, method: GeneralBlitMethod<Self::PixelType>,
@ -111,6 +124,14 @@ impl GeneralBitmap for IndexedBitmap {
self.height() self.height()
} }
fn right(&self) -> u32 {
self.right()
}
fn bottom(&self) -> u32 {
self.bottom()
}
fn clip_region(&self) -> &Rect { fn clip_region(&self) -> &Rect {
self.clip_region() self.clip_region()
} }
@ -159,6 +180,14 @@ impl GeneralBitmap for IndexedBitmap {
self.filled_circle(center_x, center_y, radius, color) self.filled_circle(center_x, center_y, radius, color)
} }
fn print_char<T: Font>(&mut self, ch: char, x: i32, y: i32, opts: FontRenderOpts<Self::PixelType>, font: &T) {
self.print_char(ch, x, y, opts, font);
}
fn print_string<T: Font>(&mut self, text: &str, x: i32, y: i32, opts: FontRenderOpts<Self::PixelType>, font: &T) {
self.print_string(text, x, y, opts, font);
}
fn blit_region( fn blit_region(
&mut self, &mut self,
method: GeneralBlitMethod<Self::PixelType>, method: GeneralBlitMethod<Self::PixelType>,
@ -190,6 +219,14 @@ impl GeneralBitmap for RgbaBitmap {
self.height() self.height()
} }
fn right(&self) -> u32 {
self.right()
}
fn bottom(&self) -> u32 {
self.bottom()
}
fn clip_region(&self) -> &Rect { fn clip_region(&self) -> &Rect {
self.clip_region() self.clip_region()
} }
@ -238,6 +275,14 @@ impl GeneralBitmap for RgbaBitmap {
self.filled_circle(center_x, center_y, radius, color) self.filled_circle(center_x, center_y, radius, color)
} }
fn print_char<T: Font>(&mut self, ch: char, x: i32, y: i32, opts: FontRenderOpts<Self::PixelType>, font: &T) {
self.print_char(ch, x, y, opts, font);
}
fn print_string<T: Font>(&mut self, text: &str, x: i32, y: i32, opts: FontRenderOpts<Self::PixelType>, font: &T) {
self.print_string(text, x, y, opts, font);
}
fn blit_region( fn blit_region(
&mut self, &mut self,
method: GeneralBlitMethod<Self::PixelType>, method: GeneralBlitMethod<Self::PixelType>,