blender
/
blender
134
398
Fork 579
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Manipulator: add array get/set functions

This commit is contained in:
Campbell Barton 2017-06-17 02:31:21 +10:00
parent 946bc4d3c1
commit 2b8d599b3a
2 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/windowmanager/manipulators/WM_manipulator_api.h
View File

@ -121,10 +121,19 @@ void WM_manipulator_property_def_func(
bool WM_manipulator_property_is_valid(
const struct wmManipulatorProperty *mpr_prop);
void WM_manipulator_property_value_set(
struct bContext *C, const struct wmManipulator *mpr, struct wmManipulatorProperty *mpr_prop, const float value);
float WM_manipulator_property_value_get(
const struct wmManipulator *mpr, struct wmManipulatorProperty *mpr_prop);
void WM_manipulator_property_value_set(
struct bContext *C, const struct wmManipulator *mpr, struct wmManipulatorProperty *mpr_prop,
const float value);
void WM_manipulator_property_value_get_array(
const struct wmManipulator *mpr, struct wmManipulatorProperty *mpr_prop,
float *value, const int value_len);
void WM_manipulator_property_value_set_array(
struct bContext *C, const struct wmManipulator *mpr, struct wmManipulatorProperty *mpr_prop,
const float *value, const int value_len);
void WM_manipulator_property_range_get(
const struct wmManipulator *mpr, struct wmManipulatorProperty *mpr_prop,
float range[2]);

48
source/blender/windowmanager/manipulators/intern/wm_manipulator_property.c
View File

@ -123,6 +123,23 @@ bool WM_manipulator_property_is_valid(const wmManipulatorProperty *mpr_prop)
(mpr_prop->custom_func.value_get_fn && mpr_prop->custom_func.value_set_fn));
}
float WM_manipulator_property_value_get(
const wmManipulator *mpr, wmManipulatorProperty *mpr_prop)
{
if (mpr_prop->custom_func.value_get_fn) {
float value = 0.0f;
mpr_prop->custom_func.value_get_fn(mpr, mpr_prop, mpr_prop->custom_func.user_data, &value, 1);
return value;
}
if (mpr_prop->index == -1) {
return RNA_property_float_get(&mpr_prop->ptr, mpr_prop->prop);
}
else {
return RNA_property_float_get_index(&mpr_prop->ptr, mpr_prop->prop, mpr_prop->index);
}
}
void WM_manipulator_property_value_set(
bContext *C, const wmManipulator *mpr,
wmManipulatorProperty *mpr_prop, const float value)
@ -142,21 +159,32 @@ void WM_manipulator_property_value_set(
RNA_property_update(C, &mpr_prop->ptr, mpr_prop->prop);
}
float WM_manipulator_property_value_get(
const wmManipulator *mpr, wmManipulatorProperty *mpr_prop)
void WM_manipulator_property_value_get_array(
const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
float *value, const int value_len)
{
if (mpr_prop->custom_func.value_get_fn) {
float value = 0.0f;
mpr_prop->custom_func.value_get_fn(mpr, mpr_prop, mpr_prop->custom_func.user_data, &value, 1);
return value;
mpr_prop->custom_func.value_get_fn(mpr, mpr_prop, mpr_prop->custom_func.user_data, value, value_len);
return;
}
if (mpr_prop->index == -1) {
return RNA_property_float_get(&mpr_prop->ptr, mpr_prop->prop);
}
else {
return RNA_property_float_get_index(&mpr_prop->ptr, mpr_prop->prop, mpr_prop->index);
BLI_assert(RNA_property_array_length(&mpr_prop->ptr, mpr_prop->prop) == value_len);
return RNA_property_float_get_array(&mpr_prop->ptr, mpr_prop->prop, value);
}
void WM_manipulator_property_value_set_array(
bContext *C, const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
const float *value, const int value_len)
{
if (mpr_prop->custom_func.value_set_fn) {
mpr_prop->custom_func.value_set_fn(mpr, mpr_prop, mpr_prop->custom_func.user_data, value, value_len);
return;
}
BLI_assert(RNA_property_array_length(&mpr_prop->ptr, mpr_prop->prop) == value_len);
RNA_property_float_set_array(&mpr_prop->ptr, mpr_prop->prop, value);
RNA_property_update(C, &mpr_prop->ptr, mpr_prop->prop);
}
void WM_manipulator_property_range_get(