Page MenuHome
Differential D8559 Diff 28048 source/blender/modifiers/intern/MOD_wave.c

Changeset View

Standalone View

View Options

source/blender/modifiers/intern/MOD_wave.c

Show First 20 Lines • Show All 371 Lines • ▼ Show 20 Linesstatic void deformVertsEM(ModifierData *md,
waveModifier_do(wmd, ctx, ctx->object, mesh_src, vertexCos, numVerts); waveModifier_do(wmd, ctx, ctx->object, mesh_src, vertexCos, numVerts);
if (!ELEM(mesh_src, NULL, mesh)) { if (!ELEM(mesh_src, NULL, mesh)) {
BKE_id_free(NULL, mesh_src); BKE_id_free(NULL, mesh_src);
} }
} }
static void panel_draw(const bContext *C, Panel *panel) static void panel_draw(const bContext *UNUSED(C), Panel *panel)
{ {
uiLayout *sub, *row, *col; uiLayout *sub, *row, *col;
uiLayout *layout = panel->layout; uiLayout *layout = panel->layout;
PointerRNA ptr;
PointerRNA ob_ptr; PointerRNA ob_ptr;
modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr); PointerRNA *ptr = modifier_panel_get_property_pointers(panel, &ob_ptr);
uiLayoutSetPropSep(layout, true); uiLayoutSetPropSep(layout, true);
row = uiLayoutRowWithHeading(layout, true, IFACE_("Motion")); row = uiLayoutRowWithHeading(layout, true, IFACE_("Motion"));
uiItemR(row, &ptr, "use_x", UI_ITEM_R_TOGGLE | UI_ITEM_R_FORCE_BLANK_DECORATE, NULL, ICON_NONE); uiItemR(row, ptr, "use_x", UI_ITEM_R_TOGGLE | UI_ITEM_R_FORCE_BLANK_DECORATE, NULL, ICON_NONE);
uiItemR(row, &ptr, "use_y", UI_ITEM_R_TOGGLE | UI_ITEM_R_FORCE_BLANK_DECORATE, NULL, ICON_NONE); uiItemR(row, ptr, "use_y", UI_ITEM_R_TOGGLE | UI_ITEM_R_FORCE_BLANK_DECORATE, NULL, ICON_NONE);
uiItemR(layout, &ptr, "use_cyclic", 0, NULL, ICON_NONE); uiItemR(layout, ptr, "use_cyclic", 0, NULL, ICON_NONE);
row = uiLayoutRowWithHeading(layout, true, IFACE_("Along Normals")); row = uiLayoutRowWithHeading(layout, true, IFACE_("Along Normals"));
uiItemR(row, &ptr, "use_normal", 0, "", ICON_NONE); uiItemR(row, ptr, "use_normal", 0, "", ICON_NONE);
sub = uiLayoutRow(row, true); sub = uiLayoutRow(row, true);
uiLayoutSetActive(sub, RNA_boolean_get(&ptr, "use_normal")); uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_normal"));
uiItemR(sub, &ptr, "use_normal_x", UI_ITEM_R_TOGGLE, "X", ICON_NONE); uiItemR(sub, ptr, "use_normal_x", UI_ITEM_R_TOGGLE, "X", ICON_NONE);
uiItemR(sub, &ptr, "use_normal_y", UI_ITEM_R_TOGGLE, "Y", ICON_NONE); uiItemR(sub, ptr, "use_normal_y", UI_ITEM_R_TOGGLE, "Y", ICON_NONE);
uiItemR(sub, &ptr, "use_normal_z", UI_ITEM_R_TOGGLE, "Z", ICON_NONE); uiItemR(sub, ptr, "use_normal_z", UI_ITEM_R_TOGGLE, "Z", ICON_NONE);
col = uiLayoutColumn(layout, false); col = uiLayoutColumn(layout, false);
uiItemR(col, &ptr, "falloff_radius", 0, "Falloff", ICON_NONE); uiItemR(col, ptr, "falloff_radius", 0, "Falloff", ICON_NONE);
uiItemR(col, &ptr, "height", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(col, ptr, "height", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
uiItemR(col, &ptr, "width", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(col, ptr, "width", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
uiItemR(col, &ptr, "narrowness", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(col, ptr, "narrowness", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
modifier_vgroup_ui(layout, &ptr, &ob_ptr, "vertex_group", "invert_vertex_group", NULL); modifier_vgroup_ui(layout, ptr, &ob_ptr, "vertex_group", "invert_vertex_group", NULL);
modifier_panel_end(layout, &ptr); modifier_panel_end(layout, ptr);
} }
static void position_panel_draw(const bContext *C, Panel *panel) static void position_panel_draw(const bContext *UNUSED(C), Panel *panel)
{ {
uiLayout *col; uiLayout *col;
uiLayout *layout = panel->layout; uiLayout *layout = panel->layout;
PointerRNA ptr; PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL);
modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
uiLayoutSetPropSep(layout, true); uiLayoutSetPropSep(layout, true);
uiItemR(layout, &ptr, "start_position_object", 0, IFACE_("Object"), ICON_NONE); uiItemR(layout, ptr, "start_position_object", 0, IFACE_("Object"), ICON_NONE);
col = uiLayoutColumn(layout, true); col = uiLayoutColumn(layout, true);
uiItemR(col, &ptr, "start_position_x", 0, "Start Position X", ICON_NONE); uiItemR(col, ptr, "start_position_x", 0, "Start Position X", ICON_NONE);
uiItemR(col, &ptr, "start_position_y", 0, "Y", ICON_NONE); uiItemR(col, ptr, "start_position_y", 0, "Y", ICON_NONE);
} }
static void time_panel_draw(const bContext *C, Panel *panel) static void time_panel_draw(const bContext *UNUSED(C), Panel *panel)
{ {
uiLayout *col; uiLayout *col;
uiLayout *layout = panel->layout; uiLayout *layout = panel->layout;
PointerRNA ptr; PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL);
modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
uiLayoutSetPropSep(layout, true); uiLayoutSetPropSep(layout, true);
col = uiLayoutColumn(layout, false); col = uiLayoutColumn(layout, false);
uiItemR(col, &ptr, "time_offset", 0, "Offset", ICON_NONE); uiItemR(col, ptr, "time_offset", 0, "Offset", ICON_NONE);
uiItemR(col, &ptr, "lifetime", 0, "Life", ICON_NONE); uiItemR(col, ptr, "lifetime", 0, "Life", ICON_NONE);
uiItemR(col, &ptr, "damping_time", 0, "Damping", ICON_NONE); uiItemR(col, ptr, "damping_time", 0, "Damping", ICON_NONE);
uiItemR(col, &ptr, "speed", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(col, ptr, "speed", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
} }
static void texture_panel_draw(const bContext *C, Panel *panel) static void texture_panel_draw(const bContext *C, Panel *panel)
{ {
uiLayout *col; uiLayout *col;
uiLayout *layout = panel->layout; uiLayout *layout = panel->layout;
PointerRNA ptr;
PointerRNA ob_ptr; PointerRNA ob_ptr;
modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr); PointerRNA *ptr = modifier_panel_get_property_pointers(panel, &ob_ptr);
int texture_coords = RNA_enum_get(&ptr, "texture_coords"); int texture_coords = RNA_enum_get(ptr, "texture_coords");
uiTemplateID(layout, C, &ptr, "texture", "texture.new", NULL, NULL, 0, ICON_NONE, NULL); uiTemplateID(layout, C, ptr, "texture", "texture.new", NULL, NULL, 0, ICON_NONE, NULL);
uiLayoutSetPropSep(layout, true); uiLayoutSetPropSep(layout, true);
col = uiLayoutColumn(layout, false); col = uiLayoutColumn(layout, false);
uiItemR(col, &ptr, "texture_coords", 0, IFACE_("Coordinates"), ICON_NONE); uiItemR(col, ptr, "texture_coords", 0, IFACE_("Coordinates"), ICON_NONE);
if (texture_coords == MOD_DISP_MAP_OBJECT) { if (texture_coords == MOD_DISP_MAP_OBJECT) {
uiItemR(col, &ptr, "texture_coords_object", 0, IFACE_("Object"), ICON_NONE); uiItemR(col, ptr, "texture_coords_object", 0, IFACE_("Object"), ICON_NONE);
PointerRNA texture_coords_obj_ptr = RNA_pointer_get(&ptr, "texture_coords_object"); PointerRNA texture_coords_obj_ptr = RNA_pointer_get(ptr, "texture_coords_object");
if (!RNA_pointer_is_null(&texture_coords_obj_ptr) && if (!RNA_pointer_is_null(&texture_coords_obj_ptr) &&
(RNA_enum_get(&texture_coords_obj_ptr, "type") == OB_ARMATURE)) { (RNA_enum_get(&texture_coords_obj_ptr, "type") == OB_ARMATURE)) {
PointerRNA texture_coords_obj_data_ptr = RNA_pointer_get(&texture_coords_obj_ptr, "data"); PointerRNA texture_coords_obj_data_ptr = RNA_pointer_get(&texture_coords_obj_ptr, "data");
uiItemPointerR(col, uiItemPointerR(col,
&ptr, ptr,
"texture_coords_bone", "texture_coords_bone",
&texture_coords_obj_data_ptr, &texture_coords_obj_data_ptr,
"bones", "bones",
IFACE_("Bone"), IFACE_("Bone"),
ICON_NONE); ICON_NONE);
} }
} }
else if (texture_coords == MOD_DISP_MAP_UV && RNA_enum_get(&ob_ptr, "type") == OB_MESH) { else if (texture_coords == MOD_DISP_MAP_UV && RNA_enum_get(&ob_ptr, "type") == OB_MESH) {
PointerRNA obj_data_ptr = RNA_pointer_get(&ob_ptr, "data"); PointerRNA obj_data_ptr = RNA_pointer_get(&ob_ptr, "data");
uiItemPointerR(col, &ptr, "uv_layer", &obj_data_ptr, "uv_layers", NULL, ICON_NONE); uiItemPointerR(col, ptr, "uv_layer", &obj_data_ptr, "uv_layers", NULL, ICON_NONE);
} }
} }
static void panelRegister(ARegionType *region_type) static void panelRegister(ARegionType *region_type)
{ {
PanelType *panel_type = modifier_panel_register(region_type, eModifierType_Wave, panel_draw); PanelType *panel_type = modifier_panel_register(region_type, eModifierType_Wave, panel_draw);
modifier_subpanel_register( modifier_subpanel_register(
region_type, "position", "Start Position", NULL, position_panel_draw, panel_type); region_type, "position", "Start Position", NULL, position_panel_draw, panel_type);
Show All 39 Lines