diff options
author | Peter Kim <pk15950@gmail.com> | 2021-08-07 15:30:15 +0300 |
---|---|---|
committer | Peter Kim <pk15950@gmail.com> | 2021-08-07 15:30:15 +0300 |
commit | a7bb537a61c7c680bc01896ccf27a02c9e7a688a (patch) | |
tree | c07d240fc1de2b1db76e52e03af1b50cccc77540 /intern | |
parent | b33b70ed077eed2c885fd91dd920087c3491b938 (diff) |
Cleanup: unnecessary double pointers in XR module
No functional changes.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/GHOST_C-api.h | 4 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_C-api.cpp | 4 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_XrAction.cpp | 8 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_XrAction.h | 4 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_XrSession.cpp | 4 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_XrSession.h | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h index 83c67f83908..b78aac6f5eb 100644 --- a/intern/ghost/GHOST_C-api.h +++ b/intern/ghost/GHOST_C-api.h @@ -1102,7 +1102,7 @@ int GHOST_XrSyncActions(GHOST_XrContextHandle xr_context, const char *action_set int GHOST_XrApplyHapticAction(GHOST_XrContextHandle xr_context, const char *action_set_name, const char *action_name, - const char **subaction_path, + const char *subaction_path, const int64_t *duration, const float *frequency, const float *amplitude); @@ -1113,7 +1113,7 @@ int GHOST_XrApplyHapticAction(GHOST_XrContextHandle xr_context, void GHOST_XrStopHapticAction(GHOST_XrContextHandle xr_context, const char *action_set_name, const char *action_name, - const char **subaction_path); + const char *subaction_path); /** * Get action set custom data (owned by Blender, not GHOST). diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp index b1af5c131ab..a2871b46222 100644 --- a/intern/ghost/intern/GHOST_C-api.cpp +++ b/intern/ghost/intern/GHOST_C-api.cpp @@ -1005,7 +1005,7 @@ int GHOST_XrSyncActions(GHOST_XrContextHandle xr_contexthandle, const char *acti int GHOST_XrApplyHapticAction(GHOST_XrContextHandle xr_contexthandle, const char *action_set_name, const char *action_name, - const char **subaction_path, + const char *subaction_path, const int64_t *duration, const float *frequency, const float *amplitude) @@ -1022,7 +1022,7 @@ int GHOST_XrApplyHapticAction(GHOST_XrContextHandle xr_contexthandle, void GHOST_XrStopHapticAction(GHOST_XrContextHandle xr_contexthandle, const char *action_set_name, const char *action_name, - const char **subaction_path) + const char *subaction_path) { GHOST_IXrContext *xr_context = (GHOST_IXrContext *)xr_contexthandle; GHOST_XrSession *xr_session = xr_context->getSession(); diff --git a/intern/ghost/intern/GHOST_XrAction.cpp b/intern/ghost/intern/GHOST_XrAction.cpp index 07eb42c14e6..704b1ce9fac 100644 --- a/intern/ghost/intern/GHOST_XrAction.cpp +++ b/intern/ghost/intern/GHOST_XrAction.cpp @@ -375,7 +375,7 @@ void GHOST_XrAction::updateState(XrSession session, void GHOST_XrAction::applyHapticFeedback(XrSession session, const char *action_name, - const char **subaction_path_str, + const char *subaction_path_str, const int64_t &duration, const float &frequency, const float &litude) @@ -390,7 +390,7 @@ void GHOST_XrAction::applyHapticFeedback(XrSession session, haptic_info.action = m_action; if (subaction_path_str != nullptr) { - SubactionIndexMap::iterator it = m_subaction_indices.find(*subaction_path_str); + SubactionIndexMap::iterator it = m_subaction_indices.find(subaction_path_str); if (it != m_subaction_indices.end()) { haptic_info.subactionPath = m_subaction_paths[it->second]; CHECK_XR( @@ -410,13 +410,13 @@ void GHOST_XrAction::applyHapticFeedback(XrSession session, void GHOST_XrAction::stopHapticFeedback(XrSession session, const char *action_name, - const char **subaction_path_str) + const char *subaction_path_str) { XrHapticActionInfo haptic_info{XR_TYPE_HAPTIC_ACTION_INFO}; haptic_info.action = m_action; if (subaction_path_str != nullptr) { - SubactionIndexMap::iterator it = m_subaction_indices.find(*subaction_path_str); + SubactionIndexMap::iterator it = m_subaction_indices.find(subaction_path_str); if (it != m_subaction_indices.end()) { haptic_info.subactionPath = m_subaction_paths[it->second]; CHECK_XR(xrStopHapticFeedback(session, &haptic_info), diff --git a/intern/ghost/intern/GHOST_XrAction.h b/intern/ghost/intern/GHOST_XrAction.h index 70eaa694ae9..3e2224fe3ff 100644 --- a/intern/ghost/intern/GHOST_XrAction.h +++ b/intern/ghost/intern/GHOST_XrAction.h @@ -103,11 +103,11 @@ class GHOST_XrAction { const XrTime &predicted_display_time); void applyHapticFeedback(XrSession session, const char *action_name, - const char **subaction_path, + const char *subaction_path, const int64_t &duration, const float &frequency, const float &litude); - void stopHapticFeedback(XrSession session, const char *action_name, const char **subaction_path); + void stopHapticFeedback(XrSession session, const char *action_name, const char *subaction_path); void *getCustomdata(); void getBindings(std::map<XrPath, std::vector<XrActionSuggestedBinding>> &r_bindings) const; diff --git a/intern/ghost/intern/GHOST_XrSession.cpp b/intern/ghost/intern/GHOST_XrSession.cpp index a63ce5c9344..4cab22ee676 100644 --- a/intern/ghost/intern/GHOST_XrSession.cpp +++ b/intern/ghost/intern/GHOST_XrSession.cpp @@ -754,7 +754,7 @@ bool GHOST_XrSession::syncActions(const char *action_set_name) bool GHOST_XrSession::applyHapticAction(const char *action_set_name, const char *action_name, - const char **subaction_path, + const char *subaction_path, const int64_t &duration, const float &frequency, const float &litude) @@ -777,7 +777,7 @@ bool GHOST_XrSession::applyHapticAction(const char *action_set_name, void GHOST_XrSession::stopHapticAction(const char *action_set_name, const char *action_name, - const char **subaction_path) + const char *subaction_path) { GHOST_XrActionSet *action_set = find_action_set(m_oxr.get(), action_set_name); if (action_set == nullptr) { diff --git a/intern/ghost/intern/GHOST_XrSession.h b/intern/ghost/intern/GHOST_XrSession.h index ec15897058f..a76e11aede1 100644 --- a/intern/ghost/intern/GHOST_XrSession.h +++ b/intern/ghost/intern/GHOST_XrSession.h @@ -76,13 +76,13 @@ class GHOST_XrSession { bool syncActions(const char *action_set_name = nullptr); bool applyHapticAction(const char *action_set_name, const char *action_name, - const char **subaction_path, + const char *subaction_path, const int64_t &duration, const float &frequency, const float &litude); void stopHapticAction(const char *action_set_name, const char *action_name, - const char **subaction_path); + const char *subaction_path); /* Custom data (owned by Blender, not GHOST) accessors. */ void *getActionSetCustomdata(const char *action_set_name); |