Merge pull request servo#11 from MortimerGoro/separate_crates

Separate rust-webvr traits to a different crate

Cargo.toml

@@ -1,45 +1,5 @@
-[package]
-name = "rust-webvr"
-version = "0.7.0"
-authors = ["Imanol Fernandez <[email protected]>"]
-
-homepage = "https://github.com/MortimerGoro/rust-webvr"
-repository = "https://github.com/MortimerGoro/rust-webvr"
-keywords = ["webvr", "openvr", "oculus", "headset", "vr"]
-license = "MIT"
-
-description = '''Safe rust API that provides a way to interact with Virtual Reality headsets 
-and integration with vendor specific SDKs like OpenVR and Oculus. The API is inspired on the 
-easy to use WebVR API but adapted to Rust design patterns'''
-
-exclude = [
- "examples/*",
+[workspace]
+members = [
+ "rust-webvr",
+ "rust-webvr-api",
 ]
-
-build = "build.rs"
-
-[package.metadata.android]
-package-name = "rust.webvr"
-
-[features]
-default = ["openvr", "mock"]
-openvr = ["libloading"]
-mock = []
-googlevr = ["gvr-sys"]
-oculusvr = ["ovr-mobile-sys"]
-serde-serialization = ["serde", "serde_derive"]
-
-[dependencies]
-log = "0.3"
-serde = { version = "1.0", optional = true }
-serde_derive = { version = "1.0", optional = true }
-time = "0.1"
-libloading = { version = "0.4", optional = true, default-features = false }
-gvr-sys = { version = "0.5", optional = true }
-ovr-mobile-sys = { version = "0.3.1", optional = true }
-
-[target.'cfg(target_os = "android")'.dependencies]
-android_injected_glue = "0.2.2"
-
-[build-dependencies]
-gl_generator = "0.5.0"

rust-webvr-api/Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+name = "rust-webvr-api"
+version = "0.8.0"
+authors = ["Imanol Fernandez <[email protected]>"]
+
+homepage = "https://github.com/MortimerGoro/rust-webvr"
+repository = "https://github.com/MortimerGoro/rust-webvr"
+keywords = ["webvr", "openvr", "oculus", "headset", "vr"]
+license = "MIT"
+
+description = '''Safe rust API that provides a way to interact with Virtual Reality headsets 
+and integration with vendor specific SDKs like OpenVR and Oculus. The API is inspired on the 
+easy to use WebVR API but adapted to Rust design patterns'''
+
+[features]
+default = ["utils", "jni_utils"]
+utils = ["time"]
+jni_utils = ["android_injected_glue"]
+serde-serialization = ["serde", "serde_derive"]
+
+[dependencies]
+serde = { version = "1.0", optional = true }
+serde_derive = { version = "1.0", optional = true }
+time = { version = "0.1", optional = true }
+
+[target.'cfg(target_os = "android")'.dependencies]
+android_injected_glue = { version = "0.2.2", optional = true }

src/api/jni_utils.rs → rust-webvr-api/src/jni_utils.rs

@@ -1,5 +1,4 @@
-#![cfg(any(feature = "googlevr", feature= "oculusvr"))]
-#![cfg(target_os = "android")]
+#[cfg(all(feature = "jni_utils", target_os = "android"))]
 
 use android_injected_glue as android;
 use android_injected_glue::ffi as ndk;

src/lib.rs → rust-webvr-api/src/lib.rs

@@ -3,30 +3,19 @@ macro_rules! identity_matrix {
  () => ([1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0]);
 }
 
-#[cfg(any(feature = "googlevr", feature= "oculusvr"))]
-#[cfg(target_os = "android")]
-extern crate android_injected_glue;
-#[cfg(feature = "googlevr")]
-extern crate gvr_sys;
-#[cfg(feature = "openvr")]
-extern crate libloading;
-#[macro_use]
-extern crate log;
-#[cfg(feature = "oculusvr")]
-extern crate ovr_mobile_sys;
-#[cfg(feature = "serde-serialization")]
-#[macro_use]
-extern crate serde_derive;
+#[cfg(all(feature = "jni_utils", target_os = "android"))]
+pub extern crate android_injected_glue;
+
+#[cfg(feature = "utils")]
 extern crate time;
 
-#[cfg(any(feature = "googlevr", feature= "oculusvr"))]
-mod gl {
- include!(concat!(env!("OUT_DIR"), "/gles_bindings.rs"));
-}
+#[cfg(all(feature = "jni_utils", target_os = "android"))]
+pub mod jni_utils;
+#[cfg(feature = "utils")]
+pub mod utils;
 
 pub mod vr_display;
 pub mod vr_service;
-pub mod vr_manager;
 pub mod vr_display_data;
 pub mod vr_display_capabilities;
 pub mod vr_eye;
@@ -42,7 +31,6 @@ pub mod vr_gamepad;
 
 pub use vr_display::{VRDisplay,VRDisplayPtr};
 pub use vr_service::{VRService,VRServiceCreator};
-pub use vr_manager::VRServiceManager;
 pub use vr_display_data::VRDisplayData;
 pub use vr_display_capabilities::VRDisplayCapabilities;
 pub use vr_eye::VREye;
@@ -56,5 +44,3 @@ pub use vr_event::{VREvent, VRDisplayEvent, VRDisplayEventReason, VRGamepadEvent
 pub use vr_field_view::VRFieldOfView;
 pub use vr_gamepad::{VRGamepad, VRGamepadPtr, VRGamepadHand,
  VRGamepadData, VRGamepadState, VRGamepadButton};
-
-pub mod api;

src/api/utils.rs → rust-webvr-api/src/utils.rs

@@ -1,3 +1,5 @@
+#[cfg(feature = "utils")]
+
 use std::mem;
 use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT};
 use std::sync::atomic::Ordering::SeqCst;

rust-webvr/Cargo.toml

@@ -0,0 +1,37 @@
+[package]
+name = "rust-webvr"
+version = "0.8.0"
+authors = ["Imanol Fernandez <[email protected]>"]
+
+homepage = "https://github.com/MortimerGoro/rust-webvr"
+repository = "https://github.com/MortimerGoro/rust-webvr"
+keywords = ["webvr", "openvr", "oculus", "headset", "vr"]
+license = "MIT"
+
+description = '''Safe rust API that provides a way to interact with Virtual Reality headsets 
+and integration with vendor specific SDKs like OpenVR and Oculus. The API is inspired on the 
+easy to use WebVR API but adapted to Rust design patterns'''
+
+exclude = [
+ "examples/*",
+]
+
+build = "build.rs"
+
+[features]
+default = ["openvr", "mock"]
+openvr = ["libloading"]
+mock = []
+googlevr = ["gvr-sys"]
+oculusvr = ["ovr-mobile-sys"]
+
+[dependencies]
+rust-webvr-api = "0.8" #{ path = "../rust-webvr-api" }
+log = "0.3"
+time = "0.1"
+libloading = { version = "0.4", optional = true, default-features = false }
+gvr-sys = { version = "0.5", optional = true }
+ovr-mobile-sys = { version = "0.3.1", optional = true }
+
+[build-dependencies]
+gl_generator = "0.5.0"

src/api/googlevr/display.rs → rust-webvr/src/api/googlevr/display.rs

@@ -2,9 +2,9 @@
 use {VRDisplay, VRDisplayData, VRDisplayCapabilities, VRFramebuffer, VRFramebufferAttributes,
  VREvent, VRDisplayEvent, VREyeParameters, VRFrameData, VRLayer, VRViewport};
 use super::service::GoogleVRService;
-use super::super::utils;
+use rust_webvr_api::utils;
 #[cfg(target_os="android")]
-use super::jni_utils::JNIScope;
+use rust_webvr_api::jni_utils::JNIScope;
 use gl;
 use gvr_sys as gvr;
 use gvr_sys::gvr_feature::*;

src/api/googlevr/gamepad.rs → rust-webvr/src/api/googlevr/gamepad.rs

@@ -1,6 +1,6 @@
 #![cfg(feature = "googlevr")]
 use {VRGamepad, VRGamepadData, VRGamepadHand, VRGamepadState, VRGamepadButton};
-use super::super::utils;
+use rust_webvr_api::utils;
 use gvr_sys as gvr;
 use gvr_sys::gvr_controller_api_status::*;
 use gvr_sys::gvr_controller_button::*;

src/api/googlevr/mod.rs → rust-webvr/src/api/googlevr/mod.rs

@@ -3,8 +3,6 @@
 mod display;
 mod gamepad;
 mod service;
-#[cfg(target_os = "android")]
-use super::jni_utils;
 
 use {VRService, VRServiceCreator};
 

src/api/googlevr/service.rs → rust-webvr/src/api/googlevr/service.rs

@@ -4,7 +4,7 @@ use {VRService, VRDisplay, VRDisplayPtr, VREvent, VRGamepadPtr};
 use super::display::{GoogleVRDisplay, GoogleVRDisplayPtr};
 use super::gamepad::{GoogleVRGamepad, GoogleVRGamepadPtr};
 #[cfg(target_os="android")]
-use super::jni_utils::JNIScope;
+use rust_webvr_api::jni_utils::JNIScope;
 #[cfg(target_os="android")]
 use android_injected_glue::ffi as ndk;
 use gvr_sys as gvr;

src/api/mock/display.rs → rust-webvr/src/api/mock/display.rs

@@ -1,5 +1,5 @@
 use {VRDisplay, VRDisplayData, VRFramebuffer, VRFramebufferAttributes, VRFrameData, VRStageParameters, VRLayer, VRViewport};
-use super::super::utils;
+use rust_webvr_api::utils;
 use std::sync::Arc;
 use std::cell::RefCell;
 pub type MockVRDisplayPtr = Arc<RefCell<MockVRDisplay>>;

src/api/mod.rs → rust-webvr/src/api/mod.rs

@@ -1,24 +1,16 @@
-mod utils;
-
-#[cfg(target_os="windows")]
-#[cfg(feature = "openvr")]
-mod openvr;
-#[cfg(target_os="windows")]
-#[cfg(feature = "openvr")]
-pub use self::openvr::OpenVRServiceCreator;
-
 #[cfg(feature = "mock")]
 mod mock;
 #[cfg(feature = "mock")]
 pub use self::mock::MockServiceCreator;
 
-#[cfg(target_os = "android")]
-#[cfg(any(feature = "googlevr", feature= "oculusvr"))]
-mod jni_utils;
+#[cfg(all(target_os="windows", feature = "openvr"))]
+mod openvr;
+#[cfg(all(target_os="windows", feature = "openvr"))]
+pub use self::openvr::OpenVRServiceCreator;
 
-#[cfg(feature = "googlevr")]
+#[cfg(all(feature = "googlevr", target_os= "android"))]
 mod googlevr;
-#[cfg(feature = "googlevr")]
+#[cfg(all(feature = "googlevr", target_os= "android"))]
 pub use self::googlevr::GoogleVRServiceCreator;
 #[cfg(all(feature = "googlevr", target_os= "android"))]
 pub use self::googlevr::jni::*;

src/api/oculusvr/display.rs → rust-webvr/src/api/oculusvr/display.rs

@@ -16,16 +16,15 @@ use std::ptr;
 use std::str;
 use std::sync::{Arc, Condvar, Mutex};
 use super::gamepad::{OculusVRGamepad, OculusVRGamepadPtr};
-use super::jni_utils::JNIScope;
+use rust_webvr_api::jni_utils::JNIScope;
 use super::service::{OVRJava, OVRServiceJava};
-use super::super::utils;
+use rust_webvr_api::utils;
 
 pub type OculusVRDisplayPtr = Arc<RefCell<OculusVRDisplay>>;
 
 extern {
  fn eglGetCurrentContext() -> *mut c_void;
  fn eglGetCurrentDisplay() -> *mut c_void;
- fn eglGetProcAddress(proc_name: *const c_char) -> *mut c_void;
  fn ANativeWindow_fromSurface(env: *mut c_void, surface: *mut c_void) -> *mut c_void;
 }
 
@@ -157,8 +156,9 @@ impl VRDisplay for OculusVRDisplay {
  }
 
  fn get_framebuffers(&self) -> Vec<VRFramebuffer> {
- self.eye_framebuffers.iter().map(|fbo| {
+ self.eye_framebuffers.iter().enumerate().map(|(index, fbo)| {
  VRFramebuffer {
+ id: index as u32,
  attributes: fbo.attributes,
  viewport: VRViewport::new(0, 0, fbo.width as i32, fbo.height as i32)
  }

src/api/oculusvr/gamepad.rs → rust-webvr/src/api/oculusvr/gamepad.rs

@@ -11,7 +11,7 @@ use std::mem;
 use std::ptr;
 use std::sync::Arc;
 use super::display::{ovr_quat_to_array, ovr_vec3_to_array};
-use super::super::utils;
+use rust_webvr_api::utils;
 
 pub type OculusVRGamepadPtr = Arc<RefCell<OculusVRGamepad>>;
 

src/api/oculusvr/mod.rs → rust-webvr/src/api/oculusvr/mod.rs

@@ -4,7 +4,6 @@
 mod display;
 mod gamepad;
 mod service;
-use super::jni_utils;
 
 use {VRService, VRServiceCreator};
 

src/api/oculusvr/service.rs → rust-webvr/src/api/oculusvr/service.rs

@@ -8,7 +8,7 @@ use ovr_mobile_sys as ovr;
 use std::mem;
 use std::ptr;
 use super::display::{OculusVRDisplay, OculusVRDisplayPtr};
-use super::jni_utils::JNIScope;
+use rust_webvr_api::jni_utils::JNIScope;
 
 const SERVICE_CLASS_NAME:&'static str = "com/rust/webvr/OVRService"; 
 

src/api/openvr/display.rs → rust-webvr/src/api/openvr/display.rs

@@ -9,7 +9,7 @@ use super::binding::ETrackingUniverseOrigin::*;
 use super::binding::EGraphicsAPIConvention::*;
 use super::library::OpenVRLibrary;
 use super::constants;
-use super::super::utils;
+use rust_webvr_api::utils;
 use std::ffi::CString;
 use std::sync::Arc;
 use std::cell::RefCell;

src/api/openvr/gamepad.rs → rust-webvr/src/api/openvr/gamepad.rs

@@ -3,7 +3,7 @@ use super::binding::ETrackingUniverseOrigin::*;
 use super::binding::EVRButtonId;
 use super::binding::EVRButtonId::*;
 use super::display::OpenVRDisplay;
-use super::super::utils;
+use rust_webvr_api::utils;
 use std::cell::RefCell;
 use std::mem;
 use std::sync::Arc;

rust-webvr/src/lib.rs

@@ -0,0 +1,24 @@
+extern crate rust_webvr_api;
+#[cfg(all(feature = "googlevr", target_os= "android"))]
+extern crate gvr_sys;
+#[cfg(feature = "openvr")]
+extern crate libloading;
+#[macro_use]
+extern crate log;
+#[cfg(all(feature = "oculusvr", target_os= "android"))]
+extern crate ovr_mobile_sys;
+#[cfg(feature = "serde-serialization")]
+#[macro_use]
+extern crate serde_derive;
+extern crate time;
+
+#[cfg(any(feature = "googlevr", feature= "oculusvr"))]
+mod gl {
+ include!(concat!(env!("OUT_DIR"), "/gles_bindings.rs"));
+}
+
+pub mod api;
+mod vr_manager;
+
+pub use rust_webvr_api::*;
+pub use vr_manager::VRServiceManager;