archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: unnecessary double pointers in XR module

Browse Source 
No functional changes.
This commit is contained in:
Peter Kim
2021-08-07 21:30:15 +09:00
parent b33b70ed07
commit a7bb537a61
10 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/ghost/GHOST_C-api.h
View File

@@ -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).

4
intern/ghost/intern/GHOST_C-api.cpp
View File

@@ -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();

8
intern/ghost/intern/GHOST_XrAction.cpp
View File

@@ -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 &amplitude)
@@ -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),

4
intern/ghost/intern/GHOST_XrAction.h
View File

@@ -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 &amplitude);
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;

4
intern/ghost/intern/GHOST_XrSession.cpp
View File

@@ -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 &amplitude)
@@ -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) {

4
intern/ghost/intern/GHOST_XrSession.h
View File

@@ -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 &amplitude);
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);

9
source/blender/makesrna/intern/rna_xr.c
View File

@@ -612,7 +612,6 @@ static bool rna_XrSessionState_action_create(bContext *C,
const bool is_button_action = (is_float_action || ami->type == XR_BOOLEAN_INPUT);
wmOperatorType *ot = NULL;
IDProperty *op_properties = NULL;
const char *haptic_name = NULL;
int64_t haptic_duration_msec;
if (is_button_action) {
@@ -625,7 +624,6 @@ static bool rna_XrSessionState_action_create(bContext *C,
}
}
haptic_name = &ami->haptic_name[0];
haptic_duration_msec = (int64_t)(ami->haptic_duration * 1000.0f);
}
@@ -637,7 +635,7 @@ static bool rna_XrSessionState_action_create(bContext *C,
subaction_paths,
ot,
op_properties,
is_button_action ? &haptic_name : NULL,
is_button_action ? ami->haptic_name : NULL,
is_button_action ? &haptic_duration_msec : NULL,
is_button_action ? &ami->haptic_frequency : NULL,
is_button_action ? &ami->haptic_amplitude : NULL,
@@ -793,7 +791,7 @@ bool rna_XrSessionState_haptic_action_apply(bContext *C,
return WM_xr_haptic_action_apply(&wm->xr,
action_set_name,
action_name,
user_path[0] ? &user_path : NULL,
user_path[0] ? user_path : NULL,
&duration_msec,
&frequency,
&amplitude);
@@ -810,8 +808,7 @@ void rna_XrSessionState_haptic_action_stop(bContext *C,
{
# ifdef WITH_XR_OPENXR
wmWindowManager *wm = CTX_wm_manager(C);
WM_xr_haptic_action_stop(
&wm->xr, action_set_name, action_name, user_path[0] ? &user_path : NULL);
WM_xr_haptic_action_stop(&wm->xr, action_set_name, action_name, user_path[0] ? user_path : NULL);
# else
UNUSED_VARS(C, action_set_name, action_name, user_path);
# endif

6
source/blender/windowmanager/WM_api.h
View File

@@ -987,7 +987,7 @@ bool WM_xr_action_create(wmXrData *xr,
const char **subaction_paths,
struct wmOperatorType *ot,
struct IDProperty *op_properties,
const char **haptic_name,
const char *haptic_name,
const int64_t *haptic_duration,
const float *haptic_frequency,
const float *haptic_amplitude,
@@ -1027,14 +1027,14 @@ bool WM_xr_action_state_get(const wmXrData *xr,
bool WM_xr_haptic_action_apply(wmXrData *xr,
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);
void WM_xr_haptic_action_stop(wmXrData *xr,
const char *action_set_name,
const char *action_name,
const char **subaction_path);
const char *subaction_path);
/* wm_xr_actionmap.c */
XrActionMap *WM_xr_actionmap_new(struct wmXrRuntimeData *runtime,

12
source/blender/windowmanager/xr/intern/wm_xr_action.c
View File

@@ -74,7 +74,7 @@ static wmXrAction *action_create(const char *action_name,
const char **subaction_paths,
wmOperatorType *ot,
IDProperty *op_properties,
const char **haptic_name,
const char *haptic_name,
const int64_t *haptic_duration,
const float *haptic_frequency,
const float *haptic_amplitude,
@@ -134,8 +134,8 @@ static wmXrAction *action_create(const char *action_name,
if (haptic_name) {
BLI_assert(is_button_action);
action->haptic_name = MEM_mallocN(strlen(*haptic_name) + 1, "XrAction_HapticName");
strcpy(action->haptic_name, *haptic_name);
action->haptic_name = MEM_mallocN(strlen(haptic_name) + 1, "XrAction_HapticName");
strcpy(action->haptic_name, haptic_name);
action->haptic_duration = *haptic_duration;
action->haptic_frequency = *haptic_frequency;
action->haptic_amplitude = *haptic_amplitude;
@@ -232,7 +232,7 @@ bool WM_xr_action_create(wmXrData *xr,
const char **subaction_paths,
wmOperatorType *ot,
IDProperty *op_properties,
const char **haptic_name,
const char *haptic_name,
const int64_t *haptic_duration,
const float *haptic_frequency,
const float *haptic_amplitude,
@@ -502,7 +502,7 @@ bool WM_xr_action_state_get(const wmXrData *xr,
bool WM_xr_haptic_action_apply(wmXrData *xr,
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)
@@ -521,7 +521,7 @@ bool WM_xr_haptic_action_apply(wmXrData *xr,
void WM_xr_haptic_action_stop(wmXrData *xr,
const char *action_set_name,
const char *action_name,
const char **subaction_path)
const char *subaction_path)
{
GHOST_XrStopHapticAction(xr->runtime->context, action_set_name, action_name, subaction_path);
}

4
source/blender/windowmanager/xr/intern/wm_xr_intern.h
View File

@@ -134,7 +134,7 @@ typedef struct wmXrAction {
eXrAxisFlag *axis_flags;
/** The currently active subaction path (if any) for modal actions. */
char **active_modal_path;
const char *active_modal_path;
/** Operator to be called on XR events. */
struct wmOperatorType *ot;
@@ -155,7 +155,7 @@ typedef struct wmXrAction {
typedef struct wmXrHapticAction {
struct wmXrHapticAction *next, *prev;
wmXrAction *action;
const char **subaction_path;
const char *subaction_path;
int64_t time_start;
} wmXrHapticAction;