[Bf-blender-cvs] [8ff1bce40f3] blender2.8: Manipulators: lamp, camera & force-field
Campbell Barton
noreply at git.blender.org
Wed Jun 7 15:56:01 CEST 2017
Commit: 8ff1bce40f3de5272eb3cb6475691f0d8d98bc52
Author: Campbell Barton
Date: Wed Jun 7 23:50:34 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB8ff1bce40f3de5272eb3cb6475691f0d8d98bc52
Manipulators: lamp, camera & force-field
>From custom-manipulators branch.
These may be improved they work on a basic level.
===================================================================
M source/blender/blenkernel/BKE_armature.h
M source/blender/editors/space_view3d/CMakeLists.txt
M source/blender/editors/space_view3d/space_view3d.c
A source/blender/editors/space_view3d/view3d_manipulators.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index a68f1e763fd..131a229f43e 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -33,6 +33,7 @@
* \author nzc
*/
+struct bPose;
struct Bone;
struct GHash;
struct Main;
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index 34b68a80a0f..af4c220ed46 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -59,6 +59,7 @@ set(SRC
view3d_walk.c
view3d_header.c
view3d_iterators.c
+ view3d_manipulators.c
view3d_ops.c
view3d_project.c
view3d_ruler.c
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 1dc9b169714..33121291935 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -739,6 +739,9 @@ static void view3d_widgets(void)
wmManipulatorMapType *wmaptype = WM_manipulatormaptype_ensure(&wmap_params);
WM_manipulatorgrouptype_append(wmaptype, TRANSFORM_WGT_manipulator);
+ WM_manipulatorgrouptype_append(wmaptype, VIEW3D_WGT_lamp);
+ WM_manipulatorgrouptype_append(wmaptype, VIEW3D_WGT_force_field);
+ WM_manipulatorgrouptype_append(wmaptype, VIEW3D_WGT_camera);
}
diff --git a/source/blender/editors/space_view3d/view3d_manipulators.c b/source/blender/editors/space_view3d/view3d_manipulators.c
new file mode 100644
index 00000000000..8d853498740
--- /dev/null
+++ b/source/blender/editors/space_view3d/view3d_manipulators.c
@@ -0,0 +1,357 @@
+/*
+ * ***** 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.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/space_view3d/view3d_manipulators.c
+ * \ingroup spview3d
+ */
+
+
+#include "BLI_blenlib.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
+#include "BKE_armature.h"
+#include "BKE_camera.h"
+#include "BKE_context.h"
+#include "BKE_object.h"
+
+#include "DNA_armature_types.h"
+#include "DNA_camera_types.h"
+#include "DNA_lamp_types.h"
+#include "DNA_object_types.h"
+#include "DNA_object_force.h"
+#include "DNA_manipulator_types.h"
+
+#include "ED_armature.h"
+#include "ED_screen.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "RNA_access.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "view3d_intern.h" /* own include */
+
+/* -------------------------------------------------------------------- */
+
+/** \name Lamp Manipulators
+ * \{ */
+
+static bool WIDGETGROUP_lamp_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgrouptype))
+{
+ Object *ob = CTX_data_active_object(C);
+
+ if (ob && ob->type == OB_LAMP) {
+ Lamp *la = ob->data;
+ return (la->type == LA_SPOT);
+ }
+ return false;
+}
+
+static void WIDGETGROUP_lamp_init(const bContext *UNUSED(C), wmManipulatorGroup *wgroup)
+{
+ const char *propname = "spot_size";
+
+ const float color[4] = {0.5f, 0.5f, 1.0f, 1.0f};
+ const float color_hi[4] = {0.8f, 0.8f, 0.45f, 1.0f};
+
+ wmManipulatorWrapper *wwrapper = MEM_mallocN(sizeof(wmManipulatorWrapper), __func__);
+
+ wwrapper->manipulator = MANIPULATOR_arrow_new(wgroup, propname, MANIPULATOR_ARROW_STYLE_INVERTED);
+ wgroup->customdata = wwrapper;
+
+ MANIPULATOR_arrow_set_range_fac(wwrapper->manipulator, 4.0f);
+ WM_manipulator_set_color(wwrapper->manipulator, color);
+ WM_manipulator_set_color_highlight(wwrapper->manipulator, color_hi);
+}
+
+static void WIDGETGROUP_lamp_refresh(const bContext *C, wmManipulatorGroup *wgroup)
+{
+ wmManipulatorWrapper *wwrapper = wgroup->customdata;
+ Object *ob = CTX_data_active_object(C);
+ Lamp *la = ob->data;
+ float dir[3];
+
+ negate_v3_v3(dir, ob->obmat[2]);
+
+ MANIPULATOR_arrow_set_direction(wwrapper->manipulator, dir);
+ WM_manipulator_set_origin(wwrapper->manipulator, ob->obmat[3]);
+
+ /* need to set property here for undo. TODO would prefer to do this in _init */
+ PointerRNA lamp_ptr;
+ const char *propname = "spot_size";
+ RNA_pointer_create(&la->id, &RNA_Lamp, la, &lamp_ptr);
+ WM_manipulator_set_property(wwrapper->manipulator, ARROW_SLOT_OFFSET_WORLD_SPACE, &lamp_ptr, propname);
+}
+
+void VIEW3D_WGT_lamp(wmManipulatorGroupType *wgt)
+{
+ wgt->name = "Lamp Widgets";
+
+ wgt->poll = WIDGETGROUP_lamp_poll;
+ wgt->init = WIDGETGROUP_lamp_init;
+ wgt->refresh = WIDGETGROUP_lamp_refresh;
+
+ wgt->flag |= (WM_MANIPULATORGROUPTYPE_IS_3D | WM_MANIPULATORGROUPTYPE_SCALE_3D);
+}
+
+/** \} */
+
+
+/* -------------------------------------------------------------------- */
+
+/** \name Camera Manipulators
+ * \{ */
+
+struct CameraWidgetGroup {
+ wmManipulator *dop_dist;
+ wmManipulator *focal_len;
+ wmManipulator *ortho_scale;
+};
+
+static bool WIDGETGROUP_camera_poll(const bContext *C, wmManipulatorGroupType *UNUSED(wgrouptype))
+{
+ Object *ob = CTX_data_active_object(C);
+
+ return (ob && ob->type == OB_CAMERA);
+}
+
+static void cameragroup_property_setup(wmManipulator *widget, Object *ob, Camera *ca, const bool is_ortho)
+{
+ const float scale[3] = {1.0f / len_v3(ob->obmat[0]), 1.0f / len_v3(ob->obmat[1]), 1.0f / len_v3(ob->obmat[2])};
+ const float scale_fac = ca->drawsize;
+ const float drawsize = is_ortho ?
+ (0.5f * ca->ortho_scale) :
+ (scale_fac / ((scale[0] + scale[1] + scale[2]) / 3.0f));
+ const float half_sensor = 0.5f * ((ca->sensor_fit == CAMERA_SENSOR_FIT_VERT) ? ca->sensor_y : ca->sensor_x);
+ const char *propname = is_ortho ? "ortho_scale" : "lens";
+
+ PointerRNA camera_ptr;
+ float min, max, range;
+ float step, precision;
+
+ RNA_pointer_create(&ca->id, &RNA_Camera, ca, &camera_ptr);
+
+ /* get property range */
+ PropertyRNA *prop = RNA_struct_find_property(&camera_ptr, propname);
+ RNA_property_float_ui_range(&camera_ptr, prop, &min, &max, &step, &precision);
+ range = max - min;
+
+ MANIPULATOR_arrow_set_range_fac(widget, is_ortho ? (scale_fac * range) : (drawsize * range / half_sensor));
+}
+
+static void WIDGETGROUP_camera_init(const bContext *C, wmManipulatorGroup *wgroup)
+{
+ Object *ob = CTX_data_active_object(C);
+ Camera *ca = ob->data;
+ float dir[3];
+
+ struct CameraWidgetGroup *camgroup = MEM_callocN(sizeof(struct CameraWidgetGroup), __func__);
+ wgroup->customdata = camgroup;
+
+ negate_v3_v3(dir, ob->obmat[2]);
+
+ /* dof distance */
+ {
+ const float color[4] = {1.0f, 0.3f, 0.0f, 1.0f};
+ const float color_hi[4] = {1.0f, 0.3f, 0.0f, 1.0f};
+
+ camgroup->dop_dist = MANIPULATOR_arrow_new(wgroup, "dof_distance", MANIPULATOR_ARROW_STYLE_CROSS);
+ WM_manipulator_set_flag(camgroup->dop_dist, WM_MANIPULATOR_DRAW_HOVER, true);
+ WM_manipulator_set_color(camgroup->dop_dist, color);
+ WM_manipulator_set_color_highlight(camgroup->dop_dist, color_hi);
+ }
+
+ /* focal length
+ * - logic/calculations are similar to BKE_camera_view_frame_ex, better keep in sync */
+ {
+ const float color[4] = {1.0f, 1.0, 0.27f, 0.5f};
+ const float color_hi[4] = {1.0f, 1.0, 0.27f, 1.0f};
+
+ camgroup->focal_len = MANIPULATOR_arrow_new(
+ wgroup, "focal_len",
+ (MANIPULATOR_ARROW_STYLE_CONE | MANIPULATOR_ARROW_STYLE_CONSTRAINED));
+ WM_manipulator_set_color(camgroup->focal_len, color);
+ WM_manipulator_set_color_highlight(camgroup->focal_len, color_hi);
+ cameragroup_property_setup(camgroup->focal_len, ob, ca, false);
+
+ camgroup->ortho_scale = MANIPULATOR_arrow_new(
+ wgroup, "ortho_scale",
+ (MANIPULATOR_ARROW_STYLE_CONE | MANIPULATOR_ARROW_STYLE_CONSTRAINED));
+ WM_manipulator_set_color(camgroup->ortho_scale, color);
+ WM_manipulator_set_color_highlight(camgroup->ortho_scale, color_hi);
+ cameragroup_property_setup(camgroup->ortho_scale, ob, ca, true);
+ }
+}
+
+static void WIDGETGROUP_camera_refresh(const bContext *C, wmManipulatorGroup *wgroup)
+{
+ if (!wgroup->customdata)
+ return;
+
+ struct CameraWidgetGroup *camgroup = wgroup->customdata;
+ Object *ob = CTX_data_active_object(C);
+ Camera *ca = ob->data;
+ PointerRNA camera_ptr;
+ float dir[3];
+
+ RNA_pointer_create(&ca->id, &RNA_Camera, ca, &camera_ptr);
+
+ negate_v3_v3(dir, ob->obmat[2]);
+
+ if (ca->flag & CAM_SHOWLIMITS) {
+ MANIPULATOR_arrow_set_direction(camgroup->dop_dist, dir);
+ MANIPULATOR_arrow_set_up_vector(camgroup->dop_dist, ob->obmat[1]);
+ WM_manipulator_set_origin(camgroup->dop_dist, ob->obmat[3]);
+ WM_manipulator_set_scale(camgroup->dop_dist, ca->drawsize);
+ WM_manipulator_set_flag(camgroup->dop_dist, WM_MANIPULATOR_HIDDEN, false);
+
+ /* need to set property here for undo. TODO would prefer to do this in _init */
+ WM_manipulator_set_property(camgroup->dop_dist, ARROW_SLOT_OFFSET_WORLD_SPACE, &camera_ptr, "dof_distance");
+ }
+ else {
+ WM_manipulator_set_flag(camgroup->dop_dist, WM_MANIPULATOR_HIDDEN, true);
+ }
+
+ /* TODO - make focal length/ortho scale widget optional */
+ if (true) {
+ const bool is_ortho = (ca->type == CAM_ORTHO);
+ const float scale[3] = {1.0f / len_v3(ob->obmat[0]), 1.0f / len_v3(ob->obmat[1]), 1.0f / len_v3(ob->obmat[2])};
+ const float scale_fac = ca->drawsize;
+ const float drawsize = is_ortho ?
+ (0.5f * ca->ortho_scale) :
+ (scale_fac / ((scale[0] + scale[1] + scale[2]) / 3.0f));
+ float offset[3];
+ float asp[2];
+
+ wmManipulator *widget = is_ortho ? camgroup->ortho_scale : camgroup->focal_len;
+ WM_manipulator_set_flag(widget, WM_MANIPULATOR_HIDDEN, false);
+ WM_manipulator_set_flag(is_ortho ? camgroup->fo
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list