Merge pull request #481 from openrails/release/1.4

Sharpe49 · web-flow · commit 636134cf65e0 · 2021-09-15T02:34:57.000+02:00
Merge pull request #476 from twpol/feature/update-from-anywhere
diff --git a/Source/ORTS.Updater/UpdateManager.cs b/Source/ORTS.Updater/UpdateManager.cs
@@ -222,11 +222,16 @@ void ValidateLastUpdate()
             if (LastUpdate != null)
             {
                 var uri = new Uri(LastUpdate.Url, UriKind.RelativeOrAbsolute);
-                if (uri.IsAbsoluteUri)
-                {
-                    LastUpdate = null;
-                    LastCheckError = new InvalidDataException("Update URL must be relative to channel URL.");
-                }
+
+                // All relative URLs are valid
+                if (!uri.IsAbsoluteUri) return;
+
+                // Official GitHub URLs are valid
+                if (uri.Scheme == "https" && uri.Host == "github.com" && uri.AbsolutePath.StartsWith("/openrails/openrails/releases")) return;
+
+                // Everything else is invalid
+                LastUpdate = null;
+                LastCheckError = new InvalidDataException("Update URL must be relative to channel URL or from https://github.com/openrails/openrails/releases.");
             }
         }
 
diff --git a/Source/RunActivity/Viewer3D/Materials.cs b/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)
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
@@ -1468,7 +1468,7 @@ public CABViewControlTypes GetControlType()
         /// Gets the requested Locomotive data and returns it as a fraction (from 0 to 1) of the range between Min and Max values.
         /// </summary>
         /// <returns>Data value as fraction (from 0 to 1) of the range between Min and Max values</returns>
-        public float GetRangeFraction()
+        public float GetRangeFraction(bool offsetFromZero = false)
         {
             var data = Locomotive.GetDataOf(Control);
             if (data < Control.MinValue)
@@ -1479,7 +1479,7 @@ public float GetRangeFraction()
             if (Control.MaxValue == Control.MinValue)
                 return 0;
 
-            return (float)((data - Control.MinValue) / (Control.MaxValue - Control.MinValue));
+            return (float)((data - (offsetFromZero && Control.MinValue < 0 ? 0 : Control.MinValue)) / (Control.MaxValue - Control.MinValue));
         }
 
         public CABViewControlStyles GetStyle()
@@ -1630,7 +1630,8 @@ public CabViewGaugeRenderer(Viewer viewer, MSTSLocomotive locomotive, CVCFirebox
 
         public color GetColor(out bool positive)
         {
-            if (Locomotive.GetDataOf(Control) < 0) { positive = false; return Gauge.NegativeColor; }
+            if (Locomotive.GetDataOf(Control) < 0)
+            { positive = false; return Gauge.NegativeColor; }
             else { positive = true; return Gauge.PositiveColor; }
         }
 
@@ -2986,7 +2987,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);
 
         }
 
@@ -2997,11 +2998,11 @@ Material FindMaterial(bool Alert)
             CABViewControlTypes controltype = CVFR.GetControlType();
             Material material = null;
 
-            if (AceFile != "")
+            if (Alert) { imageName = "alert.ace"; }
+            else if (AceFile != "")
             {
                 imageName = AceFile;
             }
-            else if (Alert) { imageName = "alert.ace"; }
             else
             {
                 switch (controltype)
@@ -3085,11 +3086,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 +3099,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 +3219,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 +3233,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;
             }
         }
@@ -3247,45 +3252,46 @@ public void UpdateDigit()
 
             Material UsedMaterial = FindMaterial();
 
-            float length = CVFR.GetRangeFraction();
+            float length = CVFR.GetRangeFraction(true);
 
             CVCGauge gauge = CVFR.GetGauge();
 
             var len = maxLen * length;
+            var absLen = Math.Abs(len);
             Vertex v1, v2, v3, v4;
 
             //the left-bottom vertex if ori=0;dir=0, right-bottom if ori=0,dir=1; left-top if ori=1,dir=0; left-bottom if ori=1,dir=1;
             v1 = new Vertex(0f, 0f, 0.002f, 0, 0, -1, 0f, 0f);
 
             if (Orientation == 0)
             {
-                if (Direction == 0)//moving right
+                if (Direction == 0 ^ len < 0)//moving right
                 {
                     //other vertices
                     v2 = new Vertex(0f, width, 0.002f, 0, 0, 1, 0f, 0f);
-                    v3 = new Vertex(len, width, 0.002f, 0, 0, 1, 0f, 0f);
-                    v4 = new Vertex(len, 0f, 0.002f, 0, 0, 1, 0f, 0f);
+                    v3 = new Vertex(absLen, width, 0.002f, 0, 0, 1, 0f, 0f);
+                    v4 = new Vertex(absLen, 0f, 0.002f, 0, 0, 1, 0f, 0f);
                 }
                 else //moving left
                 {
                     v4 = new Vertex(0f, width, 0.002f, 0, 0, 1, 0f, 0f);
-                    v3 = new Vertex(-len, width, 0.002f, 0, 0, 1, 0f, 0f);
-                    v2 = new Vertex(-len, 0f, 0.002f, 0, 0, 1, 0f, 0f);
+                    v3 = new Vertex(-absLen, width, 0.002f, 0, 0, 1, 0f, 0f);
+                    v2 = new Vertex(-absLen, 0f, 0.002f, 0, 0, 1, 0f, 0f);
                 }
             }
             else
             {
-                if (Direction == 1)//up
+                if (Direction == 1 ^ len < 0)//up
                 {
                     //other vertices
-                    v2 = new Vertex(0f, len, 0.002f, 0, 0, 1, 0f, 0f);
-                    v3 = new Vertex(width, len, 0.002f, 0, 0, 1, 0f, 0f);
+                    v2 = new Vertex(0f, absLen, 0.002f, 0, 0, 1, 0f, 0f);
+                    v3 = new Vertex(width, absLen, 0.002f, 0, 0, 1, 0f, 0f);
                     v4 = new Vertex(width, 0f, 0.002f, 0, 0, 1, 0f, 0f);
                 }
                 else //moving down
                 {
-                    v4 = new Vertex(0f, -len, 0.002f, 0, 0, 1, 0f, 0f);
-                    v3 = new Vertex(width, -len, 0.002f, 0, 0, 1, 0f, 0f);
+                    v4 = new Vertex(0f, -absLen, 0.002f, 0, 0, 1, 0f, 0f);
+                    v3 = new Vertex(width, -absLen, 0.002f, 0, 0, 1, 0f, 0f);
                     v2 = new Vertex(width, 0, 0.002f, 0, 0, 1, 0f, 0f);
                 }
             }
@@ -3298,7 +3304,7 @@ public void UpdateDigit()
             NumVertices += 4;
 
             //update the shape primitive
-            UpdateShapePrimitive();
+            UpdateShapePrimitive(UsedMaterial);
 
         }
 
@@ -3330,7 +3336,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 +3345,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)
diff --git a/Source/RunActivity/Viewer3D/Shapes.cs b/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

Original file line number	Diff line number	Diff line change
`@@ -1207,7 +1207,7 @@ public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderIte`
`1207`	`1207`
`1208`	`1208`	`public class SolidColorMaterial : Material`
`1209`	`1209`	`{`
`1210`		`- static BasicEffect basicEffect;`
	`1210`	`+ BasicEffect basicEffect;`
`1211`	`1211`
`1212`	`1212`	`public SolidColorMaterial(Viewer viewer, float a, float r, float g, float b)`
`1213`	`1213`	`: base(viewer, null)`
Original file line number	Diff line number	Diff line change
`@@ -1468,7 +1468,7 @@ public CABViewControlTypes GetControlType()`
`1468`	`1468`	`/// Gets the requested Locomotive data and returns it as a fraction (from 0 to 1) of the range between Min and Max values.`
`1469`	`1469`	`/// </summary>`
`1470`	`1470`	`/// <returns>Data value as fraction (from 0 to 1) of the range between Min and Max values</returns>`
`1471`		`- public float GetRangeFraction()`
	`1471`	`+ public float GetRangeFraction(bool offsetFromZero = false)`
`1472`	`1472`	`{`
`1473`	`1473`	`var data = Locomotive.GetDataOf(Control);`
`1474`	`1474`	`if (data < Control.MinValue)`
`@@ -1479,7 +1479,7 @@ public float GetRangeFraction()`
`1479`	`1479`	`if (Control.MaxValue == Control.MinValue)`
`1480`	`1480`	`return 0;`
`1481`	`1481`
`1482`		`- return (float)((data - Control.MinValue) / (Control.MaxValue - Control.MinValue));`
	`1482`	`+ return (float)((data - (offsetFromZero && Control.MinValue < 0 ? 0 : Control.MinValue)) / (Control.MaxValue - Control.MinValue));`
`1483`	`1483`	`}`
`1484`	`1484`
`1485`	`1485`	`public CABViewControlStyles GetStyle()`
`@@ -1630,7 +1630,8 @@ public CabViewGaugeRenderer(Viewer viewer, MSTSLocomotive locomotive, CVCFirebox`
`1630`	`1630`
`1631`	`1631`	`public color GetColor(out bool positive)`
`1632`	`1632`	`{`
`1633`		`- if (Locomotive.GetDataOf(Control) < 0) { positive = false; return Gauge.NegativeColor; }`
	`1633`	`+ if (Locomotive.GetDataOf(Control) < 0)`
	`1634`	`+ { positive = false; return Gauge.NegativeColor; }`
`1634`	`1635`	`else { positive = true; return Gauge.PositiveColor; }`
`1635`	`1636`	`}`
`1636`	`1637`
`@@ -2986,7 +2987,7 @@ public ThreeDimCabDigit(Viewer viewer, int iMatrix, string size, string aceFile,`
`2986`	`2987`
`2987`	`2988`	`//create the shape primitive`
`2988`	`2989`	`shapePrimitive = new MutableShapePrimitive(Material, NumVertices, NumIndices, new[] { -1 }, 0);`
`2989`		`- UpdateShapePrimitive();`
	`2990`	`+ UpdateShapePrimitive(Material);`
`2990`	`2991`
`2991`	`2992`	`}`
`2992`	`2993`
`@@ -2997,11 +2998,11 @@ Material FindMaterial(bool Alert)`
`2997`	`2998`	`CABViewControlTypes controltype = CVFR.GetControlType();`
`2998`	`2999`	`Material material = null;`
`2999`	`3000`
`3000`		`- if (AceFile != "")`
	`3001`	`+ if (Alert) { imageName = "alert.ace"; }`
	`3002`	`+ else if (AceFile != "")`
`3001`	`3003`	`{`
`3002`	`3004`	`imageName = AceFile;`
`3003`	`3005`	`}`
`3004`		`- else if (Alert) { imageName = "alert.ace"; }`
`3005`	`3006`	`else`
`3006`	`3007`	`{`
`3007`	`3008`	`switch (controltype)`
`@@ -3085,11 +3086,11 @@ public void UpdateDigit()`
`3085`	`3086`	`}`
`3086`	`3087`
`3087`	`3088`	`//update the shape primitive`
`3088`		`- UpdateShapePrimitive();`
	`3089`	`+ UpdateShapePrimitive(UsedMaterial);`
`3089`	`3090`
`3090`	`3091`	`}`
`3091`	`3092`
`3092`		`- private void UpdateShapePrimitive()`
	`3093`	`+ private void UpdateShapePrimitive(Material material)`
`3093`	`3094`	`{`
`3094`	`3095`	`var indexData = new short[NumIndices];`
`3095`	`3096`	`Array.Copy(TriangleListIndices, indexData, NumIndices);`
`@@ -3098,6 +3099,8 @@ private void UpdateShapePrimitive()`
`3098`	`3099`	`var vertexData = new VertexPositionNormalTexture[NumVertices];`
`3099`	`3100`	`Array.Copy(VertexList, vertexData, NumVertices);`
`3100`	`3101`	`shapePrimitive.SetVertexData(vertexData, 0, NumVertices, NumIndices / 3);`
	`3102`	`+`
	`3103`	`+ shapePrimitive.SetMaterial(material);`
`3101`	`3104`	`}`
`3102`	`3105`
`3103`	`3106`	`//ACE MAP:`
`@@ -3216,8 +3219,9 @@ public ThreeDimCabGaugeNative(Viewer viewer, int iMatrix, string size, string le`
`3216`	`3219`
`3217`	`3220`
`3218`	`3221`	`//create the shape primitive`
`3219`		`- shapePrimitive = new MutableShapePrimitive(FindMaterial(), NumVertices, NumIndices, new[] { -1 }, 0);`
`3220`		`- UpdateShapePrimitive();`
	`3222`	`+ var material = FindMaterial();`
	`3223`	`+ shapePrimitive = new MutableShapePrimitive(material, NumVertices, NumIndices, new[] { -1 }, 0);`
	`3224`	`+ UpdateShapePrimitive(material);`
`3221`	`3225`
`3222`	`3226`	`}`
`3223`	`3227`
`@@ -3229,13 +3233,14 @@ Material FindMaterial()`
`3229`	`3233`	`{`
`3230`	`3234`	`if (PositiveMaterial == null)`
`3231`	`3235`	`{`
`3232`		`- PositiveMaterial = new SolidColorMaterial(this.Viewer, 0f, c.R, c.G, c.B);`
	`3236`	`+ PositiveMaterial = new SolidColorMaterial(this.Viewer, c.A, c.R, c.G, c.B);`
`3233`	`3237`	`}`
`3234`	`3238`	`return PositiveMaterial;`
`3235`	`3239`	`}`
`3236`	`3240`	`else`
`3237`	`3241`	`{`
`3238`		`- if (NegativeMaterial == null) NegativeMaterial = new SolidColorMaterial(this.Viewer, c.A, c.R, c.G, c.B);`
	`3242`	`+ if (NegativeMaterial == null)`
	`3243`	`+ NegativeMaterial = new SolidColorMaterial(this.Viewer, c.A, c.R, c.G, c.B);`
`3239`	`3244`	`return NegativeMaterial;`
`3240`	`3245`	`}`
`3241`	`3246`	`}`
`@@ -3247,45 +3252,46 @@ public void UpdateDigit()`
`3247`	`3252`
`3248`	`3253`	`Material UsedMaterial = FindMaterial();`
`3249`	`3254`
`3250`		`- float length = CVFR.GetRangeFraction();`
	`3255`	`+ float length = CVFR.GetRangeFraction(true);`
`3251`	`3256`
`3252`	`3257`	`CVCGauge gauge = CVFR.GetGauge();`
`3253`	`3258`
`3254`	`3259`	`var len = maxLen * length;`
	`3260`	`+ var absLen = Math.Abs(len);`
`3255`	`3261`	`Vertex v1, v2, v3, v4;`
`3256`	`3262`
`3257`	`3263`	`//the left-bottom vertex if ori=0;dir=0, right-bottom if ori=0,dir=1; left-top if ori=1,dir=0; left-bottom if ori=1,dir=1;`
`3258`	`3264`	`v1 = new Vertex(0f, 0f, 0.002f, 0, 0, -1, 0f, 0f);`
`3259`	`3265`
`3260`	`3266`	`if (Orientation == 0)`
`3261`	`3267`	`{`
`3262`		`- if (Direction == 0)//moving right`
	`3268`	`+ if (Direction == 0 ^ len < 0)//moving right`
`3263`	`3269`	`{`
`3264`	`3270`	`//other vertices`
`3265`	`3271`	`v2 = new Vertex(0f, width, 0.002f, 0, 0, 1, 0f, 0f);`
`3266`		`- v3 = new Vertex(len, width, 0.002f, 0, 0, 1, 0f, 0f);`
`3267`		`- v4 = new Vertex(len, 0f, 0.002f, 0, 0, 1, 0f, 0f);`
	`3272`	`+ v3 = new Vertex(absLen, width, 0.002f, 0, 0, 1, 0f, 0f);`
	`3273`	`+ v4 = new Vertex(absLen, 0f, 0.002f, 0, 0, 1, 0f, 0f);`
`3268`	`3274`	`}`
`3269`	`3275`	`else //moving left`
`3270`	`3276`	`{`
`3271`	`3277`	`v4 = new Vertex(0f, width, 0.002f, 0, 0, 1, 0f, 0f);`
`3272`		`- v3 = new Vertex(-len, width, 0.002f, 0, 0, 1, 0f, 0f);`
`3273`		`- v2 = new Vertex(-len, 0f, 0.002f, 0, 0, 1, 0f, 0f);`
	`3278`	`+ v3 = new Vertex(-absLen, width, 0.002f, 0, 0, 1, 0f, 0f);`
	`3279`	`+ v2 = new Vertex(-absLen, 0f, 0.002f, 0, 0, 1, 0f, 0f);`
`3274`	`3280`	`}`
`3275`	`3281`	`}`
`3276`	`3282`	`else`
`3277`	`3283`	`{`
`3278`		`- if (Direction == 1)//up`
	`3284`	`+ if (Direction == 1 ^ len < 0)//up`
`3279`	`3285`	`{`
`3280`	`3286`	`//other vertices`
`3281`		`- v2 = new Vertex(0f, len, 0.002f, 0, 0, 1, 0f, 0f);`
`3282`		`- v3 = new Vertex(width, len, 0.002f, 0, 0, 1, 0f, 0f);`
	`3287`	`+ v2 = new Vertex(0f, absLen, 0.002f, 0, 0, 1, 0f, 0f);`
	`3288`	`+ v3 = new Vertex(width, absLen, 0.002f, 0, 0, 1, 0f, 0f);`
`3283`	`3289`	`v4 = new Vertex(width, 0f, 0.002f, 0, 0, 1, 0f, 0f);`
`3284`	`3290`	`}`
`3285`	`3291`	`else //moving down`
`3286`	`3292`	`{`
`3287`		`- v4 = new Vertex(0f, -len, 0.002f, 0, 0, 1, 0f, 0f);`
`3288`		`- v3 = new Vertex(width, -len, 0.002f, 0, 0, 1, 0f, 0f);`
	`3293`	`+ v4 = new Vertex(0f, -absLen, 0.002f, 0, 0, 1, 0f, 0f);`
	`3294`	`+ v3 = new Vertex(width, -absLen, 0.002f, 0, 0, 1, 0f, 0f);`
`3289`	`3295`	`v2 = new Vertex(width, 0, 0.002f, 0, 0, 1, 0f, 0f);`
`3290`	`3296`	`}`
`3291`	`3297`	`}`
`@@ -3298,7 +3304,7 @@ public void UpdateDigit()`
`3298`	`3304`	`NumVertices += 4;`
`3299`	`3305`
`3300`	`3306`	`//update the shape primitive`
`3301`		`- UpdateShapePrimitive();`
	`3307`	`+ UpdateShapePrimitive(UsedMaterial);`
`3302`	`3308`
`3303`	`3309`	`}`
`3304`	`3310`
`@@ -3330,7 +3336,7 @@ static float GetTextureCoordY(char c)`
`3330`	`3336`	`return 1.0f;`
`3331`	`3337`	`}`
`3332`	`3338`
`3333`		`- private void UpdateShapePrimitive()`
	`3339`	`+ private void UpdateShapePrimitive(Material material)`
`3334`	`3340`	`{`
`3335`	`3341`	`var indexData = new short[NumIndices];`
`3336`	`3342`	`Array.Copy(TriangleListIndices, indexData, NumIndices);`
`@@ -3339,6 +3345,8 @@ private void UpdateShapePrimitive()`
`3339`	`3345`	`var vertexData = new VertexPositionNormalTexture[NumVertices];`
`3340`	`3346`	`Array.Copy(VertexList, vertexData, NumVertices);`
`3341`	`3347`	`shapePrimitive.SetVertexData(vertexData, 0, NumVertices, NumIndices / 3);`
	`3348`	`+`
	`3349`	`+ shapePrimitive.SetMaterial(material);`
`3342`	`3350`	`}`
`3343`	`3351`
`3344`	`3352`	`public void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)`
Original file line number	Diff line number	Diff line change
`@@ -1392,7 +1392,8 @@ public virtual void Mark()`
`1392`	`1392`	`}`
`1393`	`1393`
`1394`	`1394`	`/// <summary>`
`1395`		`- /// A <c>ShapePrimitive</c> that permits manipulation of the vertex and index buffers to change geometry efficiently.`
	`1395`	`+ /// A <c>ShapePrimitive</c> that permits manipulation of vertex and index buffers to change geometry efficiently.`
	`1396`	`+ /// It permits also change of material`
`1396`	`1397`	`/// </summary>`
`1397`	`1398`	`public class MutableShapePrimitive : ShapePrimitive`
`1398`	`1399`	`{`
`@@ -1418,6 +1419,11 @@ public void SetIndexData(short[] data)`
`1418`	`1419`	`{`
`1419`	`1420`	`IndexBuffer.SetData(data);`
`1420`	`1421`	`}`
	`1422`	`+`
	`1423`	`+ public void SetMaterial(Material material)`
	`1424`	`+ {`
	`1425`	`+ Material = material;`
	`1426`	`+ }`
`1421`	`1427`	`}`
`1422`	`1428`
`1423`	`1429`	`struct ShapeInstanceData`