diff --git a/Cargo.toml b/Cargo.toml index 61d0c68..83bba96 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,2 +1,2 @@ [workspace] -members = ["libodm"] +members = ["libodm", "odm"] diff --git a/libodm/Cargo.toml b/libodm/Cargo.toml index e1277e2..06919f1 100644 --- a/libodm/Cargo.toml +++ b/libodm/Cargo.toml @@ -8,7 +8,9 @@ build = "build.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] - +libc = "0.2.95" +log = "0.4.14" [build-dependencies] -cc = "1.0" \ No newline at end of file +cc = "1.0" +pkg-config = "0.3.19" \ No newline at end of file diff --git a/libodm/build.rs b/libodm/build.rs index cda7aee..0bd7048 100644 --- a/libodm/build.rs +++ b/libodm/build.rs @@ -1,3 +1,18 @@ fn main() { - cc::Build::new().file("cpp/wrapper.cc").flag("-Wno-deprecated").flag("-Wno-deprecated-copy").compile("foo"); + + // Compile the LeapMotion wrapper (and Leap itself) + cc::Build::new().file("cpp/wrapper.cc").flag("-Wno-deprecated").flag("-Wno-deprecated-copy").flag("-L lib").flag("-lLeap").flag("-lstdc++").compile("foo"); + // pkg_config::Config::new().probe("Leap").unwrap(); + + // Set up the linker to include Leap + println!("cargo:rustc-link-search=native=libodm/lib"); + println!("cargo:rustc-link-lib=Leap"); + + // Set up the linker to include stdc++ + println!("cargo:rustc-link-lib=static-nobundle=stdc++"); + + // Make cargo auto-rebuild these files + println!("cargo:rerun-if-changed=libodm/build.rs"); + println!("cargo:rerun-if-changed=libodm/cpp/wrapper.cc"); + println!("cargo:rerun-if-changed=libodm/cpp/listener.cc"); } diff --git a/libodm/cpp/wrapper.cc b/libodm/cpp/wrapper.cc index 6585d1f..3951ebb 100644 --- a/libodm/cpp/wrapper.cc +++ b/libodm/cpp/wrapper.cc @@ -4,18 +4,15 @@ using namespace Leap; //---- Start Public Functions ----// -extern "C" -{ - void beginEventLoop(); - bool isControllerCreated(); - void endEventLoop(); - bool imageExists(); - int getImageHeight(); - int getImageWidth(); - int getImageBPP(); - const unsigned char *getImageLeft(); - const unsigned char *getImageRight(); -} +extern "C" void beginEventLoop(); +extern "C" bool isControllerCreated(); +extern "C" void endEventLoop(); +extern "C" bool imageExists(); +extern "C" int getImageHeight(); +extern "C" int getImageWidth(); +extern "C" int getImageBPP(); +extern "C" const unsigned char *getImageLeft(); +extern "C" const unsigned char *getImageRight(); //---- End Public Functions ----// //---- Start Globals ----// @@ -45,10 +42,10 @@ void beginEventLoop() void endEventLoop() { - if (controller != nullptr) - { - delete controller; - } + // if (controller != nullptr) + // { + // delete controller; + // } } bool isControllerCreated() { return controller != nullptr; } diff --git a/libodm/src/ffi.rs b/libodm/src/ffi.rs deleted file mode 100644 index e69de29..0000000 diff --git a/libodm/src/leapmotion/device.rs b/libodm/src/leapmotion/device.rs new file mode 100644 index 0000000..04c9484 --- /dev/null +++ b/libodm/src/leapmotion/device.rs @@ -0,0 +1,45 @@ +use crate::leapmotion::ffi::endEventLoop; + +use super::ffi; + +#[derive(Debug)] +pub enum DeviceError { + InstanceError, +} + +pub struct LeapMotionDevice {} + +impl LeapMotionDevice { + + /// Creates a LeapMotionDevice by talking to the device driver. This can only be called once + pub fn create_device() -> Result { + log::debug!("Creating LeapMotion device access"); + + // Handle possible error with multiple instances + unsafe { + if ffi::isControllerCreated() { + log::error!( + "Tried to create access to a LeapMotion device when an instance already exists" + ); + return Err(DeviceError::InstanceError); + } + } + + // Create an instance along with its handlers + unsafe { + ffi::beginEventLoop(); + } + + log::debug!("Device created"); + Ok(Self {}) + } +} + +impl Drop for LeapMotionDevice { + fn drop(&mut self) { + log::debug!("Informing wrapper to deallocate LeapMotion device"); + unsafe{ + ffi::endEventLoop(); + } + } +} \ No newline at end of file diff --git a/libodm/src/leapmotion/ffi.rs b/libodm/src/leapmotion/ffi.rs new file mode 100644 index 0000000..fd41286 --- /dev/null +++ b/libodm/src/leapmotion/ffi.rs @@ -0,0 +1,12 @@ + +extern { + pub fn beginEventLoop(); + pub fn isControllerCreated() -> bool; + pub fn endEventLoop(); + pub fn imageExists() -> bool; + pub fn getImageHeight() -> libc::c_int; + pub fn getImageWidth()-> libc::c_int; + pub fn getImageBPP() -> libc::c_int; + pub fn getImageLeft() -> *const u8; + pub fn getImageRight() -> *const u8; +} \ No newline at end of file diff --git a/libodm/src/leapmotion/mod.rs b/libodm/src/leapmotion/mod.rs new file mode 100644 index 0000000..aeab22a --- /dev/null +++ b/libodm/src/leapmotion/mod.rs @@ -0,0 +1,2 @@ +pub(self) mod ffi; +pub mod device; \ No newline at end of file diff --git a/libodm/src/lib.rs b/libodm/src/lib.rs index 580df78..5a99a68 100644 --- a/libodm/src/lib.rs +++ b/libodm/src/lib.rs @@ -1 +1,3 @@ -mod ffi; \ No newline at end of file +#![feature(static_nobundle)] + +pub mod leapmotion; \ No newline at end of file diff --git a/odm/Cargo.toml b/odm/Cargo.toml new file mode 100644 index 0000000..c10af91 --- /dev/null +++ b/odm/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "odm" +version = "0.1.0" +authors = ["Evan Pratten "] +edition = "2018" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +libodm = { version = "0.1.0", path = "../libodm"} +clap = "2.33.3" diff --git a/odm/src/main.rs b/odm/src/main.rs new file mode 100644 index 0000000..9d30ac2 --- /dev/null +++ b/odm/src/main.rs @@ -0,0 +1,11 @@ +use std::time::Duration; + +use libodm::leapmotion::device::LeapMotionDevice; + +fn main() { + + // Init a device + let device = LeapMotionDevice::create_device().unwrap(); + + std::thread::sleep(Duration::from_secs(1)); +} diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..386218b --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "nightly-2021-05-29" +components = [ "rustfmt", "rustc-dev", "rls" ] +targets = [ "x86_64-unknown-linux-gnu" ] \ No newline at end of file