NLA SoC: Influence/Time properties for strips can now be animated

* These settings can now be edited + keyframed (using IKEY over the button only for now... other cases will fail)

* Reshuffled some of the keyframing code to make this sort of thing easier to do. Also, restored corrections for NLA-mapping when inserting/removing keyframes.


TODOS:
* animation editors don't show these keyframes yet
* the buttons don't change colour yet to reflect this state. How to do this efficiently?
* allow keyframing of these in more places
* more robust UI handling for this.

1 files changed, 142 insertions, 95 deletions

diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 331e2d0894e..ac195f42f03 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -54,6 +54,7 @@
 #include "BKE_action.h"
 #include "BKE_constraint.h"
 #include "BKE_fcurve.h"
+#include "BKE_nla.h"
 #include "BKE_global.h"
 #include "BKE_utildefines.h"
 #include "BKE_context.h"
@@ -722,9 +723,119 @@ static float visualkey_get_value (PointerRNA *ptr, PropertyRNA *prop, int array_
 
 /* ------------------------- Insert Key API ------------------------- */
 
+/* Secondary Keyframing API call: 
+ * 	Use this when validation of necessary animation data is not necessary, since an RNA-pointer to the necessary
+ *	data being keyframed, and a pointer to the F-Curve to use have both been provided.
+ *
+ *	The flag argument is used for special settings that alter the behaviour of
+ *	the keyframe insertion. These include the 'visual' keyframing modes, quick refresh,
+ *	and extra keyframe filtering.
+ */
+short insert_keyframe_direct (PointerRNA ptr, PropertyRNA *prop, FCurve *fcu, float cfra, short flag)
+{
+	float curval= 0.0f;
+	
+	/* no F-Curve to add keyframe to? */
+	if (fcu == NULL) {
+		printf("ERROR: no F-Curve to add keyframes to \n");
+		return 0;
+	}
+	
+	/* if no property given yet, try to validate from F-Curve info */
+	if ((ptr.id.data == NULL) && (ptr.data==NULL)) {
+		printf("ERROR: no RNA-pointer available to retrieve values for keyframing from\n");
+		return 0;
+	}
+	if (prop == NULL) {
+		PointerRNA tmp_ptr;
+		
+		/* try to get property we should be affecting */
+		if ((RNA_path_resolve(&ptr, fcu->rna_path, &tmp_ptr, &prop) == 0) || (prop == NULL)) {
+			/* property not found... */
+			char *idname= (ptr.id.data) ? ((ID *)ptr.id.data)->name : "<No ID-Pointer>";
+			
+			printf("Insert Key: Could not insert keyframe, as RNA Path is invalid for the given ID (ID = %s, Path = %s)\n", idname, fcu->rna_path);
+			return 0;
+		}
+		else {
+			/* property found, so overwrite 'ptr' to make later code easier */
+			ptr= tmp_ptr;
+		}
+	}
+	
+	/* set additional flags for the F-Curve (i.e. only integer values) */
+	fcu->flag &= ~(FCURVE_INT_VALUES|FCURVE_DISCRETE_VALUES);
+	switch (RNA_property_type(prop)) {
+		case PROP_FLOAT:
+			/* do nothing */
+			break;
+		case PROP_INT:
+			/* do integer (only 'whole' numbers) interpolation between all points */
+			fcu->flag |= FCURVE_INT_VALUES;
+			break;
+		default:
+			/* do 'discrete' (i.e. enum, boolean values which cannot take any intermediate
+			 * values at all) interpolation between all points
+			 *	- however, we must also ensure that evaluated values are only integers still
+			 */
+			fcu->flag |= (FCURVE_DISCRETE_VALUES|FCURVE_INT_VALUES);
+			break;
+	}
+	
+	/* obtain value to give keyframe */
+	if ( (flag & INSERTKEY_MATRIX) && 
+		 (visualkey_can_use(&ptr, prop)) ) 
+	{
+		/* visual-keying is only available for object and pchan datablocks, as 
+		 * it works by keyframing using a value extracted from the final matrix 
+		 * instead of using the kt system to extract a value.
+		 */
+		curval= visualkey_get_value(&ptr, prop, fcu->array_index);
+	}
+	else {
+		/* read value from system */
+		curval= setting_get_rna_value(&ptr, prop, fcu->array_index);
+	}
+	
+	/* only insert keyframes where they are needed */
+	if (flag & INSERTKEY_NEEDED) {
+		short insert_mode;
+		
+		/* check whether this curve really needs a new keyframe */
+		insert_mode= new_key_needed(fcu, cfra, curval);
+		
+		/* insert new keyframe at current frame */
+		if (insert_mode)
+			insert_vert_fcurve(fcu, cfra, curval, (flag & INSERTKEY_FAST));
+		
+		/* delete keyframe immediately before/after newly added */
+		switch (insert_mode) {
+			case KEYNEEDED_DELPREV:
+				delete_fcurve_key(fcu, fcu->totvert-2, 1);
+				break;
+			case KEYNEEDED_DELNEXT:
+				delete_fcurve_key(fcu, 1, 1);
+				break;
+		}
+		
+		/* only return success if keyframe added */
+		if (insert_mode)
+			return 1;
+	}
+	else {
+		/* just insert keyframe */
+		insert_vert_fcurve(fcu, cfra, curval, (flag & INSERTKEY_FAST));
+		
+		/* return success */
+		return 1;
+	}
+	
+	/* failed */
+	return 0;
+}
+
 /* Main Keyframing API call:
- *	Use this when validation of necessary animation data isn't necessary as it
- *	already exists. It will insert a keyframe using the current value being keyframed.
+ *	Use this when validation of necessary animation data is necessary, since it may not exist yet.
  *	
  *	The flag argument is used for special settings that alter the behaviour of
  *	the keyframe insertion. These include the 'visual' keyframing modes, quick refresh,
@@ -744,102 +855,31 @@ short insert_keyframe (ID *id, bAction *act, const char group[], const char rna_
 	}
 	
 	/* get F-Curve - if no action is provided, keyframe to the default one attached to this ID-block */
-	if (act == NULL)
+	if (act == NULL) {
+		AnimData *adt= BKE_animdata_from_id(id);
+		
+		/* get action to add F-Curve+keyframe to */
 		act= verify_adt_action(id, 1);
+		
+		/* apply NLA-mapping to frame to use (if applicable) */
+		cfra= BKE_nla_tweakedit_remap(adt, cfra, NLATIME_CONVERT_UNMAP);
+	}
 	fcu= verify_fcurve(act, group, rna_path, array_index, 1);
 	
-	/* only continue if we have an F-Curve to add keyframe to */
-	if (fcu) {
-		float curval= 0.0f;
+	/* apply special time tweaking */
+		// XXX check on this stuff...
+	if (GS(id->name) == ID_OB) {
+		//Object *ob= (Object *)id;
 		
-		/* set additional flags for the F-Curve (i.e. only integer values) */
-		fcu->flag &= ~(FCURVE_INT_VALUES|FCURVE_DISCRETE_VALUES);
-		switch (RNA_property_type(prop)) {
-			case PROP_FLOAT:
-				/* do nothing */
-				break;
-			case PROP_INT:
-				/* do integer (only 'whole' numbers) interpolation between all points */
-				fcu->flag |= FCURVE_INT_VALUES;
-				break;
-			default:
-				/* do 'discrete' (i.e. enum, boolean values which cannot take any intermediate
-				 * values at all) interpolation between all points
-				 *	- however, we must also ensure that evaluated values are only integers still
-				 */
-				fcu->flag |= (FCURVE_DISCRETE_VALUES|FCURVE_INT_VALUES);
-				break;
-		}
-		
-		/* apply special time tweaking */
-			// XXX check on this stuff...
-		if (GS(id->name) == ID_OB) {
-			//Object *ob= (Object *)id;
-			
-			/* apply NLA-scaling (if applicable) */
-			//cfra= get_action_frame(ob, cfra);
-			
-			/* ancient time-offset cruft */
-			//if ( (ob->ipoflag & OB_OFFS_OB) && (give_timeoffset(ob)) ) {
-			//	/* actually frametofloat calc again! */
-			//	cfra-= give_timeoffset(ob)*scene->r.framelen;
-			//}
-		}
-		
-		/* obtain value to give keyframe */
-		if ( (flag & INSERTKEY_MATRIX) && 
-			 (visualkey_can_use(&ptr, prop)) ) 
-		{
-			/* visual-keying is only available for object and pchan datablocks, as 
-			 * it works by keyframing using a value extracted from the final matrix 
-			 * instead of using the kt system to extract a value.
-			 */
-			curval= visualkey_get_value(&ptr, prop, array_index);
-		}
-		else {
-			/* read value from system */
-			curval= setting_get_rna_value(&ptr, prop, array_index);
-		}
-		
-		/* only insert keyframes where they are needed */
-		if (flag & INSERTKEY_NEEDED) {
-			short insert_mode;
-			
-			/* check whether this curve really needs a new keyframe */
-			insert_mode= new_key_needed(fcu, cfra, curval);
-			
-			/* insert new keyframe at current frame */
-			if (insert_mode)
-				insert_vert_fcurve(fcu, cfra, curval, (flag & INSERTKEY_FAST));
-			
-			/* delete keyframe immediately before/after newly added */
-			switch (insert_mode) {
-				case KEYNEEDED_DELPREV:
-					delete_fcurve_key(fcu, fcu->totvert-2, 1);
-					break;
-				case KEYNEEDED_DELNEXT:
-					delete_fcurve_key(fcu, 1, 1);
-					break;
-			}
-			
-			/* only return success if keyframe added */
-			if (insert_mode)
-				return 1;
-		}
-		else {
-			/* just insert keyframe */
-			insert_vert_fcurve(fcu, cfra, curval, (flag & INSERTKEY_FAST));
-			
-			/* return success */
-			return 1;
-		}
+		/* ancient time-offset cruft */
+		//if ( (ob->ipoflag & OB_OFFS_OB) && (give_timeoffset(ob)) ) {
+		//	/* actually frametofloat calc again! */
+		//	cfra-= give_timeoffset(ob)*scene->r.framelen;
+		//}
 	}
 	
-	/* no F-Curve to add keyframes to */
-	printf("ERROR: no F-Curve to add keyframes to \n");
-	
-	/* return failure */
-	return 0;
+	/* insert keyframe */
+	return insert_keyframe_direct(ptr, prop, fcu, cfra, flag);
 }
 
 /* ************************************************** */
@@ -864,6 +904,9 @@ short delete_keyframe (ID *id, bAction *act, const char group[], const char rna_
 		/* if no action is provided, use the default one attached to this ID-block */
 		AnimData *adt= BKE_animdata_from_id(id);
 		act= adt->action;
+		
+		/* apply NLA-mapping to frame to use (if applicable) */
+		cfra= BKE_nla_tweakedit_remap(adt, cfra, NLATIME_CONVERT_UNMAP); 
 	}
 	/* we don't check the validity of the path here yet, but it should be ok... */
 	fcu= verify_fcurve(act, group, rna_path, array_index, 0);
@@ -877,9 +920,6 @@ short delete_keyframe (ID *id, bAction *act, const char group[], const char rna_
 		if (GS(id->name) == ID_OB) {
 			//Object *ob= (Object *)id;
 			
-			/* apply NLA-scaling (if applicable) */
-			//	cfra= get_action_frame(ob, cfra);
-			
 			/* ancient time-offset cruft */
 			//if ( (ob->ipoflag & OB_OFFS_OB) && (give_timeoffset(ob)) ) {
 			//	/* actually frametofloat calc again! */
@@ -1266,6 +1306,13 @@ static int insert_key_button_exec (bContext *C, wmOperator *op)
 			
 			MEM_freeN(path);
 		}
+		else if (ptr.type == &RNA_NlaStrip) {
+			/* handle special vars for NLA-strips */
+			NlaStrip *strip= (NlaStrip *)ptr.data;
+			FCurve *fcu= list_find_fcurve(&strip->fcurves, RNA_property_identifier(prop), 0);
+			
+			success+= insert_keyframe_direct(ptr, prop, fcu, cfra, 0);
+		}
 		else {
 			if (G.f & G_DEBUG)
 				printf("Button Insert-Key: no path to property \n");