blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Manipulator: add image-empty manipulator

This commit is contained in:
Campbell Barton 2017-08-10 14:05:43 +10:00
parent d5289f9d80
commit 5406109fbf
4 changed files with 220 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/space_view3d/CMakeLists.txt
View File

@ -60,6 +60,7 @@ set(SRC
view3d_header.c
view3d_iterators.c
view3d_manipulator_camera.c
view3d_manipulator_empty.c
view3d_manipulator_forcefield.c
view3d_manipulator_lamp.c
view3d_ops.c

1
source/blender/editors/space_view3d/space_view3d.c
View File

@ -741,6 +741,7 @@ static void view3d_widgets(void)
WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_force_field);
WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_camera);
WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_camera_view);
WM_manipulatorgrouptype_append_and_link(mmap_type, VIEW3D_WGT_empty_image);
}

14
source/blender/editors/space_view3d/view3d_intern.h
View File

@ -319,13 +319,13 @@ ARegion *view3d_has_tools_region(ScrArea *sa);
extern const char *view3d_context_dir[]; /* doc access */
/* view3d_widgets.c */
void VIEW3D_WGT_lamp_spot (struct wmManipulatorGroupType *wgt);
void VIEW3D_WGT_lamp_area (struct wmManipulatorGroupType *wgt);
void VIEW3D_WGT_lamp_target (struct wmManipulatorGroupType *wgt);
void VIEW3D_WGT_camera (struct wmManipulatorGroupType *wgt);
void VIEW3D_WGT_camera_view (struct wmManipulatorGroupType *wgt);
void VIEW3D_WGT_force_field (struct wmManipulatorGroupType *wgt);
void VIEW3D_WGT_armature_facemaps(struct wmManipulatorGroupType *wgt);
void VIEW3D_WGT_lamp_spot(struct wmManipulatorGroupType *wgt);
void VIEW3D_WGT_lamp_area(struct wmManipulatorGroupType *wgt);
void VIEW3D_WGT_lamp_target(struct wmManipulatorGroupType *wgt);
void VIEW3D_WGT_camera(struct wmManipulatorGroupType *wgt);
void VIEW3D_WGT_camera_view(struct wmManipulatorGroupType *wgt);
void VIEW3D_WGT_force_field(struct wmManipulatorGroupType *wgt);
void VIEW3D_WGT_empty_image(struct wmManipulatorGroupType *wgt);
/* draw_volume.c */
void draw_smoke_volume(struct SmokeDomainSettings *sds, struct Object *ob,

211
source/blender/editors/space_view3d/view3d_manipulator_empty.c Normal file
View File

@ -0,0 +1,211 @@
/*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* ***** END GPL LICENSE BLOCK *****
*/
/** \file blender/editors/space_view3d/view3d_manipulator_empty.c
* \ingroup spview3d
*/
#include "BLI_blenlib.h"
#include "BLI_math.h"
#include "BLI_utildefines.h"
#include "BKE_context.h"
#include "BKE_object.h"
#include "BKE_image.h"
#include "DNA_object_types.h"
#include "DNA_lamp_types.h"
#include "ED_screen.h"
#include "ED_manipulator_library.h"
#include "UI_resources.h"
#include "MEM_guardedalloc.h"
#include "RNA_access.h"
#include "WM_api.h"
#include "WM_types.h"
#include "view3d_intern.h" /* own include */
/* -------------------------------------------------------------------- */
/** \name Empty Image Manipulators
* \{ */
struct EmptyImageWidgetGroup {
wmManipulator *manipulator;
struct {
Object *ob;
float dims[2];
} state;
};
/* translate callbacks */
static void manipulator_empty_image_prop_size_get(
const wmManipulator *UNUSED(mpr), wmManipulatorProperty *mpr_prop,
void *value_p)
{
float *value = value_p;
struct EmptyImageWidgetGroup *imgroup = mpr_prop->custom_func.user_data;
const Object *ob = imgroup->state.ob;
value[0] = ob->empty_drawsize;
value[1] = ob->empty_drawsize;
}
static void manipulator_empty_image_prop_size_set(
const wmManipulator *UNUSED(mpr), wmManipulatorProperty *mpr_prop,
const void *value_p)
{
const float *value = value_p;
BLI_assert(mpr_prop->type->array_length == 2);
struct EmptyImageWidgetGroup *imgroup = mpr_prop->custom_func.user_data;
Object *ob = imgroup->state.ob;
ob->empty_drawsize = value[0];
}
/* translate callbacks */
static void manipulator_empty_image_prop_offset_get(
const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
void *value_p)
{
float *value = value_p;
BLI_assert(mpr_prop->type->array_length == 2);
const struct EmptyImageWidgetGroup *imgroup = mpr_prop->custom_func.user_data;
const Object *ob = imgroup->state.ob;
float dims[2] = {};
RNA_float_get_array(mpr->ptr, "dimensions", dims);
dims[0] *= ob->empty_drawsize;
dims[1] *= ob->empty_drawsize;
value[0] = (ob->ima_ofs[0] * dims[0]) + (0.5f * dims[0]);
value[1] = (ob->ima_ofs[1] * dims[1]) + (0.5f * dims[1]);
}
static void manipulator_empty_image_prop_offset_set(
const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
const void *value_p)
{
const float *value = value_p;
BLI_assert(mpr_prop->type->array_length == 2);
struct EmptyImageWidgetGroup *imgroup = mpr_prop->custom_func.user_data;
Object *ob = imgroup->state.ob;
float dims[2];
RNA_float_get_array(mpr->ptr, "dimensions", dims);
dims[0] *= ob->empty_drawsize;
dims[1] *= ob->empty_drawsize;
ob->ima_ofs[0] = (value[0] - (0.5f * dims[0])) / dims[0];
ob->ima_ofs[1] = (value[1] - (0.5f * dims[1])) / dims[1];
}
static bool WIDGETGROUP_empty_image_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgt))
{
Object *ob = CTX_data_active_object(C);
if (ob && ob->type == OB_EMPTY) {
return (ob->empty_drawtype == OB_EMPTY_IMAGE);
}
return false;
}
static void WIDGETGROUP_empty_image_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
{
struct EmptyImageWidgetGroup *imgroup = MEM_mallocN(sizeof(struct EmptyImageWidgetGroup), __func__);
imgroup->manipulator = WM_manipulator_new("MANIPULATOR_WT_cage_2d", mgroup, NULL);
wmManipulator *mpr = imgroup->manipulator;
RNA_enum_set(mpr->ptr, "transform",
ED_MANIPULATOR_RECT_TRANSFORM_FLAG_SCALE);
mgroup->customdata = imgroup;
WM_manipulator_set_flag(mpr, WM_MANIPULATOR_DRAW_HOVER, true);
UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, mpr->color);
UI_GetThemeColor3fv(TH_MANIPULATOR_HI, mpr->color_hi);
}
static void WIDGETGROUP_empty_image_refresh(const bContext *C, wmManipulatorGroup *mgroup)
{
struct EmptyImageWidgetGroup *imgroup = mgroup->customdata;
Object *ob = CTX_data_active_object(C);
wmManipulator *mpr = imgroup->manipulator;
copy_m4_m4(mpr->matrix_basis, ob->obmat);
RNA_enum_set(mpr->ptr, "transform",
ED_MANIPULATOR_RECT_TRANSFORM_FLAG_TRANSLATE |
ED_MANIPULATOR_RECT_TRANSFORM_FLAG_SCALE |
ED_MANIPULATOR_RECT_TRANSFORM_FLAG_SCALE_UNIFORM);
imgroup->state.ob = ob;
/* Use dimensions for aspect. */
if (ob->data != NULL) {
ImageUser iuser = *ob->iuser;
int w, h;
BKE_image_get_size(ob->data, &iuser, &w, &h);
const float dims_max = max_ff(w, h);
imgroup->state.dims[0] = (float)w / dims_max;
imgroup->state.dims[1] = (float)h / dims_max;
}
else {
copy_v2_fl(imgroup->state.dims, 1.0f);
}
RNA_float_set_array(mpr->ptr, "dimensions", imgroup->state.dims);
WM_manipulator_target_property_def_func(
mpr, "scale",
&(const struct wmManipulatorPropertyFnParams) {
.value_get_fn = manipulator_empty_image_prop_size_get,
.value_set_fn = manipulator_empty_image_prop_size_set,
.range_get_fn = NULL,
.user_data = imgroup,
});
WM_manipulator_target_property_def_func(
mpr, "offset",
&(const struct wmManipulatorPropertyFnParams) {
.value_get_fn = manipulator_empty_image_prop_offset_get,
.value_set_fn = manipulator_empty_image_prop_offset_set,
.range_get_fn = NULL,
.user_data = imgroup,
});
}
void VIEW3D_WGT_empty_image(wmManipulatorGroupType *wgt)
{
wgt->name = "Area Lamp Widgets";
wgt->idname = "VIEW3D_WGT_empty_image";
wgt->flag |= (WM_MANIPULATORGROUPTYPE_PERSISTENT |
WM_MANIPULATORGROUPTYPE_3D |
WM_MANIPULATORGROUPTYPE_DEPTH_3D);
wgt->poll = WIDGETGROUP_empty_image_poll;
wgt->setup = WIDGETGROUP_empty_image_setup;
wgt->refresh = WIDGETGROUP_empty_image_refresh;
}
/** \} */