Add default position calculation to UpdatePosition of FancyScrollRect…

…Cell
setchi · Jan 13, 2020 · 150df8d · 150df8d
1 parent d1711f5
commit 150df8d
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 17 deletions.
diff --git a/Assets/FancyScrollView/Examples/Sources/07_ScrollRect/Cell.cs b/Assets/FancyScrollView/Examples/Sources/07_ScrollRect/Cell.cs
@@ -24,12 +24,12 @@ public override void UpdateContent(ItemData itemData)
                 : new Color32(255, 255, 255, 77);
         }
 
-        protected override void UpdatePosition(float position, float viewportPosition)
+        protected override void UpdatePosition(float normalizedPosition, float localPosition)
         {
-            var x = Mathf.Sin(position * Mathf.PI * 2) * 65;
-            var y = viewportPosition;
+            base.UpdatePosition(normalizedPosition, localPosition);
 
-            transform.localPosition = new Vector2(x, y);
+            var wave = Mathf.Sin(normalizedPosition * Mathf.PI * 2) * 65;
+            transform.localPosition += Vector3.right * wave;
         }
     }
 }
diff --git a/Assets/FancyScrollView/Examples/Sources/08_GridView/Cell.cs b/Assets/FancyScrollView/Examples/Sources/08_GridView/Cell.cs
@@ -24,11 +24,11 @@ public override void UpdateContent(ItemData itemData)
                 : new Color32(255, 255, 255, 77);
         }
 
-        public override void UpdatePosition(float position)
+        protected override void UpdatePosition(float normalizedPosition, float localPosition)
         {
-            base.UpdatePosition(position);
+            base.UpdatePosition(normalizedPosition, localPosition);
 
-            var wave = Mathf.Sin(position * Mathf.PI * 2) * 65;
+            var wave = Mathf.Sin(normalizedPosition * Mathf.PI * 2) * 65;
             transform.localPosition += Vector3.right * wave;
         }
     }

diff --git a/Assets/FancyScrollView/Sources/Runtime/GridView/FancyGridViewCell.cs b/Assets/FancyScrollView/Sources/Runtime/GridView/FancyGridViewCell.cs
@@ -19,7 +19,7 @@ public abstract class FancyGridViewCell<TItemData, TContext> : FancyScrollRectCe
         where TContext : class, IFancyGridViewContext, new()
     {
         /// <inheritdoc/>
-        protected override void UpdatePosition(float position, float scrollPosition)
+        protected override void UpdatePosition(float normalizedPosition, float localPosition)
         {
             var cellSize = Context.GetCellSize();
             var spacing = Context.GetStartAxisSpacing();
@@ -29,8 +29,8 @@ protected override void UpdatePosition(float position, float scrollPosition)
             var positionInGroup = (cellSize + spacing) * (indexInGroup - (groupCount - 1) * 0.5f);
 
             transform.localPosition = Context.ScrollDirection == ScrollDirection.Horizontal
-                ? new Vector2(-scrollPosition, -positionInGroup)
-                : new Vector2(positionInGroup, scrollPosition);
+                ? new Vector2(-localPosition, -positionInGroup)
+                : new Vector2(positionInGroup, localPosition);
         }
     }
 

diff --git a/Assets/FancyScrollView/Sources/Runtime/GridView/FancyGridViewContext.cs b/Assets/FancyScrollView/Sources/Runtime/GridView/FancyGridViewContext.cs
@@ -14,9 +14,9 @@ namespace FancyScrollView
     /// </summary>
     public class FancyGridViewContext : IFancyGridViewContext
     {
+        ScrollDirection IFancyScrollRectContext.ScrollDirection { get; set; }
         Func<(float ScrollSize, float ReuseMargin)> IFancyScrollRectContext.CalculateScrollSize { get; set; }
         GameObject IFancyCellGroupContext.CellTemplate { get; set; }
-        ScrollDirection IFancyGridViewContext.ScrollDirection { get; set; }
         Func<int> IFancyCellGroupContext.GetGroupCount { get; set; }
         Func<float> IFancyGridViewContext.GetStartAxisSpacing { get; set; }
         Func<float> IFancyGridViewContext.GetCellSize { get; set; }

diff --git a/Assets/FancyScrollView/Sources/Runtime/GridView/IFancyGridViewContext.cs b/Assets/FancyScrollView/Sources/Runtime/GridView/IFancyGridViewContext.cs
@@ -13,7 +13,6 @@ namespace FancyScrollView
     /// </summary>
     public interface IFancyGridViewContext : IFancyScrollRectContext, IFancyCellGroupContext
     {
-        ScrollDirection ScrollDirection { get; set; }
         Func<float> GetStartAxisSpacing { get; set; }
         Func<float> GetCellSize { get; set ; }
     }

diff --git a/Assets/FancyScrollView/Sources/Runtime/ScrollRect/FancyScrollRect.cs b/Assets/FancyScrollView/Sources/Runtime/ScrollRect/FancyScrollRect.cs
@@ -86,6 +86,7 @@ protected override void Initialize()
         {
             base.Initialize();
 
+            Context.ScrollDirection = Scroller.ScrollDirection;
             Context.CalculateScrollSize = () =>
             {
                 var interval = CellSize + spacing;

diff --git a/Assets/FancyScrollView/Sources/Runtime/ScrollRect/FancyScrollRectCell.cs b/Assets/FancyScrollView/Sources/Runtime/ScrollRect/FancyScrollRectCell.cs
@@ -23,24 +23,29 @@ public override void UpdatePosition(float position)
         {
             var (scrollSize, reuseMargin) = Context.CalculateScrollSize();
 
-            var unclampedPosition = (Mathf.Lerp(0f, scrollSize, position) - reuseMargin) / (scrollSize - reuseMargin * 2f);
+            var normalizedPosition = (Mathf.Lerp(0f, scrollSize, position) - reuseMargin) / (scrollSize - reuseMargin * 2f);
 
             var start = 0.5f * scrollSize;
             var end = -start;
 
-            UpdatePosition(unclampedPosition, Mathf.Lerp(start, end, position));
+            UpdatePosition(normalizedPosition, Mathf.Lerp(start, end, position));
         }
 
         /// <summary>
         /// このセルの位置を更新します.
         /// </summary>
-        /// <param name="position">
+        /// <param name="normalizedPosition">
         /// ビューポートの範囲で正規化されたスクロール位置.
         /// <see cref="FancyScrollRect{TItemData, TContext}.reuseCellMarginCount"/> の値に基づいて
         ///  <c>0.0</c> ~ <c>1.0</c> の範囲を超えた値が渡されることがあります.
         /// </param>
-        /// <param name="viewportPosition">ローカル位置.</param>
-        protected virtual void UpdatePosition(float position, float viewportPosition) { }
+        /// <param name="localPosition">ローカル位置.</param>
+        protected virtual void UpdatePosition(float normalizedPosition, float localPosition)
+        {
+            transform.localPosition = Context.ScrollDirection == ScrollDirection.Horizontal
+                ? new Vector2(-localPosition, 0)
+                : new Vector2(0, localPosition);
+        }
     }
 
     /// <summary>

diff --git a/Assets/FancyScrollView/Sources/Runtime/ScrollRect/FancyScrollRectContext.cs b/Assets/FancyScrollView/Sources/Runtime/ScrollRect/FancyScrollRectContext.cs
@@ -13,6 +13,7 @@ namespace FancyScrollView
     /// </summary>
     public class FancyScrollRectContext : IFancyScrollRectContext
     {
+        ScrollDirection IFancyScrollRectContext.ScrollDirection { get; set; }
         Func<(float ScrollSize, float ReuseMargin)> IFancyScrollRectContext.CalculateScrollSize { get; set; }
     }
 }
diff --git a/Assets/FancyScrollView/Sources/Runtime/ScrollRect/IFancyScrollRectContext.cs b/Assets/FancyScrollView/Sources/Runtime/ScrollRect/IFancyScrollRectContext.cs
@@ -13,6 +13,7 @@ namespace FancyScrollView
     /// </summary>
     public interface IFancyScrollRectContext
     {
+        ScrollDirection ScrollDirection { get; set; }
         Func<(float ScrollSize, float ReuseMargin)> CalculateScrollSize { get; set; }
     }
 }