griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Camera tracking: wall scene orientation operator

Browse Source 
Made Set Floor a bit more general and name it Set Plane which defines
orientation from 3 selected tracks and makes them belong to specified
plane (wall or floor).
This commit is contained in:
Sergey Sharybin
2012-03-06 12:27:42 +00:00
parent bb21641e1c
commit 91c2aa7b95
4 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
release/scripts/startup/bl_ui/space_clip.py
View File

@@ -298,7 +298,11 @@ class CLIP_PT_tools_orientation(Panel):
settings = sc.clip.tracking.settings
col = layout.column(align=True)
col.operator("clip.set_floor")
row = col.row()
props = row.operator("clip.set_plane", text="Floor")
props.plane = 'FLOOR'
props = row.operator("clip.set_plane", text="Wall")
props.plane = 'WALL'
col.operator("clip.set_origin")
row = col.row()

2
source/blender/editors/space_clip/clip_intern.h
View File

@@ -126,7 +126,7 @@ void CLIP_OT_hide_tracks_clear(struct wmOperatorType *ot);
void CLIP_OT_lock_tracks(struct wmOperatorType *ot);
void CLIP_OT_set_origin(struct wmOperatorType *ot);
void CLIP_OT_set_floor(struct wmOperatorType *ot);
void CLIP_OT_set_plane(struct wmOperatorType *ot);
void CLIP_OT_set_axis(struct wmOperatorType *ot);
void CLIP_OT_set_scale(struct wmOperatorType *ot);
void CLIP_OT_set_solution_scale(struct wmOperatorType *ot);

2
source/blender/editors/space_clip/space_clip.c
View File

@@ -347,7 +347,7 @@ static void clip_operatortypes(void)
/* orientation */
WM_operatortype_append(CLIP_OT_set_origin);
WM_operatortype_append(CLIP_OT_set_floor);
WM_operatortype_append(CLIP_OT_set_plane);
WM_operatortype_append(CLIP_OT_set_axis);
WM_operatortype_append(CLIP_OT_set_scale);
WM_operatortype_append(CLIP_OT_set_solution_scale);

35
source/blender/editors/space_clip/tracking_ops.c
View File

@@ -2248,7 +2248,7 @@ static void set_axis(Scene *scene, Object *ob, MovieClip *clip, MovieTrackingOb
object_apply_mat4(ob, mat, 0, 0);
}
static int set_floor_exec(bContext *C, wmOperator *op)
static int set_plane_exec(bContext *C, wmOperator *op)
{
SpaceClip *sc= CTX_wm_space_clip(C);
MovieClip *clip= ED_space_clip(sc);
@@ -2261,6 +2261,7 @@ static int set_floor_exec(bContext *C, wmOperator *op)
Object *camera= get_camera_with_movieclip(scene, clip);
int tot= 0;
float vec[3][3], mat[4][4], obmat[4][4], newmat[4][4], orig[3]= {0.0f, 0.0f, 0.0f};
int plane= RNA_enum_get(op->ptr, "plane");
float rot[4][4]={{0.0f, 0.0f, -1.0f, 0.0f},
{0.0f, 1.0f, 0.0f, 0.0f},
{1.0f, 0.0f, 0.0f, 0.0f},
@@ -2308,9 +2309,16 @@ static int set_floor_exec(bContext *C, wmOperator *op)
/* construct ortho-normal basis */
unit_m4(mat);
cross_v3_v3v3(mat[0], vec[1], vec[2]);
copy_v3_v3(mat[1], vec[1]);
cross_v3_v3v3(mat[2], mat[0], mat[1]);
if (plane == 0) { /* floor */
cross_v3_v3v3(mat[0], vec[1], vec[2]);
copy_v3_v3(mat[1], vec[1]);
cross_v3_v3v3(mat[2], mat[0], mat[1]);
}
else if (plane == 1) { /* wall */
cross_v3_v3v3(mat[2], vec[1], vec[2]);
copy_v3_v3(mat[1], vec[1]);
cross_v3_v3v3(mat[0], mat[1], mat[2]);
}
normalize_v3(mat[0]);
normalize_v3(mat[1]);
@@ -2352,19 +2360,28 @@ static int set_floor_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
void CLIP_OT_set_floor(wmOperatorType *ot)
void CLIP_OT_set_plane(wmOperatorType *ot)
{
static EnumPropertyItem plane_items[] = {
{0, "FLOOR", 0, "Floor", "Set floor plane"},
{1, "WALL", 0, "Wall", "Set wall plane"},
{0, NULL, 0, NULL, NULL}
};
/* identifiers */
ot->name= "Set Floor";
ot->description= "Set floor based on 3 selected bundles by moving camera (or it's parent if present) in 3D space";
ot->idname= "CLIP_OT_set_floor";
ot->name= "Set Plane";
ot->description= "Set plane based on 3 selected bundles by moving camera (or it's parent if present) in 3D space";
ot->idname= "CLIP_OT_set_plane";
/* api callbacks */
ot->exec= set_floor_exec;
ot->exec= set_plane_exec;
ot->poll= set_orientation_poll;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
RNA_def_enum(ot->srna, "plane", plane_items, 0, "Plane", "Plane to be sued for orientation");
}
/********************** set axis operator *********************/