NLA SoC: FModifier drawing converted to use Layout Engine

* Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts.
--> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects.

* Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow.

* Finished/cleaned up the RNA-wrapping of most FModifiers. 


TODO's (help requested... Brecht?):
Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())

2 files changed, 68 insertions, 44 deletions

diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 106185085d6..0673521505f 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -179,6 +179,7 @@ extern StructRNA RNA_FileSelectParams;
 extern StructRNA RNA_FModifier;
 extern StructRNA RNA_FModifierCycles;
 extern StructRNA RNA_FModifierEnvelope;
+extern StructRNA RNA_FModifierEnvelopeControlPoint;
 extern StructRNA RNA_FModifierFunctionGenerator;
 extern StructRNA RNA_FModifierGenerator;
 extern StructRNA RNA_FModifierGenerator_PolyExpanded;
diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c
index 826d186516d..95a0482557f 100644
--- a/source/blender/makesrna/intern/rna_fcurve.c
+++ b/source/blender/makesrna/intern/rna_fcurve.c
@@ -56,17 +56,7 @@ StructRNA *rna_FModifierType_refine(struct PointerRNA *ptr)
 
 	switch (fcm->type) {
 		case FMODIFIER_TYPE_GENERATOR:
-		{
-			FMod_Generator *gen= (FMod_Generator *)fcm->data;
-			
-			switch (gen->mode) {
-				case FCM_GENERATOR_POLYNOMIAL:
-					return &RNA_FModifierGenerator_PolyExpanded;
-				//case FCM_GENERATOR_POLYNOMIAL_FACTORISED:
-				default:
-					return &RNA_FModifierGenerator;
-			}
-		}
+			return &RNA_FModifierGenerator;
 		case FMODIFIER_TYPE_FN_GENERATOR:
 			return &RNA_FModifierFunctionGenerator;
 		case FMODIFIER_TYPE_ENVELOPE:
@@ -159,19 +149,22 @@ static void rna_FCurve_RnaPath_set(PointerRNA *ptr, const char *value)
 
 #else
 
-static void rna_def_fmodifier_generator_common(StructRNA *srna)
+
+static void rna_def_fmodifier_generator(BlenderRNA *brna)
 {
+	StructRNA *srna;
 	PropertyRNA *prop;
 	
 	static EnumPropertyItem prop_mode_items[] = {
 		{FCM_GENERATOR_POLYNOMIAL, "POLYNOMIAL", 0, "Expanded Polynomial", ""},
 		{FCM_GENERATOR_POLYNOMIAL_FACTORISED, "POLYNOMIAL_FACTORISED", 0, "Factorised Polynomial", ""},
 		{0, NULL, 0, NULL, NULL}};
-		
-	/* struct wrapping settings */
-	RNA_def_struct_sdna_from(srna, "FMod_Generator", "data");	
 	
-	/* settings */
+	srna= RNA_def_struct(brna, "FModifierGenerator", "FModifier");
+	RNA_def_struct_ui_text(srna, "Generator F-Curve Modifier", "Deterministically generates values for the modified F-Curve.");
+	RNA_def_struct_sdna_from(srna, "FMod_Generator", "data");
+	
+	/* define common props */
 	prop= RNA_def_property(srna, "additive", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_GENERATOR_ADDITIVE);
 	RNA_def_property_ui_text(prop, "Additive", "Values generated by this modifier are applied on top of the existing values instead of overwriting them.");
@@ -180,41 +173,22 @@ static void rna_def_fmodifier_generator_common(StructRNA *srna)
 	prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, prop_mode_items);
 	RNA_def_property_ui_text(prop, "Mode", "Type of generator to use.");
-}
-
-/* this is a temporary dummy generator-modifier wrapping (to be discarded) */
-static void rna_def_fmodifier_generator(BlenderRNA *brna)
-{
-	StructRNA *srna;
 	
-	srna= RNA_def_struct(brna, "FModifierGenerator", "FModifier");
-	RNA_def_struct_ui_text(srna, "Generator F-Curve Modifier", "Deterministically generates values for the modified F-Curve.");
-	
-	/* define common props */
-	rna_def_fmodifier_generator_common(srna);
-}
-
-static void rna_def_fmodifier_generator_polyexpanded(BlenderRNA *brna)
-{
-	StructRNA *srna;
-	PropertyRNA *prop;
-	
-	srna= RNA_def_struct(brna, "FModifierGenerator_PolyExpanded", "FModifier");
-	RNA_def_struct_ui_text(srna, "Expanded Polynomial Generator", "Generates values for the modified F-Curve using expanded polynomial expresion.");
-	
-	/* define common props */
-	rna_def_fmodifier_generator_common(srna);
 	
 	/* order of the polynomial */
 		// XXX this has a special validation func
 	prop= RNA_def_property(srna, "poly_order", PROP_INT, PROP_NONE);
-	RNA_def_property_ui_text(prop, "Polynomial Order", "The highest power of 'x' for this polynomial. (i.e. the number of coefficients - 1)");
+	RNA_def_property_ui_text(prop, "Polynomial Order", "The highest power of 'x' for this polynomial. (number of coefficients - 1)");
 	
 	/* coefficients array */
-	//prop= RNA_def_property(srna, "coefficients", PROP_FLOAT, PROP_NONE);
-	//RNA_def_property_ui_text(prop, "Coefficients", "Coefficients for 'x' (starting from lowest power).");
+		// FIXME: this is quite difficult to try to wrap
+	//prop= RNA_def_property(srna, "coefficients", PROP_COLLECTION, PROP_NONE);
+	//RNA_def_property_collection_funcs(prop, "rna_FModifierGenerator_coefficients_begin", "rna_FModifierGenerator_coefficients_next", "rna_FModifierGenerator_coefficients_end", "rna_iterator_array_get", "rna_FModifierGenerator_coefficients_length", 0, 0, 0, 0);
+	//RNA_def_property_ui_text(prop, "Coefficients", "Coefficients for 'x' (starting from lowest power of x^0).");
 }
 
+/* --------- */
+
 static void rna_def_fmodifier_function_generator(BlenderRNA *brna)
 {
 	StructRNA *srna;
@@ -258,14 +232,63 @@ static void rna_def_fmodifier_function_generator(BlenderRNA *brna)
 
 /* --------- */
 
+static void rna_def_fmodifier_envelope_ctrl(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+	
+	srna= RNA_def_struct(brna, "FModifierEnvelopeControlPoint", NULL);
+	RNA_def_struct_ui_text(srna, "Envelope Control Point", "Control point for envelope F-Modifier.");
+	RNA_def_struct_sdna(srna, "FCM_EnvelopeData");
+	
+	/* min/max extents 
+	 *	- for now, these are allowed to go past each other, so that we can have inverted action
+	 *	- technically, the range is limited by the settings in the envelope-modifier data, not here...
+	 */
+	prop= RNA_def_property(srna, "minimum", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "min");
+	RNA_def_property_ui_text(prop, "Minimum Value", "Lower bound of envelope at this control-point.");
+	
+	prop= RNA_def_property(srna, "maximum", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "max");
+	RNA_def_property_ui_text(prop, "Maximum Value", "Upper bound of envelope at this control-point.");
+	
+	/* Frame */
+	prop= RNA_def_property(srna, "frame", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "time");
+	RNA_def_property_ui_text(prop, "Frame", "Frame this control-point occurs on.");
+	
+	// TODO:
+	//	- selection flags (not implemented in UI yet though)
+}
+
 static void rna_def_fmodifier_envelope(BlenderRNA *brna)
 {
 	StructRNA *srna;
-	//PropertyRNA *prop;
+	PropertyRNA *prop;
 	
 	srna= RNA_def_struct(brna, "FModifierEnvelope", "FModifier");
 	RNA_def_struct_ui_text(srna, "Envelope F-Modifier", "Scales the values of the modified F-Curve.");
 	RNA_def_struct_sdna_from(srna, "FMod_Envelope", "data");
+	
+	/* Collections */
+	prop= RNA_def_property(srna, "control_points", PROP_COLLECTION, PROP_NONE);
+	RNA_def_property_collection_sdna(prop, NULL, "data", "totvert");
+	RNA_def_property_struct_type(prop, "FModifierEnvelopeControlPoint");
+	RNA_def_property_ui_text(prop, "Control Points", "Control points defining the shape of the envelope.");
+	
+	/* Range Settings */
+	prop= RNA_def_property(srna, "reference_value", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "midval");
+	RNA_def_property_ui_text(prop, "Reference Value", "Value that envelope's influence is centered around / based on.");
+	
+	prop= RNA_def_property(srna, "default_minimum", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "min");
+	RNA_def_property_ui_text(prop, "Default Minimum", "Lower distance from Reference Value for 1:1 default influence.");
+	
+	prop= RNA_def_property(srna, "default_maximum", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "max");
+	RNA_def_property_ui_text(prop, "Default Maximum", "Upper distance from Reference Value for 1:1 default influence.");
 }
 
 /* --------- */
@@ -606,9 +629,9 @@ void RNA_def_fcurve(BlenderRNA *brna)
 	rna_def_fmodifier(brna);
 	
 	rna_def_fmodifier_generator(brna);
-		rna_def_fmodifier_generator_polyexpanded(brna);
 	rna_def_fmodifier_function_generator(brna);
 	rna_def_fmodifier_envelope(brna);
+		rna_def_fmodifier_envelope_ctrl(brna);
 	rna_def_fmodifier_cycles(brna);
 	rna_def_fmodifier_python(brna);
 	rna_def_fmodifier_limits(brna);