Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

Remove transparent property.

Browse Source
This commit is contained in:
PopSlime
2022-11-18 10:23:51 +08:00
parent bf942cbe45
commit 1be5cc77ca
5 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Cryville/Crtr/Components/SectionalGameObject.cs
View File

@@ -105,7 +105,7 @@ namespace Cryville.Crtr.Components {
body.Load(); body.Load();
tail.Load(); tail.Load();
mesh.Init(transform, transparent); mesh.Init(transform);
List<Material> materials = new List<Material>(); List<Material> materials = new List<Material>();
if (head.FrameName != null) AddMat(materials, head.FrameName); if (head.FrameName != null) AddMat(materials, head.FrameName);

5
Assets/Cryville/Crtr/Components/SpriteBase.cs
View File

@@ -5,7 +5,6 @@ namespace Cryville.Crtr.Components {
public abstract class SpriteBase : MeshBase { public abstract class SpriteBase : MeshBase {
public SpriteBase() { public SpriteBase() {
SubmitProperty("bound", new op_set_bound(this)); SubmitProperty("bound", new op_set_bound(this));
SubmitProperty("transparent", new PropOp.Boolean(v => transparent = v));
SubmitProperty("pivot", new PropOp.Vector2(v => Pivot = v)); SubmitProperty("pivot", new PropOp.Vector2(v => Pivot = v));
SubmitProperty("scale", new PropOp.Vector2(v => Scale = v)); SubmitProperty("scale", new PropOp.Vector2(v => Scale = v));
SubmitProperty("ui", new PropOp.Boolean(v => UI = 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") { protected void InternalInit(string meshName = "quad") {
mesh.Init(transform, transparent); mesh.Init(transform);
mesh.Mesh = GenericResources.Meshes[meshName]; mesh.Mesh = GenericResources.Meshes[meshName];
UpdateScale(); UpdateScale();
UpdateZIndex(); UpdateZIndex();

2
Assets/Cryville/Crtr/Components/SpriteRect.cs
View File

@@ -4,8 +4,6 @@ namespace Cryville.Crtr.Components {
public class SpriteRect : SpriteBase { public class SpriteRect : SpriteBase {
public SpriteRect() { public SpriteRect() {
SubmitProperty("color", new PropOp.Color(v => Color = v)); SubmitProperty("color", new PropOp.Color(v => Color = v));
transparent = true;
} }
Color _color; Color _color;

2
Assets/Cryville/Crtr/Components/SpriteText.cs
View File

@@ -86,7 +86,7 @@ namespace Cryville.Crtr.Components {
else if (frameHeight != f.Value.Rect.height) throw new Exception("Inconsistent frame height"); else if (frameHeight != f.Value.Rect.height) throw new Exception("Inconsistent frame height");
if (!meshes.ContainsKey(f.Value.Frame.Texture)) { if (!meshes.ContainsKey(f.Value.Frame.Texture)) {
var m = new MeshWrapper(); var m = new MeshWrapper();
m.Init(mesh.MeshTransform, transparent); m.Init(mesh.MeshTransform);
m.Mesh = new Mesh(); m.Mesh = new Mesh();
m.Renderer.material.mainTexture = f.Value.Frame.Texture; m.Renderer.material.mainTexture = f.Value.Frame.Texture;
meshes.Add(f.Value.Frame.Texture, m); meshes.Add(f.Value.Frame.Texture, m);

15
Assets/Cryville/Crtr/MeshWrapper.cs
View File

@@ -22,23 +22,16 @@ namespace Cryville.Crtr {
get; get;
private set; private set;
} }
public bool Transparent {
get;
private set;
}
public bool Initialized { public bool Initialized {
get; get;
private set; private set;
} }
public Material NewMaterial { public Material NewMaterial {
get { get {
return Material.Instantiate(GenericResources.Materials[ return Material.Instantiate(GenericResources.Materials["-CutoutMat"]);
Transparent ? "-TransparentMat" : "-CutoutMat"
]);
} }
} }
public void Init(Transform parent, bool transparent = false) { public void Init(Transform parent) {
Transparent = transparent;
MeshObject = new GameObject("__mesh__"); MeshObject = new GameObject("__mesh__");
MeshTransform = MeshObject.transform; MeshTransform = MeshObject.transform;
MeshTransform.SetParent(parent, false); MeshTransform.SetParent(parent, false);
@@ -48,9 +41,7 @@ namespace Cryville.Crtr {
MeshObject.AddComponent<MeshRenderer>(); MeshObject.AddComponent<MeshRenderer>();
MeshFilter = MeshObject.GetComponent<MeshFilter>(); MeshFilter = MeshObject.GetComponent<MeshFilter>();
Renderer = MeshObject.GetComponent<Renderer>(); Renderer = MeshObject.GetComponent<Renderer>();
Renderer.material = GenericResources.Materials[ Renderer.material = GenericResources.Materials["-CutoutMat"];
transparent ? "-TransparentMat" : "-CutoutMat"
]; // TODO
Initialized = true; Initialized = true;
} }
public void Destroy() { public void Destroy() {