Removed unnecessary alpha SpotLight property

Sergio0694 · Jul 11, 2017 · 9360c9c · 9360c9c
1 parent d6827ca
commit 9360c9c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 32 deletions.
diff --git a/UICompositionAnimations/Lights/PointerPositionSpotLight.cs b/UICompositionAnimations/Lights/PointerPositionSpotLight.cs
@@ -16,33 +16,6 @@ public class PointerPositionSpotLight : XamlLight
     {
         #region Properties
 
-        /// <summary>
-        /// Gets or sets the alpha channel value for the light to display
-        /// </summary>
-        public byte Alpha
-        {
-            get { return GetValue(AlphaProperty).To<byte>(); }
-            set { SetValue(AlphaProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets the <see cref="DependencyProperty"/> for the <see cref="Alpha"/> property
-        /// </summary>
-        public static readonly DependencyProperty AlphaProperty =
-            DependencyProperty.Register(nameof(Alpha), typeof(byte), typeof(PointerPositionSpotLight), new PropertyMetadata(byte.MaxValue, OnAlphaPropertyChanged));
-
-        private static void OnAlphaPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            PointerPositionSpotLight l = d as PointerPositionSpotLight;
-            if (l?._Light != null)
-            {
-                byte alpha = e.NewValue.To<byte>();
-                Color color = l._Light.InnerConeColor;
-                color.A = alpha;
-                l._Light.InnerConeColor = l._Light.OuterConeColor = color;
-            }
-        }
-
         /// <summary>
         /// Gets or sets the intensity of the light. A higher value will result in a brighter light
         /// </summary>
@@ -66,7 +39,7 @@ private static void OnShadePropertyChanged(DependencyObject d, DependencyPropert
                 byte shade = e.NewValue.To<byte>();
                 Color color = new Color
                 {
-                    A = l.Alpha,
+                    A = byte.MaxValue,
                     R = shade,
                     G = shade,
                     B = shade
@@ -225,7 +198,7 @@ protected override void OnConnected(UIElement newElement)
                 _Animation.SetReferenceParameter("pointer", pointer);
                 _Animation.SetReferenceParameter("props", _Properties);
                 _Light.StartAnimation("Offset", _Animation);
-                _Light.InnerConeColor = _Light.OuterConeColor = Color.FromArgb(Alpha, Shade, Shade, Shade);
+                _Light.InnerConeColor = _Light.OuterConeColor = Color.FromArgb(byte.MaxValue, Shade, Shade, Shade);
                 _Light.InnerConeAngleInDegrees = 0;
                 _Light.OuterConeAngleInDegrees = OuterConeAngle;
                 _Light.ConstantAttenuation = Active ? 0 : InactiveAttenuationValue;

diff --git a/UICompositionAnimations/Properties/AssemblyInfo.cs b/UICompositionAnimations/Properties/AssemblyInfo.cs
@@ -23,6 +23,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.6.3.0")]
+[assembly: AssemblyVersion("2.6.4.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: ComVisible(false)]
diff --git a/UICompositionAnimations/UICompositionAnimations.nuspec b/UICompositionAnimations/UICompositionAnimations.nuspec
@@ -2,14 +2,14 @@
 <package >
   <metadata>
     <id>Sergio0694.UWP.UICompositionAnimations</id>
-    <version>2.6.3.0</version>
+    <version>2.6.4.0</version>
     <title>UICompositionAnimations</title>
     <description>A wrapper UWP PCL to work with Windows.UI.Composition and XAML animations, and Win2D effects</description>
     <authors>Sergio Pedri</authors>
     <owners>Sergio Pedri</owners>
     <projectUrl>https://github.com/Sergio0694/UICompositionAnimations</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <releaseNotes>Added alpha and shade properties to the spot light class</releaseNotes>
+    <releaseNotes>Added attenuation property to the SpotLight, minor refactoring</releaseNotes>
     <copyright>Copyright 2017</copyright>
     <tags>uwp composition animations xaml csharp windows winrt universal app ui win2d graphics</tags>
   </metadata>