[Direct2D1] Fix issue for Matrix effect parameter

xoofx · xoofx · commit 6481a55cc3eb · 2015-07-22T18:02:56.000+09:00
diff --git a/Source/SharpDX.Direct2D1/PropertyBinding.cs b/Source/SharpDX.Direct2D1/PropertyBinding.cs
@@ -81,7 +81,7 @@ public static PropertyBinding Get(Type customEffectType, PropertyInfo propertyIn
                     binding.nativeGetSet = new NativeGetSetValue<int>(customEffectType, propertyInfo);
                     effectPropType = PropertyType.Bool;
                 }
-                else if (propTypeName.Contains("Vector2"))
+                else if (propTypeName.Contains("Vector2")) // Use string property name to allow external types (Mathematics, System Numerics...etc.)
                 {
                     binding.nativeGetSet = new NativeGetSetValue<RawVector2>(customEffectType, propertyInfo);
                     effectPropType = PropertyType.Vector2;
@@ -111,11 +111,6 @@ public static PropertyBinding Get(Type customEffectType, PropertyInfo propertyIn
                     binding.nativeGetSet = new NativeGetSetValue<RawColor4>(customEffectType, propertyInfo);
                     effectPropType = PropertyType.Vector4;
                 }
-                else if(propTypeName.Contains("Matrix"))
-                {
-                    binding.nativeGetSet = new NativeGetSetValue<RawMatrix>(customEffectType, propertyInfo);
-                    effectPropType = PropertyType.Matrix4x4;
-                }
                 else if(propTypeName.Contains("Matrix3x2"))
                 {
                     binding.nativeGetSet = new NativeGetSetValue<RawMatrix3x2>(customEffectType, propertyInfo);
@@ -126,7 +121,12 @@ public static PropertyBinding Get(Type customEffectType, PropertyInfo propertyIn
                     binding.nativeGetSet = new NativeGetSetValue<RawMatrix5x4>(customEffectType, propertyInfo);
                     effectPropType = PropertyType.Matrix5x4;
                 }
-                else if(Utilities.IsEnum(propType))
+                else if (propTypeName.Contains("Matrix"))
+                {
+                    binding.nativeGetSet = new NativeGetSetValue<RawMatrix>(customEffectType, propertyInfo);
+                    effectPropType = PropertyType.Matrix4x4;
+                }
+                else if (Utilities.IsEnum(propType))
                 {
                     // For enum, we are using int as a transient value
                     binding.nativeGetSet = new NativeGetSetValue<int>(customEffectType, propertyInfo);

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public static PropertyBinding Get(Type customEffectType, PropertyInfo propertyIn`
`81`	`81`	`binding.nativeGetSet = new NativeGetSetValue<int>(customEffectType, propertyInfo);`
`82`	`82`	`effectPropType = PropertyType.Bool;`
`83`	`83`	`}`
`84`		`- else if (propTypeName.Contains("Vector2"))`
	`84`	`+ else if (propTypeName.Contains("Vector2")) // Use string property name to allow external types (Mathematics, System Numerics...etc.)`
`85`	`85`	`{`
`86`	`86`	`binding.nativeGetSet = new NativeGetSetValue<RawVector2>(customEffectType, propertyInfo);`
`87`	`87`	`effectPropType = PropertyType.Vector2;`
`@@ -111,11 +111,6 @@ public static PropertyBinding Get(Type customEffectType, PropertyInfo propertyIn`
`111`	`111`	`binding.nativeGetSet = new NativeGetSetValue<RawColor4>(customEffectType, propertyInfo);`
`112`	`112`	`effectPropType = PropertyType.Vector4;`
`113`	`113`	`}`
`114`		`- else if(propTypeName.Contains("Matrix"))`
`115`		`- {`
`116`		`- binding.nativeGetSet = new NativeGetSetValue<RawMatrix>(customEffectType, propertyInfo);`
`117`		`- effectPropType = PropertyType.Matrix4x4;`
`118`		`- }`
`119`	`114`	`else if(propTypeName.Contains("Matrix3x2"))`
`120`	`115`	`{`
`121`	`116`	`binding.nativeGetSet = new NativeGetSetValue<RawMatrix3x2>(customEffectType, propertyInfo);`
`@@ -126,7 +121,12 @@ public static PropertyBinding Get(Type customEffectType, PropertyInfo propertyIn`
`126`	`121`	`binding.nativeGetSet = new NativeGetSetValue<RawMatrix5x4>(customEffectType, propertyInfo);`
`127`	`122`	`effectPropType = PropertyType.Matrix5x4;`
`128`	`123`	`}`
`129`		`- else if(Utilities.IsEnum(propType))`
	`124`	`+ else if (propTypeName.Contains("Matrix"))`
	`125`	`+ {`
	`126`	`+ binding.nativeGetSet = new NativeGetSetValue<RawMatrix>(customEffectType, propertyInfo);`
	`127`	`+ effectPropType = PropertyType.Matrix4x4;`
	`128`	`+ }`
	`129`	`+ else if (Utilities.IsEnum(propType))`
`130`	`130`	`{`
`131`	`131`	`// For enum, we are using int as a transient value`
`132`	`132`	`binding.nativeGetSet = new NativeGetSetValue<int>(customEffectType, propertyInfo);`