mirror of
https://github.com/WiVRn/WiVRn.git
synced 2026-11-21 17:41:54 -08:00
Add debug log when receiving pico face tracking info
This commit is contained in:
1 parent
f7b77d21b8
commit
cd72cf68b0
6 files changed
+148
-65
No files matched your search
@@ -73,7 +73,7 @@ void xr::pico_face_tracker::get_weights(XrTime time, wivrn::from_headset::tracki
|
||||
spdlog::warn("Failed to set tracking mode: {}", xr::to_string(res));
|
||||
}
|
||||
|
||||
exit:
|
||||
exit:
|
||||
out_expressions.is_valid = false;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
/*
|
||||
* WiVRn VR streaming
|
||||
* Copyright (C) 2022 Guillaume Meunier <[email protected]>
|
||||
* Copyright (C) 2022 Patrick Nicolas <[email protected]>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "xr.h"
|
||||
|
||||
#include "spdlog/fmt/fmt.h"
|
||||
|
||||
std::string xr::to_string(XrVersion version)
|
||||
{
|
||||
return fmt::format("{}.{}.{}", XR_VERSION_MAJOR(version), XR_VERSION_MINOR(version), XR_VERSION_PATCH(version));
|
||||
}
|
||||
+1
-37
@@ -26,40 +26,4 @@
|
||||
#include "swapchain.h"
|
||||
#include "system.h"
|
||||
#include "xr/check.h"
|
||||
#include "xr/pico_eye_types.h"
|
||||
#include "xr/pico_eye_types_reflection.h"
|
||||
|
||||
#include <cstddef>
|
||||
#include <string>
|
||||
#include <openxr/openxr_reflection.h>
|
||||
|
||||
namespace xr
|
||||
{
|
||||
#define XR_ENUM_CASE_STR(name, val) \
|
||||
case name: \
|
||||
return #name;
|
||||
#define XR_ENUM_STR(enumType) \
|
||||
constexpr const char * to_string(enumType e) \
|
||||
{ \
|
||||
switch (e) \
|
||||
{ \
|
||||
XR_LIST_ENUM_##enumType(XR_ENUM_CASE_STR) default : return "Unknown"; \
|
||||
} \
|
||||
}
|
||||
|
||||
XR_ENUM_STR(XrResult);
|
||||
XR_ENUM_STR(XrFormFactor);
|
||||
XR_ENUM_STR(XrViewConfigurationType);
|
||||
XR_ENUM_STR(XrEnvironmentBlendMode);
|
||||
XR_ENUM_STR(XrReferenceSpaceType);
|
||||
XR_ENUM_STR(XrActionType);
|
||||
XR_ENUM_STR(XrEyeVisibility);
|
||||
XR_ENUM_STR(XrSessionState);
|
||||
XR_ENUM_STR(XrObjectType);
|
||||
XR_ENUM_STR(XrStructureType);
|
||||
|
||||
XR_ENUM_STR(XrTrackingStateCodePICO);
|
||||
|
||||
std::string to_string(XrVersion version);
|
||||
|
||||
} // namespace xr
|
||||
#include "xr/to_string.h"
|
||||
@@ -29,3 +29,78 @@
|
||||
_(XR_MT_MIC_PERMISSION_DENIED_PICO, -7) \
|
||||
_(XR_MT_SYSTEM_DENIED_PICO, -8) \
|
||||
_(XR_MT_UNKNOWN_ERROR_PICO, -9)
|
||||
|
||||
#define XR_LIST_ENUM_XrBlendShapeIndexPICO(_) \
|
||||
_(XR_BS_EYELOOKDOWN_L_PICO, 0) \
|
||||
_(XR_BS_NOSESNEER_L_PICO, 1) \
|
||||
_(XR_BS_EYELOOKIN_L_PICO, 2) \
|
||||
_(XR_BS_BROWINNERUP_PICO, 3) \
|
||||
_(XR_BS_BROWDOWN_R_PICO, 4) \
|
||||
_(XR_BS_MOUTHCLOSE_PICO, 5) \
|
||||
_(XR_BS_MOUTHLOWERDOWN_R_PICO, 6) \
|
||||
_(XR_BS_JAWOPEN_PICO, 7) \
|
||||
_(XR_BS_MOUTHUPPERUP_R_PICO, 8) \
|
||||
_(XR_BS_MOUTHSHRUGUPPER_PICO, 9) \
|
||||
_(XR_BS_MOUTHFUNNEL_PICO, 10) \
|
||||
_(XR_BS_EYELOOKIN_R_PICO, 11) \
|
||||
_(XR_BS_EYELOOKDOWN_R_PICO, 12) \
|
||||
_(XR_BS_NOSESNEER_R_PICO, 13) \
|
||||
_(XR_BS_MOUTHROLLUPPER_PICO, 14) \
|
||||
_(XR_BS_JAWRIGHT_PICO, 15) \
|
||||
_(XR_BS_BROWDOWN_L_PICO, 16) \
|
||||
_(XR_BS_MOUTHSHRUGLOWER_PICO, 17) \
|
||||
_(XR_BS_MOUTHROLLLOWER_PICO, 18) \
|
||||
_(XR_BS_MOUTHSMILE_L_PICO, 19) \
|
||||
_(XR_BS_MOUTHPRESS_L_PICO, 20) \
|
||||
_(XR_BS_MOUTHSMILE_R_PICO, 21) \
|
||||
_(XR_BS_MOUTHPRESS_R_PICO, 22) \
|
||||
_(XR_BS_MOUTHDIMPLE_R_PICO, 23) \
|
||||
_(XR_BS_MOUTHLEFT_PICO, 24) \
|
||||
_(XR_BS_JAWFORWARD_PICO, 25) \
|
||||
_(XR_BS_EYESQUINT_L_PICO, 26) \
|
||||
_(XR_BS_MOUTHFROWN_L_PICO, 27) \
|
||||
_(XR_BS_EYEBLINK_L_PICO, 28) \
|
||||
_(XR_BS_CHEEKSQUINT_L_PICO, 29) \
|
||||
_(XR_BS_BROWOUTERUP_L_PICO, 30) \
|
||||
_(XR_BS_EYELOOKUP_L_PICO, 31) \
|
||||
_(XR_BS_JAWLEFT_PICO, 32) \
|
||||
_(XR_BS_MOUTHSTRETCH_L_PICO, 33) \
|
||||
_(XR_BS_MOUTHPUCKER_PICO, 34) \
|
||||
_(XR_BS_EYELOOKUP_R_PICO, 35) \
|
||||
_(XR_BS_BROWOUTERUP_R_PICO, 36) \
|
||||
_(XR_BS_CHEEKSQUINT_R_PICO, 37) \
|
||||
_(XR_BS_EYEBLINK_R_PICO, 38) \
|
||||
_(XR_BS_MOUTHUPPERUP_L_PICO, 39) \
|
||||
_(XR_BS_MOUTHFROWN_R_PICO, 40) \
|
||||
_(XR_BS_EYESQUINT_R_PICO, 41) \
|
||||
_(XR_BS_MOUTHSTRETCH_R_PICO, 42) \
|
||||
_(XR_BS_CHEEKPUFF_PICO, 43) \
|
||||
_(XR_BS_EYELOOKOUT_L_PICO, 44) \
|
||||
_(XR_BS_EYELOOKOUT_R_PICO, 45) \
|
||||
_(XR_BS_EYEWIDE_R_PICO, 46) \
|
||||
_(XR_BS_EYEWIDE_L_PICO, 47) \
|
||||
_(XR_BS_MOUTHRIGHT_PICO, 48) \
|
||||
_(XR_BS_MOUTHDIMPLE_L_PICO, 49) \
|
||||
_(XR_BS_MOUTHLOWERDOWN_L_PICO, 50) \
|
||||
_(XR_BS_TONGUEOUT_PICO, 51) \
|
||||
_(XR_VISEME_PP_PICO, 52) \
|
||||
_(XR_VISEME_CH_PICO, 53) \
|
||||
_(XR_VISEME_O_PICO, 54) \
|
||||
_(XR_VISEME_OU_PICO, 55) \
|
||||
_(XR_VISEME_I_BACK_PICO, 56) \
|
||||
_(XR_VISEME_U_PICO, 57) \
|
||||
_(XR_VISEME_RR_PICO, 58) \
|
||||
_(XR_VISEME_XX_PICO, 59) \
|
||||
_(XR_VISEME_AA_PICO, 60) \
|
||||
_(XR_VISEME_I_FRONT_PICO, 61) \
|
||||
_(XR_VISEME_FF_PICO, 62) \
|
||||
_(XR_VISEME_UW_PICO, 63) \
|
||||
_(XR_VISEME_TH_PICO, 64) \
|
||||
_(XR_VISEME_KK_PICO, 65) \
|
||||
_(XR_VISEME_SS_PICO, 66) \
|
||||
_(XR_VISEME_E_PICO, 67) \
|
||||
_(XR_VISEME_DD_PICO, 68) \
|
||||
_(XR_VISEME_EI_PICO, 69) \
|
||||
_(XR_VISEME_NN_PICO, 70) \
|
||||
_(XR_VISEME_SIL_PICO, 71) \
|
||||
_(XR_BLEND_SHAPE_COUNT_PICO, 72)
|
||||
@@ -0,0 +1,62 @@
|
||||
/*
|
||||
* WiVRn VR streaming
|
||||
* Copyright (C) 2022 Guillaume Meunier <[email protected]>
|
||||
* Copyright (C) 2022 Patrick Nicolas <[email protected]>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "xr/pico_eye_types.h"
|
||||
#include "xr/pico_eye_types_reflection.h"
|
||||
|
||||
#include <format>
|
||||
#include <string>
|
||||
#include <openxr/openxr_reflection.h>
|
||||
|
||||
namespace xr
|
||||
{
|
||||
#define XR_ENUM_CASE_STR(name, val) \
|
||||
case name: \
|
||||
return #name;
|
||||
#define XR_ENUM_STR(enumType) \
|
||||
constexpr const char * to_string(enumType e) \
|
||||
{ \
|
||||
switch (e) \
|
||||
{ \
|
||||
XR_LIST_ENUM_##enumType(XR_ENUM_CASE_STR) default : return "Unknown"; \
|
||||
} \
|
||||
}
|
||||
|
||||
XR_ENUM_STR(XrResult);
|
||||
XR_ENUM_STR(XrFormFactor);
|
||||
XR_ENUM_STR(XrViewConfigurationType);
|
||||
XR_ENUM_STR(XrEnvironmentBlendMode);
|
||||
XR_ENUM_STR(XrReferenceSpaceType);
|
||||
XR_ENUM_STR(XrActionType);
|
||||
XR_ENUM_STR(XrEyeVisibility);
|
||||
XR_ENUM_STR(XrSessionState);
|
||||
XR_ENUM_STR(XrObjectType);
|
||||
XR_ENUM_STR(XrStructureType);
|
||||
|
||||
XR_ENUM_STR(XrTrackingStateCodePICO);
|
||||
XR_ENUM_STR(XrBlendShapeIndexPICO);
|
||||
|
||||
inline std::string to_string(XrVersion version)
|
||||
{
|
||||
return std::format("{}.{}.{}", XR_VERSION_MAJOR(version), XR_VERSION_MINOR(version), XR_VERSION_PATCH(version));
|
||||
}
|
||||
|
||||
} // namespace xr
|
||||
@@ -27,6 +27,8 @@
|
||||
#include "util/u_logging.h"
|
||||
#include "utils/method.h"
|
||||
#include "xr/pico_eye_types.h"
|
||||
#include "xr/pico_eye_types_reflection.h"
|
||||
#include "xr/to_string.h"
|
||||
#include "xrt/xrt_defines.h"
|
||||
#include "xrt/xrt_device.h"
|
||||
#include "xrt/xrt_results.h"
|
||||
@@ -75,6 +77,13 @@ void wivrn_pico_face_tracker::update_tracking(const from_headset::tracking & tra
|
||||
if (not(face and face->is_valid))
|
||||
return;
|
||||
|
||||
// for debugging purposes
|
||||
U_LOG_D("pico face tracking blendshapes:");
|
||||
for (auto i = 0; i <= XR_BS_TONGUEOUT_PICO; i++)
|
||||
{
|
||||
U_LOG_D(" %s: %f", xr::to_string(static_cast<XrBlendShapeIndexPICO>(i)), face->weights[i]);
|
||||
}
|
||||
|
||||
std::array<float, XR_FACE_EXPRESSION2_COUNT_FB> weights{};
|
||||
|
||||
#define MAP_EXPRESSION(fb, pico) \
|
||||
|
||||
Reference in new issue
Block a user