Expose HeightfieldColliderShape to use it in Game Studio

sources/editor/Xenko.Assets.Presentation/Preview/HeightmapPreview.cs

@@ -0,0 +1,95 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Assets.Physics;
+using Xenko.Assets.Presentation.Preview.Views;
+using Xenko.Core.Mathematics;
+using Xenko.Editor.Preview;
+using Xenko.Graphics;
+using Xenko.Physics;
+
+namespace Xenko.Assets.Presentation.Preview
+{
+    [AssetPreview(typeof(HeightmapAsset), typeof(HeightmapPreviewView))]
+    public class HeightmapPreview : PreviewFromSpriteBatch<HeightmapAsset>
+    {
+        private Heightmap heightmap;
+        private Texture heightmapTexture;
+        private BlendStateDescription adequateBlendState;
+
+        public int Width => heightmap?.Width ?? 0;
+        public int Length => heightmap?.Length ?? 0;
+
+        /// <summary>
+        /// Gets or sets a callback that will be invoked when the texture is loaded.
+        /// </summary>
+        public Action NotifyHeightmapLoaded { get; set; }
+
+        protected override Vector2 SpriteSize
+        {
+            get
+            {
+                if (heightmapTexture == null)
+                    return base.SpriteSize;
+
+                return new Vector2(heightmapTexture.Width, heightmapTexture.Height);
+            }
+        }
+
+        protected virtual Vector2 ImageCenter
+        {
+            get
+            {
+                if (heightmapTexture == null)
+                    return Vector2.Zero;
+
+                var imageSize = new Vector2(heightmapTexture.Width, heightmapTexture.Height);
+
+                return imageSize / 2f;
+            }
+        }
+
+        protected override void LoadContent()
+        {
+            heightmap = LoadAsset<Heightmap>(AssetItem.Location);
+
+            heightmapTexture = heightmap?.CreateTexture(Game.GraphicsDevice);
+
+            adequateBlendState = BlendStates.Opaque;
+
+            NotifyHeightmapLoaded?.Invoke();
+
+            // Always use LDR
+            RenderingMode = RenderingMode.LDR;
+        }
+
+        protected override void UnloadContent()
+        {
+            if (heightmapTexture != null)
+            {
+                heightmapTexture.Dispose();
+                heightmapTexture = null;
+            }
+
+            if (heightmap != null)
+            {
+                UnloadAsset(heightmap);
+                heightmap = null;
+            }
+        }
+
+        protected override void RenderSprite()
+        {
+            if (heightmapTexture == null)
+                return;
+
+            var origin = ImageCenter - SpriteOffsets;
+            var region = new RectangleF(0, 0, heightmapTexture.Width, heightmapTexture.Height);
+            var orientation = ImageOrientation.AsIs;
+
+            SpriteBatch.Begin(Game.GraphicsContext, SpriteSortMode.Texture, adequateBlendState);
+            SpriteBatch.Draw(heightmapTexture, WindowSize / 2, region, Color.White, 0, origin, SpriteScale, SpriteEffects.None, orientation, swizzle: SwizzleMode.RRR1);
+            SpriteBatch.End();
+        }
+    }
+}

sources/editor/Xenko.Assets.Presentation/Preview/Views/HeightmapPreviewView.cs

@@ -0,0 +1,15 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System.Windows;
+using Xenko.Editor.Preview.View;
+
+namespace Xenko.Assets.Presentation.Preview.Views
+{
+    public class HeightmapPreviewView : XenkoPreviewView
+    {
+        static HeightmapPreviewView()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(HeightmapPreviewView), new FrameworkPropertyMetadata(typeof(HeightmapPreviewView)));
+        }
+    }
+}

sources/editor/Xenko.Assets.Presentation/Templates/Assets/Physics/ColliderShapeHeightfield.xktpl

@@ -0,0 +1,10 @@
+!TemplateAssetFactory
+Id: 1D3C9128-C94B-413B-9ABB-80ADDD372F61
+AssetTypeName: ColliderShapeAsset
+Name: Heightfield
+Scope: Asset
+Description: A heightfield collider
+Group: Physics
+Icon: ..\.xktpl\ColliderPlane.png
+DefaultOutputName: ColliderHeightfield
+FactoryTypeName: ColliderShapeHeightfieldFactory

sources/editor/Xenko.Assets.Presentation/Templates/Assets/Physics/Heightmap.xktpl

@@ -0,0 +1,12 @@
+!TemplateAssetFactory
+Id: 127EC64F-6E15-4964-98F4-DB735B39AE09
+AssetTypeName: HeightmapAsset
+Name: Heightmap
+Scope: Asset
+Description: A heightmap for heightfield
+Group: Physics
+Order: 100
+Icon: ..\.xktpl\TextureGray.png
+DefaultOutputName: Heightmap
+FactoryTypeName: HeightmapFactory
+ImportSource: true

sources/editor/Xenko.Assets.Presentation/Templates/HeightmapFactoryTemplateGenerator.cs

@@ -0,0 +1,45 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Xenko.Assets.Textures;
+using Xenko.Core;
+using Xenko.Core.Assets.Editor.Settings;
+using Xenko.Core.Assets.IO;
+using Xenko.Core.Assets.Templates;
+using Xenko.Core.IO;
+using Xenko.Core.Reflection;
+
+namespace Xenko.Assets.Presentation.Templates
+{
+    public class HeightmapFactoryTemplateGenerator : AssetFromFileTemplateGenerator
+    {
+        public new static readonly HeightmapFactoryTemplateGenerator Default = new HeightmapFactoryTemplateGenerator();
+
+        public static readonly Guid TemplateId = new Guid("127EC64F-6E15-4964-98F4-DB735B39AE09");
+
+        public override bool IsSupportingTemplate(TemplateDescription templateDescription)
+        {
+            if (templateDescription == null) throw new ArgumentNullException(nameof(templateDescription));
+            return templateDescription.Id == TemplateId;
+        }
+
+        protected override async Task<IEnumerable<UFile>> BrowseForSourceFiles(TemplateAssetDescription description, bool allowMultiSelection)
+        {
+            var assetType = description.GetAssetType();
+            var assetTypeName = TypeDescriptorFactory.Default.AttributeRegistry.GetAttribute<DisplayAttribute>(assetType)?.Name ?? assetType.Name;
+            var extensions = new FileExtensionCollection($"Source files for {assetTypeName}", TextureImporter.FileExtensions);
+            var result = await BrowseForFiles(extensions, allowMultiSelection, true, InternalSettings.FileDialogLastImportDirectory.GetValue());
+            if (result != null)
+            {
+                var list = result.ToList();
+                InternalSettings.FileDialogLastImportDirectory.SetValue(list.First());
+                InternalSettings.Save();
+                return list;
+            }
+            return null;
+        }
+    }
+}

sources/editor/Xenko.Assets.Presentation/Templates/XenkoTemplates.cs

@@ -16,6 +16,7 @@ public static void Register()
             TemplateManager.Register(AssetFactoryTemplateGenerator.Default);
             TemplateManager.Register(AssetFromFileTemplateGenerator.Default);
             // Specific asset templates must be registered after AssetFactoryTemplateGenerator
+            TemplateManager.Register(HeightmapFactoryTemplateGenerator.Default);
             TemplateManager.Register(ColliderShapeHullFactoryTemplateGenerator.Default);
             TemplateManager.Register(ProceduralModelFactoryTemplateGenerator.Default);
             TemplateManager.Register(SkyboxFactoryTemplateGenerator.Default);

sources/editor/Xenko.Assets.Presentation/Themes/Generic.xaml

@@ -397,4 +397,61 @@
       </Setter.Value>
     </Setter>
   </Style>
+
+  <Style TargetType="{x:Type views:HeightmapPreviewView}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type views:HeightmapPreviewView}">
+          <DockPanel d:DataContext="{d:DesignInstance viewModel:HeightmapPreviewViewModel}">
+            <Grid Background="{StaticResource NormalBrush}" DockPanel.Dock="Top">
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+              </Grid.RowDefinitions>
+              <DockPanel Grid.Row="0">
+                <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
+                  <Button Command="{Binding PreviewZoomOutCommand}" Background="Transparent" Margin="2">
+                    <Image Source="{StaticResource ImageZoomOut}" RenderOptions.BitmapScalingMode="NearestNeighbor" Width="16" Height="16" />
+                  </Button>
+                  <Button Command="{Binding PreviewZoomInCommand}" Background="Transparent" Margin="2">
+                    <Image Source="{StaticResource ImageZoomIn}" RenderOptions.BitmapScalingMode="NearestNeighbor" Width="16" Height="16" />
+                  </Button>
+                  <Button Command="{Binding PreviewScaleToRealSizeCommand}" Background="Transparent" Margin="2">
+                    <Image Source="{StaticResource ImageScaleOnRealSize}" RenderOptions.BitmapScalingMode="NearestNeighbor" Width="16" Height="16" />
+                  </Button>
+                  <Button Command="{Binding PreviewFitOnScreenCommand}" Background="Transparent" Margin="2">
+                    <Image Source="{StaticResource ImageFitOnScreen}" RenderOptions.BitmapScalingMode="NearestNeighbor" Width="16" Height="16" />
+                  </Button>
+                </StackPanel>
+              </DockPanel>
+            </Grid>
+            <StatusBar DockPanel.Dock="Bottom" Visibility="{Binding Session, Converter={xk:Chained {xk:ObjectToBool}, {xk:VisibleOrCollapsed}}}">
+              <StatusBar.ItemsPanel>
+                <ItemsPanelTemplate>
+                  <Grid>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="*"/>
+                      <ColumnDefinition Width="Auto"/>
+                      <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
+                  </Grid>
+                </ItemsPanelTemplate>
+              </StatusBar.ItemsPanel>
+              <StatusBarItem Grid.Column="0">
+                <TextBlock Margin="5" VerticalAlignment="Center" Text="{Binding SpriteScale, StringFormat={}{0:P}}"/>
+              </StatusBarItem>
+              <Separator Grid.Column="1"/>
+              <StatusBarItem Grid.Column="2">
+                <StackPanel Orientation="Horizontal">
+                  <TextBlock Margin="5" VerticalAlignment="Center" Text="{Binding PreviewHeightmapWidth, StringFormat={xk:Localize W: {0}}}"/>
+                  <TextBlock Margin="5" VerticalAlignment="Center" Text="{Binding PreviewHeightmapLength, StringFormat={xk:Localize L: {0}}}"/>
+                </StackPanel>
+              </StatusBarItem>
+            </StatusBar>
+
+            <ContentPresenter x:Name="PART_XenkoView"/>
+          </DockPanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 </ResourceDictionary>

sources/editor/Xenko.Assets.Presentation/Thumbnails/HeightmapThumbnailCompiler.cs

@@ -0,0 +1,87 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System.Collections.Generic;
+using Xenko.Assets.Physics;
+using Xenko.Core.Assets;
+using Xenko.Core.Assets.Compiler;
+using Xenko.Core.Mathematics;
+using Xenko.Core.Serialization.Contents;
+using Xenko.Editor.Thumbnails;
+using Xenko.Graphics;
+using Xenko.Physics;
+using Xenko.Rendering;
+
+namespace Xenko.Assets.Presentation.Thumbnails
+{
+    [AssetCompiler(typeof(HeightmapAsset), typeof(ThumbnailCompilationContext))]
+    public class HeightmapThumbnailCompiler : ThumbnailCompilerBase<HeightmapAsset>
+    {
+        public HeightmapThumbnailCompiler()
+        {
+            IsStatic = false;
+            Priority = 10050;
+        }
+
+        public override IEnumerable<ObjectUrl> GetInputFiles(AssetItem assetItem)
+        {
+            var asset = (HeightmapAsset)assetItem.Asset;
+            var url = asset.Source.FullPath;
+            if (!string.IsNullOrEmpty(url))
+            {
+                yield return new ObjectUrl(UrlType.File, url);
+            }
+        }
+
+        protected override void CompileThumbnail(ThumbnailCompilerContext context, string thumbnailStorageUrl, AssetItem assetItem, Package originalPackage, AssetCompilerResult result)
+        {
+            result.BuildSteps.Add(new ThumbnailBuildStep(new HeightmapThumbnailCommand(context, assetItem, originalPackage, thumbnailStorageUrl,
+                new ThumbnailCommandParameters(assetItem.Asset, thumbnailStorageUrl, context.ThumbnailResolution))
+            { InputFilesGetter = () => GetInputFiles(assetItem) }));
+        }
+
+        /// <summary>
+        /// Command used to build the thumbnail of the texture in the storage
+        /// </summary>
+        public class HeightmapThumbnailCommand : ThumbnailFromSpriteBatchCommand<Heightmap>
+        {
+            private Texture texture;
+
+            public HeightmapThumbnailCommand(ThumbnailCompilerContext context, AssetItem assetItem, IAssetFinder assetFinder, string url, ThumbnailCommandParameters parameters)
+                : base(context, assetItem, assetFinder, url, parameters)
+            {
+                parameters.ColorSpace = ColorSpace.Linear;
+            }
+
+            protected override void PreloadAsset()
+            {
+                base.PreloadAsset();
+
+                texture = LoadedAsset?.CreateTexture(GraphicsDevice);
+            }
+
+            protected override void UnloadAsset()
+            {
+                if (texture != null)
+                {
+                    texture.Dispose();
+                    texture = null;
+                }
+
+                base.UnloadAsset();
+            }
+
+            protected override void RenderSprites(RenderDrawContext context)
+            {
+                if (LoadedAsset == null)
+                    return;
+
+                if (texture != null)
+                {
+                    var destinationRectangle = new RectangleF(0, 0, Parameters.ThumbnailSize.X, Parameters.ThumbnailSize.Y);
+
+                    SpriteBatch.Draw(texture, destinationRectangle, new RectangleF(0, 0, texture.Width, texture.Height), Color.White, 0f, new Vector2(0, 0), SpriteEffects.None, swizzle: SwizzleMode.RRR1);
+                }
+            }
+        }
+    }
+}

sources/editor/Xenko.Assets.Presentation/ViewModel/Preview/HeightmapPreviewViewModel.cs

@@ -0,0 +1,40 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Assets.Presentation.Preview;
+using Xenko.Core.Assets.Editor.ViewModel;
+using Xenko.Editor.Preview;
+using Xenko.Editor.Preview.ViewModel;
+
+namespace Xenko.Assets.Presentation.ViewModel.Preview
+{
+    [AssetPreviewViewModel(typeof(HeightmapPreview))]
+    public class HeightmapPreviewViewModel : TextureBasePreviewViewModel
+    {
+        private HeightmapPreview heightmapPreview;
+        private int previewHeightmapLength;
+        private int previewHeightmapWidth;
+
+        public HeightmapPreviewViewModel(SessionViewModel session)
+            : base(session)
+        {
+        }
+
+        public int PreviewHeightmapLength { get { return previewHeightmapLength; } private set { SetValue(ref previewHeightmapLength, value); } }
+
+        public int PreviewHeightmapWidth { get { return previewHeightmapWidth; } private set { SetValue(ref previewHeightmapWidth, value); } }
+
+        public override void AttachPreview(IAssetPreview preview)
+        {
+            heightmapPreview = (HeightmapPreview)preview;
+            heightmapPreview.NotifyHeightmapLoaded += UpdateHeightmapInfo;
+            UpdateHeightmapInfo();
+            AttachPreviewTexture(preview);
+        }
+
+        private void UpdateHeightmapInfo()
+        {
+            PreviewHeightmapWidth = heightmapPreview.Width;
+            PreviewHeightmapLength = heightmapPreview.Length;
+        }
+    }
+}

sources/editor/Xenko.Assets.Presentation/Xenko.Assets.Presentation.xkpkg

@@ -52,6 +52,8 @@ TemplateFolders:
         - !file Templates/Assets/Physics/ColliderShapePlane.xktpl
         - !file Templates/Assets/Physics/ColliderShapeSphere.xktpl
         - !file Templates/Assets/Physics/ColliderShapeCone.xktpl
+        - !file Templates/Assets/Physics/ColliderShapeHeightfield.xktpl
+        - !file Templates/Assets/Physics/Heightmap.xktpl
         - !file Templates/Assets/Scenes/DefaultPrefab.xktpl
         - !file Templates/Assets/Scenes/DefaultNavigationMesh.xktpl
         - !file Templates/Assets/Scenes/DefaultScene.xktpl