Skip to content

Commit 5ea1cbe

Browse files
committed
Containers: manage both 45ft and 45ftHC containers
1 parent 65c8461 commit 5ea1cbe

File tree

1 file changed

+5
-45
lines changed

1 file changed

+5
-45
lines changed

Source/Orts.Simulation/Simulation/Container.cs

Lines changed: 5 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public enum ContainerType
4242
C40ft,
4343
C40ftHC,
4444
C45ft,
45+
C45ftHC,
4546
C48ft,
4647
C53ft
4748
}
@@ -81,51 +82,7 @@ public enum Status
8182
public Matrix RelativeContainerMatrix = Matrix.Identity;
8283
public MSTSWagon Wagon;
8384
public string LoadFilePath;
84-
85-
86-
// generates container from FreightAnim
87-
/* public Container(Simulator simulator, string baseShapeFileFolderSlash, FreightAnimationDiscrete freightAnimDiscrete, ContainerHandlingItem containerStation )
88-
{
89-
Simulator = simulator;
90-
ShapeFileName = freightAnimDiscrete.ShapeFileName;
91-
BaseShapeFileFolderSlash = baseShapeFileFolderSlash;
92-
MassKG = freightAnimDiscrete.LoadWeightKG;
93-
ContainerType = freightAnimDiscrete.ContainerType;
94-
switch (ContainerType)
95-
{
96-
case ContainerType.C20ft:
97-
LengthM = 6.1f;
98-
break;
99-
case ContainerType.C40ft:
100-
LengthM = 12.19f;
101-
break;
102-
case ContainerType.C40ftHC:
103-
LengthM = 12.19f;
104-
HeightM = 2.9f;
105-
break;
106-
case ContainerType.C45ft:
107-
LengthM = 13.7f;
108-
break;
109-
case ContainerType.C48ft:
110-
LengthM = 14.6f;
111-
break;
112-
case ContainerType.C53ft:
113-
LengthM = 16.15f;
114-
break;
115-
default:
116-
break;
117-
}
118-
WorldPosition.XNAMatrix = freightAnimDiscrete.Wagon.WorldPosition.XNAMatrix;
119-
WorldPosition.TileX = freightAnimDiscrete.Wagon.WorldPosition.TileX;
120-
WorldPosition.TileZ = freightAnimDiscrete.Wagon.WorldPosition.TileZ;
121-
var translation = Matrix.CreateTranslation(freightAnimDiscrete.XOffset, freightAnimDiscrete.YOffset, freightAnimDiscrete.ZOffset);
122-
WorldPosition.XNAMatrix = translation * WorldPosition.XNAMatrix;
123-
IntrinsicShapeOffset = freightAnimDiscrete.IntrinsicShapeOffset;
124-
125-
ContainerStation = containerStation;
126-
}*/
127-
128-
public Container(FreightAnimationDiscrete freightAnimDiscreteCopy, FreightAnimationDiscrete freightAnimDiscrete, bool stacked = false)
85+
public Container(FreightAnimationDiscrete freightAnimDiscreteCopy, FreightAnimationDiscrete freightAnimDiscrete, bool stacked = false)
12986
{
13087
Wagon = freightAnimDiscrete.Wagon;
13188
Copy(freightAnimDiscreteCopy.Container);
@@ -219,6 +176,9 @@ private void ComputeDimensions()
219176
HeightM = 2.9f;
220177
break;
221178
case ContainerType.C45ft:
179+
LengthM = 13.7f;
180+
break;
181+
case ContainerType.C45ftHC:
222182
LengthM = 13.7f;
223183
HeightM = 2.9f;
224184
break;

0 commit comments

Comments
 (0)