mirror of
https://github.com/mii443/rust-openvr.git
synced 2025-08-23 00:35:31 +00:00
WIP first half of the api
This commit is contained in:
Colin Sherratt
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,6 +1,3 @@
|
||||
[submodule "modules/cgmath"]
|
||||
path = modules/cgmath
|
||||
url = https://github.com/bjz/cgmath-rs
|
||||
[submodule "thirdparty/OculusSDK"]
|
||||
path = modules/OculusSDK
|
||||
url = https://github.com/jherico/OculusSDK.git
|
||||
|
||||
10
configure
vendored
10
configure
vendored
@ -170,15 +170,15 @@ def write_makefile(modules):
|
||||
|
||||
|
||||
modules = [Bin("oculus-info", ["oculus-vr"]),
|
||||
LibMakefile("libovr_wrapper.a", "src/oculus-vr/", "src/oculus-vr/libovr_wrapper.a", ["cgmath", "libOculusVR.a"]),
|
||||
LibCMake("libOculusVR.a", "modules/OculusSDK/LibOVR/", "modules/OculusSDK/LibOVR/libOculusVR.a"),
|
||||
Lib("cgmath")]
|
||||
|
||||
if platform.system() == "Linux":
|
||||
modules += [Lib("oculus-vr", ["libOculusVR.a", "libedid.a", "cgmath", "libovr_wrapper.a"]),
|
||||
LibCMake("libedid.a", "modules/OculusSDK/3rdParty/EDID/", "modules/OculusSDK/3rdParty/EDID/libedid.a")]
|
||||
modules += [Lib("oculus-vr", ["libovr.a", "cgmath"]),
|
||||
LibMakefile("libovr.a",
|
||||
"modules/OculusSDK/",
|
||||
"modules/OculusSDK/LibOVR/Lib/Linux/Release/x86_64/libovr.a")]
|
||||
|
||||
elif platform.system() == "Darwin":
|
||||
modules += [Lib("oculus-vr", ["libOculusVR.a", "cgmath", "libovr_wrapper.a"])]
|
||||
modules += [Lib("oculus-vr", ["libovr.a", "cgmath"])]
|
||||
|
||||
write_makefile(modules)
|
||||
Submodule modules/OculusSDK deleted from edf1c772a4
@ -2,10 +2,61 @@
|
||||
|
||||
extern crate ovr = "oculus-vr";
|
||||
|
||||
fn main() {
|
||||
ovr::init();
|
||||
use ovr::{SensorCapabilities, Ovr};
|
||||
|
||||
let dm = match ovr::DeviceManager::new() {
|
||||
fn main() {
|
||||
let ovr = match Ovr::init() {
|
||||
Some(ovr) => ovr,
|
||||
None => {
|
||||
println!("Could not initialize Oculus SDK");
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
let hmd = match ovr.first_hmd() {
|
||||
Some(hmd) => hmd,
|
||||
None => {
|
||||
println!("Could not get hmd");
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
let started = hmd.start_sensor(SensorCapabilities::new().set_orientation(true),
|
||||
SensorCapabilities::new().set_orientation(true));
|
||||
|
||||
if !started {
|
||||
println!("Could not start sensor");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
match hmd.get_sensor_description() {
|
||||
Some(sd) => {
|
||||
println!("Vendor id: {:x}", sd.vendor_id);
|
||||
println!("Product id: {:x}", sd.product_id);
|
||||
println!("Serial number: {:s}", sd.serial_number);
|
||||
}
|
||||
None => println!("Failed to get sensor description"),
|
||||
}
|
||||
|
||||
let hmd_desc = hmd.get_description();
|
||||
|
||||
println!("Hmd Type: {:?}", hmd_desc.hmd_type);
|
||||
println!("Product Name: {:s}", hmd_desc.product_name);
|
||||
println!("Manufacture: {:s}", hmd_desc.manufacture);
|
||||
println!("Hmd Capabilities: {:?}", hmd_desc.hmd_capabilities);
|
||||
println!("Sensor Capabilities: {:?}", hmd_desc.sensor_capabilities);
|
||||
println!("Distorion Capabilities: {}", hmd_desc.distortion_capabilities);
|
||||
println!("Resolution: {:?}", hmd_desc.resolution);
|
||||
println!("Window Position: {:?}", hmd_desc.window_position);
|
||||
println!("Default eye field of view: {:?}", hmd_desc.default_eye_fov);
|
||||
println!("Max eye field of view: {:?}", hmd_desc.max_eye_fov);
|
||||
println!("Eyes render order: {:?}", hmd_desc.eye_render_order);
|
||||
println!("Display device name: {:s}", hmd_desc.display_device_name);
|
||||
println!("Display idr: {}", hmd_desc.display_id);
|
||||
|
||||
|
||||
/*let dm = match ovr::DeviceManager::new() {
|
||||
Some(dm) => dm,
|
||||
None => {
|
||||
println!("Could not initialize Oculus Device Manager");
|
||||
@ -56,5 +107,5 @@ fn main() {
|
||||
println!("Chroma Ab Correction: {:?}", info.chroma_ab_correction());
|
||||
println!("display name: {:s}", info.name());
|
||||
println!("display id: {:?}", info.id());
|
||||
println!("display x,y {:?}", info.desktop());
|
||||
println!("display x,y {:?}", info.desktop());*/
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
|
||||
LIBOVR_INCLUDE_PATH=../../modules/OculusSDK/LibOVR/Include/
|
||||
LIBOVR_LIB_PATH=../../modules/OculusSDK/LibOVR/Lib/Linux/Release/x86_64/libovr.a
|
||||
|
||||
all: libovr_wrapper.a
|
||||
|
||||
clean:
|
||||
-rm wrapper.o libovr_wrapper.a
|
||||
|
||||
libovr_wrapper.a: wrapper.o
|
||||
ar rcs libovr_wrapper.a wrapper.o
|
||||
|
||||
wrapper.o: wrapper.cpp
|
||||
c++ -fPIC -I $(LIBOVR_INCLUDE_PATH) -c -o wrapper.o wrapper.cpp
|
||||
1069
src/oculus-vr/lib.rs
1069
src/oculus-vr/lib.rs
File diff suppressed because it is too large
Load Diff
@ -1,310 +0,0 @@
|
||||
#include "OVR.h"
|
||||
|
||||
extern "C"
|
||||
{
|
||||
struct Vector3f {
|
||||
float x, y, z;
|
||||
};
|
||||
|
||||
struct Quatf {
|
||||
float x, y, z, w;
|
||||
};
|
||||
|
||||
struct Matrix4f {
|
||||
float m11, m12, m13, m14,
|
||||
m21, m22, m23, m24,
|
||||
m31, m32, m33, m34,
|
||||
m41, m42, m43, m44;
|
||||
};
|
||||
|
||||
struct HMDInfoC {
|
||||
unsigned int HResolution;
|
||||
unsigned int VResolution;
|
||||
float HScreenSize;
|
||||
float VScreenSize;
|
||||
float VScreenCenter;
|
||||
float EyeToScreenDistance;
|
||||
float LensSeparationDistance;
|
||||
float InterpupillaryDistance;
|
||||
float DistortionK[4];
|
||||
float ChromaAbCorrection[4];
|
||||
int DesktopX;
|
||||
int DesktopY;
|
||||
char DisplayDeviceName[32];
|
||||
long DisplayId;
|
||||
};
|
||||
|
||||
struct MessageBodyFrame {
|
||||
struct Vector3f Acceleration;
|
||||
struct Vector3f RotationRate;
|
||||
struct Vector3f MagneticField;
|
||||
float Temperature;
|
||||
float TimeDelta;
|
||||
};
|
||||
|
||||
|
||||
class RustMessageHandler : public OVR::MessageHandler {
|
||||
public:
|
||||
RustMessageHandler(void *_ptr, void (*_BodyFrame)(void *ptr, struct MessageBodyFrame *msg)) {
|
||||
ptr = _ptr;
|
||||
BodyFrame = _BodyFrame;
|
||||
}
|
||||
|
||||
void OnMessage(const OVR::Message& msg) {
|
||||
if (msg.Type == OVR::Message_BodyFrame) {
|
||||
const OVR::MessageBodyFrame& bf = static_cast<const OVR::MessageBodyFrame&>(msg);
|
||||
struct MessageBodyFrame mbf = {
|
||||
{bf.Acceleration.x, bf.Acceleration.y, bf.Acceleration.z},
|
||||
{bf.RotationRate.x, bf.RotationRate.y, bf.RotationRate.z},
|
||||
{bf.MagneticField.x, bf.MagneticField.y, bf.MagneticField.z},
|
||||
bf.Temperature,
|
||||
bf.TimeDelta
|
||||
};
|
||||
BodyFrame(ptr, &mbf);
|
||||
|
||||
}
|
||||
}
|
||||
void *ptr;
|
||||
void (*BodyFrame)(void *ptr, struct MessageBodyFrame *msg);
|
||||
};
|
||||
|
||||
RustMessageHandler* OVR_MessageHandler(void *_ptr, void (*_BodyFrame)(void *ptr, struct MessageBodyFrame *msg)) {
|
||||
return new RustMessageHandler(_ptr, _BodyFrame);
|
||||
}
|
||||
|
||||
void* OVR_MessageHandler_move_ptr(RustMessageHandler* mh) {
|
||||
void *ptr = mh->ptr;
|
||||
mh->ptr = NULL;
|
||||
return ptr;
|
||||
}
|
||||
|
||||
void OVR_MessageHandler_drop(RustMessageHandler* mh) {
|
||||
delete mh;
|
||||
}
|
||||
|
||||
void OVR_system_init(void) {
|
||||
OVR::System::Init(OVR::Log::ConfigureDefaultLog(OVR::LogMask_All));
|
||||
}
|
||||
|
||||
OVR::DeviceManager* OVR_DeviceManager_Create(void) {
|
||||
return OVR::DeviceManager::Create();
|
||||
}
|
||||
|
||||
void OVR_DeviceManager_drop(OVR::DeviceManager *dm) {
|
||||
delete dm;
|
||||
}
|
||||
|
||||
OVR::HMDDevice* OVR_DeviceManager_EnumerateDevices(OVR::DeviceManager* pManager) {
|
||||
return pManager->EnumerateDevices<OVR::HMDDevice>().CreateDevice();
|
||||
}
|
||||
|
||||
struct HMDInfoC OVR_HMDDevice_GetDeviceInfo(OVR::HMDDevice* pHMD) {
|
||||
OVR::HMDInfo hmd;
|
||||
struct HMDInfoC out_hmd;
|
||||
pHMD->GetDeviceInfo(&hmd);
|
||||
|
||||
out_hmd.HResolution = hmd.HResolution;
|
||||
out_hmd.VResolution = hmd.VResolution;
|
||||
out_hmd.HScreenSize = hmd.HScreenSize;
|
||||
out_hmd.VScreenSize = hmd.VScreenSize;
|
||||
out_hmd.VScreenCenter = hmd.VScreenCenter;
|
||||
out_hmd.EyeToScreenDistance = hmd.EyeToScreenDistance;
|
||||
out_hmd.LensSeparationDistance = hmd.LensSeparationDistance;
|
||||
out_hmd.InterpupillaryDistance = hmd.InterpupillaryDistance;
|
||||
out_hmd.DesktopX = hmd.DesktopX;
|
||||
out_hmd.DesktopY = hmd.DesktopY;
|
||||
out_hmd.DisplayId = hmd.DisplayId;
|
||||
|
||||
memcpy(out_hmd.DistortionK, hmd.DistortionK, sizeof(hmd.DistortionK));
|
||||
memcpy(out_hmd.ChromaAbCorrection, hmd.ChromaAbCorrection, sizeof(hmd.ChromaAbCorrection));
|
||||
memcpy(out_hmd.DisplayDeviceName, hmd.DisplayDeviceName, sizeof(hmd.DisplayDeviceName));
|
||||
return out_hmd;
|
||||
}
|
||||
|
||||
OVR::SensorDevice* OVR_HMDDevice_GetSensor(OVR::HMDDevice* pHMD) {
|
||||
return pHMD->GetSensor();
|
||||
}
|
||||
|
||||
void OVR_SensorDevice_drop(OVR::SensorDevice* sd) {
|
||||
delete sd;
|
||||
}
|
||||
|
||||
void OVR_SensorDevice_SetMessageHandler(OVR::SensorDevice* sensor, RustMessageHandler* mh) {
|
||||
sensor->SetMessageHandler(mh);
|
||||
}
|
||||
|
||||
OVR::SensorFusion* OVR_SensorFusion(OVR::HMDDevice* pHMD) {
|
||||
OVR::SensorFusion* SFusion = new OVR::SensorFusion;
|
||||
return SFusion;
|
||||
}
|
||||
|
||||
bool OVR_SensorFusion_IsAttachedToSensor(OVR::SensorFusion *sf) {
|
||||
return sf->IsAttachedToSensor();
|
||||
}
|
||||
|
||||
Quatf OVR_SensorFusion_GetOrientation(OVR::SensorFusion *sf) {
|
||||
OVR::Quatf quat = sf->GetOrientation();
|
||||
Quatf out = {quat.x, quat.y, quat.z, quat.w};
|
||||
return out;
|
||||
}
|
||||
|
||||
Quatf OVR_SensorFusion_GetPredictedOrientation(OVR::SensorFusion *sf) {
|
||||
OVR::Quatf quat = sf->GetPredictedOrientation();
|
||||
Quatf out = {quat.x, quat.y, quat.z, quat.w};
|
||||
return out;
|
||||
}
|
||||
|
||||
Quatf OVR_SensorFusion_GetPredictedOrientation_opt(OVR::SensorFusion *sf, float dt) {
|
||||
OVR::Quatf quat = sf->GetPredictedOrientation(dt);
|
||||
Quatf out = {quat.x, quat.y, quat.z, quat.w};
|
||||
return out;
|
||||
}
|
||||
|
||||
Vector3f OVR_SensorFusion_GetAcceleration(OVR::SensorFusion *sf) {
|
||||
OVR::Vector3f vec = sf->GetAcceleration();
|
||||
Vector3f out = {vec.x, vec.y, vec.z};
|
||||
return out;
|
||||
}
|
||||
|
||||
Vector3f OVR_SensorFusion_GetAngularVelocity(OVR::SensorFusion *sf) {
|
||||
OVR::Vector3f vec = sf->GetAngularVelocity();
|
||||
Vector3f out = {vec.x, vec.y, vec.z};
|
||||
return out;
|
||||
}
|
||||
|
||||
Vector3f OVR_SensorFusion_GetMagnetometer(OVR::SensorFusion *sf) {
|
||||
OVR::Vector3f vec = sf->GetMagnetometer();
|
||||
Vector3f out = {vec.x, vec.y, vec.z};
|
||||
return out;
|
||||
}
|
||||
|
||||
Vector3f OVR_SensorFusion_GetCalibratedMagnetometer(OVR::SensorFusion *sf) {
|
||||
OVR::Vector3f vec = sf->GetCalibratedMagnetometer();
|
||||
Vector3f out = {vec.x, vec.y, vec.z};
|
||||
return out;
|
||||
}
|
||||
|
||||
void OVR_SensorFusion_Reset(OVR::SensorFusion *sf) {
|
||||
sf->Reset();
|
||||
}
|
||||
|
||||
void OVR_SensorFusion_EnableMotionTracking(OVR::SensorFusion *sf, bool enable) {
|
||||
sf->EnableMotionTracking(enable);
|
||||
}
|
||||
|
||||
bool OVR_SensorFusion_IsMotionTrackingEnabled(OVR::SensorFusion *sf) {
|
||||
return sf->IsMotionTrackingEnabled();
|
||||
}
|
||||
|
||||
float OVR_SensorFusion_GetPredictionDelta(OVR::SensorFusion *sf) {
|
||||
return sf->GetPredictionDelta();
|
||||
}
|
||||
|
||||
void OVR_SensorFusion_SetPrediction(OVR::SensorFusion *sf, float dt, bool enable) {
|
||||
sf->SetPrediction(dt, enable);
|
||||
}
|
||||
|
||||
void OVR_SensorFusion_SetPredictionEnabled(OVR::SensorFusion *sf, bool enable) {
|
||||
sf->SetPredictionEnabled(enable);
|
||||
}
|
||||
|
||||
bool OVR_SensorFusion_IsPredictionEnabled(OVR::SensorFusion *sf) {
|
||||
return sf->IsPredictionEnabled();
|
||||
}
|
||||
|
||||
void OVR_SensorFusion_SetGravityEnabled(OVR::SensorFusion *sf, bool enableGravity) {
|
||||
sf->SetGravityEnabled(enableGravity);
|
||||
}
|
||||
|
||||
bool OVR_SensorFusion_IsGravityEnabled(OVR::SensorFusion *sf) {
|
||||
return sf->IsGravityEnabled();
|
||||
}
|
||||
|
||||
float OVR_SensorFusion_GetAccelGain(OVR::SensorFusion *sf) {
|
||||
return sf->GetAccelGain();
|
||||
}
|
||||
|
||||
void OVR_SensorFusion_SetAccelGain(OVR::SensorFusion *sf, float ag) {
|
||||
return sf->SetAccelGain(ag);
|
||||
}
|
||||
|
||||
bool OVR_SensorFusion_SaveMagCalibration(OVR::SensorFusion *sf, const char *calibrationName) {
|
||||
return sf->SaveMagCalibration(calibrationName);
|
||||
}
|
||||
|
||||
bool OVR_SensorFusion_LoadMagCalibration(OVR::SensorFusion *sf, const char *calibrationName) {
|
||||
return sf->LoadMagCalibration(calibrationName);
|
||||
}
|
||||
|
||||
void OVR_SensorFusion_SetYawCorrectionEnabled(OVR::SensorFusion *sf, bool enable) {
|
||||
sf->SetYawCorrectionEnabled(enable);
|
||||
}
|
||||
|
||||
bool OVR_SensorFusion_IsYawCorrectionEnabled(OVR::SensorFusion *sf) {
|
||||
return sf->IsYawCorrectionEnabled();
|
||||
}
|
||||
|
||||
void OVR_SensorFusion_SetMagCalibration(OVR::SensorFusion *sf, Matrix4f *m) {
|
||||
OVR::Matrix4f mat = OVR::Matrix4f(m->m11, m->m12, m->m13, m->m14,
|
||||
m->m21, m->m22, m->m23, m->m24,
|
||||
m->m31, m->m32, m->m33, m->m34,
|
||||
m->m41, m->m42, m->m43, m->m44);
|
||||
sf->SetMagCalibration(mat);
|
||||
}
|
||||
|
||||
Matrix4f OVR_SensorFusion_GetMagCalibration(OVR::SensorFusion *sf) {
|
||||
OVR::Matrix4f m = sf->GetMagCalibration();
|
||||
Matrix4f out = {
|
||||
m.M[0][0], m.M[0][1], m.M[0][2], m.M[0][3],
|
||||
m.M[1][0], m.M[1][1], m.M[1][2], m.M[1][3],
|
||||
m.M[2][0], m.M[2][1], m.M[2][2], m.M[2][3],
|
||||
m.M[3][0], m.M[3][1], m.M[3][2], m.M[3][3],
|
||||
};
|
||||
return out;
|
||||
}
|
||||
|
||||
time_t OVR_SensorFusion_GetMagCalibrationTime(OVR::SensorFusion *sf) {
|
||||
return sf->GetMagCalibrationTime();
|
||||
}
|
||||
|
||||
bool OVR_SensorFusion_HasMagCalibration(OVR::SensorFusion *sf) {
|
||||
return sf->HasMagCalibration();
|
||||
}
|
||||
|
||||
void OVR_SensorFusion_ClearMagCalibration(OVR::SensorFusion *sf) {
|
||||
sf->ClearMagCalibration();
|
||||
}
|
||||
|
||||
void OVR_SensorFusion_ClearMagReferences(OVR::SensorFusion *sf) {
|
||||
sf->ClearMagReferences();
|
||||
}
|
||||
|
||||
Vector3f OVR_SensorFusion_GetCalibratedMagValue(OVR::SensorFusion *sf, const Vector3f *rawMag) {
|
||||
OVR::Vector3f input = OVR::Vector3f(rawMag->x, rawMag->y, rawMag->z);
|
||||
OVR::Vector3f vec = sf->GetCalibratedMagValue(input);
|
||||
Vector3f out = {vec.x, vec.y, vec.z};
|
||||
return out;
|
||||
}
|
||||
|
||||
|
||||
bool OVR_SensorFusion_AttachToSensor(OVR::SensorFusion* SFusion, OVR::SensorDevice *pSensor) {
|
||||
return (*SFusion).AttachToSensor(pSensor);
|
||||
}
|
||||
|
||||
void OVR_SensorFusion_OnMessage(OVR::SensorFusion* SFusion, const MessageBodyFrame *msg) {
|
||||
OVR::MessageBodyFrame sensor(NULL);
|
||||
|
||||
sensor.TimeDelta = msg->TimeDelta;
|
||||
sensor.Temperature = msg->Temperature;
|
||||
|
||||
sensor.Acceleration = OVR::Vector3f(msg->Acceleration.x, msg->Acceleration.y, msg->Acceleration.z);
|
||||
sensor.RotationRate = OVR::Vector3f(msg->RotationRate.x, msg->RotationRate.y, msg->RotationRate.z);
|
||||
sensor.MagneticField = OVR::Vector3f(msg->MagneticField.x, msg->MagneticField.y, msg->MagneticField.z);
|
||||
|
||||
SFusion->OnMessage(sensor);
|
||||
}
|
||||
|
||||
void OVR_SensorFusion_drop(OVR::SensorFusion *sf) {
|
||||
delete sf;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user