More clean up

SteelFill · SteelFill · commit b1517eea27fb · 2025-07-04T19:27:30.000-05:00
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs
@@ -1041,7 +1041,9 @@ public FreightAnimationContinuous(STFReader stf, MSTSWagon wagon)
                 }),
                 new STFReader.TokenProcessor("flip", ()=>{ Flipped = stf.ReadBoolBlock(true);}),
                 new STFReader.TokenProcessor("shapeindex", ()=>{ ShapeIndex = stf.ReadIntBlock(null);}),
+                new STFReader.TokenProcessor("ortsshapeindex", ()=>{ ShapeIndex = stf.ReadIntBlock(null);}),
                 new STFReader.TokenProcessor("shapehierarchy", ()=>{ ShapeHierarchy = stf.ReadStringBlock(null);}),
+                new STFReader.TokenProcessor("ortsshapehierarchy", ()=>{ ShapeHierarchy = stf.ReadStringBlock(null);}),
                 new STFReader.TokenProcessor("visibility", ()=>{
                     for (int index = 0; index < 3; index++)
                         Visibility[index] = false;
@@ -1158,7 +1160,9 @@ public FreightAnimationStatic(STFReader stf)
             }),
             new STFReader.TokenProcessor("flip", ()=>{ Flipped = stf.ReadBoolBlock(true);}),
             new STFReader.TokenProcessor("shapeindex", ()=>{ ShapeIndex = stf.ReadIntBlock(null);}),
+            new STFReader.TokenProcessor("ortsshapeindex", ()=>{ ShapeIndex = stf.ReadIntBlock(null);}),
             new STFReader.TokenProcessor("shapehierarchy", ()=>{ ShapeHierarchy = stf.ReadStringBlock(null);}),
+            new STFReader.TokenProcessor("ortsshapehierarchy", ()=>{ ShapeHierarchy = stf.ReadStringBlock(null);}),
             new STFReader.TokenProcessor("visibility", ()=>{
                 for (int index = 0; index < 3; index++)
                     Visibility[index] = false;
diff --git a/Source/RunActivity/Viewer3D/Lights.cs b/Source/RunActivity/Viewer3D/Lights.cs
@@ -125,7 +125,7 @@ public LightViewer(Viewer viewer, TrainCar car, TrainCarViewer carViewer)
                     }
                     else
                     {
-                        if (light.ShapeHierarchy != null)
+                        if (!String.IsNullOrEmpty(light.ShapeHierarchy))
                         {
                             if ((CarViewer as MSTSWagonViewer).TrainCarShape.SharedShape.MatrixNames.Contains(light.ShapeHierarchy))
                             {
diff --git a/Source/RunActivity/Viewer3D/ParticleEmitter.cs b/Source/RunActivity/Viewer3D/ParticleEmitter.cs
@@ -258,7 +258,7 @@ public ParticleEmitterPrimitive(Viewer viewer, ParticleEmitterData data, MSTSWag
             }
             else
             {
-                if (EmitterData.ShapeHierarchy != null)
+                if (!String.IsNullOrEmpty(EmitterData.ShapeHierarchy))
                 {
                     if (CarViewer.TrainCarShape.SharedShape.MatrixNames.Contains(EmitterData.ShapeHierarchy))
                     {
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
@@ -1358,7 +1358,7 @@ public CabRenderer(Viewer viewer, MSTSLocomotiveViewer carViewer)
                     }
                     else
                     {
-                        if (view.ShapeHierarchy != null)
+                        if (!String.IsNullOrEmpty(view.ShapeHierarchy))
                         {
                             if (carViewer.TrainCarShape.SharedShape.MatrixNames.Contains(view.ShapeHierarchy))
                             {
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
@@ -448,7 +448,7 @@ from data in effect.Value
                 }
                 else
                 {
-                    if (view.ShapeHierarchy != null)
+                    if (!String.IsNullOrEmpty(view.ShapeHierarchy))
                     {
                         if (TrainCarShape.SharedShape.MatrixNames.Contains(view.ShapeHierarchy))
                         {
diff --git a/Source/RunActivity/Viewer3D/RollingStock/SubSystems/FreightAnimationsViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/SubSystems/FreightAnimationsViewer.cs
@@ -15,13 +15,14 @@
 // You should have received a copy of the GNU General Public License
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 using Microsoft.Xna.Framework;
 using Orts.Simulation.RollingStocks;
 using Orts.Simulation.RollingStocks.SubSystems;
 using ORTS.Common;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
 
 namespace Orts.Viewer3D.RollingStock.SubSystems
 {
@@ -94,7 +95,7 @@ public FreightAnimationViewer(Viewer viewer, MSTSWagonViewer wagonViewer, string
             }
             else
             {
-                if (Animation.ShapeHierarchy != null)
+                if (!String.IsNullOrEmpty(Animation.ShapeHierarchy))
                 {
                     if (wagonViewer.TrainCarShape.SharedShape.MatrixNames.Contains(Animation.ShapeHierarchy))
                     {
diff --git a/Source/RunActivity/Viewer3D/Shapes.cs b/Source/RunActivity/Viewer3D/Shapes.cs
@@ -2131,10 +2131,12 @@ void LoadContent()
             else if (LodControls[0].DistanceLevels.Length > 0 && LodControls[0].DistanceLevels[0].SubObjects.Length > 0)
             {
                 // Zero the position offset of the root matrix for compatibility with MSTS, unless modified thru SD file
-                if (!adjustMAIN && LodControls[0].DistanceLevels[0].SubObjects[0].ShapePrimitives.Length > 0 &&
+                if (LodControls[0].DistanceLevels[0].SubObjects[0].ShapePrimitives.Length > 0 &&
                     LodControls[0].DistanceLevels[0].SubObjects[0].ShapePrimitives[0].Hierarchy[0] == -1)
                 {
-                    Matrices[0].Translation = Vector3.Zero;
+                    Matrices[0].M41 = 0;
+                    Matrices[0].M42 = 0;
+                    Matrices[0].M43 = 0;
                 }
                 // Look for root subobject, it is not necessarily the first (see ProTrain signal)
                 for (int soIndex = 0; soIndex <= LodControls[0].DistanceLevels[0].SubObjects.Length - 1; soIndex++)
diff --git a/Source/RunActivity/Viewer3D/Sound.cs b/Source/RunActivity/Viewer3D/Sound.cs
@@ -757,7 +757,7 @@ public void Initialize(Viewer viewer, WorldLocation worldLocation, Events.Source
                         }
                         else
                         {
-                            if (mstsStream.ShapeHierarchy != null)
+                            if (!String.IsNullOrEmpty(mstsStream.ShapeHierarchy))
                             {
                                 if (CarViewer.TrainCarShape.SharedShape.MatrixNames.Contains(mstsStream.ShapeHierarchy))
                                 {

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public LightViewer(Viewer viewer, TrainCar car, TrainCarViewer carViewer)`
`125`	`125`	`}`
`126`	`126`	`else`
`127`	`127`	`{`
`128`		`- if (light.ShapeHierarchy != null)`
	`128`	`+ if (!String.IsNullOrEmpty(light.ShapeHierarchy))`
`129`	`129`	`{`
`130`	`130`	`if ((CarViewer as MSTSWagonViewer).TrainCarShape.SharedShape.MatrixNames.Contains(light.ShapeHierarchy))`
`131`	`131`	`{`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ public ParticleEmitterPrimitive(Viewer viewer, ParticleEmitterData data, MSTSWag`
`258`	`258`	`}`
`259`	`259`	`else`
`260`	`260`	`{`
`261`		`- if (EmitterData.ShapeHierarchy != null)`
	`261`	`+ if (!String.IsNullOrEmpty(EmitterData.ShapeHierarchy))`
`262`	`262`	`{`
`263`	`263`	`if (CarViewer.TrainCarShape.SharedShape.MatrixNames.Contains(EmitterData.ShapeHierarchy))`
`264`	`264`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1358,7 +1358,7 @@ public CabRenderer(Viewer viewer, MSTSLocomotiveViewer carViewer)`
`1358`	`1358`	`}`
`1359`	`1359`	`else`
`1360`	`1360`	`{`
`1361`		`- if (view.ShapeHierarchy != null)`
	`1361`	`+ if (!String.IsNullOrEmpty(view.ShapeHierarchy))`
`1362`	`1362`	`{`
`1363`	`1363`	`if (carViewer.TrainCarShape.SharedShape.MatrixNames.Contains(view.ShapeHierarchy))`
`1364`	`1364`	`{`
Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ from data in effect.Value`
`448`	`448`	`}`
`449`	`449`	`else`
`450`	`450`	`{`
`451`		`- if (view.ShapeHierarchy != null)`
	`451`	`+ if (!String.IsNullOrEmpty(view.ShapeHierarchy))`
`452`	`452`	`{`
`453`	`453`	`if (TrainCarShape.SharedShape.MatrixNames.Contains(view.ShapeHierarchy))`
`454`	`454`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,14 @@`
`15`	`15`	`// You should have received a copy of the GNU General Public License`
`16`	`16`	`// along with Open Rails. If not, see <http://www.gnu.org/licenses/>.`
`17`	`17`
	`18`	`+using System;`
	`19`	`+using System.Collections.Generic;`
	`20`	`+using System.Diagnostics;`
	`21`	`+using System.Linq;`
`18`	`22`	`using Microsoft.Xna.Framework;`
`19`	`23`	`using Orts.Simulation.RollingStocks;`
`20`	`24`	`using Orts.Simulation.RollingStocks.SubSystems;`
`21`	`25`	`using ORTS.Common;`
`22`		`-using System.Collections.Generic;`
`23`		`-using System.Diagnostics;`
`24`		`-using System.Linq;`
`25`	`26`
`26`	`27`	`namespace Orts.Viewer3D.RollingStock.SubSystems`
`27`	`28`	`{`
`@@ -94,7 +95,7 @@ public FreightAnimationViewer(Viewer viewer, MSTSWagonViewer wagonViewer, string`
`94`	`95`	`}`
`95`	`96`	`else`
`96`	`97`	`{`
`97`		`- if (Animation.ShapeHierarchy != null)`
	`98`	`+ if (!String.IsNullOrEmpty(Animation.ShapeHierarchy))`
`98`	`99`	`{`
`99`	`100`	`if (wagonViewer.TrainCarShape.SharedShape.MatrixNames.Contains(Animation.ShapeHierarchy))`
`100`	`101`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2131,10 +2131,12 @@ void LoadContent()`
`2131`	`2131`	`else if (LodControls[0].DistanceLevels.Length > 0 && LodControls[0].DistanceLevels[0].SubObjects.Length > 0)`
`2132`	`2132`	`{`
`2133`	`2133`	`// Zero the position offset of the root matrix for compatibility with MSTS, unless modified thru SD file`
`2134`		`- if (!adjustMAIN && LodControls[0].DistanceLevels[0].SubObjects[0].ShapePrimitives.Length > 0 &&`
	`2134`	`+ if (LodControls[0].DistanceLevels[0].SubObjects[0].ShapePrimitives.Length > 0 &&`
`2135`	`2135`	`LodControls[0].DistanceLevels[0].SubObjects[0].ShapePrimitives[0].Hierarchy[0] == -1)`
`2136`	`2136`	`{`
`2137`		`- Matrices[0].Translation = Vector3.Zero;`
	`2137`	`+ Matrices[0].M41 = 0;`
	`2138`	`+ Matrices[0].M42 = 0;`
	`2139`	`+ Matrices[0].M43 = 0;`
`2138`	`2140`	`}`
`2139`	`2141`	`// Look for root subobject, it is not necessarily the first (see ProTrain signal)`
`2140`	`2142`	`for (int soIndex = 0; soIndex <= LodControls[0].DistanceLevels[0].SubObjects.Length - 1; soIndex++)`
Original file line number	Diff line number	Diff line change
`@@ -757,7 +757,7 @@ public void Initialize(Viewer viewer, WorldLocation worldLocation, Events.Source`
`757`	`757`	`}`
`758`	`758`	`else`
`759`	`759`	`{`
`760`		`- if (mstsStream.ShapeHierarchy != null)`
	`760`	`+ if (!String.IsNullOrEmpty(mstsStream.ShapeHierarchy))`
`761`	`761`	`{`
`762`	`762`	`if (CarViewer.TrainCarShape.SharedShape.MatrixNames.Contains(mstsStream.ShapeHierarchy))`
`763`	`763`	`{`