Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion nanvr/server_openvr/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ fn main() {
let mut build = cc::Build::new();
build
.cpp(true)
.std("c++17")
.std("c++20")
.flag_if_supported("-fdiagnostics-color=always")
.files(source_files_paths)
.include(filepaths::workspace_dir().join("thirdparty/openvr/headers"))
.include("cpp");
Expand Down
4 changes: 4 additions & 0 deletions nanvr/server_openvr/cpp/nanvr_server/HMD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -283,3 +283,7 @@ void Hmd::GetProjectionRaw(vr::EVREye eye, float* left, float* right, float* top
vr::DistortionCoordinates_t Hmd::ComputeDistortion(vr::EVREye, float u, float v) {
return { { u, v }, { u, v }, { u, v } };
}

bool Hmd::ComputeInverseDistortion(vr::HmdVector2_t*, vr::EVREye, uint32_t, float, float) {
return false;
}
3 changes: 3 additions & 0 deletions nanvr/server_openvr/cpp/nanvr_server/HMD.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,7 @@ class Hmd : public TrackedDevice, vr::IVRDisplayComponent {
virtual void
GetProjectionRaw(vr::EVREye eEye, float* pfLeft, float* pfRight, float* pfTop, float* pfBottom);
virtual vr::DistortionCoordinates_t ComputeDistortion(vr::EVREye eEye, float fU, float fV);
virtual bool ComputeInverseDistortion(
vr::HmdVector2_t* pResult, vr::EVREye eEye, uint32_t unChannel, float fU, float fV
);
};
2 changes: 1 addition & 1 deletion nanvr/server_openvr/cpp/nanvr_server/nanvr_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class DriverProvider : public vr::IServerTrackedDeviceProvider {
}
#ifdef __linux__
else if (event.eventType == vr::VREvent_ChaperoneUniverseHasChanged
|| event.eventType == vr::VREvent_ChaperoneRoomSetupFinished
|| event.eventType == vr::VREvent_ChaperoneRoomSetupCommitted
|| event.eventType == vr::VREvent_ChaperoneFlushCache
|| event.eventType == vr::VREvent_ChaperoneSettingsHaveChanged
|| event.eventType == vr::VREvent_SeatedZeroPoseReset
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/openvr
Submodule openvr updated 191 files