at least it compiles now

Author: revmischa

changelog.md

@@ -5,7 +5,9 @@ when upgrading from a version of sdl3 to another.
 
 ## v0.1.0 - SDL3 Migration
 
-- The barest rewrite to support libSDL3. Almost certainly broken in many ways but an attempt to jump-start SDL3 support in Rust.
+Full documentation on changes in SDL3: https://github.com/libsdl-org/SDL/blob/main/docs/README-migration.md
+
+- The barest rewrite to support SDL3. Almost certainly broken in many ways but an attempt to jump-start SDL3 support in Rust.
 - The Gamecontroller subsystem was renamed to Gamepad.
 - Most coordinates for rectangles and points now use f32 instead of u32.
 - New distinctions between screen and pixel size for scaled displays.

examples/animation.rs

@@ -1,18 +1,20 @@
-extern crate sdl2;
+extern crate sdl3;
 use std::path::Path;
 
-use sdl2::event::Event;
-use sdl2::keyboard::Keycode;
-use sdl2::rect::Point;
-use sdl2::rect::Rect;
+use sdl3::event::Event;
+use sdl3::keyboard::Keycode;
+use sdl3::rect::Point;
+use sdl3::rect::Rect;
+use sdl3::render::FPoint;
+use sdl3::render::FRect;
 use std::time::Duration;
 
 fn main() -> Result<(), String> {
-    let sdl_context = sdl2::init()?;
+    let sdl_context = sdl3::init()?;
     let video_subsystem = sdl_context.video()?;
 
     let window = video_subsystem
-        .window("SDL2", 640, 480)
+        .window("sdl3", 640, 480)
         .position_centered()
         .build()
         .map_err(|e| e.to_string())?;
@@ -24,36 +26,36 @@ fn main() -> Result<(), String> {
         .map_err(|e| e.to_string())?;
     let texture_creator = canvas.texture_creator();
 
-    canvas.set_draw_color(sdl2::pixels::Color::RGBA(0, 0, 0, 255));
+    canvas.set_draw_color(sdl3::pixels::Color::RGBA(0, 0, 0, 255));
 
     let timer = sdl_context.timer()?;
 
     let mut event_pump = sdl_context.event_pump()?;
 
     // animation sheet and extras are available from
     // https://opengameart.org/content/a-platformer-in-the-forest
-    let temp_surface = sdl2::surface::Surface::load_bmp(Path::new("assets/characters.bmp"))?;
+    let temp_surface = sdl3::surface::Surface::load_bmp(Path::new("assets/characters.bmp"))?;
     let texture = texture_creator
         .create_texture_from_surface(&temp_surface)
         .map_err(|e| e.to_string())?;
 
     let frames_per_anim = 4;
-    let sprite_tile_size = (32, 32);
+    let sprite_tile_size = (32., 32.);
 
     // Baby - walk animation
-    let mut source_rect_0 = Rect::new(0, 0, sprite_tile_size.0, sprite_tile_size.0);
-    let mut dest_rect_0 = Rect::new(0, 0, sprite_tile_size.0 * 4, sprite_tile_size.0 * 4);
-    dest_rect_0.center_on(Point::new(-64, 120));
+    let mut source_rect_0 = FRect::new(0., 0., sprite_tile_size.0, sprite_tile_size.0);
+    let mut dest_rect_0 = FRect::new(0., 0., sprite_tile_size.0 * 4., sprite_tile_size.0 * 4.);
+    // dest_rect_0.center_on(FPoint::new(-64., 120.));
 
     // King - walk animation
-    let mut source_rect_1 = Rect::new(0, 32, sprite_tile_size.0, sprite_tile_size.0);
-    let mut dest_rect_1 = Rect::new(0, 32, sprite_tile_size.0 * 4, sprite_tile_size.0 * 4);
-    dest_rect_1.center_on(Point::new(0, 240));
+    let mut source_rect_1 = FRect::new(0., 32., sprite_tile_size.0, sprite_tile_size.0);
+    let mut dest_rect_1 = FRect::new(0., 32., sprite_tile_size.0 * 4., sprite_tile_size.0 * 4.);
+    // dest_rect_1.center_on(FPoint::new(0., 240.));
 
     // Soldier - walk animation
-    let mut source_rect_2 = Rect::new(0, 64, sprite_tile_size.0, sprite_tile_size.0);
-    let mut dest_rect_2 = Rect::new(0, 64, sprite_tile_size.0 * 4, sprite_tile_size.0 * 4);
-    dest_rect_2.center_on(Point::new(440, 360));
+    let mut source_rect_2 = FRect::new(0., 64., sprite_tile_size.0, sprite_tile_size.0);
+    let mut dest_rect_2 = FRect::new(0., 64., sprite_tile_size.0 * 4., sprite_tile_size.0 * 4.);
+    // dest_rect_2.center_on(Point::new(440, 360));
 
     let mut running = true;
     while running {

examples/game-controller.rs

@@ -1,9 +1,9 @@
-extern crate sdl2;
+extern crate sdl3;
 
 fn main() -> Result<(), String> {
     // This is required for certain controllers to work on Windows without the
     // video subsystem enabled:
-    sdl2::hint::set("SDL_JOYSTICK_THREAD", "1");
+    sdl3::hint::set("SDL_JOYSTICK_THREAD", "1");
 
     let sdl_context = sdl2::init()?;
     let game_controller_subsystem = sdl_context.game_controller()?;
@@ -44,8 +44,8 @@ fn main() -> Result<(), String> {
     let (mut lo_freq, mut hi_freq) = (0, 0);
 
     for event in sdl_context.event_pump()?.wait_iter() {
-        use sdl2::controller::Axis;
-        use sdl2::event::Event;
+        use sdl3::controller::Axis;
+        use sdl3::event::Event;
 
         match event {
             Event::ControllerAxisMotion {

src/sdl3/audio.rs

@@ -229,35 +229,35 @@ impl AudioSubsystem {
 #[derive(Copy, Clone, Eq, PartialEq, Debug, Hash)]
 pub enum AudioFormat {
     /// Unsigned 8-bit samples
-    U8 = sys::AUDIO_U8 as i32,
+    U8 = sys::SDL_AUDIO_U8 as i32,
     /// Signed 8-bit samples
-    S8 = sys::AUDIO_S8 as i32,
+    S8 = sys::SDL_AUDIO_S8 as i32,
     /// Signed 16-bit samples, little-endian
-    S16LSB = sys::AUDIO_S16LSB as i32,
+    S16LSB = sys::SDL_AUDIO_S16LSB as i32,
     /// Signed 16-bit samples, big-endian
-    S16MSB = sys::AUDIO_S16MSB as i32,
+    S16MSB = sys::SDL_AUDIO_S16MSB as i32,
     /// Signed 32-bit samples, little-endian
-    S32LSB = sys::AUDIO_S32LSB as i32,
+    S32LSB = sys::SDL_AUDIO_S32LSB as i32,
     /// Signed 32-bit samples, big-endian
-    S32MSB = sys::AUDIO_S32MSB as i32,
+    S32MSB = sys::SDL_AUDIO_S32MSB as i32,
     /// 32-bit floating point samples, little-endian
-    F32LSB = sys::AUDIO_F32LSB as i32,
+    F32LSB = sys::SDL_AUDIO_F32LSB as i32,
     /// 32-bit floating point samples, big-endian
-    F32MSB = sys::AUDIO_F32MSB as i32,
+    F32MSB = sys::SDL_AUDIO_F32MSB as i32,
 }
 
 impl AudioFormat {
     fn from_ll(raw: sys::SDL_AudioFormat) -> Option<AudioFormat> {
         use self::AudioFormat::*;
         match raw as u32 {
-            sys::AUDIO_U8 => Some(U8),
-            sys::AUDIO_S8 => Some(S8),
-            sys::AUDIO_S16LSB => Some(S16LSB),
-            sys::AUDIO_S16MSB => Some(S16MSB),
-            sys::AUDIO_S32LSB => Some(S32LSB),
-            sys::AUDIO_S32MSB => Some(S32MSB),
-            sys::AUDIO_F32LSB => Some(F32LSB),
-            sys::AUDIO_F32MSB => Some(F32MSB),
+            sys::SDL_AUDIO_U8 => Some(U8),
+            sys::SDL_AUDIO_S8 => Some(S8),
+            sys::SDL_AUDIO_S16LSB => Some(S16LSB),
+            sys::SDL_AUDIO_S16MSB => Some(S16MSB),
+            sys::SDL_AUDIO_S32LSB => Some(S32LSB),
+            sys::SDL_AUDIO_S32MSB => Some(S32MSB),
+            sys::SDL_AUDIO_F32LSB => Some(F32LSB),
+            sys::SDL_AUDIO_F32MSB => Some(F32MSB),
             _ => None,
         }
     }
@@ -289,11 +289,6 @@ impl AudioFormat {
 
 #[cfg(target_endian = "big")]
 impl AudioFormat {
-    /// Unsigned 16-bit samples, native endian
-    #[inline]
-    pub const fn u16_sys() -> AudioFormat {
-        AudioFormat::U16MSB
-    }
     /// Signed 16-bit samples, native endian
     #[inline]
     pub const fn s16_sys() -> AudioFormat {