Merge pull request #477 from Csantucci/3D-cab-solid-bar-and-digital-fix

Bug fix for https://bugs.launchpad.net/or/+bug/1943302 3D cab bugs in bars and digitals

Author: cjakeman

Source/RunActivity/Viewer3D/Materials.cs

@@ -1207,7 +1207,7 @@ public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderIte
 
     public class SolidColorMaterial : Material
     {
-        static BasicEffect basicEffect;
+        BasicEffect basicEffect;
 
         public SolidColorMaterial(Viewer viewer, float a, float r, float g, float b)
             : base(viewer, null)

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

@@ -2986,7 +2986,7 @@ public ThreeDimCabDigit(Viewer viewer, int iMatrix, string size, string aceFile,
 
             //create the shape primitive
             shapePrimitive = new MutableShapePrimitive(Material, NumVertices, NumIndices, new[] { -1 }, 0);
-            UpdateShapePrimitive();
+            UpdateShapePrimitive(Material);
 
         }
 
@@ -3085,11 +3085,11 @@ public void UpdateDigit()
             }
 
             //update the shape primitive
-            UpdateShapePrimitive();
+            UpdateShapePrimitive(UsedMaterial);
 
         }
 
-        private void UpdateShapePrimitive()
+        private void UpdateShapePrimitive(Material material)
         {
             var indexData = new short[NumIndices];
             Array.Copy(TriangleListIndices, indexData, NumIndices);
@@ -3098,6 +3098,8 @@ private void UpdateShapePrimitive()
             var vertexData = new VertexPositionNormalTexture[NumVertices];
             Array.Copy(VertexList, vertexData, NumVertices);
             shapePrimitive.SetVertexData(vertexData, 0, NumVertices, NumIndices / 3);
+
+            shapePrimitive.SetMaterial(material);
         }
 
         //ACE MAP:
@@ -3216,8 +3218,9 @@ public ThreeDimCabGaugeNative(Viewer viewer, int iMatrix, string size, string le
 
 
             //create the shape primitive
-            shapePrimitive = new MutableShapePrimitive(FindMaterial(), NumVertices, NumIndices, new[] { -1 }, 0);
-            UpdateShapePrimitive();
+            var material = FindMaterial();
+            shapePrimitive = new MutableShapePrimitive(material, NumVertices, NumIndices, new[] { -1 }, 0);
+            UpdateShapePrimitive(material);
 
         }
 
@@ -3229,13 +3232,14 @@ Material FindMaterial()
             {
                 if (PositiveMaterial == null)
                 {
-                    PositiveMaterial = new SolidColorMaterial(this.Viewer, 0f, c.R, c.G, c.B);
+                    PositiveMaterial = new SolidColorMaterial(this.Viewer, c.A, c.R, c.G, c.B);
                 }
                 return PositiveMaterial;
             }
             else
             {
-                if (NegativeMaterial == null) NegativeMaterial = new SolidColorMaterial(this.Viewer, c.A, c.R, c.G, c.B);
+                if (NegativeMaterial == null)
+                    NegativeMaterial = new SolidColorMaterial(this.Viewer, c.A, c.R, c.G, c.B);
                 return NegativeMaterial;
             }
         }
@@ -3298,7 +3302,7 @@ public void UpdateDigit()
             NumVertices += 4;
 
             //update the shape primitive
-            UpdateShapePrimitive();
+            UpdateShapePrimitive(UsedMaterial);
 
         }
 
@@ -3330,7 +3334,7 @@ static float GetTextureCoordY(char c)
             return 1.0f;
         }
 
-        private void UpdateShapePrimitive()
+        private void UpdateShapePrimitive(Material material)
         {
             var indexData = new short[NumIndices];
             Array.Copy(TriangleListIndices, indexData, NumIndices);
@@ -3339,6 +3343,8 @@ private void UpdateShapePrimitive()
             var vertexData = new VertexPositionNormalTexture[NumVertices];
             Array.Copy(VertexList, vertexData, NumVertices);
             shapePrimitive.SetVertexData(vertexData, 0, NumVertices, NumIndices / 3);
+
+            shapePrimitive.SetMaterial(material);
         }
 
         public void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)

Source/RunActivity/Viewer3D/Shapes.cs

@@ -1392,7 +1392,8 @@ public virtual void Mark()
     }
 
     /// <summary>
-    /// A <c>ShapePrimitive</c> that permits manipulation of the vertex and index buffers to change geometry efficiently.
+    /// A <c>ShapePrimitive</c> that permits manipulation of vertex and index buffers to change geometry efficiently.
+    /// It permits also change of material
     /// </summary>
     public class MutableShapePrimitive : ShapePrimitive
     {
@@ -1418,6 +1419,11 @@ public void SetIndexData(short[] data)
         {
             IndexBuffer.SetData(data);
         }
+
+        public void SetMaterial(Material material)
+        {
+            Material = material;
+        }
     }
 
     struct ShapeInstanceData