[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18171] branches/blender2.5/blender/source /blender/editors: 2.5
Michael Fox
mfoxdogg at gmail.com
Tue Dec 30 11:37:55 CET 2008
Revision: 18171
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18171
Author: mfoxdogg
Date: 2008-12-30 11:37:52 +0100 (Tue, 30 Dec 2008)
Log Message:
-----------
2.5
******
- ported Make track , and Clear track (ctrl-t, Alt-t)
- make track is a direct port does not use context data loops
- make Track crashes as Constraints have not been ported yet
- added select_extend to mouse select so now you can use shift again
- Still does not use Context data loops as this get all messed up, kaito can you look into it
- currently only works with 1 modifier key at a time so ctrl+alt does not work, until i can figure out how best to achieve this
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/object/object_intern.h
branches/blender2.5/blender/source/blender/editors/object/object_ops.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c
Modified: branches/blender2.5/blender/source/blender/editors/object/object_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_edit.c 2008-12-30 10:10:44 UTC (rev 18170)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c 2008-12-30 10:37:52 UTC (rev 18171)
@@ -882,10 +882,10 @@
BIF_undo_push("Add hook");
}
-void make_track(Scene *scene, View3D *v3d)
+void make_track(Scene *scene, View3D *v3d, short mode)
{
Base *base;
- short mode=0;
+ /*short mode=0;*/
if(scene->id.lib) return;
if(G.obedit) {
@@ -1025,6 +1025,62 @@
RNA_def_property_enum_items(prop, prop_clear_parent_types);
}
+/* ******************** clear track operator ******************* */
+
+
+static EnumPropertyItem prop_clear_track_types[] = {
+ {0, "CLEAR", "Clear Track", ""},
+ {1, "CLEAR_KEEP_TRANSFORM", "Clear and Keep Transformation (Clear Track)", ""},
+ {0, NULL, NULL, NULL}
+};
+
+/* note, poll should check for editable scene */
+static int object_clear_track_exec(bContext *C, wmOperator *op)
+{
+ Object *ob= CTX_data_active_object(C);
+
+ if(G.obedit) return;
+
+ CTX_DATA_BEGIN(C, Object*, ob, selected_objects) {
+ /*if(TESTBASELIB(v3d, base)) {*/
+ ob->track= NULL;
+ ob->recalc |= OB_RECALC;
+
+ if(RNA_enum_is_equal(op->ptr, "type", "CLEAR_KEEP_TRANSFORM")) {
+ apply_obmat(ob);
+ }
+ /*}*/
+ }
+ CTX_DATA_END;
+
+ DAG_scene_sort(CTX_data_scene(C));
+ ED_anim_dag_flush_update(C);
+
+ BIF_undo_push("Clear Track");
+
+ return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_clear_track(wmOperatorType *ot)
+{
+ PropertyRNA *prop;
+
+ /* identifiers */
+ ot->name= "Clear track";
+ ot->idname= "OBJECT_OT_clear_track";
+
+ /* api callbacks */
+ ot->invoke= WM_menu_invoke;
+ ot->exec= object_clear_track_exec;
+
+ ot->poll= ED_operator_areaactive; // XXX solve
+ ot->flag= OPTYPE_REGISTER;
+
+ prop = RNA_def_property(ot->srna, "type", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_items(prop, prop_clear_track_types);
+}
+
+
/* ***************************** */
/* ****** Select by Type ****** */
static EnumPropertyItem prop_select_object_types[] = {
@@ -1831,6 +1887,115 @@
RNA_def_property_enum_items(prop, prop_make_parent_types);
}
+/* *** make track ***** */
+static EnumPropertyItem prop_make_track_types[] = {
+ {1, "TRACKTO", "TrackTo Constraint", ""},
+ {2, "LOCKTRACK", "LockTrack Constraint", ""},
+ {3, "OLDTRACK", "Old Track", ""},
+ {0, NULL, NULL, NULL}
+};
+
+static int make_track_exec(bContext *C, wmOperator *op)
+{
+ Scene *scene= CTX_data_scene(C);
+ ScrArea *sa= CTX_wm_area(C);
+ ARegion *ar= CTX_wm_region(C);
+ View3D *v3d= sa->spacedata.first;
+ Base *base;
+
+ if(scene->id.lib) return;
+
+
+ if(RNA_enum_is_equal(op->ptr, "type", "TRACKTO")){
+ bConstraint *con;
+ bTrackToConstraint *data;
+
+ for(base= FIRSTBASE; base; base= base->next) {
+ if(TESTBASELIB(v3d, base)) {
+ if(base!=BASACT) {
+// XXX con = add_new_constraint(CONSTRAINT_TYPE_TRACKTO);
+ strcpy (con->name, "AutoTrack");
+
+ data = con->data;
+ data->tar = BASACT->object;
+ base->object->recalc |= OB_RECALC;
+
+ /* Lamp and Camera track differently by default */
+ if (base->object->type == OB_LAMP || base->object->type == OB_CAMERA) {
+ data->reserved1 = TRACK_nZ;
+ data->reserved2 = UP_Y;
+ }
+
+// XXX add_constraint_to_object(con, base->object);
+ }
+ }
+ }
+
+ }
+ else if(RNA_enum_is_equal(op->ptr, "type", "LOCKTRACK")){
+ bConstraint *con;
+ bLockTrackConstraint *data;
+
+ for(base= FIRSTBASE; base; base= base->next) {
+ if(TESTBASELIB(v3d, base)) {
+ if(base!=BASACT) {
+// XXX con = add_new_constraint(CONSTRAINT_TYPE_LOCKTRACK);
+ strcpy (con->name, "AutoTrack");
+
+ data = con->data;
+ data->tar = BASACT->object;
+ base->object->recalc |= OB_RECALC;
+
+ /* Lamp and Camera track differently by default */
+ if (base->object->type == OB_LAMP || base->object->type == OB_CAMERA) {
+ data->trackflag = TRACK_nZ;
+ data->lockflag = LOCK_Y;
+ }
+
+// XXX add_constraint_to_object(con, base->object);
+ }
+ }
+ }
+
+ }
+ else if(RNA_enum_is_equal(op->ptr, "type", "OLDTRACK")){
+ for(base= FIRSTBASE; base; base= base->next) {
+ if(TESTBASELIB(v3d, base)) {
+ if(base!=BASACT) {
+ base->object->track= BASACT->object;
+ base->object->recalc |= OB_RECALC;
+ }
+ }
+ }
+ }
+ DAG_scene_sort(CTX_data_scene(C));
+ ED_anim_dag_flush_update(C);
+
+ BIF_undo_push("make track");
+
+ return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_make_track(wmOperatorType *ot)
+{
+ PropertyRNA *prop;
+
+ /* identifiers */
+ ot->name= "Make Track";
+ ot->idname= "OBJECT_OT_make_track";
+
+ /* api callbacks */
+ ot->invoke= WM_menu_invoke;
+ ot->exec= make_track_exec;
+
+ ot->poll= ED_operator_areaactive; // XXX solve
+ ot->flag= OPTYPE_REGISTER;
+
+ prop = RNA_def_property(ot->srna, "type", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_items(prop, prop_make_track_types);
+}
+
+
/* ******************* ***************** */
void enter_editmode(Scene *scene, View3D *v3d, int wc)
Modified: branches/blender2.5/blender/source/blender/editors/object/object_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_intern.h 2008-12-30 10:10:44 UTC (rev 18170)
+++ branches/blender2.5/blender/source/blender/editors/object/object_intern.h 2008-12-30 10:37:52 UTC (rev 18171)
@@ -34,6 +34,8 @@
/* object_edit.c */
void OBJECT_OT_make_parent(wmOperatorType *ot);
void OBJECT_OT_clear_parent(wmOperatorType *ot);
+void OBJECT_OT_make_track(wmOperatorType *ot);
+void OBJECT_OT_clear_track(wmOperatorType *ot);
void OBJECT_OT_de_select_all(struct wmOperatorType *ot);
void OBJECT_OT_select_invert(struct wmOperatorType *ot);
void OBJECT_OT_select_random(struct wmOperatorType *ot);
Modified: branches/blender2.5/blender/source/blender/editors/object/object_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_ops.c 2008-12-30 10:10:44 UTC (rev 18170)
+++ branches/blender2.5/blender/source/blender/editors/object/object_ops.c 2008-12-30 10:37:52 UTC (rev 18171)
@@ -64,6 +64,8 @@
{
WM_operatortype_append(OBJECT_OT_make_parent);
WM_operatortype_append(OBJECT_OT_clear_parent);
+ WM_operatortype_append(OBJECT_OT_make_track);
+ WM_operatortype_append(OBJECT_OT_clear_track);
WM_operatortype_append(OBJECT_OT_select_invert);
WM_operatortype_append(OBJECT_OT_select_random);
WM_operatortype_append(OBJECT_OT_de_select_all);
@@ -84,6 +86,8 @@
WM_keymap_add_item(keymap, "OBJECT_OT_select_by_layer",PADASTERKEY, KM_PRESS, KM_ALT, 0);
WM_keymap_verify_item(keymap, "OBJECT_OT_make_parent", PKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_verify_item(keymap, "OBJECT_OT_clear_parent", PKEY, KM_PRESS, KM_ALT, 0);
+ WM_keymap_verify_item(keymap, "OBJECT_OT_make_track", TKEY, KM_PRESS, KM_CTRL, 0);
+ WM_keymap_verify_item(keymap, "OBJECT_OT_clear_track", TKEY, KM_PRESS, KM_ALT, 0);
// RNA_int_set(WM_keymap_add_item(keymap, "OBJECT_OT_viewzoom", PADPLUSKEY, KM_PRESS, 0, 0)->ptr, "delta", 1);
}
Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c 2008-12-30 10:10:44 UTC (rev 18170)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c 2008-12-30 10:37:52 UTC (rev 18171)
@@ -1492,7 +1492,7 @@
ot->idname= "VIEW3D_OT_select_extend";
/* api callbacks */
- ot->invoke= view3d_select_invoke;
+ ot->invoke= view3d_select_extend_invoke;
ot->poll= ED_operator_view3d_active;
prop = RNA_def_property(ot->srna, "modifier", PROP_ENUM, PROP_NONE);
More information about the Bf-blender-cvs
mailing list