diff --git a/.gitignore b/.gitignore index fd5204b..179ceca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Ignore Windows image thumbnails +Thumbs.db + ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. diff --git a/SparkiyClient/SharpDX.Toolkit.Game.Direct2D b/SparkiyClient/SharpDX.Toolkit.Game.Direct2D index d264958..ade4989 160000 --- a/SparkiyClient/SharpDX.Toolkit.Game.Direct2D +++ b/SparkiyClient/SharpDX.Toolkit.Game.Direct2D @@ -1 +1 @@ -Subproject commit d2649585a94e3a98a8f397ddb1c663362ea2cbe2 +Subproject commit ade49891e994454d264edb92c340a4ff404a1d5f diff --git a/SparkiyClient/SparkiyClient.Common/ExtendedViewModel.cs b/SparkiyClient/SparkiyClient.Common/ExtendedViewModel.cs index 811616f..36e93b8 100644 --- a/SparkiyClient/SparkiyClient.Common/ExtendedViewModel.cs +++ b/SparkiyClient/SparkiyClient.Common/ExtendedViewModel.cs @@ -82,7 +82,10 @@ public ExtendedObservableObject() base.RaisePropertyChanged(propertyName); } - public bool IsDirty => this.propertyManager.IsDirty; + public bool IsDirty + { + get { return this.propertyManager.IsDirty; } + } public void MarkAsClean() { @@ -174,8 +177,8 @@ public PropertyManager(INotifyPropertyChangedTrigger trigger) this.propertyValues[propertyName] = defaultValue; return (T)this.propertyValues[propertyName]; } - - public bool IsDirty => this.isDirty; + + public bool IsDirty { get { return this.isDirty; } } public void MarkAsClean() { diff --git a/SparkiyClient/SparkiyClient.Common/SparkiyClient.Common.csproj b/SparkiyClient/SparkiyClient.Common/SparkiyClient.Common.csproj index ed4d94e..d5fd76c 100644 --- a/SparkiyClient/SparkiyClient.Common/SparkiyClient.Common.csproj +++ b/SparkiyClient/SparkiyClient.Common/SparkiyClient.Common.csproj @@ -26,6 +26,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -52,6 +53,40 @@ prompt 4 + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + @@ -101,4 +136,4 @@ --> - \ No newline at end of file + diff --git a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs index 5f5904d..620a590 100644 --- a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs +++ b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs @@ -68,7 +68,7 @@ public Project Project set { this.SetProperty(value); } } - public RelayCommand CreateProjectCommand { get; } + public RelayCommand CreateProjectCommand { get; private set; } } public sealed class CreateProjectPageViewModelDesignTime : CreateProjectPageViewModel diff --git a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/DebugPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/DebugPageViewModel.cs index 0d2fcc8..b43520f 100644 --- a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/DebugPageViewModel.cs +++ b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/DebugPageViewModel.cs @@ -53,6 +53,8 @@ public DebugPageViewModel(IProjectService projectService, INavigationService nav this.NavigateToHomeCommand = new RelayCommand(this.NavigateToHomeCommandExecute); this.NavigateToEditorCommand = new RelayCommand(this.NavigateToEditorCommandExecute); + + this.OutputMessages = new ObservableCollection(); } public async override void OnNavigatedTo(NavigationEventArgs e) @@ -85,7 +87,7 @@ private void NavigateToHomeCommandExecute() private void MessagesCheckTimerOnTick(object sender, object o) { - if (this.projectPlayEngineManager?.Engine == null) + if (this.projectPlayEngineManager == null || this.projectPlayEngineManager.Engine == null) return; foreach (var engineMessage in this.projectPlayEngineManager.Engine.GetMessages()) @@ -115,14 +117,14 @@ public async Task AssignProjectAsync(Project project) } - public RelayCommand NavigateToEditorCommand { get; } + public RelayCommand NavigateToEditorCommand { get; private set; } - public RelayCommand NavigateToHomeCommand { get; } + public RelayCommand NavigateToHomeCommand { get; private set; } - public Project Project => this.project; + public Project Project { get { return this.project; } } - public ObservableCollection OutputMessages { get; } = new ObservableCollection(); + public ObservableCollection OutputMessages { get; private set; } } public sealed class DebugPageViewModelDesignTime : DebugPageViewModel diff --git a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/EditPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/EditPageViewModel.cs index 439ff72..964bc3f 100644 --- a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/EditPageViewModel.cs +++ b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/EditPageViewModel.cs @@ -199,7 +199,7 @@ public CodeFile SelectedFile if (this.SelectedFile == value) return; - if (this.SelectedFile != null && this.editor?.Code != null) + if (this.SelectedFile != null && this.editor != null && this.editor.Code != null) { Log.Debug("Assigning code from editor to file \"{0}\"", this.SelectedFile.Name); this.SelectedFile.Code = this.editor.Code ?? String.Empty; @@ -210,12 +210,12 @@ public CodeFile SelectedFile if (this.SelectedFile != null && editor != null) { Log.Debug("Assigning code from file \"{0}\" to editor", this.SelectedFile.Name); - this.editor.Code = this.SelectedFile.Code?.TrimEnd('\r', '\n') + "\r" ?? String.Empty; + this.editor.Code = this.SelectedFile.Code != null ? this.SelectedFile.Code.TrimEnd('\r', '\n') + "\r" : String.Empty; } } } - public RelayCommand AddNewFileCommand { get; } + public RelayCommand AddNewFileCommand { get; private set; } public INewFileViewModel NewFileViewModel { @@ -223,15 +223,15 @@ public INewFileViewModel NewFileViewModel protected set { this.SetProperty(value); } } - public RelayCommand AddNewAssetCommand { get; } + public RelayCommand AddNewAssetCommand { get; private set; } - public RelayCommand NavigateToHomeCommand { get; } + public RelayCommand NavigateToHomeCommand { get; private set; } - public RelayCommand NavigateToProjectCommand { get; } + public RelayCommand NavigateToProjectCommand { get; private set; } - public RelayCommand DebugProjectCommand { get; } + public RelayCommand DebugProjectCommand { get; private set; } - public RelayCommand PlayProjectCommand { get; } + public RelayCommand PlayProjectCommand { get; private set; } } public sealed class EditPageViewModelDesignTime : EditPageViewModel diff --git a/SparkiyClient/SparkiyClient.UILogic/Services/ProjectService.cs b/SparkiyClient/SparkiyClient.UILogic/Services/ProjectService.cs index 4cbbc03..6a6a13d 100644 --- a/SparkiyClient/SparkiyClient.UILogic/Services/ProjectService.cs +++ b/SparkiyClient/SparkiyClient.UILogic/Services/ProjectService.cs @@ -55,7 +55,7 @@ public async Task ImportAsset(Project project, StorageFile file) if (asset != null) project.Assets.Add(asset); - Log.Debug("Asset \"{0}\" imported.", asset?.Name ?? ""); + Log.Debug("Asset \"{0}\" imported.", asset != null ? asset.Name : ""); } private Asset ResolveAsset(StorageFile file) @@ -105,7 +105,7 @@ public async Task SaveAsync() Log.Debug("Saving projects..."); // Retrieve all dirty projects - var dirtyProjects = this.projects.Where(p => p.IsDirty || (p.Files?.Any(s => s.IsDirty) ?? false)); + var dirtyProjects = this.projects.Where(p => p.IsDirty || (p.Files != null ? p.Files.Any(s => s.IsDirty) : false)); foreach (var dirtyProject in dirtyProjects) { // Create project folder if it doesnt exist or retrieve one from project files path @@ -122,17 +122,22 @@ public async Task SaveAsync() // Save all dirty files var scriptsFolder = await projectFolder.GetFolderAsync(ProjectFilesPath); - var dirtyFiles = dirtyProject.Files?.Where(s => s.IsDirty); - if (dirtyFiles != null) - foreach (var script in dirtyFiles) + if (dirtyProject.Files != null) + { + var dirtyFiles = dirtyProject.Files.Where(s => s.IsDirty); + if (dirtyFiles != null) { - await SaveFileSafeAsync( - scriptsFolder, - script.Name, - script is Script ? ProjectFilesScriptExtension : ProjectFilesClassExtension, - script.Code ?? String.Empty); - script.MarkAsClean(); + foreach (var script in dirtyFiles) + { + await SaveFileSafeAsync( + scriptsFolder, + script.Name, + script is Script ? ProjectFilesScriptExtension : ProjectFilesClassExtension, + script.Code ?? String.Empty); + script.MarkAsClean(); + } } + } dirtyProject.MarkAsClean(); diff --git a/SparkiyClient/SparkiyClient.UILogic/Services/StorageService.cs b/SparkiyClient/SparkiyClient.UILogic/Services/StorageService.cs index 9f033f9..b582f9a 100644 --- a/SparkiyClient/SparkiyClient.UILogic/Services/StorageService.cs +++ b/SparkiyClient/SparkiyClient.UILogic/Services/StorageService.cs @@ -83,6 +83,6 @@ public async Task SaveFileSafeAsync( /// /// The workspace folder /// - public StorageFolder WorkspaceFolder => this.workspaceFolder; + public StorageFolder WorkspaceFolder { get { return this.workspaceFolder; } } } } \ No newline at end of file diff --git a/SparkiyClient/SparkiyClient.UILogic/SparkiyClient.UILogic.csproj b/SparkiyClient/SparkiyClient.UILogic/SparkiyClient.UILogic.csproj index 283f671..39a5225 100644 --- a/SparkiyClient/SparkiyClient.UILogic/SparkiyClient.UILogic.csproj +++ b/SparkiyClient/SparkiyClient.UILogic/SparkiyClient.UILogic.csproj @@ -52,6 +52,40 @@ prompt 4 + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + @@ -145,4 +179,4 @@ --> - \ No newline at end of file + diff --git a/SparkiyClient/SparkiyClient.UILogic/ViewModels/MainPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic/ViewModels/MainPageViewModel.cs index 46817d1..6d0ce84 100644 --- a/SparkiyClient/SparkiyClient.UILogic/ViewModels/MainPageViewModel.cs +++ b/SparkiyClient/SparkiyClient.UILogic/ViewModels/MainPageViewModel.cs @@ -72,6 +72,8 @@ public MainPageViewModel(INavigationService navigationService, IAlertMessageServ this.nextReleaseCountdownTimer.Tick += NextReleaseCountdownTimerOnTick; this.nextReleaseCountdownTimer.Start(); this.NextReleaseCountdownTimerOnTick(null, null); + + this.Projects = new ObservableCollection(); } private bool NewProjectCommandCanExecute() @@ -127,7 +129,9 @@ protected async void InitializeWorkspaceCommandExecuteAsync() this.RequiresWorkspaceInitialization = this.storageService.RequiresHardStorageInitialization(); await this.samplesService.GetSamplesAsync(); await this.LoadProjectsAsync(); - this.NewProjectCommand?.RaiseCanExecuteChanged(); + + if (this.NewProjectCommand != null) + this.NewProjectCommand.RaiseCanExecuteChanged(); } public bool LoadingData @@ -154,15 +158,15 @@ public bool IsNextReleaseReady protected set { this.SetProperty(value); } } - public string CurrentVersion => Application.Current.GetVersion(); + public string CurrentVersion { get { return Application.Current.GetVersion(); } } - public RelayCommand InitializeWorkspaceCommand { get; } + public RelayCommand InitializeWorkspaceCommand { get; private set; } - public RelayCommand ProjectSelectedCommand { get; } + public RelayCommand ProjectSelectedCommand { get; private set; } - public ObservableCollection Projects { get; } = new ObservableCollection(); + public ObservableCollection Projects { get; private set; } - public RelayCommand NewProjectCommand { get; } + public RelayCommand NewProjectCommand { get; private set; } } [ComVisible(false)] diff --git a/SparkiyClient/SparkiyClient.UILogic/ViewModels/PlayPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic/ViewModels/PlayPageViewModel.cs index ddd8eea..1024fa2 100644 --- a/SparkiyClient/SparkiyClient.UILogic/ViewModels/PlayPageViewModel.cs +++ b/SparkiyClient/SparkiyClient.UILogic/ViewModels/PlayPageViewModel.cs @@ -80,7 +80,7 @@ private async Task AssignProjectAsync(Project project) this.projectPlayStateManager.PlayProject(); } - public RelayCommand StopCommand { get; } + public RelayCommand StopCommand { get; private set; } } public sealed class PlayPageViewModelDesignTime : PlayPageViewModel diff --git a/SparkiyClient/SparkiyClient.UILogic/ViewModels/ProjectPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic/ViewModels/ProjectPageViewModel.cs index 636a514..4995ce0 100644 --- a/SparkiyClient/SparkiyClient.UILogic/ViewModels/ProjectPageViewModel.cs +++ b/SparkiyClient/SparkiyClient.UILogic/ViewModels/ProjectPageViewModel.cs @@ -111,11 +111,11 @@ public bool IsEditMode } } - public RelayCommand EditCommand { get; } + public RelayCommand EditCommand { get; private set; } - public RelayCommand PlayCommand { get; } + public RelayCommand PlayCommand { get; private set; } - public RelayCommand GoBackCommand { get; } + public RelayCommand GoBackCommand { get; private set; } public bool LoadingData { diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/AdSettings.xml b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/AdSettings.xml index 32c7925..e69de29 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/AdSettings.xml +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/AdSettings.xml @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/App.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/App.xaml.cs index 1376549..6c008c1 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/App.xaml.cs +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/App.xaml.cs @@ -255,12 +255,18 @@ private void OnUnhandledRegistrationException(Exception ex) /// Get an reference to the current Application instance /// as an MvvmAppBase object. /// - public static new App Current => (App)Application.Current; + public static new App Current + { + get { return (App)Application.Current; } + } /// /// Get the IoC Unity Container /// - public IUnityContainer Container => this.container; + public IUnityContainer Container + { + get { return this.container; } + } #region IDisposable Support private bool disposedValue = false; // To detect redundant calls @@ -271,7 +277,8 @@ void Dispose(bool disposing) { if (disposing) { - this.container?.Dispose(); + if (this.container != null) + this.container.Dispose(); } // TODO: free unmanaged resources (unmanaged objects) and override a finalizer below. diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Assets/Thumbs.db b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Assets/Thumbs.db index 759dcda..af9e0a5 100644 Binary files a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Assets/Thumbs.db and b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Assets/Thumbs.db differ diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Common/PageBase.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Common/PageBase.cs index 4b092c0..136328e 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Common/PageBase.cs +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Common/PageBase.cs @@ -64,6 +64,6 @@ protected override void OnNavigatedFrom(NavigationEventArgs e) /// /// View Model /// - protected ExtendedViewModel ViewModel => this.DataContext as ExtendedViewModel; + protected ExtendedViewModel ViewModel { get { return this.DataContext as ExtendedViewModel; } } } } \ No newline at end of file diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/CodeEditor/CodeEditorControl.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/CodeEditor/CodeEditorControl.xaml.cs index 1120698..31d51ce 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/CodeEditor/CodeEditorControl.xaml.cs +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/CodeEditor/CodeEditorControl.xaml.cs @@ -22,7 +22,8 @@ private void OnLoaded(object sender, RoutedEventArgs routedEventArgs) { this.CodeEditor.TextView.TextChanged += (o, args) => { - this.OnCodeChanged?.Invoke(this, null); + if (this.OnCodeChanged != null) + this.OnCodeChanged.Invoke(this, null); }; } diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/CodeEditor/UI/SyntaxEditor.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/CodeEditor/UI/SyntaxEditor.cs index 8c1b3e4..6d94e62 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/CodeEditor/UI/SyntaxEditor.cs +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/CodeEditor/UI/SyntaxEditor.cs @@ -227,7 +227,8 @@ public string Text get { string text = String.Empty; - this.TextView?.Document.GetText(TextGetOptions.None, out text); + if (this.TextView != null) + this.TextView.Document.GetText(TextGetOptions.None, out text); return text; } set diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/MessagesPopupControl.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/MessagesPopupControl.xaml.cs index 8391c90..91c8bc0 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/MessagesPopupControl.xaml.cs +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/MessagesPopupControl.xaml.cs @@ -18,13 +18,13 @@ public sealed partial class MessagesPopupControl : UserControl, IMessagesPopup private static readonly Brush MessageBackgroundBrushDefault = new SolidColorBrush(new Color() {R = 0x42, G = 0x98, B = 0xED, A = 255}); - public ObservableCollection Messages { get; } = new ObservableCollection(); + public ObservableCollection Messages { get; private set; } - public Brush MessageBackgroundBrush { get; set; } = MessageBackgroundBrushDefault; + public Brush MessageBackgroundBrush { get; set; } - public Brush ErrorBackgroundBrush { get; set; } = new SolidColorBrush(Colors.OrangeRed); + public Brush ErrorBackgroundBrush { get; set; } - public int TemporaryMessageDisplayTime { get; set; } = 5000; + public int TemporaryMessageDisplayTime { get; set; } public Brush CurrentBackgroundBrush @@ -63,6 +63,12 @@ private static void PropertyChangedCallback(DependencyObject dependencyObject, public MessagesPopupControl() { + // Set default values + this.Messages = new ObservableCollection(); + this.MessageBackgroundBrush = MessageBackgroundBrushDefault; + this.ErrorBackgroundBrush = new SolidColorBrush(Colors.OrangeRed); + this.TemporaryMessageDisplayTime = 5000; + this.InitializeComponent(); this.DataContext = this; diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/News/NewsControl.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/News/NewsControl.xaml.cs index 9f0675d..3d11161 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/News/NewsControl.xaml.cs +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/News/NewsControl.xaml.cs @@ -23,13 +23,19 @@ public sealed partial class NewsControl : UserControl { public NewsControl() { + this.Articles = new ObservableCollection
(); + this.InitializeComponent(); } private void ArticleDismissOnClick(object sender, RoutedEventArgs e) { - var article = ((e.OriginalSource as FrameworkElement)?.DataContext as Article); + var sourceElement = e.OriginalSource as FrameworkElement; + if (sourceElement == null) + throw new NullReferenceException("Could not retrieve Article from source"); + + var article = sourceElement.DataContext as Article; if (article == null) throw new NullReferenceException("Could not retrieve Article from source"); @@ -38,13 +44,17 @@ private void ArticleDismissOnClick(object sender, RoutedEventArgs e) private void ArticleOnClick(object sender, RoutedEventArgs e) { - var article = ((e.OriginalSource as FrameworkElement)?.DataContext as Article); + var sourceElement = e.OriginalSource as FrameworkElement; + if (sourceElement == null) + throw new NullReferenceException("Could not retrieve Article from source"); + + var article = sourceElement.DataContext as Article; if (article == null) throw new NullReferenceException("Could not retrieve Article from source"); article.Action.Invoke(); } - public ObservableCollection
Articles { get; } = new ObservableCollection
(); + public ObservableCollection
Articles { get; private set; } } } diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs index c2a35b7..eea240f 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs @@ -30,49 +30,50 @@ namespace SparkiyClient.Controls.PlayView { public sealed partial class PlayViewControl : UserControl, IProjectPlayStateManagment, IProjectPlayEngineManagement - { - private static ILogger Log = LogManagerFactory.DefaultLogManager.GetLogger(); + { + private static ILogger Log = LogManagerFactory.DefaultLogManager.GetLogger(); - private Project project; - private IEngineBindings engine; + private Project project; + private IEngineBindings engine; // State tracking - private bool isPaused = true; - private bool isInitialized = false; + private bool isPaused = true; + private bool isInitialized = false; public event ProjectPlayStateEventHandler OnStateChanged; public PlayViewControl() - { - this.InitializeComponent(); - } + { + this.InitializeComponent(); + } public void AssignProject(Project project) - { + { Log.Debug("Assigned project \"{0}\" to the PlayView", project.Name); // Stop currently running project - if (this.IsInitialized) - this.StopProject(); + if (this.IsInitialized) + this.StopProject(); // Assign new project - this.project = project; + this.project = project; this.RebuildEngine(); } - public void StopProject() + public void StopProject() { this.isInitialized = false; this.Engine.Stop(); - this.OnStateChanged?.Invoke(this); + if (this.OnStateChanged != null) + this.OnStateChanged.Invoke(this); } - public void PlayProject() + public void PlayProject() { if (!this.IsInitialized || this.IsPlaying) return; @@ -81,10 +82,11 @@ public void PlayProject() this.isPaused = false; - this.OnStateChanged?.Invoke(this); + if (this.OnStateChanged != null) + this.OnStateChanged.Invoke(this); } - public void PauseProject() + public void PauseProject() { if (!this.IsInitialized || this.IsPause) return; @@ -93,16 +95,18 @@ public void PauseProject() this.isPaused = true; - this.OnStateChanged?.Invoke(this); + if (this.OnStateChanged != null) + this.OnStateChanged.Invoke(this); } - public void RestartProject() + public void RestartProject() { this.StopProject(); this.RebuildEngine(); this.Engine.Play(); - this.OnStateChanged?.Invoke(this); + if (this.OnStateChanged != null) + this.OnStateChanged.Invoke(this); } private void RebuildEngine() @@ -140,10 +144,10 @@ private void RebuildEngine() this.engine.Initialize(); // Add assets to the engine - foreach (var imageAsset in imageAssets) - { - this.engine.AddImageAsset(imageAsset.Name, imageAsset.Data); - } + foreach (var imageAsset in imageAssets) + { + this.engine.AddImageAsset(imageAsset.Name, imageAsset.Data); + } // Add scripts to the engine bool allScriptsValid = true; @@ -154,17 +158,17 @@ private void RebuildEngine() else this.isInitialized = true; } - public void TakeScreenshot() - { + public void TakeScreenshot() + { throw new NotImplementedException(); - } + } - public bool IsInitialized => this.isInitialized; + public bool IsInitialized { get { return this.isInitialized; } } - public bool IsPlaying => !this.isPaused; + public bool IsPlaying { get { return !this.isPaused; } } - public bool IsPause => this.isPaused; + public bool IsPause { get { return this.isPaused; } } - public IEngineBindings Engine => this.engine; - } + public IEngineBindings Engine { get { return this.engine; } } + } } diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Converters/BooleanToVisibilityConverter.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Converters/BooleanToVisibilityConverter.cs index c139b0f..56ccb18 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Converters/BooleanToVisibilityConverter.cs +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Converters/BooleanToVisibilityConverter.cs @@ -12,7 +12,7 @@ public class ToVisibilityConverter : IValueConverter /// /// Set to true if you want to show control when expression value is true. Set to false if you want to hide/collapse control when expression value is true. /// - public bool TriggerValue { get; set; } = false; + public bool TriggerValue { get; set; } /// /// Set to true if you just want to hide the control else set to false if you want to collapse the control diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Services/NavigationService.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Services/NavigationService.cs index e8e14d2..90acc3f 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Services/NavigationService.cs +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Services/NavigationService.cs @@ -21,7 +21,7 @@ public class NavigationService : INavigationService public string CurrentPageKey { get; private set; } - public bool CanGoBack => this.historyStack.Any(); + public bool CanGoBack { get { return this.historyStack.Any(); } } private static Frame GetFrame() { diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Services/ViewModelProviderService.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Services/ViewModelProviderService.cs index 6e3c5c4..1f4f753 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Services/ViewModelProviderService.cs +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Services/ViewModelProviderService.cs @@ -9,18 +9,18 @@ namespace SparkiyClient.Services { public class ViewModelProviderService { - public IMainPageViewModel MainPage => DesignMode.DesignModeEnabled ? new MainPageViewModelDesignTime() : ServiceLocator.Current?.GetInstance(); + public IMainPageViewModel MainPage { get { return DesignMode.DesignModeEnabled ? new MainPageViewModelDesignTime() : ServiceLocator.Current == null ? null : ServiceLocator.Current.GetInstance();}} - public IProjectPageViewModel ProjectPage => DesignMode.DesignModeEnabled ? new ProjectPageViewModelDesignTime() : ServiceLocator.Current?.GetInstance(); + public IProjectPageViewModel ProjectPage { get { return DesignMode.DesignModeEnabled ? new ProjectPageViewModelDesignTime() : ServiceLocator.Current == null ? null : ServiceLocator.Current.GetInstance();}} - public IPlayPageViewModel PlayPage => DesignMode.DesignModeEnabled ? new PlayPageViewModelDesignTime() : ServiceLocator.Current?.GetInstance(); + public IPlayPageViewModel PlayPage { get { return DesignMode.DesignModeEnabled ? new PlayPageViewModelDesignTime() : ServiceLocator.Current == null ? null : ServiceLocator.Current.GetInstance();}} #if WINDOWS_APP - public ICreateProjectPageViewModel CreateProjectPage => DesignMode.DesignModeEnabled ? new CreateProjectPageViewModelDesignTime() : ServiceLocator.Current?.GetInstance(); + public ICreateProjectPageViewModel CreateProjectPage { get { return DesignMode.DesignModeEnabled ? new CreateProjectPageViewModelDesignTime() : ServiceLocator.Current == null ? null : ServiceLocator.Current.GetInstance();}} - public IEditPageViewModel EditPage => DesignMode.DesignModeEnabled ? new EditPageViewModelDesignTime() : ServiceLocator.Current?.GetInstance(); + public IEditPageViewModel EditPage { get { return DesignMode.DesignModeEnabled ? new EditPageViewModelDesignTime() : ServiceLocator.Current == null ? null : ServiceLocator.Current.GetInstance();}} - public IDebugPageViewModel DebugPage => DesignMode.DesignModeEnabled ? new DebugPageViewModelDesignTime() : ServiceLocator.Current?.GetInstance(); + public IDebugPageViewModel DebugPage { get { return DesignMode.DesignModeEnabled ? new DebugPageViewModelDesignTime() : ServiceLocator.Current == null ? null : ServiceLocator.Current.GetInstance(); }} #endif } } \ No newline at end of file diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/MainPage.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/MainPage.xaml.cs index 7ba8026..9e0aa7b 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/MainPage.xaml.cs +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/MainPage.xaml.cs @@ -27,6 +27,9 @@ private void ProjectOnItemClick(object sender, ItemClickEventArgs e) /// /// The view model /// - public new IMainPageViewModel ViewModel => this.DataContext as IMainPageViewModel; + public new IMainPageViewModel ViewModel + { + get { return this.DataContext as IMainPageViewModel; } + } } } diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/PlayPage.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/PlayPage.xaml.cs index ec19e1f..220a1fd 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/PlayPage.xaml.cs +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/PlayPage.xaml.cs @@ -43,6 +43,6 @@ protected override async void OnNavigatedTo(NavigationEventArgs e) base.OnNavigatedTo(e); } - public new IPlayPageViewModel ViewModel => this.DataContext as IPlayPageViewModel; + public new IPlayPageViewModel ViewModel { get { return this.DataContext as IPlayPageViewModel; } } } } diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/Thumbs.db b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/Thumbs.db index 44405fc..41eb479 100644 Binary files a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/Thumbs.db and b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/Thumbs.db differ diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/arm.txt b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/arm.txt index 7712414..7a1b3b9 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/arm.txt +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/arm.txt @@ -1,4 +1,4 @@ -MainPackage=C:\Users\Aleksandar\Source\Repos\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\ARM\Release\SparkiyClient.Windows_1.6.0.2_ARM.appx -SymbolPackage=C:\Users\Aleksandar\Source\Repos\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\AppPackages\SparkiyClient.Windows_1.6.0.2_Test\SparkiyClient.Windows_1.6.0.2_ARM.appxsym -ResourcePack=C:\Users\Aleksandar\Source\Repos\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\ARM\Release\SparkiyClient.Windows_1.6.0.2_scale-140.appx -ResourcePack=C:\Users\Aleksandar\Source\Repos\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\ARM\Release\SparkiyClient.Windows_1.6.0.2_scale-180.appx +MainPackage=C:\Users\Aleksandar\Source\Repos\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\ARM\Release\SparkiyClient.Windows_1.6.1.1_ARM.appx +SymbolPackage=C:\Users\Aleksandar\Source\Repos\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\AppPackages\SparkiyClient.Windows_1.6.1.1_Test\SparkiyClient.Windows_1.6.1.1_ARM.appxsym +ResourcePack=C:\Users\Aleksandar\Source\Repos\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\ARM\Release\SparkiyClient.Windows_1.6.1.1_scale-140.appx +ResourcePack=C:\Users\Aleksandar\Source\Repos\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\ARM\Release\SparkiyClient.Windows_1.6.1.1_scale-180.appx diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x64.txt b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x64.txt index 2b59855..50e8c3c 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x64.txt +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x64.txt @@ -1,2 +1,2 @@ -MainPackage=C:\Users\Aleksandar\Source\Repos\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\x64\Release\SparkiyClient.Windows_1.6.0.2_x64.appx -SymbolPackage=C:\Users\Aleksandar\Source\Repos\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\AppPackages\SparkiyClient.Windows_1.6.0.2_Test\SparkiyClient.Windows_1.6.0.2_x64.appxsym +MainPackage=C:\Users\Aleksandar\Source\Repos\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\x64\Release\SparkiyClient.Windows_1.6.1.1_x64.appx +SymbolPackage=C:\Users\Aleksandar\Source\Repos\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\AppPackages\SparkiyClient.Windows_1.6.1.1_Test\SparkiyClient.Windows_1.6.1.1_x64.appxsym diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x86.txt b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x86.txt index 2ab61f6..2c48fcd 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x86.txt +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x86.txt @@ -1,2 +1,2 @@ -MainPackage=C:\Users\Aleksandar\Source\Repos\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\x86\Release\SparkiyClient.Windows_1.6.0.2_x86.appx -SymbolPackage=C:\Users\Aleksandar\Source\Repos\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\AppPackages\SparkiyClient.Windows_1.6.0.2_Test\SparkiyClient.Windows_1.6.0.2_x86.appxsym +MainPackage=C:\Users\Aleksandar\Source\Repos\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\x86\Release\SparkiyClient.Windows_1.6.1.1_x86.appx +SymbolPackage=C:\Users\Aleksandar\Source\Repos\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\AppPackages\SparkiyClient.Windows_1.6.1.1_Test\SparkiyClient.Windows_1.6.1.1_x86.appxsym diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.appxmanifest b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.appxmanifest index f25e1a9..344e751 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.appxmanifest +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.appxmanifest @@ -1,6 +1,6 @@  - + Sparkiy Aleksandar Toplek diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj index 30ff1e2..89c872c 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj @@ -97,6 +97,7 @@ false prompt true + false bin\x86\Release\ diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml.cs index 17dd158..be557a5 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml.cs +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml.cs @@ -49,15 +49,17 @@ private void OnLoaded(object sender, RoutedEventArgs routedEventArgs) { // Load AdRotator AdRotatorControl.Log += message => Log.Debug(message); - var adRotatorControl = new AdRotator.AdRotatorControl(); - adRotatorControl.Margin = new Thickness(0, 5, 0, 10); - adRotatorControl.VerticalAlignment = VerticalAlignment.Bottom; - adRotatorControl.HorizontalAlignment = HorizontalAlignment.Stretch; - adRotatorControl.LocalSettingsLocation = "AdSettings.xml"; - adRotatorControl.AdWidth = 320; - adRotatorControl.AdHeight = 125; - adRotatorControl.AutoStartAds = true; + var adRotatorControl = new AdRotator.AdRotatorControl + { + Margin = new Thickness(0, 5, 0, 10), + VerticalAlignment = VerticalAlignment.Bottom, + HorizontalAlignment = HorizontalAlignment.Stretch, + LocalSettingsLocation = "AdSettings.xml", + AutoStartAds = true, + AdRefreshInterval = 20, + }; adRotatorControl.PlatformAdProviderComponents.Add(AdType.AdDuplex, typeof(AdDuplex.Controls.AdControl)); + adRotatorControl.PlatformAdProviderComponents.Add(AdType.Smaato, typeof(SOMAW81.AdViewer)); Grid.SetRow(adRotatorControl, 1); (this.SideBarControl.Content as Grid).Children.Add(adRotatorControl); } @@ -88,6 +90,9 @@ private void OutputMessagesOnCollectionChanged(object sender, NotifyCollectionCh } - public new IDebugPageViewModel ViewModel => this.DataContext as IDebugPageViewModel; + public new IDebugPageViewModel ViewModel + { + get { return this.DataContext as IDebugPageViewModel; } + } } } diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml.cs index 28e62de..fafd322 100644 --- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml.cs +++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml.cs @@ -1268,6 +1268,9 @@ public EditPage() this.ViewModel.AssignEditor(this.CodeEditor); } - public new IEditPageViewModel ViewModel => this.DataContext as IEditPageViewModel; + public new IEditPageViewModel ViewModel + { + get { return this.DataContext as IEditPageViewModel; } + } } } diff --git a/SparkiyClient/SparkiyEngine.Bindings.Component/Common/Attributes/MethodDeclarationDocumentationParamAttribute.cs b/SparkiyClient/SparkiyEngine.Bindings.Component/Common/Attributes/MethodDeclarationDocumentationParamAttribute.cs index 664b197..e140ddf 100644 --- a/SparkiyClient/SparkiyEngine.Bindings.Component/Common/Attributes/MethodDeclarationDocumentationParamAttribute.cs +++ b/SparkiyClient/SparkiyEngine.Bindings.Component/Common/Attributes/MethodDeclarationDocumentationParamAttribute.cs @@ -13,11 +13,11 @@ public MethodDeclarationDocumentationParamAttribute(string name, DataTypes type, } - public string Name { get; } + public string Name { get; private set; } - public DataTypes Type { get; } + public DataTypes Type { get; private set; } - public string Description { get; } + public string Description { get; private set; } protected bool Equals(MethodDeclarationDocumentationParamAttribute other) @@ -36,7 +36,7 @@ public override int GetHashCode() { unchecked { - return (base.GetHashCode() * 397) ^ (Name?.GetHashCode() ?? 0); + return (base.GetHashCode() * 397) ^ (Name == null ? 0 : Name.GetHashCode()); } } } diff --git a/SparkiyClient/SparkiyEngine.Bindings.Component/SparkiyEngine.Bindings.Component.csproj b/SparkiyClient/SparkiyEngine.Bindings.Component/SparkiyEngine.Bindings.Component.csproj index b915fea..5750c08 100644 --- a/SparkiyClient/SparkiyEngine.Bindings.Component/SparkiyEngine.Bindings.Component.csproj +++ b/SparkiyClient/SparkiyEngine.Bindings.Component/SparkiyEngine.Bindings.Component.csproj @@ -51,6 +51,40 @@ prompt 4 + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + @@ -97,4 +131,4 @@ --> - \ No newline at end of file + diff --git a/SparkiyClient/SparkiyEngine.Documentation.MDProvider/MainPage.xaml.cs b/SparkiyClient/SparkiyEngine.Documentation.MDProvider/MainPage.xaml.cs index 3dd9d73..f5dd434 100644 --- a/SparkiyClient/SparkiyEngine.Documentation.MDProvider/MainPage.xaml.cs +++ b/SparkiyClient/SparkiyEngine.Documentation.MDProvider/MainPage.xaml.cs @@ -113,6 +113,9 @@ private async Task GenerateLinkPages(IEnumerable pages) var groupedPages = validPages.GroupBy(llp => llp.Substring(0, llp.LastIndexOf('/'))).ToDictionary(grouping => grouping.Key, grouping => grouping); foreach (var group in groupedPages) { + if (group.Key == "reference") + continue; + var pageContent = this.GenerateLinkPage(group.Key, group.Value); var pageUrl = this.GetLinkCategory(group.Key); @@ -146,6 +149,7 @@ private string GenerateLinkPage(string category, IEnumerable items) const string page = "---\r\n" + "title: {0} -- Sparkiy Reference\r\n" + + "headerActiveClass: reference\r\n" + "generatorVersion: {1}\r\n" + "generatedDate: {2}\r\n" + "---\r\n" + @@ -181,6 +185,7 @@ private string GeneratePage(MethodDeclarationDocumentationDetails details) const string page = "---\r\n" + "title: {0} -- Sparkiy Reference\r\n" + + "headerActiveClass: reference\r\n" + "generatorVersion: {1}\r\n" + "generatedDate: {2}\r\n" + "---\r\n" + @@ -298,12 +303,12 @@ private string GeneratePage(MethodDeclarationDocumentationDetails details) private string GetLinkCategory(string category) { - return "/" + category?.TrimStart('/'); + return "/" + category != null ? category.TrimStart('/') : String.Empty; } private string GetLink(MethodDeclarationDocumentationDetails details) { - return "/api/" + details.Category?.TrimStart('/') + details.Declaration.Name; + return "reference/api/" + details.Category != null ? details.Category.TrimStart('/') : String.Empty + details.Declaration.Name; } } } diff --git a/SparkiyClient/SparkiyEngine.Engine/Sparkiy.cs b/SparkiyClient/SparkiyEngine.Engine/Sparkiy.cs index a91ade1..a172b30 100644 --- a/SparkiyClient/SparkiyEngine.Engine/Sparkiy.cs +++ b/SparkiyClient/SparkiyEngine.Engine/Sparkiy.cs @@ -20,7 +20,7 @@ internal class ScriptManager private readonly List activeScripts = new List(); private readonly List inactiveScripts = new List(); - public bool HasInactiveScripts => this.inactiveScripts.Any(); + public bool HasInactiveScripts { get { return this.inactiveScripts.Any(); } } public void AddScript(string name) { @@ -267,9 +267,9 @@ public object CallFunction(string script, string name, MethodTypes type, Diction new MethodDeclarationOverloadDetails() { Type = type, - Input = inputParameters?.Values.ToArray() ?? new DataTypes[0] + Input = inputParameters == null ? new DataTypes[0] : inputParameters.Values.ToArray() }, - inputParameters?.Keys.ToArray() ?? new object[0]); + inputParameters == null ? new object[0] : inputParameters.Keys.ToArray()); } else { @@ -277,9 +277,9 @@ public object CallFunction(string script, string name, MethodTypes type, Diction new MethodDeclarationOverloadDetails() { Type = type, - Input = inputParameters?.Values.ToArray() ?? new DataTypes[0] + Input = inputParameters == null ? new DataTypes[0] : inputParameters.Values.ToArray() }, - inputParameters?.Keys.ToArray() ?? new object[0]); + inputParameters == null ? new object[0] : inputParameters.Keys.ToArray()); } } catch (Exception ex) @@ -318,7 +318,8 @@ public void AddMessage(EngineMessage message) { this.messages.Add(message); - this.OnMessageCreated?.Invoke(this); + if (this.OnMessageCreated != null) + this.OnMessageCreated.Invoke(this); } /// diff --git a/SparkiyClient/SparkiyEngine.Engine/SparkiyEngine.Engine.csproj b/SparkiyClient/SparkiyEngine.Engine/SparkiyEngine.Engine.csproj index 930fa36..c38aa28 100644 --- a/SparkiyClient/SparkiyEngine.Engine/SparkiyEngine.Engine.csproj +++ b/SparkiyClient/SparkiyEngine.Engine/SparkiyEngine.Engine.csproj @@ -52,6 +52,40 @@ prompt 4 + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + @@ -89,4 +123,4 @@ --> - \ No newline at end of file + diff --git a/SparkiyClient/SparkiyEngine.Graphics.DirectX/GraphicsBindings Implementation/GraphicsBindings.cs b/SparkiyClient/SparkiyEngine.Graphics.DirectX/GraphicsBindings Implementation/GraphicsBindings.cs index d3c500c..e9c9b0f 100644 --- a/SparkiyClient/SparkiyEngine.Graphics.DirectX/GraphicsBindings Implementation/GraphicsBindings.cs +++ b/SparkiyClient/SparkiyEngine.Graphics.DirectX/GraphicsBindings Implementation/GraphicsBindings.cs @@ -47,9 +47,11 @@ public void Pause() public void Stop() { - this.game?.Exit(); - this.game?.Dispose(); - this.game = null; + if (this.game != null) { + this.game.Exit(); + this.game.Dispose(); + this.game = null; + } } public void AddImageAsset(string name, WriteableBitmap imageAsset) diff --git a/SparkiyClient/SparkiyEngine.Graphics.DirectX/SparkiyEngine.Graphics.DirectX.csproj b/SparkiyClient/SparkiyEngine.Graphics.DirectX/SparkiyEngine.Graphics.DirectX.csproj index f426258..876eec4 100644 --- a/SparkiyClient/SparkiyEngine.Graphics.DirectX/SparkiyEngine.Graphics.DirectX.csproj +++ b/SparkiyClient/SparkiyEngine.Graphics.DirectX/SparkiyEngine.Graphics.DirectX.csproj @@ -53,6 +53,40 @@ prompt 4 + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + @@ -126,4 +160,4 @@ --> - \ No newline at end of file + diff --git a/SparkiyClient/SparkiyEngine.Graphics.DirectX/Style2D.cs b/SparkiyClient/SparkiyEngine.Graphics.DirectX/Style2D.cs index ffe1ff9..d1d0bc4 100644 --- a/SparkiyClient/SparkiyEngine.Graphics.DirectX/Style2D.cs +++ b/SparkiyClient/SparkiyEngine.Graphics.DirectX/Style2D.cs @@ -4,7 +4,7 @@ namespace SparkiyEngine.Graphics.DirectX { - internal struct Style2D + internal class Style2D { private static readonly Color4 DefaultStrokeColor = new Color4(new Vector4(0, 0, 0, 1)); private static readonly Color4 DefaultFillColor = new Color4(new Vector4(0, 0, 0, 1)); diff --git a/SparkiyClient/SparkiyEngine.Input/SparkiyEngine.Input.csproj b/SparkiyClient/SparkiyEngine.Input/SparkiyEngine.Input.csproj index 3bb8b48..a209994 100644 --- a/SparkiyClient/SparkiyEngine.Input/SparkiyEngine.Input.csproj +++ b/SparkiyClient/SparkiyEngine.Input/SparkiyEngine.Input.csproj @@ -50,6 +50,40 @@ prompt 4 + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + diff --git a/SparkiyClient/SparkiyEngine.Language.Lua/SparkiyEngine.Language.Lua.Windows/SparkiyEngine.Language.Lua.Windows.vcxproj b/SparkiyClient/SparkiyEngine.Language.Lua/SparkiyEngine.Language.Lua.Windows/SparkiyEngine.Language.Lua.Windows.vcxproj index 8224bc6..117a0c8 100644 --- a/SparkiyClient/SparkiyEngine.Language.Lua/SparkiyEngine.Language.Lua.Windows/SparkiyEngine.Language.Lua.Windows.vcxproj +++ b/SparkiyClient/SparkiyEngine.Language.Lua/SparkiyEngine.Language.Lua.Windows/SparkiyEngine.Language.Lua.Windows.vcxproj @@ -194,4 +194,4 @@ - \ No newline at end of file + diff --git a/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Windows/SparkiyEngine.Language.LuaImplementation.Windows.vcxproj b/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Windows/SparkiyEngine.Language.LuaImplementation.Windows.vcxproj index 6878a04..88b02d6 100644 --- a/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Windows/SparkiyEngine.Language.LuaImplementation.Windows.vcxproj +++ b/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Windows/SparkiyEngine.Language.LuaImplementation.Windows.vcxproj @@ -226,4 +226,4 @@ - \ No newline at end of file +