Merge pull request #756 from da-markson/VIX-3737

VIX-3737 Added new movement type of Resize to the Text Effect

Author: jeffu231

src/Vixen.Modules/Effect/Picture/EffectType.cs

@@ -33,7 +33,8 @@ public enum EffectType
 		[Description("Peekaboo 270")]
 		RenderPicturePeekaboo270,
 		[Description("Wiggle")]
-		RenderPictureWiggle
-		
+		RenderPictureWiggle,
+		[Description("Resize")]
+		RenderPictureResize
 	}
 }

src/Vixen.Modules/Effect/Picture/Picture.cs

@@ -58,6 +58,7 @@ public EffectType Type
 				UpdateDirectionAttribute();
 				UpdateMovementRateAttribute();
 				UpdateCenterStopAttribute();
+				UpdateSizingAttribute();
 				OnPropertyChanged();
 			}
 		}
@@ -150,6 +151,23 @@ public Curve YOffsetCurve
 			}
 		}
 
+		[Value]
+		[ProviderCategory(@"Movement", 1)]
+		[ProviderDisplayName(@"Sizing")]
+		[ProviderDescription(@"Sizing")]
+		[PropertyOrder(7)]
+		public Curve SizingCurve
+		{
+			get { return _data.ScalingCurve; }
+			set
+			{
+				_data.ScalingCurve = value;
+				IsDirty = true;
+				UpdateSizingAttribute();
+				OnPropertyChanged();
+			}
+		}
+
 		[Value]
 		[ProviderCategory(@"Movement", 1)]
 		[ProviderDisplayName(@"PictureCenterStop")]
@@ -415,6 +433,7 @@ private void UpdateAttributes()
 			UpdateStringOrientationAttributes();
 			UpdatePictureSourceAttribute(false);
 			UpdateCenterStopAttribute(false);
+			UpdateSizingAttribute(false);
 			TypeDescriptor.Refresh(this);
 		}
 
@@ -470,6 +489,24 @@ private void UpdateCenterStopAttribute(bool refresh = true)
 			}
 		}
 
+		/// <summary>
+		/// Determines when the 'Sizing' setting is applicable. 
+		/// </summary>
+		private void UpdateSizingAttribute(bool refresh = true)
+		{
+			// Sizing is only applicable for movement type of Resize
+			bool resizeApplicable = Type == EffectType.RenderPictureResize;
+
+			Dictionary<string, bool> propertyStates = new Dictionary<string, bool>(1)
+			{
+				{nameof(SizingCurve), resizeApplicable }
+			};
+			SetBrowsable(propertyStates);
+			if (refresh)
+			{
+				TypeDescriptor.Refresh(this);
+			}
+		}
 
 		private void UpdateMovementRateAttribute(bool refresh = true)
 		{
@@ -753,13 +790,28 @@ private void InitialRender(int frame, double intervalPosFactor)
 
 				if (_pictures.Count > 0)
 				{
-					for (int i = 0; i < _pictures.Count; i++)
+					if (Type == EffectType.RenderPictureResize && _pictures.Count == 1)
+					{
+						_fp = new FastPixel.FastPixel(ScaleImage(_pictures[0].bitmap, CalculateSizing(GetEffectTimeIntervalPosition(frame) * 100)));
+					}
+
+					else
 					{
-						if (frame >= _pictures[i].frame)
+						for (int i = 0; i < _pictures.Count; i++)
 						{
-							_fp = new FastPixel.FastPixel(_pictures[i].bitmap);
-							_pictures.RemoveAt(i);
-							break;
+							if (frame >= _pictures[i].frame)
+							{
+								if (Type == EffectType.RenderPictureResize)
+								{
+									_fp = new FastPixel.FastPixel(ScaleImage(_pictures[i].bitmap, CalculateSizing(GetEffectTimeIntervalPosition(frame) * 100)));
+								}
+								else
+								{
+									_fp = new FastPixel.FastPixel(_pictures[i].bitmap);
+								}
+								_pictures.RemoveAt(i);
+								break;
+							}
 						}
 					}
 				}
@@ -971,6 +1023,15 @@ private void CalculatePixel(int x, int y, IPixelFrameBuffer frameBuffer, int fra
 			}
 			switch (Type)
 			{
+				case EffectType.RenderPictureResize:
+					if (TargetPositioning == TargetPositioningType.Locations)
+					{
+						locationY = _yoffset - y + _yOffsetAdj;
+						locationX = x + _xoffset - _xOffsetAdj;
+						break;
+					}
+					frameBuffer.SetPixel(xCoord - _xoffset + _xOffsetAdj, _yoffset - yCoord + _yOffsetAdj, fpColor);
+					return;
 				case EffectType.RenderPicturePeekaboo0:
 					if (TargetPositioning == TargetPositioningType.Locations)
 					{
@@ -1188,6 +1249,11 @@ private double CalculateIncreaseBrightness(double intervalPos)
 			return ScaleCurveToValue(IncreaseBrightnessCurve.GetValue(intervalPos), 100, 10);
 		}
 
+		private double CalculateSizing(double intervalPos)
+		{
+			return ScaleCurveToValue(SizingCurve.GetValue(intervalPos), 100, 0) / 100;
+		}
+
 		private Color CustomColor(int frame, double level, Color fpColor, double adjustedBrightness)
 		{
 			if (ColorEffect == ColorEffect.CustomColor)
@@ -1248,6 +1314,10 @@ public static Bitmap ScaleImage(Image image, double scale)
 				var newWidth = (int) (image.Width * ratio);
 				var newHeight = (int) (image.Height * ratio);
 
+				// Make sure dimensions are at least 1 pixel
+				newWidth = Math.Max(1, newWidth);
+				newHeight = Math.Max(1, newHeight);
+
 				var newImage = new Bitmap(newWidth, newHeight);
 				using (var g = Graphics.FromImage(newImage))
 				{

src/Vixen.Modules/Effect/Picture/PictureData.cs

@@ -20,6 +20,7 @@ public PictureData()
 			LevelCurve = new Curve(new PointPairList(new[] { 0.0, 100.0 }, new[] { 100.0, 100.0 }));
 			Colors = new ColorGradient(Color.DodgerBlue);
 			ColorEffect = ColorEffect.None;
+			ScalingCurve = new Curve(new PointPairList(new[] { 0.0, 100.0 }, new[] { 100.0, 100.0 }));
 			ScalePercent = 50;
 			Source = PictureSource.Embedded;
 			MovementRate = 4;
@@ -65,6 +66,9 @@ public PictureData()
 		[DataMember]
 		public int ScalePercent { get; set; }
 
+		[DataMember]
+		public Curve ScalingCurve { get; set; }
+
 		[DataMember(EmitDefaultValue = false)]
 		public int XOffset { get; set; }
 
@@ -112,6 +116,12 @@ public void OnDeserialized(StreamingContext c)
 			if (TilePictures == TilePictures.None)
 				TilePictures = TilePictures.BlueGlowDots;
 
+			// Ensure curves are not null. This use-case can be if loading a sequence prior to introducing the Movement of Resize 
+			if (ScalingCurve == null)
+			{
+				ScalingCurve = new Curve(new PointPairList(new[] { 0.0, 100.0 }, new[] { 100.0, 100.0 }));
+			}
+
 			//if one of them is null the others probably are, and if this one is not then they all should be good.
 			//Try to save some cycles on every load
 

src/Vixen.Modules/EffectEditor/EffectDescriptorAttributes/EffectDisplayNameDescriptors.resx

@@ -141,10 +141,10 @@
   <data name="CenterStop" xml:space="preserve">
     <value>Center Stop</value>
   </data>
-	<data name="EndStop" xml:space="preserve">
+  <data name="EndStop" xml:space="preserve">
     <value>End Stop</value>
   </data>
-	<data name="CenterText" xml:space="preserve">
+  <data name="CenterText" xml:space="preserve">
     <value>Center Text</value>
   </data>
   <data name="Interval" xml:space="preserve">
@@ -1383,4 +1383,7 @@
   <data name="PatternPatternType" xml:space="preserve">
     <value>Pattern Type</value>
   </data>
+  <data name="Sizing" xml:space="preserve">
+    <value>Sizing</value>
+  </data>
 </root>