MinPixels

Seldom-SE · May 31, 2024 · 4491d51 · 4491d51
1 parent f3c816b
commit 4491d51
Show file tree

Hide file tree

Showing 23 changed files with 78 additions and 44 deletions.
diff --git a/examples/anchors.rs b/examples/anchors.rs
@@ -13,7 +13,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::splat(32), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(32), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/animated_sprites.rs b/examples/animated_sprites.rs
@@ -13,7 +13,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::new(51, 35), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::new(51, 35), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/animated_text.rs b/examples/animated_text.rs
@@ -13,7 +13,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::splat(64), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(64), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/animated_tilemap.rs b/examples/animated_tilemap.rs
@@ -14,7 +14,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::splat(16), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(16), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/buttons.rs b/examples/buttons.rs
@@ -13,7 +13,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::splat(16), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(16), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/canvas.rs b/examples/canvas.rs
@@ -15,7 +15,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::splat(64), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(64), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/cursor.rs b/examples/cursor.rs
@@ -13,7 +13,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::splat(16), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(16), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/filter.rs b/examples/filter.rs
@@ -13,7 +13,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::splat(32), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(32), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/filter_layers.rs b/examples/filter_layers.rs
@@ -13,7 +13,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::new(64, 32), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::new(64, 32), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/layers.rs b/examples/layers.rs
@@ -13,7 +13,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::splat(32), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(32), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/line.rs b/examples/line.rs
@@ -13,7 +13,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::splat(32), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(32), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/palette_change.rs b/examples/palette_change.rs
@@ -21,7 +21,7 @@ fn main() {
                 UVec2::splat(64),
                 // This is the palette that assets will be loaded with
                 // It is also the palette that assets will be displayed with, until changed
-                "palette/palette_1.palette.png".into(),
+                "palette/palette_1.palette.png",
             ),
         ))
         .insert_resource(ClearColor(Color::BLACK))

diff --git a/examples/particles.rs b/examples/particles.rs
@@ -15,7 +15,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::splat(32), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(32), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/sprite.rs b/examples/sprite.rs
@@ -13,7 +13,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::splat(16), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(16), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/sprite_filter.rs b/examples/sprite_filter.rs
@@ -13,7 +13,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::splat(32), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(32), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/state.rs b/examples/state.rs
@@ -18,7 +18,7 @@ fn main() {
             }),
             InputManagerPlugin::<Action>::default(),
             StateMachinePlugin,
-            PxPlugin::<Layer>::new(UVec2::splat(16), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(16), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/text.rs b/examples/text.rs
@@ -13,7 +13,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::splat(64), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(64), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/text_filter.rs b/examples/text_filter.rs
@@ -13,7 +13,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::splat(64), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(64), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/tilemap.rs b/examples/tilemap.rs
@@ -14,7 +14,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::splat(16), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(16), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/examples/tilemap_filter.rs b/examples/tilemap_filter.rs
@@ -14,7 +14,7 @@ fn main() {
                 }),
                 ..default()
             }),
-            PxPlugin::<Layer>::new(UVec2::splat(16), "palette/palette_1.palette.png".into()),
+            PxPlugin::<Layer>::new(UVec2::splat(16), "palette/palette_1.palette.png"),
         ))
         .insert_resource(ClearColor(Color::BLACK))
         .add_systems(Startup, init)

diff --git a/src/cursor.rs b/src/cursor.rs
@@ -79,11 +79,11 @@ fn update_cursor_position(
         **position = None;
         return;
     };
-    let new_position = new_position / screen_tf.scale.truncate() * screen.size.as_vec2()
-        + screen.size.as_vec2() / 2.;
+    let new_position = new_position / screen_tf.scale.truncate() * screen.computed_size.as_vec2()
+        + screen.computed_size.as_vec2() / 2.;
 
     **position = (new_position.cmpge(Vec2::ZERO).all()
-        && new_position.cmplt(screen.size.as_vec2()).all())
+        && new_position.cmplt(screen.computed_size.as_vec2()).all())
     .then(|| new_position.as_uvec2());
 }
 

diff --git a/src/position.rs b/src/position.rs
@@ -21,7 +21,7 @@ macro_rules! align_to_screen {
                     };
 
                     **pos = align.as_uvec2().as_ivec2()
-                        * (screen.size.as_ivec2() - size.as_ivec2())
+                        * (screen.computed_size.as_ivec2() - size.as_ivec2())
                         + anchor.pos(size).as_ivec2();
                 });
         }

diff --git a/src/screen.rs b/src/screen.rs
@@ -43,36 +43,55 @@ pub(crate) fn screen_plugin<L: PxLayer>(size: ScreenSize) -> impl FnOnce(&mut Ap
                 (
                     update_screen,
                     (
-                        (
-                            clear_screen,
-                            (apply_deferred, draw_screen::<L>)
-                                .chain()
-                                .in_set(PxSet::Draw),
-                        )
-                            .chain(),
-                        resize_screen,
-                        update_screen_palette,
-                    ),
+                        (clear_screen, resize_screen),
+                        draw_screen::<L>.in_set(PxSet::Draw),
+                    )
+                        .chain(),
+                    update_screen_palette,
                 ),
             );
     }
 }
 
 /// Size of the image which `seldom_pixel` draws to
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug)]
 pub enum ScreenSize {
     /// The screen will have the given dimensions, which is scaled up to fit the window, preserving
     /// the given dimensions' aspect ratio
     Fixed(UVec2),
-    /// The screen will match the aspect ratio of the window, with dimensions with at least as many
+    /// The screen will match the aspect ratio of the window, with an area of at least as many
     /// pixels as given
     MinPixels(u32),
 }
 
+impl From<UVec2> for ScreenSize {
+    fn from(value: UVec2) -> Self {
+        Self::Fixed(value)
+    }
+}
+
+impl ScreenSize {
+    fn compute(self, window_size: Vec2) -> UVec2 {
+        use ScreenSize::*;
+
+        match self {
+            Fixed(size) => size,
+            MinPixels(pixels) => {
+                let pixels = pixels as f32;
+                let width = (window_size.x * pixels / window_size.y).sqrt();
+                let height = pixels / width;
+
+                UVec2::new(width as u32, height as u32)
+            }
+        }
+    }
+}
+
 #[derive(Clone, Resource)]
 pub(crate) struct Screen {
     pub(crate) image: Handle<Image>,
     pub(crate) size: ScreenSize,
+    pub(crate) computed_size: UVec2,
 }
 
 #[derive(Component)]
@@ -106,10 +125,7 @@ fn insert_screen(
 ) -> impl Fn(ResMut<Assets<Image>>, Query<&Window, With<PrimaryWindow>>, Commands) {
     move |mut images, windows, mut commands| {
         let window = windows.single();
-        let computed_size = size.compute(UVec2::new(
-            window.physical_width(),
-            window.physical_height(),
-        ));
+        let computed_size = size.compute(Vec2::new(window.width(), window.height()));
 
         commands.insert_resource(Screen {
             image: images.add(Image {
@@ -162,8 +178,11 @@ fn init_screen(
     }
 
     let (entity, window) = windows.single();
-    let calculated_screen_scale =
-        screen_scale(screen.size, Vec2::new(window.width(), window.height())).extend(1.);
+    let calculated_screen_scale = screen_scale(
+        screen.computed_size,
+        Vec2::new(window.width(), window.height()),
+    )
+    .extend(1.);
 
     commands.spawn((
         MaterialMesh2dBundle {
@@ -192,13 +211,28 @@ fn init_screen(
 fn resize_screen(
     mut window_resized: EventReader<WindowResized>,
     mut screens: Query<&mut Transform, With<ScreenMarker>>,
-    screen: Res<Screen>,
+    mut screen: ResMut<Screen>,
+    mut images: ResMut<Assets<Image>>,
 ) {
     if let Some(window_resized) = window_resized.read().last() {
+        let window_size = Vec2::new(window_resized.width, window_resized.height);
+        let computed_size = screen.size.compute(window_size);
+
+        if computed_size != screen.computed_size {
+            let image = images.get_mut(&screen.image).unwrap();
+            image.data = vec![0; (computed_size.x * computed_size.y) as usize];
+
+            let size = &mut image.texture_descriptor.size;
+            size.width = computed_size.x;
+            size.height = computed_size.y;
+        }
+
+        screen.computed_size = computed_size;
+
         let mut transform = screens.single_mut();
 
         transform.scale = screen_scale(
-            screen.size,
+            computed_size,
             Vec2::new(window_resized.width, window_resized.height),
         )
         .extend(1.);