Fix undo and get conway panel pagination in a half decent state

[CI BUILD]
IxxyXR · Apr 30, 2021 · 4b2ce50 · 4b2ce50
1 parent a3c7791
commit 4b2ce50
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/Assets/Polyhydra/Prefabs/PopUpWindow_PolyhydraConwayOps.prefab b/Assets/Polyhydra/Prefabs/PopUpWindow_PolyhydraConwayOps.prefab
@@ -415,6 +415,7 @@ MonoBehaviour:
   m_OrderedPageButtons: []
   m_PrevButton: {fileID: 0}
   m_NextButton: {fileID: 0}
+  ButtonsPerPage: 16
   m_ColorTransitionDuration: 0
   ButtonPrefab: {fileID: 7630606763700834929, guid: 56c1524891cb7c44fb711233648ba9ff,
     type: 3}

diff --git a/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowBase.cs b/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowBase.cs
@@ -7,8 +7,11 @@ namespace TiltBrush
 {
     public abstract class PolyhydraPopUpWindowBase : PopUpWindow
     {
+        public int ButtonsPerPage = 16;
+
         [SerializeField] protected float m_ColorTransitionDuration;
         [SerializeField] protected GameObject ButtonPrefab;
+        [NonSerialized] public int FirstButtonIndex = 0;
 
         protected float m_ColorTransitionValue;
         protected Material m_ColorBackground;
@@ -93,7 +96,7 @@ protected void CreateButtons()
                 rButton.transform.localScale = Vector3.one * .3f;
 
                 Renderer rButtonRenderer = rButton.GetComponent<Renderer>();
-                rButtonRenderer.material.mainTexture = GetButtonIcon(buttonIndex);
+                rButtonRenderer.material.mainTexture = GetButtonTexture(buttonIndex);
 
                 PolyhydraThingButton rButtonScript = rButton.GetComponent<PolyhydraThingButton>();
                 rButtonScript.ButtonIndex = buttonIndex;
@@ -104,9 +107,9 @@ protected void CreateButtons()
             }
         }
 
-        internal Texture2D GetButtonIcon(int buttonIndex)
+        protected Texture2D GetButtonTexture(int buttonIndex)
         {
-            return Resources.Load<Texture2D>(GetButtonTexturePath(buttonIndex));
+            return Resources.Load<Texture2D>(GetButtonTexturePath(buttonIndex + FirstButtonIndex));
         }
 
         protected abstract string GetButtonTexturePath(int i);
@@ -136,10 +139,6 @@ public void PolyhydraThingButtonPressed(int ButtonIndex)
             HandleButtonPress(ButtonIndex);
             ParentPanel.RebuildPoly();
         }
-
-        protected Texture2D GetButtonTexture(int buttonIndex)
-        {
-            return Resources.Load<Texture2D>(GetButtonTexturePath(buttonIndex));
-        }
+
     }
 }
diff --git a/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowConwayOps.cs b/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowConwayOps.cs
@@ -25,8 +25,6 @@ public class PolyhydraPopUpWindowConwayOps : PolyhydraPopUpWindowBase
     {
 
         [NonSerialized] protected int OpStackIndex = 0;
-        [NonSerialized] public int ButtonsPerPage = 16;
-        [NonSerialized] public int FirstButtonIndex = 0;
 
 
         protected override string[] GetButtonList()
@@ -59,8 +57,8 @@ public override void HandleButtonPress(int relativeButtonIndex)
 
             ops[OpStackIndex] = op;
             ParentPanel.PolyhydraModel.ConwayOperators = ops;
-            ParentPanel.ButtonsConwayOps[OpStackIndex].SetButtonTexture(GetButtonTexture(absoluteButtonIndex));
-
+            ParentPanel.ButtonsConwayOps[OpStackIndex].SetButtonTexture(GetButtonTexture(relativeButtonIndex));
+            ParentPanel.ButtonsConwayOps[OpStackIndex].SetDescriptionText(GetButtonList()[relativeButtonIndex]);
             if (opConfig.usesAmount)
             {
                 ParentPanel.SlidersConwayOps[OpStackIndex * 2].gameObject.SetActive(true);

diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset
@@ -23,7 +23,7 @@ EditorSettings:
   m_EnableTextureStreamingInEditMode: 1
   m_EnableTextureStreamingInPlayMode: 1
   m_AsyncShaderCompilation: 1
-  m_EnterPlayModeOptionsEnabled: 0
+  m_EnterPlayModeOptionsEnabled: 1
   m_EnterPlayModeOptions: 3
   m_ShowLightmapResolutionOverlay: 1
   m_UseLegacyProbeSampleCount: 1