mirror of
https://github.com/WiVRn/WiVRn.git
synced 2026-11-20 00:51:32 -08:00
Remove FoV from headset info packet
This commit is contained in:
1 parent
3a9b40472e
commit
117027c390
6 files changed
-39
No files matched your search
@@ -247,18 +247,6 @@ std::shared_ptr<scenes::stream> scenes::stream::create(std::unique_ptr<wivrn_ses
|
||||
.variant = application::get_messages_info().variant,
|
||||
};
|
||||
|
||||
{
|
||||
auto [flags, views] = self->session.locate_views(
|
||||
XR_VIEW_CONFIGURATION_TYPE_PRIMARY_STEREO,
|
||||
self->instance.now(),
|
||||
application::space(xr::spaces::view));
|
||||
|
||||
assert(views.size() == info.fov.size());
|
||||
|
||||
for (auto [i, j]: std::views::zip(views, info.fov))
|
||||
j = i.fov;
|
||||
}
|
||||
|
||||
const auto & config = application::get_config();
|
||||
|
||||
{
|
||||
|
||||
@@ -338,7 +338,6 @@ struct headset_info_packet
|
||||
};
|
||||
std::optional<audio_description> speaker;
|
||||
std::optional<audio_description> microphone;
|
||||
std::array<XrFovf, 2> fov;
|
||||
bool hand_tracking;
|
||||
bool eye_gaze;
|
||||
bool palm_pose;
|
||||
|
||||
@@ -56,9 +56,6 @@
|
||||
<property name="SpeakerSampleRate" type="u" access="read"/>
|
||||
<property name="MicChannels" type="u" access="read"/>
|
||||
<property name="MicSampleRate" type="u" access="read"/>
|
||||
<property name="FieldOfView" type="a(dddd)" access="read">
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName" value="QList<field_of_view>"/>
|
||||
</property>
|
||||
<property name="HandTracking" type="b" access="read"/>
|
||||
<property name="EyeGaze" type="b" access="read"/>
|
||||
<property name="FaceTracking" type="b" access="read"/>
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
#include "util/u_logging.h"
|
||||
#include "utils/method.h"
|
||||
|
||||
#include "xrt_cast.h"
|
||||
#include <cstdint>
|
||||
#include <stdio.h>
|
||||
#include <openxr/openxr.h>
|
||||
@@ -128,10 +127,6 @@ wivrn_hmd::wivrn_hmd(wivrn::wivrn_session * cnx,
|
||||
hmd->views[1].display.w_pixels = eye_width;
|
||||
hmd->views[1].display.h_pixels = eye_height;
|
||||
hmd->views[1].rot = u_device_rotation_ident;
|
||||
|
||||
// FOV from headset info packet
|
||||
hmd->distortion.fov[0] = xrt_cast(info.fov[0]);
|
||||
hmd->distortion.fov[1] = xrt_cast(info.fov[1]);
|
||||
}
|
||||
|
||||
xrt_result_t wivrn_hmd::update_inputs()
|
||||
|
||||
@@ -1232,14 +1232,6 @@ std::pair<bool, std::optional<std::string>> wivrn_session::validate_headset_info
|
||||
// only allow connecting from the "same" headset
|
||||
refuse |= prev_info.system_name != info.system_name;
|
||||
|
||||
for (uint32_t i = 0; i < 2; i++)
|
||||
{
|
||||
refuse |= prev_info.fov[i].angleDown != info.fov[i].angleDown;
|
||||
refuse |= prev_info.fov[i].angleUp != info.fov[i].angleUp;
|
||||
refuse |= prev_info.fov[i].angleRight != info.fov[i].angleRight;
|
||||
refuse |= prev_info.fov[i].angleLeft != info.fov[i].angleLeft;
|
||||
}
|
||||
|
||||
refuse |= prev_info.palm_pose != info.palm_pose;
|
||||
refuse |= prev_info.user_presence != info.user_presence;
|
||||
refuse |= prev_info.passthrough != info.passthrough;
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
*/
|
||||
|
||||
#include "application.h"
|
||||
#include "openxr/openxr.h"
|
||||
#include "sleep_inhibitor.h"
|
||||
#include "util/u_trace_marker.h"
|
||||
|
||||
@@ -807,15 +806,6 @@ void on_headset_info_packet(const wivrn::from_headset::headset_info_packet & inf
|
||||
wivrn_server_set_mic_channels(dbus_server, mic.num_channels);
|
||||
wivrn_server_set_mic_sample_rate(dbus_server, mic.sample_rate);
|
||||
|
||||
builder = g_variant_builder_new(G_VARIANT_TYPE("a(dddd)"));
|
||||
for (XrFovf fov: info.fov)
|
||||
{
|
||||
g_variant_builder_add(builder, "(dddd)", fov.angleLeft, fov.angleRight, fov.angleUp, fov.angleDown);
|
||||
}
|
||||
GVariant * value_field_of_view = g_variant_new("a(dddd)", builder);
|
||||
g_variant_builder_unref(builder);
|
||||
wivrn_server_set_field_of_view(dbus_server, value_field_of_view);
|
||||
|
||||
wivrn_server_set_hand_tracking(dbus_server, info.hand_tracking);
|
||||
wivrn_server_set_eye_gaze(dbus_server, info.eye_gaze);
|
||||
wivrn_server_set_face_tracking(dbus_server, info.face_tracking != wivrn::from_headset::face_type::none);
|
||||
|
||||
Reference in new issue
Block a user