From 1be5cc77ca75c983a89527b31ffe326c824832ac Mon Sep 17 00:00:00 2001
From: PopSlime <popslime@qq.com>
Date: Fri, 18 Nov 2022 10:23:51 +0800
Subject: [PATCH] Remove transparent property.

---
 .../Crtr/Components/SectionalGameObject.cs        |  2 +-
 Assets/Cryville/Crtr/Components/SpriteBase.cs     |  5 +----
 Assets/Cryville/Crtr/Components/SpriteRect.cs     |  2 --
 Assets/Cryville/Crtr/Components/SpriteText.cs     |  2 +-
 Assets/Cryville/Crtr/MeshWrapper.cs               | 15 +++------------
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/Assets/Cryville/Crtr/Components/SectionalGameObject.cs b/Assets/Cryville/Crtr/Components/SectionalGameObject.cs
index c1e2548..9b3c364 100644
--- a/Assets/Cryville/Crtr/Components/SectionalGameObject.cs
+++ b/Assets/Cryville/Crtr/Components/SectionalGameObject.cs
@@ -105,7 +105,7 @@ namespace Cryville.Crtr.Components {
 			body.Load();
 			tail.Load();
 
-			mesh.Init(transform, transparent);
+			mesh.Init(transform);
 
 			List<Material> materials = new List<Material>();
 			if (head.FrameName != null) AddMat(materials, head.FrameName);
diff --git a/Assets/Cryville/Crtr/Components/SpriteBase.cs b/Assets/Cryville/Crtr/Components/SpriteBase.cs
index ea5162b..67d93c4 100644
--- a/Assets/Cryville/Crtr/Components/SpriteBase.cs
+++ b/Assets/Cryville/Crtr/Components/SpriteBase.cs
@@ -5,7 +5,6 @@ namespace Cryville.Crtr.Components {
 	public abstract class SpriteBase : MeshBase {
 		public SpriteBase() {
 			SubmitProperty("bound", new op_set_bound(this));
-			SubmitProperty("transparent", new PropOp.Boolean(v => transparent = v));
 			SubmitProperty("pivot", new PropOp.Vector2(v => Pivot = v));
 			SubmitProperty("scale", new PropOp.Vector2(v => Scale = v));
 			SubmitProperty("ui", new PropOp.Boolean(v => UI = v));
@@ -91,10 +90,8 @@ namespace Cryville.Crtr.Components {
 			}
 		}
 
-		public bool transparent = false;
-
 		protected void InternalInit(string meshName = "quad") {
-			mesh.Init(transform, transparent);
+			mesh.Init(transform);
 			mesh.Mesh = GenericResources.Meshes[meshName];
 			UpdateScale();
 			UpdateZIndex();
diff --git a/Assets/Cryville/Crtr/Components/SpriteRect.cs b/Assets/Cryville/Crtr/Components/SpriteRect.cs
index ee957af..76bbbb6 100644
--- a/Assets/Cryville/Crtr/Components/SpriteRect.cs
+++ b/Assets/Cryville/Crtr/Components/SpriteRect.cs
@@ -4,8 +4,6 @@ namespace Cryville.Crtr.Components {
 	public class SpriteRect : SpriteBase {
 		public SpriteRect() {
 			SubmitProperty("color", new PropOp.Color(v => Color = v));
-
-			transparent = true;
 		}
 
 		Color _color;
diff --git a/Assets/Cryville/Crtr/Components/SpriteText.cs b/Assets/Cryville/Crtr/Components/SpriteText.cs
index 3ed26f9..9b6e2d9 100644
--- a/Assets/Cryville/Crtr/Components/SpriteText.cs
+++ b/Assets/Cryville/Crtr/Components/SpriteText.cs
@@ -86,7 +86,7 @@ namespace Cryville.Crtr.Components {
 				else if (frameHeight != f.Value.Rect.height) throw new Exception("Inconsistent frame height");
 				if (!meshes.ContainsKey(f.Value.Frame.Texture)) {
 					var m = new MeshWrapper();
-					m.Init(mesh.MeshTransform, transparent);
+					m.Init(mesh.MeshTransform);
 					m.Mesh = new Mesh();
 					m.Renderer.material.mainTexture = f.Value.Frame.Texture;
 					meshes.Add(f.Value.Frame.Texture, m);
diff --git a/Assets/Cryville/Crtr/MeshWrapper.cs b/Assets/Cryville/Crtr/MeshWrapper.cs
index b48bab7..bd21bf8 100644
--- a/Assets/Cryville/Crtr/MeshWrapper.cs
+++ b/Assets/Cryville/Crtr/MeshWrapper.cs
@@ -22,23 +22,16 @@ namespace Cryville.Crtr {
 			get;
 			private set;
 		}
-		public bool Transparent {
-			get;
-			private set;
-		}
 		public bool Initialized {
 			get;
 			private set;
 		}
 		public Material NewMaterial {
 			get {
-				return Material.Instantiate(GenericResources.Materials[
-					Transparent ? "-TransparentMat" : "-CutoutMat"
-				]);
+				return Material.Instantiate(GenericResources.Materials["-CutoutMat"]);
 			}
 		}
-		public void Init(Transform parent, bool transparent = false) {
-			Transparent = transparent;
+		public void Init(Transform parent) {
 			MeshObject = new GameObject("__mesh__");
 			MeshTransform = MeshObject.transform;
 			MeshTransform.SetParent(parent, false);
@@ -48,9 +41,7 @@ namespace Cryville.Crtr {
 				MeshObject.AddComponent<MeshRenderer>();
 			MeshFilter = MeshObject.GetComponent<MeshFilter>();
 			Renderer = MeshObject.GetComponent<Renderer>();
-			Renderer.material = GenericResources.Materials[
-				transparent ? "-TransparentMat" : "-CutoutMat"
-			]; // TODO
+			Renderer.material = GenericResources.Materials["-CutoutMat"];
 			Initialized = true;
 		}
 		public void Destroy() {