[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54458] trunk/blender/source/blender: patch [#33697] Apply transformation added to metaballs.

Campbell Barton ideasman42 at gmail.com
Mon Feb 11 11:56:22 CET 2013


Revision: 54458
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54458
Author:   campbellbarton
Date:     2013-02-11 10:56:21 +0000 (Mon, 11 Feb 2013)
Log Message:
-----------
patch [#33697] Apply transformation added to metaballs.
from Jesse Werner (vidjogamer), with own addition of RNA function, scale and rotation support.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/include/ED_mball.h
    trunk/blender/source/blender/editors/metaball/mball_edit.c
    trunk/blender/source/blender/editors/object/object_transform.c
    trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
    trunk/blender/source/blender/makesrna/intern/makesrna.c
    trunk/blender/source/blender/makesrna/intern/rna_internal.h
    trunk/blender/source/blender/makesrna/intern/rna_meta.c

Added Paths:
-----------
    trunk/blender/source/blender/makesrna/intern/rna_meta_api.c

Modified: trunk/blender/source/blender/editors/include/ED_mball.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_mball.h	2013-02-11 10:01:32 UTC (rev 54457)
+++ trunk/blender/source/blender/editors/include/ED_mball.h	2013-02-11 10:56:21 UTC (rev 54458)
@@ -32,6 +32,7 @@
 #define __ED_MBALL_H__
 
 struct bContext;
+struct MetaBall;
 struct Object;
 struct wmKeyConfig;
 
@@ -48,5 +49,6 @@
 
 void undo_push_mball(struct bContext *C, const char *name);
 
-#endif
+void ED_mball_transform(struct MetaBall *mb, float *mat);
 
+#endif  /* __ED_MBALL_H__ */

Modified: trunk/blender/source/blender/editors/metaball/mball_edit.c
===================================================================
--- trunk/blender/source/blender/editors/metaball/mball_edit.c	2013-02-11 10:01:32 UTC (rev 54457)
+++ trunk/blender/source/blender/editors/metaball/mball_edit.c	2013-02-11 10:56:21 UTC (rev 54458)
@@ -586,3 +586,27 @@
 	undo_editmode_push(C, name, get_data, free_undoMball, undoMball_to_editMball, editMball_to_undoMball, NULL);
 }
 
+/* matrix is 4x4 */
+void ED_mball_transform(MetaBall *mb, float *mat)
+{
+	MetaElem *me;
+	float quat[4];
+	const float scale = mat4_to_scale((float (*)[4])mat);
+	const float scale_sqrt = sqrtf(scale);
+
+	mat4_to_quat(quat, (float (*)[4])mat);
+
+	for (me = mb->elems.first; me; me = me->next) {
+		mul_m4_v3((float (*)[4])mat, &me->x);
+		mul_qt_qtqt(me->quat, quat, me->quat);
+		me->rad *= scale;
+		/* hrmf, probably elems shouldn't be
+		 * treating scale differently - campbell */
+		if (ELEM3(me->type, MB_CUBE, MB_PLANE, MB_TUBE)) {
+			mul_v3_fl(&me->expx, scale);
+		}
+		else {
+			mul_v3_fl(&me->expx, scale_sqrt);
+		}
+	}
+}

Modified: trunk/blender/source/blender/editors/object/object_transform.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_transform.c	2013-02-11 10:01:32 UTC (rev 54457)
+++ trunk/blender/source/blender/editors/object/object_transform.c	2013-02-11 10:56:21 UTC (rev 54458)
@@ -67,6 +67,7 @@
 
 #include "ED_armature.h"
 #include "ED_keyframing.h"
+#include "ED_mball.h"
 #include "ED_mesh.h"
 #include "ED_screen.h"
 #include "ED_view3d.h"
@@ -407,6 +408,12 @@
 				change = 0;
 			}
 		}
+		else if (ob->type == OB_MBALL) {
+			if (ID_REAL_USERS(ob->data) > 1) {
+				BKE_report(reports, RPT_ERROR, "Cannot apply to a multi user metaball, doing nothing");
+				change = 0;
+			}
+		}
 		else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
 			Curve *cu;
 
@@ -516,6 +523,10 @@
 				bp++;
 			}
 		}
+		else if (ob->type == OB_MBALL) {
+			MetaBall *mb = ob->data;
+			ED_mball_transform(mb, (float *)mat);
+		}
 		else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
 			Curve *cu = ob->data;
 

Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt	2013-02-11 10:01:32 UTC (rev 54457)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt	2013-02-11 10:56:21 UTC (rev 54458)
@@ -105,6 +105,7 @@
 	rna_main_api.c
 	rna_material_api.c
 	rna_mesh_api.c
+	rna_meta_api.c
 	rna_texture_api.c
 	rna_object_api.c
 	rna_pose_api.c

Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c	2013-02-11 10:01:32 UTC (rev 54457)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c	2013-02-11 10:56:21 UTC (rev 54458)
@@ -3248,7 +3248,7 @@
 	{"rna_main.c", "rna_main_api.c", RNA_def_main},
 	{"rna_material.c", "rna_material_api.c", RNA_def_material},
 	{"rna_mesh.c", "rna_mesh_api.c", RNA_def_mesh},
-	{"rna_meta.c", NULL, RNA_def_meta},
+	{"rna_meta.c", "rna_meta_api.c", RNA_def_meta},
 	{"rna_modifier.c", NULL, RNA_def_modifier},
 	{"rna_nla.c", NULL, RNA_def_nla},
 	{"rna_nodetree.c", NULL, RNA_def_nodetree},

Modified: trunk/blender/source/blender/makesrna/intern/rna_internal.h
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_internal.h	2013-02-11 10:01:32 UTC (rev 54457)
+++ trunk/blender/source/blender/makesrna/intern/rna_internal.h	2013-02-11 10:56:21 UTC (rev 54458)
@@ -264,6 +264,7 @@
 void RNA_api_main(struct StructRNA *srna);
 void RNA_api_material(StructRNA *srna);
 void RNA_api_mesh(struct StructRNA *srna);
+void RNA_api_meta(struct StructRNA *srna);
 void RNA_api_object(struct StructRNA *srna);
 void RNA_api_object_base(struct StructRNA *srna);
 void RNA_api_pose(struct StructRNA *srna);

Modified: trunk/blender/source/blender/makesrna/intern/rna_meta.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_meta.c	2013-02-11 10:01:32 UTC (rev 54457)
+++ trunk/blender/source/blender/makesrna/intern/rna_meta.c	2013-02-11 10:56:21 UTC (rev 54458)
@@ -351,6 +351,8 @@
 	
 	/* anim */
 	rna_def_animdata_common(srna);
+
+	RNA_api_meta(srna);
 }
 
 void RNA_def_meta(BlenderRNA *brna)

Added: trunk/blender/source/blender/makesrna/intern/rna_meta_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_meta_api.c	                        (rev 0)
+++ trunk/blender/source/blender/makesrna/intern/rna_meta_api.c	2013-02-11 10:56:21 UTC (rev 54458)
@@ -0,0 +1,60 @@
+/*
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2009 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/makesrna/intern/rna_meta_api.c
+ *  \ingroup RNA
+ */
+
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "RNA_define.h"
+
+#include "BLO_sys_types.h"
+
+#include "BLI_utildefines.h"
+
+#include "ED_mball.h"
+
+#include "rna_internal.h"  /* own include */
+
+#ifdef RNA_RUNTIME
+/* none */
+#else
+
+void RNA_api_meta(StructRNA *srna)
+{
+	FunctionRNA *func;
+	PropertyRNA *parm;
+
+	func = RNA_def_function(srna, "transform", "ED_mball_transform");
+	RNA_def_function_ui_description(func, "Transform meta elements by a matrix");
+	parm = RNA_def_float_matrix(func, "matrix", 4, 4, NULL, 0.0f, 0.0f, "", "Matrix", 0.0f, 0.0f);
+	RNA_def_property_flag(parm, PROP_REQUIRED);
+}
+
+#endif


Property changes on: trunk/blender/source/blender/makesrna/intern/rna_meta_api.c
___________________________________________________________________
Added: svn:eol-style
   + native




More information about the Bf-blender-cvs mailing list