Release 1.0.0-beta05 (fixes #115 #116 #117).

SiliconStudio · Nov 26, 2014 · ceba0b1 · ceba0b1
1 parent b47b609
commit ceba0b1
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 11 deletions.
diff --git 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
@@ -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
diff --git 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<string, BundleOdbBackend>();

diff --git 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
@@ -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
@@ -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
         /// </summary>
         /// <value>The asset location.</value>
         public UFile AssetLocation { get; set; }
+
+        /// <summary>
+        /// Gets or sets the hash of the asset source (optional).
+        /// </summary>
+        /// <value>
+        /// The hash of the asset source.
+        /// </value>
+        public ObjectId? Hash { get; set; }
     }
 }
diff --git 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<string, bool> 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
@@ -133,9 +133,6 @@
             <Setter.Value>
                 <ControlTemplate TargetType="Window">
                     <Grid Background="#05000000" Margin="6">
-                        <Grid.Effect>
-                            <DropShadowEffect BlurRadius="4" RenderingBias="Quality" ShadowDepth="2"/>
-                        </Grid.Effect>
                         <Border x:Name="ContentBorder" Background="{StaticResource BackgroundBrush}" BorderBrush="Black" BorderThickness="1" IsHitTestVisible="True">
                             <DockPanel>
                                 <DockPanel DockPanel.Dock="Top" VerticalAlignment="Top" Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(WindowChrome.WindowChrome).ResizeBorderThickness}" WindowChrome.IsHitTestVisibleInChrome="False">
@@ -1749,7 +1746,6 @@
                                 <SplineDoubleKeyFrame KeyTime="0" Value="0" />
                                 <SplineDoubleKeyFrame KeyTime="00:00:2.4" Value="145" />
                             </DoubleAnimationUsingKeyFrames>
-
                         </Storyboard>
                     </ControlTemplate.Resources>
                     <Grid>
@@ -1801,8 +1797,18 @@
                         </EventTrigger>
                         <Trigger Property="IsIndeterminate" Value="True">
                             <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource IndeterminateOn}" />
+                                <BeginStoryboard>
+                                    <Storyboard x:Name="IndeterminateOnStoryboard">
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="IndeterminateGradientFill" Storyboard.TargetProperty="(Shape.Fill).(Brush.Transform).(TransformGroup.Children)[0].X">
+                                            <SplineDoubleKeyFrame KeyTime="0" Value="0" />
+                                            <SplineDoubleKeyFrame KeyTime="00:00:2.4" Value="145" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </BeginStoryboard>
                             </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="IndeterminateOnStoryboard"/>
+                            </Trigger.ExitActions>
                             <Setter Property="Visibility" TargetName="IndeterminateRoot" Value="Visible"/>
                         </Trigger>
                     </ControlTemplate.Triggers>

diff --git 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.
         /// </remarks>
-        public const string CurrentAsText = CurrentAssemblyAsText + "-beta04"; 
+        public const string CurrentAsText = CurrentAssemblyAsText + "-beta05"; 
     }
 
     partial class PublicKeys