Merge pull request #478 from Newbilius/master

Optional anisotropic filtering added to component "Image"

Author: rds1983

src/Myra/Graphics2D/RenderContext.cs

@@ -25,15 +25,29 @@ namespace Myra.Graphics2D
 	public enum TextureFiltering
 	{
 		Nearest,
-		Linear
-	}
+		Linear,
+        Anisotropic
+    }
 
 	public partial class RenderContext : IDisposable
 	{
 #if MONOGAME || FNA
 		private static RasterizerState _uiRasterizerState;
-
-		private static RasterizerState UIRasterizerState
+		private static SamplerState _textureFilteringAnisotropic = new SamplerState
+        {
+            Filter = TextureFilter.Anisotropic,
+            AddressU = TextureAddressMode.Clamp,
+            AddressV = TextureAddressMode.Clamp,
+            AddressW = TextureAddressMode.Clamp,
+            BorderColor = Color.Transparent,
+            MaxAnisotropy = 16,
+            MaxMipLevel = 16,
+            MipMapLevelOfDetailBias = 0f,
+            ComparisonFunction = CompareFunction.Never,
+            FilterMode = TextureFilterMode.Default
+        };
+
+        private static RasterizerState UIRasterizerState
 		{
 			get
 			{
@@ -105,6 +119,7 @@ internal Rectangle DeviceScissor
 			}
 		}
 
+        private bool _isAnisotropicFilteringOn;
 
 		public Rectangle Scissor
 		{
@@ -255,7 +270,7 @@ public void Draw(Texture2D texture, Rectangle destinationRectangle, Rectangle? s
 		/// <param name="depth"></param>
 		public void Draw(Texture2D texture, Vector2 position, Rectangle? sourceRectangle, Color color, float rotation, Vector2 scale, float depth = 0.0f)
 		{
-			SetTextureFiltering(TextureFiltering.Nearest);
+			SetTextureFiltering(_isAnisotropicFilteringOn ? TextureFiltering.Anisotropic : TextureFiltering.Nearest);
 			color = CrossEngineStuff.MultiplyColor(color, Opacity);
 			scale *= Transform.Scale;
 			rotation += Transform.Rotation;
@@ -430,7 +445,7 @@ public void DrawRichText(RichTextLayout richText, Vector2 position, Color color,
 		public void Begin()
 		{
 #if MONOGAME || FNA
-			var samplerState = _textureFiltering == TextureFiltering.Nearest ? SamplerState.PointClamp : SamplerState.LinearClamp;
+            var samplerState = SelectedSamplerState();
 
 			_renderer.Begin(SpriteSortMode.Deferred,
 				BlendState.AlphaBlend,
@@ -439,9 +454,8 @@ public void Begin()
 				UIRasterizerState,
 				null);
 #elif STRIDE
-			var samplerState = _textureFiltering == TextureFiltering.Nearest ?
-				MyraEnvironment.Game.GraphicsDevice.SamplerStates.PointClamp :
-				MyraEnvironment.Game.GraphicsDevice.SamplerStates.LinearClamp;
+			var samplerState = SelectedSamplerState();
+
 			_renderer.Begin(MyraEnvironment.Game.GraphicsContext,
 				SpriteSortMode.Deferred,
 				BlendStates.AlphaBlend,
@@ -455,7 +469,39 @@ public void Begin()
 			_beginCalled = true;
 		}
 
-		public void End()
+#if MONOGAME || FNA
+        private SamplerState SelectedSamplerState()
+        {
+            switch (_textureFiltering)
+            {
+                case TextureFiltering.Nearest:
+                    return SamplerState.PointClamp;
+                case TextureFiltering.Linear:
+                    return SamplerState.LinearClamp;
+                case TextureFiltering.Anisotropic:
+                    return _textureFilteringAnisotropic;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+#elif STRIDE
+        private SamplerState SelectedSamplerState()
+        {
+            switch (_textureFiltering)
+            {
+                case TextureFiltering.Nearest:
+                    return MyraEnvironment.Game.GraphicsDevice.SamplerStates.PointClamp;
+                case TextureFiltering.Linear:
+                    return MyraEnvironment.Game.GraphicsDevice.SamplerStates.LinearClamp;
+                case TextureFiltering.Anisotropic:
+                    return MyraEnvironment.Game.GraphicsDevice.SamplerStates.AnisotropicClamp;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+#endif
+
+        public void End()
 		{
 			_renderer.End();
 			_beginCalled = false;
@@ -489,5 +535,10 @@ public void Dispose()
 		{
 			ReleaseUnmanagedResources();
 		}
-	}
+
+        public void SetAnisotropicFilteringMode(bool isAnisotropicFiltering)
+        {
+            _isAnisotropicFilteringOn = isAnisotropicFiltering;
+        }
+    }
 }

src/Myra/Graphics2D/UI/Containers/ScrollViewer.cs

@@ -135,7 +135,13 @@ public IImage VerticalScrollKnob
 			get; set;
 		}
 
-		[Browsable(false)]
+		[Category("Appearance")]
+		public int ScrollMultiplier
+		{
+			get; set;
+		} = 10;
+
+        [Browsable(false)]
 		[Content]
 		public override Widget Content
 		{
@@ -395,7 +401,7 @@ public override void OnMouseWheel(float delta)
 				return;
 			}
 
-			var step = 10 * ScrollMaximum.Y / _thumbMaximumY;
+			var step = ScrollMultiplier * ScrollMaximum.Y / _thumbMaximumY;
 			if (delta < 0)
 			{
 				_scrollbarOrientation = Orientation.Vertical;

src/Myra/Graphics2D/UI/Simple/Image.cs

@@ -35,7 +35,22 @@ public class Image : Widget, IPressable
 	{
 		private IImage _image, _overImage, _pressedImage;
 
-		[Category("Appearance")]
+        private bool _isAnisotropicFiltering = false;
+
+        public bool IsAnisotropicFiltering
+        {
+            get
+            {
+                return _isAnisotropicFiltering;
+            }
+            set
+            {
+                _isAnisotropicFiltering = value;
+                InvalidateMeasure();
+            }
+        }
+
+        [Category("Appearance")]
 		public IImage Renderable
 		{
 			get
@@ -164,8 +179,10 @@ public override void InternalRender(RenderContext context)
 					bounds.Height = (int)(bounds.Width * aspect);
 				}
 
-				image.Draw(context, bounds, Color);
-			}
+                context.SetAnisotropicFilteringMode(_isAnisotropicFiltering);
+                image.Draw(context, bounds, Color);
+                context.SetAnisotropicFilteringMode(false);
+            }
 		}
 
 		public void ApplyPressableImageStyle(PressableImageStyle imageStyle)