Object tracking: configurable scale for object solution

Added slider to define scale of object solution which is used to define
"depth" of object relative to camera position. This slider effects on all
"users" of object solution such as bundles display, constrained objects and so.

Added new operator called "Set Solution Scale" to set real scale for object
solution based on real distance between two bundles reconstructed for this object.

New slider and operator can be found on "Object" panel in toolbox when in
reconstruction mode and active tracking object isn't a camera.

3 files changed, 77 insertions, 8 deletions

diff --git a/source/blender/editors/space_clip/clip_intern.h b/source/blender/editors/space_clip/clip_intern.h
index 38da4dd86ff..64881499a31 100644
--- a/source/blender/editors/space_clip/clip_intern.h
+++ b/source/blender/editors/space_clip/clip_intern.h
@@ -124,6 +124,7 @@ void CLIP_OT_set_origin(struct wmOperatorType *ot);
 void CLIP_OT_set_floor(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);
 
 void CLIP_OT_set_center_principal(struct wmOperatorType *ot);
 
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index 01779a806b9..5291121571c 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -351,6 +351,7 @@ static void clip_operatortypes(void)
 	WM_operatortype_append(CLIP_OT_set_floor);
 	WM_operatortype_append(CLIP_OT_set_axis);
 	WM_operatortype_append(CLIP_OT_set_scale);
+	WM_operatortype_append(CLIP_OT_set_solution_scale);
 
 	/* detect */
 	WM_operatortype_append(CLIP_OT_detect_features);
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index c37113e924c..ff970a9db30 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -2344,7 +2344,7 @@ void CLIP_OT_set_axis(wmOperatorType *ot)
 
 /********************** set scale operator *********************/
 
-static int set_scale_exec(bContext *C, wmOperator *op)
+static int do_set_scale(bContext *C, wmOperator *op, int scale_solution)
 {
 	SpaceClip *sc= CTX_wm_space_clip(C);
 	MovieClip *clip= ED_space_clip(sc);
@@ -2352,24 +2352,26 @@ static int set_scale_exec(bContext *C, wmOperator *op)
 	MovieTrackingObject *tracking_object= BKE_tracking_active_object(tracking);
 	MovieTrackingTrack *track;
 	Scene *scene= CTX_data_scene(C);
-	Object *object;
+	Object *object= NULL;
 	ListBase *tracksbase= BKE_tracking_get_tracks(tracking);
 	int tot= 0;
 	float vec[2][3], mat[4][4], scale;
 	float dist= RNA_float_get(op->ptr, "distance");
 
 	if(count_selected_bundles(C)!=2) {
-		BKE_report(op->reports, RPT_ERROR, "Two tracks with bundles should be selected to scale scene");
+		BKE_report(op->reports, RPT_ERROR, "Two tracks with bundles should be selected to set scale");
 
 		return OPERATOR_CANCELLED;
 	}
 
-	if(tracking_object->flag&TRACKING_OBJECT_CAMERA)
+	if(tracking_object->flag&TRACKING_OBJECT_CAMERA) {
 		object= scene->camera;
-	else
+	}
+	else if(!scale_solution) {
 		object= OBACT;
+	}
 
-	if(object->parent)
+	if(object && object->parent)
 		object= object->parent;
 
 	BKE_get_tracking_mat(scene, NULL, mat);
@@ -2392,7 +2394,8 @@ static int set_scale_exec(bContext *C, wmOperator *op)
 		if(tracking_object->flag&TRACKING_OBJECT_CAMERA) {
 			mul_v3_fl(object->size, scale);
 			mul_v3_fl(object->loc, scale);
-		} else {
+		} else
+		if(!scale_solution){
 			object->size[0]= object->size[1]= object->size[2]= 1.0f/scale;
 
 			if(scene->camera) {
@@ -2401,9 +2404,14 @@ static int set_scale_exec(bContext *C, wmOperator *op)
 				object->size[2]/= scene->camera->size[2];
 			}
 		}
+		else {
+			tracking_object->scale= scale;
+		}
 
 		DAG_id_tag_update(&clip->id, 0);
-		DAG_id_tag_update(&object->id, OB_RECALC_OB);
+
+		if(object)
+			DAG_id_tag_update(&object->id, OB_RECALC_OB);
 
 		WM_event_add_notifier(C, NC_MOVIECLIP|NA_EVALUATED, clip);
 		WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
@@ -2412,6 +2420,11 @@ static int set_scale_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
+static int set_scale_exec(bContext *C, wmOperator *op)
+{
+	return do_set_scale(C, op, 0);
+}
+
 static int set_scale_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
 {
 	SpaceClip *sc= CTX_wm_space_clip(C);
@@ -2444,6 +2457,60 @@ void CLIP_OT_set_scale(wmOperatorType *ot)
 		"Distance", "Distance between selected tracks", -100.0f, 100.0f);
 }
 
+/********************** set solution scale operator *********************/
+
+static int set_solution_scale_poll(bContext *C)
+{
+	if(space_clip_frame_poll(C)) {
+		Scene *scene= CTX_data_scene(C);
+		SpaceClip *sc= CTX_wm_space_clip(C);
+		MovieClip *clip= ED_space_clip(sc);
+		MovieTracking *tracking= &clip->tracking;
+		MovieTrackingObject *tracking_object= BKE_tracking_active_object(tracking);
+
+		return (tracking_object->flag&TRACKING_OBJECT_CAMERA) == 0;
+	}
+
+	return 0;
+}
+
+static int set_solution_scale_exec(bContext *C, wmOperator *op)
+{
+	return do_set_scale(C, op, 1);
+}
+
+static int set_solution_scale_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
+{
+	SpaceClip *sc= CTX_wm_space_clip(C);
+	MovieClip *clip= ED_space_clip(sc);
+	float dist= RNA_float_get(op->ptr, "distance");
+
+	if(dist==0.0f)
+		RNA_float_set(op->ptr, "distance", clip->tracking.settings.object_distance);
+
+	return set_solution_scale_exec(C, op);
+}
+
+void CLIP_OT_set_solution_scale(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Set Solution Scale";
+	ot->description= "Set object solution scale using distance between two selected tracks";
+	ot->idname= "CLIP_OT_set_solution_scale";
+
+	/* api callbacks */
+	ot->exec= set_solution_scale_exec;
+	ot->invoke= set_solution_scale_invoke;
+	ot->poll= set_solution_scale_poll;
+
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_float(ot->srna, "distance", 0.0f, -FLT_MAX, FLT_MAX,
+		"Distance", "Distance between selected tracks", -100.0f, 100.0f);
+}
+
 /********************** set principal center operator *********************/
 
 static int set_center_principal_exec(bContext *C, wmOperator *UNUSED(op))