Removed null-ness from fields in OriginOffsetContainer

Author: aborziak-ms

source/LottieToWinComp/Brushes.cs

@@ -431,7 +431,7 @@ static CompositionColorBrush TranslateBoundSolidColor(
 
             if (!offset.IsAnimated && !value.IsAnimated)
             {
-                return ConvertTo.Vector2(value.InitialValue) + offset.OffsetValue!;
+                return ConvertTo.Vector2(value.InitialValue) + offset.OffsetValue;
             }
 
             // Animate source property first.
@@ -443,8 +443,8 @@ static CompositionColorBrush TranslateBoundSolidColor(
 
             // Create expression that offsets source property by origin offset.
             WinCompData.Expressions.Vector2 expression = offset.IsAnimated ?
-                ExpressionFactory.OriginOffsetExressionAdded(sourcePropertyName, offset.OffsetExpression!) :
-                ExpressionFactory.OriginOffsetValueAdded(sourcePropertyName, (Sn.Vector2)offset.OffsetValue!);
+                ExpressionFactory.OriginOffsetExressionAdded(sourcePropertyName, offset.OffsetExpression) :
+                ExpressionFactory.OriginOffsetValueAdded(sourcePropertyName, offset.OffsetValue);
 
             var expressionAnimation = context.ObjectFactory.CreateExpressionAnimation(expression);
             expressionAnimation.SetReferenceParameter("my", obj);

source/LottieToWinComp/ShapeLayerContext.cs

@@ -26,24 +26,28 @@ public class OriginOffsetContainer
             public RectangleOrRoundedRectangleGeometry Geometry { get; }
 
             // Use expression if size is animated
-            public WinCompData.Expressions.Vector2? OffsetExpression { get; }
+            public WinCompData.Expressions.Vector2 OffsetExpression { get; }
 
             // Use constant value if size is static
-            public Sn.Vector2? OffsetValue { get; }
+            public Sn.Vector2 OffsetValue { get; }
 
-            public bool IsAnimated => OffsetValue is null;
+            // IsAnimated = true means that we have to use OffsetExpression.
+            // IsAnimated = false means that we can use OffsetValue instead of OffsetExpression to optimize the code.
+            public bool IsAnimated { get; }
 
             public OriginOffsetContainer(RectangleOrRoundedRectangleGeometry geometry, WinCompData.Expressions.Vector2 expression)
             {
+                IsAnimated = true;
                 Geometry = geometry;
                 OffsetExpression = expression;
-                OffsetValue = null;
+                OffsetValue = new Sn.Vector2(0, 0);
             }
 
             public OriginOffsetContainer(RectangleOrRoundedRectangleGeometry geometry, Sn.Vector2 value)
             {
+                IsAnimated = false;
                 Geometry = geometry;
-                OffsetExpression = null;
+                OffsetExpression = new WinCompData.Expressions.Vector2.Constructed(value.X, value.Y);
                 OffsetValue = value;
             }
         }