breaking up app into pieces

Author: revmischa

Cargo.lock

@@ -8,4 +8,5 @@ edition = "2021"
 [dependencies]
 libc = "*"
 sdl2 = "0.35.2"
-projectm-rs = "^1.0.4"
+# projectm-rs = "^1.0.4"
+projectm-rs = { path = "../projectm-rs" }

Cargo.toml

@@ -0,0 +1,89 @@
+use sdl2::event::Event;
+use sdl2::keyboard::Keycode;
+
+use projectm_rs::core::{projectm, projectm_handle};
+
+use crate::dummy_audio;
+
+pub struct App {
+    pm: projectm_handle,
+    sdl_context: sdl2::Sdl,
+    canvas: sdl2::render::Canvas<sdl2::video::Window>,
+}
+
+impl App {
+    pub fn new() -> Self {
+        let pm = projectm::create();
+
+        // setup sdl
+        let sdl_context = sdl2::init().unwrap();
+        let video_subsystem = sdl_context.video().unwrap();
+        // let audio_subsystem = sdl_context.audio()?;
+
+        // create window
+        // get screen dimensions
+        let mut display_index = 0;
+        let display_mode = video_subsystem.desktop_display_mode(display_index).unwrap();
+        let mut window_width = display_mode.w as u32;
+        let mut window_height = display_mode.h as u32;
+        let window = video_subsystem
+            .window("frontend-sdl2-rust", window_width, window_height)
+            .position_centered()
+            .build()
+            .expect("could not initialize video subsystem");
+
+        // create canvas/renderer
+        let canvas = window
+            .into_canvas()
+            .build()
+            .expect("could not make a canvas");
+
+        // projectm::init
+        let projectm_handle = projectm::create();
+
+        projectm::set_window_size(
+            projectm_handle,
+            canvas.output_size().unwrap().0.try_into().unwrap(),
+            canvas.output_size().unwrap().1.try_into().unwrap(),
+        );
+        println!("projectm initialized!");
+        Self {
+            pm,
+            sdl_context,
+            canvas,
+        }
+    }
+
+    pub fn main_loop(&mut self) {
+        // events
+        let mut event_pump = self.sdl_context.event_pump().unwrap();
+
+        // renderLoop
+        'running: loop {
+            // check for event
+            for event in event_pump.poll_iter() {
+                match event {
+                    Event::Quit { .. }
+                    | Event::KeyDown {
+                        keycode: Some(Keycode::Escape),
+                        ..
+                    } => {
+                        break 'running;
+                    }
+                    _ => {}
+                }
+            }
+
+            // generate random audio
+            dummy_audio::generate_random_audio_data(self.pm);
+
+            // projectm::render
+            unsafe {
+                projectm::render_frame(self.pm);
+            }
+
+            // present/render
+            self.canvas.present();
+        }
+    }
+}

src/app.rs

@@ -0,0 +1,17 @@
+use projectm_rs::core::{projectm, projectm_handle};
+
+pub fn generate_random_audio_data(projectm_handle: projectm_handle) {
+    let mut pcm_data: [[libc::c_short; 512]; 2] = [[0; 512]; 2];
+    let mut i: libc::c_int = 0 as libc::c_int;
+    while i < 512 as libc::c_int {
+        if i % 2 as libc::c_int == 1 as libc::c_int {
+            pcm_data[0 as libc::c_int as usize][i as usize] =
+                -(pcm_data[0 as libc::c_int as usize][i as usize] as libc::c_int) as libc::c_short;
+            pcm_data[1 as libc::c_int as usize][i as usize] =
+                -(pcm_data[1 as libc::c_int as usize][i as usize] as libc::c_int) as libc::c_short
+        }
+        i += 1
+    }
+
+    projectm::pcm_add_int16(projectm_handle, &pcm_data[0][0], 512, 2)
+}

src/dummy_audio.rs

@@ -0,0 +1,2 @@
+pub mod app;
+mod dummy_audio;

src/lib.rs

@@ -1,89 +1,13 @@
-use sdl2::event::Event;
-use sdl2::keyboard::Keycode;
 use projectm_rs::core::*;
 
-fn main() -> Result<(), String> {
-    // setup sdl
-    let sdl_context = sdl2::init()?;
-    let video_subsystem = sdl_context.video()?;
-    // let audio_subsystem = sdl_context.audio()?;
-
-    // create window
-    // get screen dimensions
-    let mut display_index = 0;
-    let display_mode = video_subsystem.desktop_display_mode(display_index)?;
-    let mut window_width = display_mode.w as u32;
-    let mut window_height = display_mode.h as u32;
-    let window = video_subsystem.window("frontend-sdl2-rust",  window_width, window_height)
-        .position_centered()
-        .build()
-        .expect("could not initialize video subsystem");
-    
-    // create canvas/renderer
-    let mut canvas = window.into_canvas().build()
-        .expect("could not make a canvas");
-
-
-    // projectm::init
-    let projectm_handle = unsafe {
-        projectm::create()
-    };
-
-    unsafe {
-        projectm::set_window_size(projectm_handle, canvas.output_size().unwrap().0.try_into().unwrap(), canvas.output_size().unwrap().1.try_into().unwrap())
-    }
-    println!("projectm initialized!");
-
-    // events
-    let mut event_pump = sdl_context.event_pump()?;
+use App;
 
-    // renderLoop
-    'running: loop {
-
-        // check for event
-        for event in event_pump.poll_iter() {
-            match event {
-                Event::Quit {..} |
-                Event::KeyDown { keycode: Some(Keycode::Escape), .. } => {
-                    break 'running;
-                },
-                _ => {}
-            }
-        }
+fn main() -> Result<(), String> {
+    let mut app = App::new();
 
-        // generate random audio
-        generate_random_audio_data(projectm_handle);
+    app.init();
 
-        // projectm::render
-        unsafe {
-            projectm::render_frame(projectm_handle);
-        }
-        
-        // present/render
-        canvas.present();
-    }
+    app.main_loop();
 
-    // finish okay
     Ok(())
 }
-
-fn generate_random_audio_data(projectm_handle: projectm_handle)
-{
-    let mut pcm_data: [[libc::c_short; 512]; 2] = [[0; 512]; 2];
-    let mut i: libc::c_int = 0 as libc::c_int;
-    while i < 512 as libc::c_int {
-        if i % 2 as libc::c_int == 1 as libc::c_int {
-            pcm_data[0 as libc::c_int as usize][i as usize] =
-                -(pcm_data[0 as libc::c_int as usize][i as usize] as
-                      libc::c_int) as libc::c_short;
-            pcm_data[1 as libc::c_int as usize][i as usize] =
-                -(pcm_data[1 as libc::c_int as usize][i as usize] as
-                      libc::c_int) as libc::c_short
-        }
-        i += 1
-    };
-
-    unsafe {
-        projectm::pcm_add_int16(projectm_handle, &pcm_data[0][0], 512, 2)
-    }
-}