* Use heart shape instead of circle for players

andijakl · Sep 17, 2016 · 9e55dc3 · 9e55dc3
1 parent 05fbdf2
commit 9e55dc3
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 32 deletions.
diff --git a/KissMachineKinect/KissMachineKinect.Windows/MainPage.xaml b/KissMachineKinect/KissMachineKinect.Windows/MainPage.xaml
@@ -23,7 +23,7 @@
             <RowDefinition Height="1*"></RowDefinition>
             <RowDefinition Height="1*"></RowDefinition>
         </Grid.RowDefinitions>
-        <MediaElement x:Name="SpeakerMedia" AutoPlay="False" />
+        <MediaElement x:Name="SpeakerMedia" AutoPlay="False" AudioCategory="GameEffects" />
 
         <Viewbox Grid.Row="0" Grid.RowSpan="5" x:Name="MainViewbox">
             <Grid x:Name="DisplayGrid">
@@ -42,7 +42,7 @@
         <Viewbox Stretch="Uniform" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                  Grid.Row="1" Grid.RowSpan="3" Grid.Column="0"
                  Visibility="{Binding PhotoCountDown, Converter={StaticResource IntToVisibilityConverter}}" >
-            <TextBlock x:Name="HeartBackground" Text="&#xE00B;" 
+            <TextBlock x:Name="HeartBackground" Text="&#xEB52;" 
                        FontFamily="Segoe MDL2 Assets" 
                        Foreground="{StaticResource CustomAccentBrush}" FontSize="100" 
                        HorizontalAlignment="Center" VerticalAlignment="Stretch"  />

diff --git a/KissMachineKinect/KissMachineKinect.Windows/MainPage.xaml.cs b/KissMachineKinect/KissMachineKinect.Windows/MainPage.xaml.cs
@@ -829,8 +829,9 @@ private async Task LoadFileToViewfinderBitmap(StorageFile photoFileName)
 
         private async Task StopKissPhotoTimer(bool setToInvisible = true)
         {
-            // If no timer is running, don't do anything
-            // Do not stop the timer if currently showing the photo so that it will be cleared again
+            // If no timer is running, don't do anything.
+            // Do not stop the timer if currently showing the photo so that it will be cleared again.
+            // If in "give a kiss" state, in any case proceed to setting text to invisbile - no timer is running.
             if (PhotoCountDown != (int)KissCountdownStatusService.SpecialKissTexts.GiveAKiss 
                 && (_photoCountdownTimer == null || ShowTakenPhoto)) return;
 
@@ -857,7 +858,12 @@ private void SetCountdown(int newValue)
             _dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
             {
                 PhotoCountDown = newValue;
-                if (PhotoCountDown == (int)KissCountdownStatusService.SpecialKissTexts.Invisible) return;
+                if (PhotoCountDown == (int) KissCountdownStatusService.SpecialKissTexts.Invisible)
+                {
+                    PhotoCountDownText = string.Empty;
+                    Debug.WriteLine("Set countdown to invisible");
+                    return;
+                }
                 // Convert countdown value to text
                 var textConverter = new CountdownIntToStringConverter();
                 PhotoCountDownText = (string)textConverter.Convert(PhotoCountDown, typeof(string), null, Windows.Globalization.Language.CurrentInputMethodLanguageTag);

diff --git a/KissMachineKinect/KissMachineKinect.Windows/Models/PlayerInfo.cs b/KissMachineKinect/KissMachineKinect.Windows/Models/PlayerInfo.cs
@@ -13,9 +13,8 @@ public class PlayerInfo
     {
         public ulong TrackingId { get; set; }
         public int BodyNum { get; set; }
-        private Ellipse FaceCircle1 { get; set; }
-        private Ellipse FaceCircle2 { get; set; }
-        public double CircleSize { get; set; } = 30;
+        private TextBlock HeartFace { get; }
+        public double CircleSize { get; set; } = 90;
         public ColorSpacePoint FacePosInColor { get; set; }
 
         public CameraSpacePoint FacePosInCamera { get; set; }
@@ -24,52 +23,43 @@ public PlayerInfo(Canvas drawingCanvas, ulong trackingId, int bodyNum)
         {
             BodyNum = bodyNum;
             TrackingId = trackingId;
-            FaceCircle1 = new Ellipse
+            HeartFace = new TextBlock
             {
-                Fill = new SolidColorBrush(Colors.Red),
-                Opacity = 0.2,
-                Visibility = Visibility.Collapsed,
-                Width = CircleSize,
-                Height = CircleSize
-            };
-            FaceCircle2 = new Ellipse
-            {
-                Fill = new SolidColorBrush(Colors.Red),
+                Text = "\uEB52",
+                FontFamily = new FontFamily("Segoe MDL2 Assets"),
+                FontSize = CircleSize,
+                Foreground = new SolidColorBrush(Colors.Red),
                 Opacity = 0.5,
                 Visibility = Visibility.Collapsed,
-                Width = CircleSize / 2.0,
-                Height = CircleSize / 2.0
+                Width = CircleSize,
+                Height = CircleSize,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center
             };
-            drawingCanvas.Children.Add(FaceCircle1);
-            drawingCanvas.Children.Add(FaceCircle2);
+            drawingCanvas.Children.Add(HeartFace);
         }
 
         public void RemoveFromWorld(Canvas drawingCanvas)
         {
-            drawingCanvas.Children.Remove(FaceCircle1);
-            drawingCanvas.Children.Remove(FaceCircle2);
+            drawingCanvas.Children.Remove(HeartFace);
         }
 
         public bool IsVisible()
         {
-            return FaceCircle1.Visibility == Visibility.Visible;
+            return HeartFace.Visibility == Visibility.Visible;
         }
 
         public void SetVisibility(bool visible)
         {
-            FaceCircle1.Visibility = visible ? Visibility.Visible : Visibility.Collapsed;
-            FaceCircle2.Visibility = visible ? Visibility.Visible : Visibility.Collapsed;
-            //FaceCircle.Visibility = Visibility.Collapsed;
+            HeartFace.Visibility = visible ? Visibility.Visible : Visibility.Collapsed;
         }
 
         public void SetPosition(CameraSpacePoint facePosInCamera, ColorSpacePoint facePosInColor)
         {
             FacePosInCamera = facePosInCamera;
             FacePosInColor = facePosInColor;
-            Canvas.SetLeft(FaceCircle1, facePosInColor.X - CircleSize / 2.0);
-            Canvas.SetTop(FaceCircle1, facePosInColor.Y - CircleSize / 2.0);
-            Canvas.SetLeft(FaceCircle2, facePosInColor.X - CircleSize / 4.0);
-            Canvas.SetTop(FaceCircle2, facePosInColor.Y - CircleSize / 4.0);
+            Canvas.SetLeft(HeartFace, facePosInColor.X - CircleSize / 2.0);
+            Canvas.SetTop(HeartFace, facePosInColor.Y - CircleSize / 2.0);
         }
 
     }

diff --git a/KissMachineKinect/KissMachineKinect.Windows/Services/SpeechService.cs b/KissMachineKinect/KissMachineKinect.Windows/Services/SpeechService.cs
@@ -36,12 +36,14 @@ public void Init()
                     break;
                 }
             }
+            Debug.WriteLine("Speech initialized");
         }
 
         public void Suspend()
         {
             _synthesizer.Dispose();
             _synthesizer = null;
+            Debug.WriteLine("Speech disposed");
         }
 
         public async Task SpeakTextAsync(string textToSpeak)