From 1782dfbb0ee38c22c1ef1151bd86ba58fc8be14e Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Thu, 21 Jan 2016 20:43:44 +0100 Subject: [PATCH] Added pivot/map and removed testcode --- YJMPD-UWP/Assets/Direction.png | Bin 0 -> 11497 bytes YJMPD-UWP/MainPage.xaml.cs | 4 ---- YJMPD-UWP/ViewModels/MatchVM.cs | 17 +++++++++++---- YJMPD-UWP/Views/MatchView.xaml | 37 +++++++++++++++++++++++++------- YJMPD-UWP/YJMPD-UWP.csproj | 3 +++ 5 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 YJMPD-UWP/Assets/Direction.png diff --git a/YJMPD-UWP/Assets/Direction.png b/YJMPD-UWP/Assets/Direction.png new file mode 100644 index 0000000000000000000000000000000000000000..a6a1271447590a6ee1c3c179fccf20a49ddff067 GIT binary patch literal 11497 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 literal 0 HcmV?d00001 diff --git a/YJMPD-UWP/MainPage.xaml.cs b/YJMPD-UWP/MainPage.xaml.cs index d72d48f..65b08cc 100644 --- a/YJMPD-UWP/MainPage.xaml.cs +++ b/YJMPD-UWP/MainPage.xaml.cs @@ -51,10 +51,6 @@ namespace YJMPD_UWP { if (e.Handled) return; - App.Game.MoveToStarted(new BasicGeoposition { Latitude = 44.768187, Longitude = -0.472412 }); - e.Handled = true; - return; - if (App.Game.Status == Model.GameHandler.GameStatus.STARTED) { e.Handled = true; diff --git a/YJMPD-UWP/ViewModels/MatchVM.cs b/YJMPD-UWP/ViewModels/MatchVM.cs index dfbb81b..426e5cb 100644 --- a/YJMPD-UWP/ViewModels/MatchVM.cs +++ b/YJMPD-UWP/ViewModels/MatchVM.cs @@ -26,9 +26,11 @@ namespace YJMPD_UWP.ViewModels { dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () => { + if (App.Game.Status != Model.GameHandler.GameStatus.STARTED) + return; + Degrees = (int)(angle + -e.Heading.HeadingMagneticNorth); NotifyPropertyChanged(nameof(Degrees)); - Debug.WriteLine("Degrees " + Degrees + " / " + angle); }); } @@ -36,15 +38,14 @@ namespace YJMPD_UWP.ViewModels { dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () => { - if (App.Game.Status == Model.GameHandler.GameStatus.STARTED) + if (App.Game.Status != Model.GameHandler.GameStatus.STARTED) return; angle = (int)Util.DegreeBearing(e.Position.Coordinate.Point.Position, App.Game.Destination); HeadingVisible = Util.Distance(e.Position.Coordinate.Point.Position, App.Game.Destination) > 500; - Debug.WriteLine(HeadingVisible); - NotifyPropertyChanged(nameof(HeadingVisible)); + NotifyPropertyChanged(nameof(InvHeadingVisible)); }); } @@ -87,6 +88,14 @@ namespace YJMPD_UWP.ViewModels get; private set; } + public bool InvHeadingVisible + { + get + { + return !HeadingVisible; + } + } + public bool MessageVisible { get diff --git a/YJMPD-UWP/Views/MatchView.xaml b/YJMPD-UWP/Views/MatchView.xaml index e5045d1..a39b0c7 100644 --- a/YJMPD-UWP/Views/MatchView.xaml +++ b/YJMPD-UWP/Views/MatchView.xaml @@ -3,6 +3,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:YJMPD_UWP.Views" + xmlns:map="using:Windows.UI.Xaml.Controls.Maps" xmlns:convert="using:YJMPD_UWP.Helpers.Converter" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" @@ -12,14 +13,33 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -29,4 +49,5 @@ + diff --git a/YJMPD-UWP/YJMPD-UWP.csproj b/YJMPD-UWP/YJMPD-UWP.csproj index a4f11f5..11ea7b6 100644 --- a/YJMPD-UWP/YJMPD-UWP.csproj +++ b/YJMPD-UWP/YJMPD-UWP.csproj @@ -159,6 +159,9 @@ + + PreserveNewest +