Use SDL3 (#6)

* sdl3

* sdl3

* WIP

* bindgen

* WIP

* update sdl3

Author: revmischa

.cargo/config.toml

@@ -0,0 +1,3 @@
+[env]
+# use pipewire for audio
+SDL_AUDIODRIVER = "pipewire"

.gitignore

@@ -1,4 +1,2 @@
-.*
-!.gitignore
-
-target/
+.vscode/
+target/

Cargo.lock

@@ -1,19 +1,22 @@
 [package]
 name = "projectm_sdl"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 rust-version = "1.68.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 libc = "*"
-sdl2 = "0.35"
-projectm-rs = "1.0.5"
-# projectm-rs = { path = "../projectm-rs" }
-#projectm-rs = { git = "https://github.com/projectM-visualizer/projectm-rs" }
+projectm = "1.0.5"
+# projectm = { path = "../projectm-rs" }
+#projectm = { git = "https://github.com/projectM-visualizer/projectm" }
+# sdl3 = { git = "https://github.com/revmischa/sdl3-rs.git", features = ["use-bindgen"] }
+sdl3 = "0.5.0"
+# sdl3 = { path = "../../sdl3-rs" }
 
 # gl = "0.14.0"
 
 [features]
+static-link = ["sdl3/static-link"]
 dummy_audio = []

Cargo.toml

@@ -10,15 +10,15 @@
 
 <br />
 
-<h3 align="center">Frontend-SDL2-Rust</h3>
+<h3 align="center">ProjectM</h3>
 
   <p align="center">
-    Example rust app, utilizing the <a href="https://crates.io/crates/projectm-rs" target="_blank">projectM</a> crate
+    Reference projectM application in Rust, utilizing the <a href="https://crates.io/crates/projectm" target="_blank">projectM</a> crate
     <br />
     <br />
-    <a href="https://github.com/projectM-visualizer/frontend-sdl2-rust/issues" target="_blank">Report Bug</a>
+    <a href="https://github.com/projectM-visualizer/frontend-sdl-rust/issues" target="_blank">Report Bug</a>
     ·
-    <a href="https://github.com/projectM-visualizer/frontend-sdl2-rust/issues" target="_blank">Request Feature</a>
+    <a href="https://github.com/projectM-visualizer/frontend-sdl-rust/issues" target="_blank">Request Feature</a>
   </p>
 </div>
 
@@ -45,6 +45,7 @@
 <br />
 
 <!-- GETTING STARTED -->
+
 ## Getting Started
 
 To get this crate up and running properly, you'll need to install some prerequisites.
@@ -56,29 +57,29 @@ development files. To build projectM, both binaries and development files need t
 
 #### General build dependencies for all platforms:
 
-* [**Rust**](https://www.rust-lang.org/tools/install)
-* A working build toolchain.
-* [**CMake**](https://cmake.org/): Used to generate platform-specific build files.
-* **OpenGL**: 3D graphics library. Used to render the visualizations.
-* or **GLES3**: OpenGL libraries for embedded systems, version 3. Required to build projectM on Android devices,
+- [**Rust**](https://www.rust-lang.org/tools/install)
+- A working build toolchain.
+- [**CMake**](https://cmake.org/): Used to generate platform-specific build files.
+- **OpenGL**: 3D graphics library. Used to render the visualizations.
+- or **GLES3**: OpenGL libraries for embedded systems, version 3. Required to build projectM on Android devices,
   Raspberry Pi, Emscripten and the Universal Windows Platform.
-* [**glm**](https://github.com/g-truc/glm):  OpenGL Mathematics library. Optional, will use a bundled version with
+- [**glm**](https://github.com/g-truc/glm): OpenGL Mathematics library. Optional, will use a bundled version with
   autotools or if not installed.
-* [**SDL2**](https://github.com/libsdl-org/SDL): Simple Directmedia Layer. Version 2.0.5 or higher is required to build
+- [**SDL3**](https://github.com/libsdl-org/SDL): Simple Directmedia Layer >= 3. Provided by sdl3-rs.
   the test UI.
-* [**LLVM**](https://llvm.org/): Low-Level Virtual Machine. Optional and **experimental**, used to speed up preset
+- [**LLVM**](https://llvm.org/): Low-Level Virtual Machine. Optional and **experimental**, used to speed up preset
   execution by leveraging the LLVM JIT compiler.
 
 #### Only relevant for Windows:
 
-* [**vcpkg**](https://github.com/microsoft/vcpkg): C++ Library Manager for Windows. _Optional_, but recommended to
+- [**vcpkg**](https://github.com/microsoft/vcpkg): C++ Library Manager for Windows. _Optional_, but recommended to
   install the aforementioned library dependencies.
-* [**GLEW**](http://glew.sourceforge.net/): The OpenGL Extension Wrangler Library. Only required if using CMake to
-  configure the build, the pre-created solutions use a bundled copy of GLEW.
+- [**GLEW**](http://glew.sourceforge.net/): The OpenGL Extension Wrangler Library. Only required if using CMake to
+configure the build, the pre-created solutions use a bundled copy of GLEW.
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
-
 <!-- USAGE EXAMPLES -->
+
 ## Usage
 
 ```
@@ -92,8 +93,8 @@ cargo build
 ### If using SDL installed via Homebrew
 
 ```
-RUSTFLAGS="-L$(brew --prefix sdl2)/lib" cargo build
-RUSTFLAGS="-L$(brew --prefix sdl2)/lib" cargo run
+RUSTFLAGS="-L$(brew --prefix sdl3)/lib" cargo build
+RUSTFLAGS="-L$(brew --prefix sdl3)/lib" cargo run
 ```
 
 ### Optimized build
@@ -104,9 +105,8 @@ cargo run --release
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
-
-
 <!-- CONTRIBUTING -->
+
 ## Contributing
 
 Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
@@ -122,23 +122,24 @@ Don't forget to give the project a star! Thanks again!
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
-
-
 <!-- LICENSE -->
+
 ## License
 
 Distributed under the LGPL-2.1 license. See `LICENSE` for more information.
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
 <!-- SUPPORT -->
+
 ## Support
 
 [![Discord][discord-shield]][discord-url]
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
 <!-- CONTACT -->
+
 ## Contact
 
 Blaquewithaq (Discord: SoFloppy#1289) - [@anomievision](https://twitter.com/anomievision) - [email protected]
@@ -147,16 +148,17 @@ Blaquewithaq (Discord: SoFloppy#1289) - [@anomievision](https://twitter.com/anom
 
 <!-- MARKDOWN LINKS & IMAGES -->
 <!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
+
 [contributors-shield]: https://img.shields.io/github/contributors/projectM-visualizer/projectm-rs.svg?style=for-the-badge
-[contributors-url]: https://github.com/projectM-visualizer/frontend-sdl2-rust/graphs/contributors
+[contributors-url]: https://github.com/projectM-visualizer/frontend-sdl-rust/graphs/contributors
 [forks-shield]: https://img.shields.io/github/forks/projectM-visualizer/projectm-rs.svg?style=for-the-badge
-[forks-url]: https://github.com/projectM-visualizer/frontend-sdl2-rust/network/members
+[forks-url]: https://github.com/projectM-visualizer/frontend-sdl-rust/network/members
 [stars-shield]: https://img.shields.io/github/stars/projectM-visualizer/projectm-rs.svg?style=for-the-badge
-[stars-url]: https://github.com/projectM-visualizer/frontend-sdl2-rust/stargazers
+[stars-url]: https://github.com/projectM-visualizer/frontend-sdl-rust/stargazers
 [issues-shield]: https://img.shields.io/github/issues/projectM-visualizer/projectm-rs.svg?style=for-the-badge
-[issues-url]: https://github.com/projectM-visualizer/frontend-sdl2-rust/issues
+[issues-url]: https://github.com/projectM-visualizer/frontend-sdl-rust/issues
 [license-shield]: https://img.shields.io/github/license/projectM-visualizer/projectm-rs.svg?style=for-the-badge
-[license-url]: https://github.com/projectM-visualizer/frontend-sdl2-rust/blob/master/LICENSE
+[license-url]: https://github.com/projectM-visualizer/frontend-sdl-rust/blob/master/LICENSE
 [crates-shield]: https://img.shields.io/crates/v/projectm-rs?style=for-the-badge
 [crates-url]: https://crates.io/crates/projectm-rs
 [crates-dl-shield]: https://img.shields.io/crates/d/projectm-rs?style=for-the-badge

README.md

@@ -1,7 +1,7 @@
 use std::sync::{Arc, Mutex};
 
-use projectm_rs::core::{ProjectMHandle, Projectm};
-use sdl2::video::GLProfile;
+use projectm::core::{ProjectMHandle, Projectm};
+use sdl3::video::GLProfile;
 
 pub mod audio;
 pub mod config;
@@ -15,12 +15,12 @@ pub type ProjectMWrapped = Arc<Mutex<ProjectMHandle>>;
 /// Application state
 pub struct App {
     pm: ProjectMWrapped,
-    playlist: projectm_rs::playlist::Playlist,
-    sdl_context: sdl2::Sdl,
-    window: sdl2::video::Window,
+    playlist: projectm::playlist::Playlist,
+    sdl_context: sdl3::Sdl,
+    window: sdl3::video::Window,
     config: config::Config,
     audio: audio::Audio,
-    _gl_context: sdl2::video::GLContext,
+    _gl_context: sdl3::video::GLContext,
 }
 
 pub fn default_config() -> config::Config {
@@ -30,7 +30,13 @@ pub fn default_config() -> config::Config {
 impl App {
     pub fn new(config: Option<crate::app::config::Config>) -> Self {
         // setup sdl
-        let sdl_context = sdl2::init().unwrap();
+        let sdl_context = sdl3::init().unwrap();
+        // print SDL version
+        let version = sdl3::version::version();
+        println!(
+            "SDL version: {}.{}.{}",
+            version.major, version.minor, version.patch
+        );
         let video_subsystem = sdl_context.video().unwrap();
 
         // request GL version
@@ -45,14 +51,22 @@ impl App {
         // create window
         // get screen dimensions
         let display_index = 0;
-        let display_mode = video_subsystem.desktop_display_mode(display_index).unwrap();
-        let window_width = display_mode.w as u32;
-        let window_height = display_mode.h as u32;
+        let driver = video_subsystem.current_video_driver();
+        println!("Using video driver: {}", driver);
+        let display_id = video_subsystem.get_primary_display_id();
+        let display_mode = video_subsystem.current_display_mode(display_id).unwrap();
+        let window_width = 100; // display_mode.w as u32;
+        let window_height = 100; // display_mode.h as u32;
+        println!(
+            "Display {} is {}x{}",
+            display_index, window_width, window_height
+        );
         let window = video_subsystem
             .window("ProjectM", window_width, window_height)
             .opengl()
+            .maximized()
             .position_centered()
-            .allow_highdpi()
+            // .allow_highdpi()
             .build()
             .expect("could not initialize video subsystem");
 
@@ -64,10 +78,10 @@ impl App {
         let pm = Projectm::create();
 
         // and a preset playlist
-        let playlist = projectm_rs::playlist::Playlist::create(pm);
+        let playlist = projectm::playlist::Playlist::create(pm);
 
         // get/set window size
-        let (width, height) = window.drawable_size(); // highDPI aware
+        let (width, height) = window.size(); // TODO: need high DPI support here https://github.com/libsdl-org/SDL/issues/7134
         Projectm::set_window_size(pm, width.try_into().unwrap(), height.try_into().unwrap());
 
         // create a mutex to protect the projectM instance