New shaders for text on ship's bases

Sandrem · Feb 8, 2019 · 9001ed4 · 9001ed4
1 parent e2a6ced
commit 9001ed4
Show file tree

Hide file tree

Showing 26 changed files with 116 additions and 1 deletion.
diff --git a/Assets/Materials/3DTextOrange.mat b/Assets/Materials/3DTextOrange.mat
diff --git a/Assets/Materials/3DTextOrange.mat.meta b/Assets/Materials/3DTextOrange.mat.meta
diff --git a/Assets/Materials/3DTextWhite.mat b/Assets/Materials/3DTextWhite.mat
diff --git a/Assets/Materials/3DTextWhite.mat.meta b/Assets/Materials/3DTextWhite.mat.meta
diff --git a/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseLarge.prefab b/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseLarge.prefab
diff --git a/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseMedium.prefab b/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseMedium.prefab
diff --git a/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseSmall.prefab b/Assets/Resources/Prefabs/ShipModel/ShipBase/ShipBaseSmall.prefab
diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials.meta b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials.meta
diff --git a/...ts/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Front.mat b/...ts/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Front.mat
diff --git a/...sources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Front.mat.meta b/...sources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Front.mat.meta
diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Info.mat b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Info.mat
diff --git a/...esources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Info.mat.meta b/...esources/ShipStandInsert/Universal/SecondEdition/Large/FirstOrder/Materials/Info.mat.meta
diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Materials.meta b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Materials.meta
diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Materials/Base.mat b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Materials/Base.mat
diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Materials/Base.mat.meta b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Materials/Base.mat.meta
diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Rebel/Materials.meta b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Rebel/Materials.meta
diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Rebel/Materials/Info.mat b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Rebel/Materials/Info.mat
diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Rebel/Materials/Info.mat.meta b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Large/Rebel/Materials/Info.mat.meta
diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Medium/Materials.meta b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Medium/Materials.meta
diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Medium/Materials/Base.mat b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Medium/Materials/Base.mat
diff --git a/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Medium/Materials/Base.mat.meta b/Assets/Resources/ShipStandInsert/Universal/SecondEdition/Medium/Materials/Base.mat.meta
diff --git a/Assets/Scripts/View/Ship/GenericShip.cs b/Assets/Scripts/View/Ship/GenericShip.cs
@@ -165,7 +165,7 @@ public void SetShipBaseImageSecondEdition()
             //Ship Info
             newTexture = "ShipStandInsert/Universal/SecondEdition/" + this.ShipInfo.BaseSize.ToString() + "/" + this.Faction.ToString() + "/Info";
             newMaterial = CreateMaterial(newTexture);
-            StandardShaderUtils.ChangeRenderMode(newMaterial, StandardShaderUtils.BlendMode.Fade);
+            StandardShaderUtils.ChangeRenderMode(newMaterial, StandardShaderUtils.BlendMode.Cutout);
             shipAllParts.Find("ShipBase/ShipStandInsert/ShipStandInsertImage/ShipInfo").GetComponent<Renderer>().material = newMaterial;
             shipAllParts.Find("ShipBase/ShipStandInsert/ShipStandInsertImage/ShipInfo").GetComponent<Renderer>().shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.Off;
             shipAllParts.Find("ShipBase/ShipStandInsert/ShipStandInsertImage/ShipInfo").GetComponent<MeshRenderer>().enabled = true;

diff --git a/Assets/Shaders/3DTextOneSided.shader b/Assets/Shaders/3DTextOneSided.shader
@@ -0,0 +1,18 @@
+Shader "Custom/3D Text One Sided" {
+	Properties {
+		_MainTex ("Font Texture", 2D) = "white" {}
+		_Color ("Text Color", Color) = (1,1,1,1)
+	}
+
+	SubShader {
+		Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" }
+		Lighting Off Cull Back ZWrite Off Fog { Mode Off }
+		Blend SrcAlpha OneMinusSrcAlpha
+		Pass {
+			Color [_Color]
+			SetTexture [_MainTex] {
+				combine primary, texture * primary
+			}
+		}
+	}
+}
diff --git a/Assets/Shaders/3DTextOneSided.shader.meta b/Assets/Shaders/3DTextOneSided.shader.meta
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset