Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pull] master from LibreVR:master #68

Merged
merged 2 commits into from
Aug 17, 2019
Merged

[pull] master from LibreVR:master #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a52325
InputManager: Hotfix bugged SteamVR Input velocity data.
CrossVR Aug 17, 2019
a9e05c2
Update appcast.xml
CrossVR Aug 17, 2019
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
12 changes: 11 additions & 1 deletion Revive/InputManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,19 +253,29 @@ void InputManager::GetTrackingState(ovrSession session, ovrTrackingState* outSta
outState->StatusFlags = TrackedDevicePoseToOVRStatusFlags(poses[vr::k_unTrackedDeviceIndex_Hmd]);

// Convert the hand poses
vr::TrackedDeviceIndex_t hands[] = { vr::VRSystem()->GetTrackedDeviceIndexForControllerRole(vr::TrackedControllerRole_LeftHand),
vr::VRSystem()->GetTrackedDeviceIndexForControllerRole(vr::TrackedControllerRole_RightHand) };
for (int i = 0; i < ovrHand_Count; i++)
{
vr::InputPoseActionData_t handPose;
vr::EVRInputError err = vr::VRInput()->GetPoseActionDataRelativeToNow(m_ActionPose, origin, relTime, &handPose, sizeof(vr::InputPoseActionData_t), m_Hands[i]);
if (err != vr::VRInputError_None)
if (err != vr::VRInputError_None || hands[i] == vr::k_unTrackedDeviceIndexInvalid)
{
outState->HandPoses[i].ThePose = OVR::Posef::Identity();
continue;
}

// Apply a 45-degree offset to better fit the Oculus Touch pose
vr::TrackedDevicePose_t pose;
vr::HmdMatrix34_t offset = REV::Matrix4f(OVR::Matrix4f::RotationX(-MATH_FLOAT_PIOVER4));
vr::VRSystem()->ApplyTransform(&pose, &handPose.pose, &offset);

// Velocity data from SteamVR Input is in the wrong tracking space
vr::TrackedDevicePose_t rawPose;
vr::VRSystem()->ApplyTransform(&rawPose, &poses[hands[i]], &offset);
pose.vAngularVelocity = rawPose.vAngularVelocity;
pose.vVelocity = rawPose.vVelocity;

outState->HandPoses[i] = TrackedDevicePoseToOVRPose(pose, m_LastHandPose[i], absTime);
outState->HandStatusFlags[i] = TrackedDevicePoseToOVRStatusFlags(handPose.pose);
}
Expand Down
2 changes: 1 addition & 1 deletion ReviveOverlay/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define REV_MAJOR_VERSION 1
#define REV_MINOR_VERSION 8
#define REV_PATCH_VERSION 0
#define REV_BUILD_NUMBER 5
#define REV_BUILD_NUMBER 6

#define REV_VERSION_STRING REV_STRINGIFY(REV_MAJOR_VERSION.REV_MINOR_VERSION.REV_PATCH_VERSION.REV_BUILD_NUMBER)
#define REV_VERSION_INT (REV_MAJOR_VERSION << 24 | REV_MINOR_VERSION << 16 | REV_PATCH_VERSION << 8 | REV_BUILD_NUMBER)
16 changes: 13 additions & 3 deletions appcast.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,19 @@
<title>Version 1.8.0</title>
<description>
<![CDATA[
<h3>Changes</h3>
<h3>Hotfixes</h3>

<p>This release has been updated a few times to fix some minor mistakes, redownload the release if you experience any of these problems.</p>

<ul>
<li>Fixed menu button activating unintentionally</li>
<li>Fixed apps not being recognized correctly in the Steam library</li>
<li>Fixed game image being stuck in the same position when turning your head</li>
<li>Fixed incorrect throwing direction in Echo Arena</li>
<li>Change the default grip binding to use capsense instead of the force sensor</li>
</ul>

<p>Hotfix was released to fix issues with the menu button and change the default grip binding.</p>
<h3>Changes</h3>

<ul>
<li>Revive: Major overhaul of SteamVR Input support</li>
Expand All @@ -33,7 +43,7 @@
<pubDate>15 August 2019</pubDate>
<enclosure url="https://github.com/LibreVR/Revive/releases/download/1.8.0/ReviveInstaller.exe"
type="application/exe"
sparkle:version="1.8.0.5"
sparkle:version="1.8.0.6"
sparkle:os="windows-x64"/>
</item>
</channel>
Expand Down