diff --git a/SVSim.BattleEngine/Engine/UIDrawCall.cs b/SVSim.BattleEngine/Engine/UIDrawCall.cs index cd39c6d0..c1d692f2 100644 --- a/SVSim.BattleEngine/Engine/UIDrawCall.cs +++ b/SVSim.BattleEngine/Engine/UIDrawCall.cs @@ -9,7 +9,6 @@ public class UIDrawCall : MonoBehaviour public enum Clipping { None = 0, - TextureMask = 1, SoftClip = 3, ConstrainButDontClip = 4 } @@ -22,10 +21,6 @@ public class UIDrawCall : MonoBehaviour [HideInInspector] public int widgetCount; - [NonSerialized] - [HideInInspector] - public UIPanel panel; - private Material mMaterial; private Texture mTexture; @@ -38,14 +33,9 @@ public class UIDrawCall : MonoBehaviour private bool mRebuildMat = true; - private bool mLegacyShader; - [NonSerialized] public bool isDirty; - [NonSerialized] - private bool mTextureClip; - private static int[] ClipRange = null; private static int[] ClipArgs = null; @@ -82,26 +72,6 @@ public class UIDrawCall : MonoBehaviour } } - public bool isClipped => mClipCount != 0; - - private bool IsWizardMaterial() - { - if (mMaterial.shader.name == "Wizard/VariantSleeveShader") - { - return true; - } - return false; - } - - private bool IsSleeveMaterial() - { - if (mMaterial.name.Contains("sleeve")) - { - return true; - } - return false; - } - private void Awake() { if (ClipRange == null) diff --git a/SVSim.BattleEngine/Engine/UIPanel.cs b/SVSim.BattleEngine/Engine/UIPanel.cs index 49ae1add..720ef3f1 100644 --- a/SVSim.BattleEngine/Engine/UIPanel.cs +++ b/SVSim.BattleEngine/Engine/UIPanel.cs @@ -18,7 +18,6 @@ public class UIPanel : UIRect public Vector4 baseClipRegion; public Vector2 clipSoftness; public Vector2 clipOffset; - public int clipCount; // UIRect abstract implementations public override float alpha { get; set; } = 1f; diff --git a/SVSim.BattleEngine/Shim/UnityEngine/UnityShim.cs b/SVSim.BattleEngine/Shim/UnityEngine/UnityShim.cs index bb1b9282..a5440181 100644 --- a/SVSim.BattleEngine/Shim/UnityEngine/UnityShim.cs +++ b/SVSim.BattleEngine/Shim/UnityEngine/UnityShim.cs @@ -46,7 +46,6 @@ namespace UnityEngine public class Object { public string name { get; set; } - public HideFlags hideFlags { get; set; } public int GetInstanceID() => 0; public override string ToString() => name ?? base.ToString(); public static void Destroy(Object o) { } @@ -292,13 +291,11 @@ public int particleCount => 0; public Texture mainTexture { get; set; } public Vector2 mainTextureOffset { get; set; } public Vector2 mainTextureScale { get; set; } - public string[] shaderKeywords { get; set; } public Color GetColor(string n) => Color.white; public void SetFloat(string n, float v) { } public void SetInt(string n, int v) { } public void SetColor(string n, Color c) { } public void SetTexture(string n, Texture t) { } - public void EnableKeyword(string k) { } } public partial class Mesh : Object { } public class Texture : Object { public int width => 0; public int height => 0; } @@ -351,7 +348,7 @@ public void Play(int hash, int layer, float normalizedTime) { } // ---- enums (grow members as the compiler demands) ---- public enum FontStyle { Normal} // KeyCode lives in UnityRuntime.cs (full enum). - [Flags] public enum HideFlags { None = 0, NotEditable = 8, DontSave = 52} + [Flags] public enum HideFlags { None = 0} public enum SendMessageOptions { DontRequireReceiver } // ---- attributes: permissive ctors accept any compile-time attribute args ---- diff --git a/SVSim.BattleEngine/Shim/UnityEngine/UnityShimExt.cs b/SVSim.BattleEngine/Shim/UnityEngine/UnityShimExt.cs index 753ad3b4..bf86c44a 100644 --- a/SVSim.BattleEngine/Shim/UnityEngine/UnityShimExt.cs +++ b/SVSim.BattleEngine/Shim/UnityEngine/UnityShimExt.cs @@ -55,7 +55,6 @@ namespace UnityEngine public partial class Material { - public void CopyPropertiesFromMaterial(Material mat) { } } public partial class Mesh