Merge pull request #25 from Sparkiy/development

Development

README.md

@@ -1,5 +1,8 @@
-# Sparkiy for Windows
-_Sparkiy/sparkiy-client_
+# Sparkiy
+_[Sparkiy/sparkiy-client](https://github.com/Sparkiy/sparkiy-client)_
+
+[![GratiPay Tips](https://img.shields.io/gratipay/sparkiy.svg?style=flat-square)](https://gratipay.com/sparkiy/)
+[![Bountysource](https://www.bountysource.com/badge/team?team_id=54298&style=bounties_posted)](https://www.bountysource.com/teams/sparkiy-client/bounties?utm_source=sparkiy-client&utm_medium=shield&utm_campaign=bounties_posted)
 
 ## Overview
 Bring your ideas to life. Make something everyone can play on their computer, tablet, phone and console.
@@ -12,6 +15,7 @@ Sparkiy is fully-featured platform for game and application development. Touch f
 - Xbox One
 
 ## Project status
+
 |               | master | beta | development | edge |
 | ------------- | ------ | ---- | ----------- | ---- |
 | Windows       | [![master build status](https://ci.appveyor.com/api/projects/status/gvxevc5yih5oodnn/branch/master?svg=true&pendingText=pending...&passingText=OK&failingText=failed)](https://ci.appveyor.com/project/AleksandarDev/sparkiy-client/branch/master) | [![beta build status](https://ci.appveyor.com/api/projects/status/gvxevc5yih5oodnn/branch/beta?svg=true&pendingText=pending...&passingText=OK&failingText=failed)](https://ci.appveyor.com/project/AleksandarDev/sparkiy-client/branch/beta) | [![development build status](https://ci.appveyor.com/api/projects/status/gvxevc5yih5oodnn/branch/development?svg=true&pendingText=pending...&passingText=OK&failingText=failed)](https://ci.appveyor.com/project/AleksandarDev/sparkiy-client/branch/development) | [![edge build status](https://ci.appveyor.com/api/projects/status/gvxevc5yih5oodnn/branch/edge?svg=true&pendingText=pending...&passingText=OK&failingText=failed)](https://ci.appveyor.com/project/AleksandarDev/sparkiy-client/branch/edge) |

SparkiyClient/SparkiyClient.Common/SparkiyClient.Common.csproj

@@ -99,4 +99,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs

@@ -1,15 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 using GalaSoft.MvvmLight.Command;
 using GalaSoft.MvvmLight.Views;
+using Nito.AsyncEx;
 using SparkiyClient.Common;
 using SparkiyClient.UILogic.Models;
 using SparkiyClient.UILogic.Services;
 
-namespace SparkiyClient.UILogic.ViewModels
+namespace SparkiyClient.UILogic.Windows.ViewModels
 {
 	public interface ICreateProjectPageViewModel
 	{
@@ -30,6 +28,21 @@ public CreateProjectPageViewModel(IProjectService projectService, INavigationSer
 			this.projectService = projectService;
 
 			this.CreateProjectCommand = new RelayCommand(this.CreateProjectCommandExecuteAsync);
+
+			this.Project = new Project()
+			{
+				Files = NotifyTaskCompletion.Create(async () =>
+				{
+					return new ObservableCollection<CodeFile>()
+					{
+						new Script()
+						{
+							Name = "Entry",
+							Code = "function Created()\n\nend\n\nfunction Started()\n\nend\n\nfunction Draw()\n\nend\n\nfunction Touched(type, x, y)\n\nend\n\nfunction Stopped()\n\nend\n"
+						}
+					};
+				})
+			};
 		}
 
 
@@ -41,10 +54,17 @@ private async void CreateProjectCommandExecuteAsync()
 
 		public Project Project
 		{
-			get { return this.GetProperty<Project>(defaultValue: new Project()); }
+			get { return this.GetProperty<Project>(); }
 			set { this.SetProperty(value); }
 		}
 
 		public RelayCommand CreateProjectCommand { get; }
 	}
+
+	public sealed class CreateProjectPageViewModelDesignTime : CreateProjectPageViewModel
+	{
+		public CreateProjectPageViewModelDesignTime() : base(null, null)
+		{
+		}
+	}
 }

SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/DebugPageViewModel.cs

@@ -1,13 +1,47 @@
-using SparkiyClient.Common;
+using System.Threading.Tasks;
+using SparkiyClient.Common;
+using SparkiyClient.UILogic.Models;
+using SparkiyClient.UILogic.Services;
 
-namespace SparkiyClient.UILogic.ViewModels
+namespace SparkiyClient.UILogic.Windows.ViewModels
 {
 	public interface IDebugPageViewModel
 	{
-
+		void AssignProjectPlayEngineManager(IProjectPlayEngineManagement projectPlayEngineManagement);
+
+		void AssignProjectPlayStateManager(IProjectPlayStateManagment projectPlayStateManagment);
+
+		Task AssignProjectAsync(Project project);
 	}
 
 	public class DebugPageViewModel : ExtendedViewModel, IDebugPageViewModel
+	{
+		private IProjectPlayEngineManagement projectPlayEngineManager;
+		private IProjectPlayStateManagment projectPlayStateManager;
+		private Project project;
+
+
+
+		public void AssignProjectPlayEngineManager(IProjectPlayEngineManagement projectPlayEngineManager)
+		{
+			this.projectPlayEngineManager = projectPlayEngineManager;
+		}
+
+		public void AssignProjectPlayStateManager(IProjectPlayStateManagment projectPlayStateManager)
+		{
+			this.projectPlayStateManager = projectPlayStateManager;
+		}
+
+		public async Task AssignProjectAsync(Project project)
+		{
+			this.project = project;
+			this.projectPlayEngineManager.AssignProject(this.project);
+
+			this.projectPlayStateManager.PlayProject();
+		}
+	}
+
+	public sealed class DebugPageViewModelDesignTime : DebugPageViewModel
 	{
 
 	}

SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/EditPageViewModel.cs

@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Windows.Storage.Pickers;
 using Windows.UI.Xaml.Navigation;
@@ -16,7 +14,7 @@
 using SparkiyClient.UILogic.Models;
 using SparkiyClient.UILogic.Services;
 
-namespace SparkiyClient.UILogic.ViewModels
+namespace SparkiyClient.UILogic.Windows.ViewModels
 {
 	public interface INewFileViewModel
 	{
@@ -159,7 +157,7 @@ private async void AddNewAssetCommandExecuteAsync()
 			foreach (var selectedFile in selectedFiles)
 				await this.projectService.ImportAsset(this.Project, selectedFile);
 
-			var img = new Image();
+			var img = new ImageAsset();
 
 		}
 
@@ -211,7 +209,7 @@ public INewFileViewModel NewFileViewModel
 		public RelayCommand PlayProjectCommand { get; }
 	}
 
-	public class EditPageViewModelDesignTime : EditPageViewModel
+	public sealed class EditPageViewModelDesignTime : EditPageViewModel
 	{
 		public EditPageViewModelDesignTime() : base(null, null)
 		{

SparkiyClient/SparkiyClient.UILogic/Models/Image.cs → SparkiyClient/SparkiyClient.UILogic/Models/ImageAsset.cs

@@ -5,9 +5,9 @@
 
 namespace SparkiyClient.UILogic.Models
 {
-	public class Image : AssetWithData<BitmapImage>
+	public class ImageAsset : AssetWithData<BitmapImage>
 	{
-		private static readonly ILogger Log = LogManagerFactory.DefaultLogManager.GetLogger<Image>();
+		private static readonly ILogger Log = LogManagerFactory.DefaultLogManager.GetLogger<ImageAsset>();
 
 		/// <summary>
 		/// Gets the data asynchronously from given path.
@@ -17,7 +17,7 @@ public class Image : AssetWithData<BitmapImage>
 		public override async Task GetDataAsync()
 		{
 			this.Data = new BitmapImage(new Uri(this.Path, UriKind.Absolute));
-			Log.Debug("Loaded Image \"{0}\"", this.Name);
+			Log.Debug("Loaded ImageAsset \"{0}\"", this.Name);
 		}
 #pragma warning restore 1998
 	}

SparkiyClient/SparkiyClient.UILogic/Models/Project.cs

@@ -28,7 +28,7 @@ public async Task LoadAsync(IProjectService projectService)
 				await file.GetCodeAsync();
 
 			// Load images
-			foreach (var image in this.Assets.Result.OfType<Image>())
+			foreach (var image in this.Assets.Result.OfType<ImageAsset>())
 				await image.GetDataAsync();
 		}
 

SparkiyClient/SparkiyClient.UILogic/Services/IProjectPlayEngineManagement.cs

@@ -0,0 +1,13 @@
+using System.Threading.Tasks;
+using SparkiyClient.UILogic.Models;
+using SparkiyEngine.Bindings.Component.Engine;
+
+namespace SparkiyClient.UILogic.Services
+{
+	public interface IProjectPlayEngineManagement
+	{
+		void AssignProject(Project project);
+
+		IEngineBindings Engine { get; }
+	}
+}

SparkiyClient/SparkiyClient.UILogic/Services/IProjectPlayStateManagment.cs

@@ -0,0 +1,20 @@
+namespace SparkiyClient.UILogic.Services
+{
+	public interface IProjectPlayStateManagment
+	{
+		void PlayProject();
+
+		void PauseProject();
+
+		void RestartProject();
+
+		void TakeScreenshot();
+
+
+		bool IsInitialized { get; }
+
+		bool IsPlaying { get; }
+
+		bool IsPause { get; }
+	}
+}

SparkiyClient/SparkiyClient.UILogic/Services/ProjectService.cs

@@ -61,7 +61,7 @@ public async Task ImportAsset(Project project, StorageFile file)
 		private Asset ResolveAsset(StorageFile file)
 		{
 			if (file.ContentType == "image/png")
-				return new Image()
+				return new ImageAsset()
 				{
 					Name = file.DisplayName,
 					Path = file.Path

SparkiyClient/SparkiyClient.UILogic/SparkiyClient.UILogic.csproj

@@ -60,7 +60,7 @@
     <Compile Include="Models\Asset.cs" />
     <Compile Include="Models\AssetWithData.cs" />
     <Compile Include="Models\Class.cs" />
-    <Compile Include="Models\Image.cs" />
+    <Compile Include="Models\ImageAsset.cs" />
     <Compile Include="Models\ImageSources.cs" />
     <Compile Include="Models\ImageReference.cs" />
     <Compile Include="Models\Project.cs" />
@@ -70,6 +70,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\DialogCommand.cs" />
     <Compile Include="Services\IAlertMessageService.cs" />
+    <Compile Include="Services\IProjectPlayEngineManagement.cs" />
+    <Compile Include="Services\IProjectPlayStateManagment.cs" />
     <Compile Include="Services\IProjectService.cs" />
     <Compile Include="Services\IStorageService.cs" />
     <Compile Include="Services\ProjectService.cs" />
@@ -140,4 +142,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

SparkiyClient/SparkiyClient.UILogic/ViewModels/PlayPageViewModel.cs

@@ -11,4 +11,9 @@ public class PlayPageViewModel : ExtendedViewModel, IPlayPageViewModel
 	{
 
 	}
+
+	public sealed class PlayPageViewModelDesignTime : PlayPageViewModel
+	{
+
+	}
 }

SparkiyClient/SparkiyClient/SparkiyClient.Shared/App.xaml.cs

@@ -42,6 +42,7 @@
 using MetroLog.Internal;
 using Microsoft.Practices.ServiceLocation;
 using SparkiyClient.Common;
+using SparkiyClient.UILogic.Windows.ViewModels;
 using SparkiyClient.Views;
 
 namespace SparkiyClient
@@ -195,10 +196,11 @@ private void OnContainerRegistration(IUnityContainer container)
 
 			// Register instances
 			this.container.RegisterInstance<IUnityContainer>(this.container);
-
+			
 			// Register services
 			this.container.RegisterType<IAlertMessageService, AlertMessageService>(new ContainerControlledLifetimeManager());
 			this.container.RegisterType<INavigationService, NavigationService>(new ContainerControlledLifetimeManager());
+			this.container.RegisterType<EngineProviderService, EngineProviderService>(new ContainerControlledLifetimeManager());
 			this.container.RegisterType<IStorageService, StorageService>(new ContainerControlledLifetimeManager());
 			this.container.RegisterType<IProjectService, ProjectService>(new ContainerControlledLifetimeManager());
 

SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/CodeEditor/CodeEditorControl.xaml.cs

@@ -10,8 +10,6 @@ public sealed partial class CodeEditorControl : UserControl, ICodeEditor
     {
 	    public event EventHandler OnCodeChanged;
 
-	    private const string DebugTemplate = "function Created()\n\t\nend\n\nfunction Started()\n\t\nend\n\nfunction Draw()\n\t\nend\n\nfunction Touched(state, x, y)\n\t\nend\n\nfunction Stopped()\n\t\nend\n";
-
 
         public CodeEditorControl()
         {
@@ -22,10 +20,6 @@ public CodeEditorControl()
 
 	    private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
 	    {
-#if DEBUG
-		    this.CodeEditor.Text = DebugTemplate;
-#endif
-
 			this.CodeEditor.TextView.TextChanged += (o, args) =>
 		    {
 		        this.OnCodeChanged?.Invoke(this, null);

SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml

@@ -0,0 +1,15 @@
+<UserControl
+    x:Class="SparkiyClient.Controls.PlayView.PlayViewControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:SparkiyClient.Controls.PlayView"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    d:DesignHeight="300"
+    d:DesignWidth="400">
+
+    <Grid>
+	    <SwapChainPanel x:Name="SwapChainPanel" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" />
+    </Grid>
+</UserControl>