From ceba0b113502491c206046a0ed874f435102fcfa Mon Sep 17 00:00:00 2001 From: Virgile Bello Date: Wed, 26 Nov 2014 20:28:06 +0900 Subject: [PATCH] Release 1.0.0-beta05 (fixes #115 #116 #117). --- Paradox.pdxpkg | 2 +- build/ReleaseNotes.md | 9 +++++++++ samples | 2 +- .../BundlePacker.cs | 11 ++++++++++- .../SiliconStudio.Assets.CompilerApp/Program.cs | 2 +- .../Analysis/AssetDependencyManager.cs | 5 ++++- .../Analysis/AssetFileChangedEvent.cs | 9 +++++++++ .../Storage/BundleOdbBackend.cs | 5 +++++ .../Themes/ExpressionDark/Theme.xaml | 16 +++++++++++----- sources/shared/SharedAssemblyInfo.cs | 2 +- 10 files changed, 52 insertions(+), 11 deletions(-) diff --git a/Paradox.pdxpkg b/Paradox.pdxpkg index ce569baa44..c6b2591175 100644 --- a/Paradox.pdxpkg +++ b/Paradox.pdxpkg @@ -2,7 +2,7 @@ Id: cc1bcc78-50b2-4da6-8902-f7a3ae42898b Meta: Name: Paradox - Version: 1.0.0-beta04 + Version: 1.0.0-beta05 Owners: - Silicon Studio Corp. Authors: diff --git a/build/ReleaseNotes.md b/build/ReleaseNotes.md index 4592d2479b..cebe9ef1bb 100644 --- a/build/ReleaseNotes.md +++ b/build/ReleaseNotes.md @@ -1,3 +1,12 @@ +### Version 1.0.0-beta05 + +Release date: 2014/11/26 + +#### Issues fixed +- Build: Fixed build issues due to Asset Compiler ([#116](https://github.com/SiliconStudio/paradox/issues/116)). +- Samples: Fixed various samples that didn't build since recent changes in SpriteBatch.MeasureString ([#117](https://github.com/SiliconStudio/paradox/issues/117)). +- Studio: Fixed high CPU usage due to improper WPF refreshes ([#115](https://github.com/SiliconStudio/paradox/issues/115)). + ### Version 1.0.0-beta04 Release date: 2014/11/25 diff --git a/samples b/samples index 88947366a1..1884f0ad5d 160000 --- a/samples +++ b/samples @@ -1 +1 @@ -Subproject commit 88947366a1bffa2b8b25fa6d2e1a5c15dac4350e +Subproject commit 1884f0ad5dda13294d49d2af196570ff9f47c718 diff --git a/sources/assets/SiliconStudio.Assets.CompilerApp/BundlePacker.cs b/sources/assets/SiliconStudio.Assets.CompilerApp/BundlePacker.cs index 0a58fbfaf3..c98925c053 100644 --- a/sources/assets/SiliconStudio.Assets.CompilerApp/BundlePacker.cs +++ b/sources/assets/SiliconStudio.Assets.CompilerApp/BundlePacker.cs @@ -161,7 +161,16 @@ public void Build(Logger logger, PackageSession packageSession, PackageProfile p VirtualFileSystem.CreateDirectory("/data_output/db"); // Mount output database and delete previous bundles that shouldn't exist anymore (others should be overwritten) - var outputDatabase = new ObjectDatabase("/data_output/db"); + var outputDatabase = new ObjectDatabase("/data_output/db", loadDefaultBundle: false); + try + { + outputDatabase.LoadBundle("default").GetAwaiter().GetResult(); + } + catch (Exception) + { + logger.Info("Generate bundles: Tried to load previous 'default' bundle but it was invalid. Deleting it..."); + outputDatabase.BundleBackend.DeleteBundles(x => Path.GetFileNameWithoutExtension(x) == "default"); + } var outputBundleBackend = outputDatabase.BundleBackend; var outputGroupBundleBackends = new Dictionary(); diff --git a/sources/assets/SiliconStudio.Assets.CompilerApp/Program.cs b/sources/assets/SiliconStudio.Assets.CompilerApp/Program.cs index ac165791b4..6f3c47acbb 100644 --- a/sources/assets/SiliconStudio.Assets.CompilerApp/Program.cs +++ b/sources/assets/SiliconStudio.Assets.CompilerApp/Program.cs @@ -219,7 +219,7 @@ private static int Main(string[] args) } catch (Exception e) { - options.Logger.Error("{0}", e); + options.Logger.Error("Unhandled exception: {0}", e, e.Message); exitCode = BuildResultCode.BuildError; } finally diff --git a/sources/assets/SiliconStudio.Assets/Analysis/AssetDependencyManager.cs b/sources/assets/SiliconStudio.Assets/Analysis/AssetDependencyManager.cs index 53c1719824..11bfd32af9 100644 --- a/sources/assets/SiliconStudio.Assets/Analysis/AssetDependencyManager.cs +++ b/sources/assets/SiliconStudio.Assets/Analysis/AssetDependencyManager.cs @@ -1342,7 +1342,10 @@ private void SourceImportFileHashCallback(UFile sourceFile, ObjectId hash) { // If the hash is empty, the source file has been deleted var changeType = (hash == ObjectId.Empty) ? AssetFileChangedType.SourceDeleted : AssetFileChangedType.SourceUpdated; - sourceImportFileChangedEventsToAdd.Add(new AssetFileChangedEvent(item.Package, changeType, item.Location) { AssetId = assetImport.Id }); + + // Transmit the hash in the event as well, so that we can check again if the asset has not been updated during the async round-trip + // (it happens when reimporting multiple assets at once). + sourceImportFileChangedEventsToAdd.Add(new AssetFileChangedEvent(item.Package, changeType, item.Location) { AssetId = assetImport.Id, Hash = hash }); } } diff --git a/sources/assets/SiliconStudio.Assets/Analysis/AssetFileChangedEvent.cs b/sources/assets/SiliconStudio.Assets/Analysis/AssetFileChangedEvent.cs index 5f0f34b751..417804da25 100644 --- a/sources/assets/SiliconStudio.Assets/Analysis/AssetFileChangedEvent.cs +++ b/sources/assets/SiliconStudio.Assets/Analysis/AssetFileChangedEvent.cs @@ -2,6 +2,7 @@ // This file is distributed under GPL v3. See LICENSE.md for details. using System; using SiliconStudio.Core.IO; +using SiliconStudio.Core.Storage; namespace SiliconStudio.Assets.Analysis { @@ -46,5 +47,13 @@ public AssetFileChangedEvent(Package package, AssetFileChangedType changeType, U /// /// The asset location. public UFile AssetLocation { get; set; } + + /// + /// Gets or sets the hash of the asset source (optional). + /// + /// + /// The hash of the asset source. + /// + public ObjectId? Hash { get; set; } } } \ No newline at end of file diff --git a/sources/common/core/SiliconStudio.Core.Serialization/Storage/BundleOdbBackend.cs b/sources/common/core/SiliconStudio.Core.Serialization/Storage/BundleOdbBackend.cs index ea684e6711..d98d6ecb43 100644 --- a/sources/common/core/SiliconStudio.Core.Serialization/Storage/BundleOdbBackend.cs +++ b/sources/common/core/SiliconStudio.Core.Serialization/Storage/BundleOdbBackend.cs @@ -710,6 +710,11 @@ public void DeleteBundles(Func bundleFileDeletePredicate) foreach (var bundleFile in bundleFiles) { var bundleRealFile = VirtualFileSystem.GetAbsolutePath(bundleFile); + + // Remove ".mp3" (Android only) + if (bundleRealFile.EndsWith(".mp3", StringComparison.CurrentCultureIgnoreCase)) + bundleRealFile = bundleRealFile.Substring(0, bundleRealFile.Length - 4); + if (bundleFileDeletePredicate(bundleRealFile)) { NativeFile.FileDelete(bundleRealFile); diff --git a/sources/common/presentation/SiliconStudio.Presentation/Themes/ExpressionDark/Theme.xaml b/sources/common/presentation/SiliconStudio.Presentation/Themes/ExpressionDark/Theme.xaml index f7b141c0b5..78960f4f95 100644 --- a/sources/common/presentation/SiliconStudio.Presentation/Themes/ExpressionDark/Theme.xaml +++ b/sources/common/presentation/SiliconStudio.Presentation/Themes/ExpressionDark/Theme.xaml @@ -133,9 +133,6 @@ - - - @@ -1749,7 +1746,6 @@ - @@ -1801,8 +1797,18 @@ - + + + + + + + + + + + diff --git a/sources/shared/SharedAssemblyInfo.cs b/sources/shared/SharedAssemblyInfo.cs index 60f8392c9b..fcb96a808c 100644 --- a/sources/shared/SharedAssemblyInfo.cs +++ b/sources/shared/SharedAssemblyInfo.cs @@ -46,7 +46,7 @@ internal class ParadoxVersion /// please use a double digit like alpha00 alpha01...etc. in order to make sure that we will follow the correct /// order for the versions. /// - public const string CurrentAsText = CurrentAssemblyAsText + "-beta04"; + public const string CurrentAsText = CurrentAssemblyAsText + "-beta05"; } partial class PublicKeys