[Bf-blender-cvs] [3e33c898282] xr-actions-D9124: Fix build error on Linux / gcc
Peter Kim
noreply at git.blender.org
Sun Oct 18 08:19:14 CEST 2020
Commit: 3e33c8982824ec68695cf7a8af1c5cecafab36c7
Author: Peter Kim
Date: Sun Oct 18 15:06:12 2020 +0900
Branches: xr-actions-D9124
https://developer.blender.org/rB3e33c8982824ec68695cf7a8af1c5cecafab36c7
Fix build error on Linux / gcc
===================================================================
M intern/ghost/intern/GHOST_XrSession.cpp
M intern/ghost/intern/GHOST_XrSession.h
M source/blender/makesrna/intern/rna_xr.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/xr/intern/wm_xr_actions.c
M source/blender/windowmanager/xr/intern/wm_xr_session.c
===================================================================
diff --git a/intern/ghost/intern/GHOST_XrSession.cpp b/intern/ghost/intern/GHOST_XrSession.cpp
index 299e047abdf..2ab3187f6c1 100644
--- a/intern/ghost/intern/GHOST_XrSession.cpp
+++ b/intern/ghost/intern/GHOST_XrSession.cpp
@@ -1242,7 +1242,7 @@ bool GHOST_XrSession::applyHapticAction(const char *action_set_name,
const char *action_name,
uint32_t count,
const char *const *subaction_paths,
- const int64_t *duration,
+ const GHOST_TInt64 *duration,
const float *frequency,
const float *amplitude)
{
@@ -1260,7 +1260,8 @@ bool GHOST_XrSession::applyHapticAction(const char *action_set_name,
XrSession &session = m_oxr->session;
XrHapticVibration vibration{XR_TYPE_HAPTIC_VIBRATION};
- vibration.duration = (*duration == 0) ? XR_MIN_HAPTIC_DURATION : *duration;
+ vibration.duration = (*duration == 0) ? XR_MIN_HAPTIC_DURATION :
+ static_cast<XrDuration>(*duration);
vibration.frequency = *frequency;
vibration.amplitude = *amplitude;
diff --git a/intern/ghost/intern/GHOST_XrSession.h b/intern/ghost/intern/GHOST_XrSession.h
index 3f6e3491c40..b86a241f877 100644
--- a/intern/ghost/intern/GHOST_XrSession.h
+++ b/intern/ghost/intern/GHOST_XrSession.h
@@ -85,7 +85,7 @@ class GHOST_XrSession {
const char *action_name,
uint32_t count,
const char *const *subaction_paths,
- const int64_t *duration,
+ const GHOST_TInt64 *duration,
const float *frequency,
const float *amplitude);
void stopHapticAction(const char *action_set_name,
diff --git a/source/blender/makesrna/intern/rna_xr.c b/source/blender/makesrna/intern/rna_xr.c
index aff21983619..da302001614 100644
--- a/source/blender/makesrna/intern/rna_xr.c
+++ b/source/blender/makesrna/intern/rna_xr.c
@@ -335,7 +335,7 @@ bool rna_XrSessionState_haptic_action_apply(bContext *C,
}
}
- unsigned long long duration_msec = (unsigned long long)(duration * 1000.0f);
+ long long duration_msec = (long long)(duration * 1000.0f);
return WM_xr_haptic_action_apply(&wm->xr,
action_set_name,
@@ -460,16 +460,12 @@ static void rna_def_xr_session_settings(BlenderRNA *brna)
};
static const EnumPropertyItem selection_eyes[] = {
- {XR_EYE_LEFT,
- "EYE_LEFT",
- 0,
- "Left Eye",
- "Use the left eye's perspective when selecting in VR"},
+ {XR_EYE_LEFT, "EYE_LEFT", 0, "Left Eye", "Use the left eye's perspective for VR selection"},
{XR_EYE_RIGHT,
"EYE_RIGHT",
0,
"Right Eye",
- "Use the right eye's perspective when selecting in VR"},
+ "Use the right eye's perspective for VR selection"},
{0, NULL, 0, NULL, NULL},
};
@@ -538,9 +534,7 @@ static void rna_def_xr_session_settings(BlenderRNA *brna)
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_enum_items(prop, selection_eyes);
RNA_def_property_ui_text(
- prop,
- "Selection Eye",
- "Which eye's perspective will be used when selecting with VR controllers");
+ prop, "Selection Eye", "Which eye's perspective to use when selecting in VR");
RNA_def_property_update(prop, NC_WM | ND_XR_DATA_CHANGED, NULL);
prop = RNA_def_property(srna, "clip_start", PROP_FLOAT, PROP_DISTANCE);
@@ -622,7 +616,7 @@ static void rna_def_xr_session_state(BlenderRNA *brna)
"Action Set",
"Action set name (must not contain upper case letters or special "
"characters other than '-', '_', or '.'");
- RNA_def_parameter_flags(parm, PROP_STRING, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_boolean(func, "result", 0, "Result", "");
RNA_def_function_return(func, parm);
@@ -632,7 +626,7 @@ static void rna_def_xr_session_state(BlenderRNA *brna)
parm = RNA_def_pointer(func, "context", "Context", "", "");
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_string(func, "action_set_name", NULL, 64, "Action Set", "Action set name");
- RNA_def_parameter_flags(parm, PROP_STRING, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_string(func,
"name",
NULL,
@@ -640,22 +634,22 @@ static void rna_def_xr_session_state(BlenderRNA *brna)
"Action",
"Action name (must not contain upper case letters or special characters "
"other than '-', '_', or '.'");
- RNA_def_parameter_flags(parm, PROP_STRING, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_enum(func, "type", action_types, 0, "Type", "Action type");
- RNA_def_parameter_flags(parm, PROP_ENUM, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
parm = RNA_def_string(func, "user_path0", NULL, 64, "User Path 0", "User path 0");
- RNA_def_parameter_flags(parm, PROP_STRING, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_string(func, "user_path1", NULL, 64, "User Path 1", "User path 1");
- RNA_def_parameter_flags(parm, PROP_STRING, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_string(func, "op", NULL, OP_MAX_TYPENAME, "Operator", "Operator to execute");
- RNA_def_parameter_flags(parm, PROP_STRING, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_enum(func,
"op_flag",
op_flags,
0,
"Operator Flag",
"When to execute the operator (press, release, or modal)");
- RNA_def_parameter_flags(parm, PROP_ENUM, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
parm = RNA_def_boolean(func, "result", 0, "Result", "");
RNA_def_function_return(func, parm);
@@ -665,13 +659,13 @@ static void rna_def_xr_session_state(BlenderRNA *brna)
parm = RNA_def_pointer(func, "context", "Context", "", "");
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_string(func, "action_set_name", NULL, 64, "Action Set", "Action set name");
- RNA_def_parameter_flags(parm, PROP_STRING, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_string(func, "action_name", NULL, 64, "Action", "Action name");
- RNA_def_parameter_flags(parm, PROP_STRING, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_string(func, "user_path0", NULL, 64, "User Path 0", "OpenXR user path 0");
- RNA_def_parameter_flags(parm, PROP_STRING, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_string(func, "user_path1", NULL, 64, "User Path 1", "OpenXR user path 1");
- RNA_def_parameter_flags(parm, PROP_STRING, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_float_translation(func,
"location",
3,
@@ -682,7 +676,7 @@ static void rna_def_xr_session_state(BlenderRNA *brna)
"Location offset",
-FLT_MAX,
FLT_MAX);
- RNA_def_parameter_flags(parm, PROP_FLOAT, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_float_rotation(func,
"rotation",
3,
@@ -693,7 +687,7 @@ static void rna_def_xr_session_state(BlenderRNA *brna)
"Rotation offset",
-2 * M_PI,
2 * M_PI);
- RNA_def_parameter_flags(parm, PROP_FLOAT, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_boolean(func, "result", 0, "Result", "");
RNA_def_function_return(func, parm);
@@ -704,25 +698,25 @@ static void rna_def_xr_session_state(BlenderRNA *brna)
parm = RNA_def_pointer(func, "context", "Context", "", "");
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_string(func, "action_set_name", NULL, 64, "Action Set", "Action set name");
- RNA_def_parameter_flags(parm, PROP_STRING, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_string(func, "profile", NULL, 256, "Profile", "OpenXR interaction profile path");
- RNA_def_parameter_flags(parm, PROP_STRING, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_string(func, "action_name", NULL, 64, "Action", "Action name");
- RNA_def_parameter_flags(parm, PROP_STRING, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_string(func,
"interaction_path0",
NULL,
256,
"Interaction Path 0",
"OpenXR interaction (user + component) path 0");
- RNA_def_parameter_flags(parm, PROP_STRING, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_string(func,
"interaction_path1",
NULL,
256,
"Interaction Path 1",
"OpenXR interaction (user + component) path 1");
- RNA_def_parameter_flags(parm, PROP_STRING, PARM_REQUIRED);
+ RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
parm = RNA_def_boolean(func, "result", 0, "Result", "
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list