Containers: remove commented code

Author: Csantucci

Source/Orts.Simulation/Simulation/Container.cs

@@ -145,8 +145,6 @@ public Container(BinaryReader inf, FreightAnimationDiscrete freightAnimDiscrete,
                     totalOffset.Y += containerStation.StackLocations[stackLocationIndex].Containers[iPos].HeightM;
                 totalOffset.Z *= -1;
                 Vector3.Transform(ref totalOffset, ref containerStation.ShapePosition.XNAMatrix, out totalOffset);
-                //               WorldPosition = new WorldLocation(car.WorldPosition.TileX, car.WorldPosition.TileZ,
-                //                   totalOffset.X, totalOffset.Y, -totalOffset.Z);
                 WorldPosition.XNAMatrix = containerStation.ShapePosition.XNAMatrix;
                 WorldPosition.XNAMatrix.Translation = totalOffset;
                 WorldPosition.TileX = containerStation.ShapePosition.TileX;
@@ -208,8 +206,6 @@ public void ComputeContainerStationContainerPosition (int stackLocationIndex, in
                     totalOffset.Y += stackLocation.Containers[iPos].HeightM;
             totalOffset.Z *= -1;
             Vector3.Transform(ref totalOffset, ref  ContainerStation.ShapePosition.XNAMatrix, out totalOffset);
-            //               WorldPosition = new WorldLocation(car.WorldPosition.TileX, car.WorldPosition.TileZ,
-            //                   totalOffset.X, totalOffset.Y, -totalOffset.Z);
             WorldPosition.XNAMatrix = ContainerStation.ShapePosition.XNAMatrix;
             WorldPosition.XNAMatrix.Translation = totalOffset;
             WorldPosition.TileX = ContainerStation.ShapePosition.TileX;
@@ -285,16 +281,6 @@ public ContainerManager(Simulator simulator)
             Containers = new List<Container>();
         }
 
-/*        static Dictionary<int, FuelPickupItem> GetContainerHandlingItemsFromDB(TrackNode[] trackNodes, TrItem[] trItemTable)
-        {
-            return (from trackNode in trackNodes
-                    where trackNode != null && trackNode.TrVectorNode != null && trackNode.TrVectorNode.NoItemRefs > 0
-                    from itemRef in trackNode.TrVectorNode.TrItemRefs.Distinct()
-                    where trItemTable[itemRef] != null && trItemTable[itemRef].ItemType == TrItem.trItemType.trPICKUP
-                    select new KeyValuePair<int, ContainerHandlingItem>(itemRef, new ContainerHandlingItem(trackNode, trItemTable[itemRef])))
-                    .ToDictionary(_ => _.Key, _ => _.Value);
-        }*/
-
         public ContainerHandlingItem CreateContainerStation(WorldPosition shapePosition, IEnumerable<int> trackIDs, PickupObj thisWorldObj)
         {
             var trackItem = trackIDs.Select(id => Simulator.FuelManager.FuelPickupItems[id]).First();
@@ -333,7 +319,6 @@ public class ContainerHandlingItem : FuelPickupItem
         public StackLocation[] StackLocations;
         public float StackLocationsLength = 12.19f;
         public int StackLocationsCount;
- //       public int[] AllocatedContainerIndices;
         public float PickingSurfaceYOffset;
         public Vector3 PickingSurfaceRelativeTopStartPosition;
         public float TargetX;
@@ -575,9 +560,6 @@ public void Update()
                         Status = ContainerStationStatus.LoadHorizontallyMoveToPick;
                         TargetX = StackLocations[SelectedStackLocationIndex].Position.X;
                         TargetZ = StackLocations[SelectedStackLocationIndex].Position.Z + StackLocations[SelectedStackLocationIndex].Containers[StackLocations[SelectedStackLocationIndex].Containers.Count - 1].LengthM * (StackLocations[SelectedStackLocationIndex].Flipped ? -1 : 1) / 2;
- //                       TargetX = PickingSurfaceRelativeTopStartPosition.X;
- //                       TargetZ = PickingSurfaceRelativeTopStartPosition.Z - RelativeContainerPosition.Translation.Z + HandledContainer.IntrinsicShapeZOffset;
- //                       RelativeContainerPosition.M43 = HandledContainer.IntrinsicShapeZOffset;
                         MoveX = true;
                         MoveZ = true;
                     }
@@ -589,7 +571,6 @@ public void Update()
                         MoveZ = false;
                         MoveGrabber = false;
                         Status = ContainerStationStatus.LoadLowerToPick;
-                        //                       TargetY = HandledContainer.HeightM + HandledContainer.IntrinsicShapeYOffset - PickingSurfaceYOffset;
                         TargetY = ComputeTargetYBase(StackLocations[SelectedStackLocationIndex].Containers.Count - 1, SelectedStackLocationIndex) - PickingSurfaceYOffset;
                         RelativeContainerPosition.M42 = - TargetY + StackLocations[SelectedStackLocationIndex].Containers[StackLocations[SelectedStackLocationIndex].Containers.Count -1].WorldPosition.XNAMatrix.M42 + InitialInvAnimationXNAMatrix.M42;
                         MoveY = true;
@@ -953,9 +934,6 @@ public void PrepareForUnload(FreightAnimationDiscrete linkedFreightAnimation)
 
         public void PrepareForLoad(FreightAnimationDiscrete linkedFreightAnimation)
         {
-            //           var invAnimationXNAMatrix = Matrix.Invert(InitialAnimationXNAMatrix);
-            //           RelativeContainerPosition = new Matrix();
-            //           RelativeContainerPosition = Matrix.Multiply(Containers.Last().WorldPosition.XNAMatrix, invAnimationXNAMatrix);
             LinkedFreightAnimation = linkedFreightAnimation;
             SelectedStackLocationIndex = SelectLoadPosition();
             if (SelectedStackLocationIndex == -1) return;

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs

@@ -149,7 +149,6 @@ public FreightAnimations(STFReader stf, MSTSWagon wagon)
                     stf.MustMatch(")");
                 }),
             });
-//            Load(Wagon, LoadDataList);
         }
 
         /// <summary>
@@ -244,26 +243,6 @@ public FreightAnimations(FreightAnimations copyFACollection, MSTSWagon wagon)
                 {
                     Animations.Add(new FreightAnimationStatic(freightAnim as FreightAnimationStatic));
                 }
-/*                else if (freightAnim is FreightAnimationDiscrete)
-                {
-                    Animations.Add(new FreightAnimationDiscrete(freightAnim as FreightAnimationDiscrete, this));
-                    if ((Animations.Last() as FreightAnimationDiscrete).LoadedAtStart && wagon.Simulator.Initialize && (Animations.Last() as FreightAnimationDiscrete).Container != null)
-                    {
-                        if (empty)
-                        {
-                            empty = false;
-                            FreightType = wagon.IntakePointList.Last().Type;
-                            var last = Animations.Last() as FreightAnimationDiscrete;
-                            FreightWeight += last.Container.MassKG;
-                            last.Loaded = true;
-                        }
-                        else
-                        {
-                            (Animations.Last() as FreightAnimationDiscrete).LoadedAtStart = false;
-                            Trace.TraceWarning("The wagon can't be full with two different materials, only first is retained");
-                        }
-                    }
-                }*/
             }
             FreightWeight = copyFACollection.FreightWeight;
             FreightType = copyFACollection.FreightType;
@@ -586,9 +565,6 @@ public void UpdateEmptyFreightAnims(float containerLengthM)
                         // emptyAnim might be 40ft ; if complex, delete Empty animation
                         if (emptyAnim.LoadPosition == LoadPosition.Front || emptyAnim.LoadPosition == LoadPosition.Rear)
                         {
-                            /*                           anim.Wagon.IntakePointList.Remove(emptyAnim.LinkedIntakePoint);
-                                                       deletableEmptyAnims.Add(emptyAnim);
-                                                       continue;*/
                             var multiplier = 1;
                             if (anim.LoadPosition == LoadPosition.CenterFront) multiplier = -1;
                             emptyAnim.Offset.Z = Offset.Z + multiplier * (LoadingAreaLength / 2 - (LoadingAreaLength / 2 - anim.LoadingAreaLength) / 2);