diff --git a/openxr/src/localization_map_ml.rs b/openxr/src/localization_map_ml.rs index 6178ae0e..ac079388 100644 --- a/openxr/src/localization_map_ml.rs +++ b/openxr/src/localization_map_ml.rs @@ -2,32 +2,18 @@ use crate::*; #[derive(Clone)] pub struct LocalizationMapML { - inner: sys::LocalizationMapML, + pub name: String, + pub map_uuid: UuidEXT, + pub map_type: LocalizationMapTypeML, } impl LocalizationMapML { #[inline] pub fn from_raw(inner: sys::LocalizationMapML) -> Self { - Self { inner } - } - #[inline] - pub fn as_raw(&self) -> sys::LocalizationMapML { - self.inner - } - #[inline] - pub fn name(&self) -> &str { - unsafe { - std::ffi::CStr::from_ptr(self.inner.name.as_ptr()) - .to_str() - .unwrap() + Self { + name: unsafe { fixed_str(&inner.name).into() }, + map_uuid: inner.map_uuid, + map_type: inner.map_type, } } - #[inline] - pub fn map_uuid(&self) -> UuidEXT { - self.inner.map_uuid - } - #[inline] - pub fn map_type(&self) -> LocalizationMapTypeML { - self.inner.map_type - } }