From c6549e37a9e5eb89e241f4457922d33f12ad9500 Mon Sep 17 00:00:00 2001 From: gered Date: Sun, 16 Apr 2023 20:39:10 -0400 Subject: [PATCH] put all the prelude stuff into a single prelude module i still don't like this --- ggdt/src/audio/mod.rs | 2 -- ggdt/src/audio/prelude.rs | 8 ----- ggdt/src/graphics/bitmap/general.rs | 6 ++-- ggdt/src/graphics/bitmap/indexed/mod.rs | 10 ++++-- ggdt/src/graphics/bitmap/rgb/mod.rs | 10 ++++-- ggdt/src/graphics/mod.rs | 2 -- ggdt/src/graphics/prelude.rs | 34 ------------------ ggdt/src/math/mod.rs | 2 -- ggdt/src/math/prelude.rs | 8 ----- ggdt/src/prelude.rs | 48 +++++++++++++++++++++---- ggdt/src/system/mod.rs | 1 - ggdt/src/system/prelude.rs | 10 ------ ggdt/src/utils/mod.rs | 2 -- 13 files changed, 58 insertions(+), 85 deletions(-) delete mode 100644 ggdt/src/audio/prelude.rs delete mode 100644 ggdt/src/graphics/prelude.rs delete mode 100644 ggdt/src/math/prelude.rs delete mode 100644 ggdt/src/system/prelude.rs diff --git a/ggdt/src/audio/mod.rs b/ggdt/src/audio/mod.rs index e975f26..4f9abac 100644 --- a/ggdt/src/audio/mod.rs +++ b/ggdt/src/audio/mod.rs @@ -8,8 +8,6 @@ pub mod buffer; pub mod device; pub mod queue; -pub mod prelude; - /// The number of simultaneously playing audio channels supported by this library currently. pub const NUM_CHANNELS: usize = 8; diff --git a/ggdt/src/audio/prelude.rs b/ggdt/src/audio/prelude.rs deleted file mode 100644 index f7dfdac..0000000 --- a/ggdt/src/audio/prelude.rs +++ /dev/null @@ -1,8 +0,0 @@ -pub use crate::{ - // - audio::buffer::wav::*, - audio::buffer::*, - audio::device::*, - audio::queue::*, - audio::*, -}; diff --git a/ggdt/src/graphics/bitmap/general.rs b/ggdt/src/graphics/bitmap/general.rs index 624638e..1ff5dad 100644 --- a/ggdt/src/graphics/bitmap/general.rs +++ b/ggdt/src/graphics/bitmap/general.rs @@ -6,10 +6,8 @@ //! //! Only a subset of the most common Bitmap drawing operations will be provided here. -use crate::graphics::bitmap::indexed::blit::IndexedBlitMethod; -use crate::graphics::bitmap::indexed::IndexedBitmap; -use crate::graphics::bitmap::rgb::blit::RgbaBlitMethod; -use crate::graphics::bitmap::rgb::RgbaBitmap; +use crate::graphics::bitmap::indexed::{IndexedBitmap, IndexedBlitMethod}; +use crate::graphics::bitmap::rgb::{RgbaBitmap, RgbaBlitMethod}; use crate::graphics::bitmap::BitmapError; use crate::graphics::font::{Font, FontRenderOpts}; use crate::graphics::Pixel; diff --git a/ggdt/src/graphics/bitmap/indexed/mod.rs b/ggdt/src/graphics/bitmap/indexed/mod.rs index 2759e14..0639e4b 100644 --- a/ggdt/src/graphics/bitmap/indexed/mod.rs +++ b/ggdt/src/graphics/bitmap/indexed/mod.rs @@ -4,9 +4,13 @@ use crate::graphics::bitmap::rgb::RgbaBitmap; use crate::graphics::bitmap::{Bitmap, BitmapError}; use crate::graphics::palette::Palette; -pub mod blit; -pub mod primitives; -pub mod triangles; +mod blit; +mod primitives; +mod triangles; + +pub use blit::*; +pub use primitives::*; +pub use triangles::*; pub type IndexedBitmap = Bitmap; diff --git a/ggdt/src/graphics/bitmap/rgb/mod.rs b/ggdt/src/graphics/bitmap/rgb/mod.rs index 90ce758..8dfbd23 100644 --- a/ggdt/src/graphics/bitmap/rgb/mod.rs +++ b/ggdt/src/graphics/bitmap/rgb/mod.rs @@ -5,9 +5,13 @@ use crate::graphics::bitmap::{Bitmap, BitmapError}; use crate::graphics::color::{to_argb32, to_rgb32}; use crate::graphics::palette::Palette; -pub mod blit; -pub mod primitives; -pub mod triangles; +mod blit; +mod primitives; +mod triangles; + +pub use blit::*; +pub use primitives::*; +pub use triangles::*; pub type RgbaBitmap = Bitmap; diff --git a/ggdt/src/graphics/mod.rs b/ggdt/src/graphics/mod.rs index 789527e..e4135e7 100644 --- a/ggdt/src/graphics/mod.rs +++ b/ggdt/src/graphics/mod.rs @@ -8,8 +8,6 @@ pub mod color; pub mod font; pub mod palette; -pub mod prelude; - /// Common trait to represent single pixel/colour values. pub trait Pixel: PrimInt + Unsigned + Default + Display {} impl Pixel for T where T: PrimInt + Unsigned + Default + Display {} diff --git a/ggdt/src/graphics/prelude.rs b/ggdt/src/graphics/prelude.rs deleted file mode 100644 index 062b816..0000000 --- a/ggdt/src/graphics/prelude.rs +++ /dev/null @@ -1,34 +0,0 @@ -pub use crate::graphics::{ - // - bitmap::{ - blit::*, - general::*, - gif::*, - iff::*, - indexed::{ - // - blit::*, - primitives::*, - triangles::*, - *, - }, - pcx::*, - png::*, - primitives::*, - rgb::{ - // - blit::*, - primitives::*, - triangles::*, - *, - }, - triangles::*, - *, - }, - bitmapatlas::*, - blendmap::*, - color::*, - font::*, - palette::*, - *, -}; diff --git a/ggdt/src/math/mod.rs b/ggdt/src/math/mod.rs index 60912c9..b7d70ee 100644 --- a/ggdt/src/math/mod.rs +++ b/ggdt/src/math/mod.rs @@ -5,8 +5,6 @@ pub mod matrix3x3; pub mod rect; pub mod vector2; -pub mod prelude; - pub const PI: f32 = std::f32::consts::PI; // 180 degrees pub const HALF_PI: f32 = PI / 2.0; diff --git a/ggdt/src/math/prelude.rs b/ggdt/src/math/prelude.rs deleted file mode 100644 index 8510901..0000000 --- a/ggdt/src/math/prelude.rs +++ /dev/null @@ -1,8 +0,0 @@ -pub use crate::math::{ - // - circle::*, - matrix3x3::*, - rect::*, - vector2::*, - *, -}; diff --git a/ggdt/src/prelude.rs b/ggdt/src/prelude.rs index a74be7b..8f731ab 100644 --- a/ggdt/src/prelude.rs +++ b/ggdt/src/prelude.rs @@ -1,16 +1,52 @@ pub use crate::{ // - audio::prelude::*, + audio::{ + buffer::{wav::*, *}, + device::*, + queue::*, + *, + }, base::*, entities::*, events::*, - graphics::prelude::*, - math::prelude::*, + graphics::{ + // + bitmap::{ + blit::*, general::*, gif::*, iff::*, indexed::*, pcx::*, png::*, primitives::*, rgb::*, triangles::*, *, + }, + bitmapatlas::*, + blendmap::*, + color::*, + font::*, + palette::*, + *, + }, + math::{ + // + circle::*, + matrix3x3::*, + rect::*, + vector2::*, + *, + }, states::*, system::{ - prelude::*, - res::{dos_like::*, standard::*}, + event::*, // + input_devices::{ + keyboard::{codes::*, scancodes::*, *}, + mouse::{buttons::*, cursor::*, *}, + *, + }, + res::{dos_like::*, standard::*, *}, + *, + }, + utils::{ + // + bytes::*, + io::*, + lzwgif::*, + packbits::*, + *, }, - utils::prelude::*, *, }; diff --git a/ggdt/src/system/mod.rs b/ggdt/src/system/mod.rs index fc93346..b22a425 100644 --- a/ggdt/src/system/mod.rs +++ b/ggdt/src/system/mod.rs @@ -9,7 +9,6 @@ pub mod input_devices; pub mod res; mod framebuffer; -pub mod prelude; fn is_x11_compositor_skipping_problematic() -> bool { /* diff --git a/ggdt/src/system/prelude.rs b/ggdt/src/system/prelude.rs deleted file mode 100644 index 8f3b8e9..0000000 --- a/ggdt/src/system/prelude.rs +++ /dev/null @@ -1,10 +0,0 @@ -pub use crate::system::{ - event::*, // - input_devices::{ - keyboard::{codes::*, scancodes::*, *}, - mouse::{buttons::*, cursor::*, *}, - *, - }, - res::*, - *, -}; diff --git a/ggdt/src/utils/mod.rs b/ggdt/src/utils/mod.rs index c7cf42e..06d1cd5 100644 --- a/ggdt/src/utils/mod.rs +++ b/ggdt/src/utils/mod.rs @@ -9,8 +9,6 @@ pub mod io; pub mod lzwgif; pub mod packbits; -pub mod prelude; - pub fn rnd_value(low: N, high: N) -> N { rand::thread_rng().gen_range(low..=high) }