Fix #693 (error "Trying to create a material from string - this is no…

… longer supported.")
RemoteTechnologiesGroup · Aug 17, 2018 · 53a3cf2 · 53a3cf2
1 parent e55430c
commit 53a3cf2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/src/RemoteTech/NetworkRenderer.cs b/src/RemoteTech/NetworkRenderer.cs
@@ -44,6 +44,7 @@ public MapFilter Filter {
         private readonly HashSet<BidirectionalEdge<ISatellite>> mEdges = new HashSet<BidirectionalEdge<ISatellite>>();
         private readonly List<NetworkLine> mLines = new List<NetworkLine>();
         private readonly List<NetworkCone> mCones = new List<NetworkCone>();
+        private static float mLineWidth = 1f;
 
         public bool ShowOmni  { get { return (Filter & MapFilter.Omni)   == MapFilter.Omni; } }
         public bool ShowDish  { get { return (Filter & MapFilter.Dish)   == MapFilter.Dish; } }
@@ -58,6 +59,22 @@ public MapFilter Filter {
         static NetworkRenderer()
         {
             RTUtil.LoadImage(out mTexMark, "mark");
+
+            if(Versioning.version_major == 1)
+            {
+                switch(Versioning.version_minor)
+                {
+                    case 3:
+                        mLineWidth = 3f; //1f is too thin in 1.3
+                        break;
+                    case 4:
+                        mLineWidth = 1f; //1f is matching to CommNet's line width
+                        break;
+                    default:
+                        mLineWidth = 1f;
+                        break;
+                }
+            }
         }
 
         public static NetworkRenderer CreateAndAttach()
@@ -237,8 +254,7 @@ private void UpdateNetworkCones()
                 if (!center.HasValue) continue;
 
                 mCones[i] = mCones[i] ?? NetworkCone.Instantiate();
-                mCones[i].Material = MapView.fetch.orbitLinesMaterial;
-                mCones[i].LineWidth = 2.0f;
+                mCones[i].LineWidth = mLineWidth;
                 mCones[i].Antenna = antennas[i];
                 mCones[i].Color = Color.gray;
                 mCones[i].Active = ShowCone;
@@ -267,8 +283,7 @@ private void UpdateNetworkEdges()
             {
                 it.MoveNext();
                 mLines[i] = mLines[i] ?? NetworkLine.Instantiate();
-                mLines[i].Material = MapView.fetch.orbitLinesMaterial;
-                mLines[i].LineWidth = 3.0f;
+                mLines[i].LineWidth = mLineWidth;
                 mLines[i].Edge = it.Current;
                 mLines[i].Color = CheckColor(it.Current);
                 mLines[i].Active = true;

diff --git a/src/RemoteTech/UI/NetworkCone.cs b/src/RemoteTech/UI/NetworkCone.cs
@@ -6,6 +6,8 @@ namespace RemoteTech.UI
 {
     public class NetworkCone : MonoBehaviour
     {
+        private static Material CommNetMaterial = null;
+
         public Vector3d Center
         {
             set
@@ -55,11 +57,13 @@ public static NetworkCone Instantiate()
 
         public void Awake()
         {
+            if (CommNetMaterial == null) { CommNetMaterial = Resources.Load<Material>("Telemetry/TelemetryMaterial"); }
+
             SetupMesh();
             gameObject.layer = 31;
             LineWidth = 1.0f;
             Color = Color.white;
-            Material = new Material("Shader \"Vertex Colors/Alpha\" {Category{Tags {\"Queue\"=\"Transparent\" \"IgnoreProjector\"=\"True\" \"RenderType\"=\"Transparent\"}SubShader {Cull Off ZWrite On Blend SrcAlpha OneMinusSrcAlpha Pass {BindChannels {Bind \"Color\", color Bind \"Vertex\", vertex}}}}}");
+            Material = CommNetMaterial;
         }
 
         private void UpdateMesh(Vector3d center, IAntenna dish)

diff --git a/src/RemoteTech/UI/NetworkLine.cs b/src/RemoteTech/UI/NetworkLine.cs
@@ -6,6 +6,8 @@ namespace RemoteTech.UI
 {
     public class NetworkLine : MonoBehaviour
     {
+        private static Material CommNetMaterial = null;
+
         public BidirectionalEdge<ISatellite> Edge
         {
             set
@@ -53,11 +55,13 @@ public static NetworkLine Instantiate()
 
         public void Awake()
         {
+            if (CommNetMaterial == null) { CommNetMaterial = Resources.Load<Material>("Telemetry/TelemetryMaterial"); }
+
             SetupMesh();
             gameObject.layer = 31;
             LineWidth = 1.0f;
             Color = Color.white;
-            Material = new Material("Shader \"Vertex Colors/Alpha\" {Category{Tags {\"Queue\"=\"Transparent\" \"IgnoreProjector\"=\"True\" \"RenderType\"=\"Transparent\"}SubShader {Cull Off ZWrite On Blend SrcAlpha OneMinusSrcAlpha Pass {BindChannels {Bind \"Color\", color Bind \"Vertex\", vertex}}}}}");
+            Material = CommNetMaterial;
         }
 
         private void UpdateMesh(BidirectionalEdge<ISatellite> edge)