Skip to content

Commit

Permalink
Automatic merge of T1.5-rc3-98-g567f7ca0a and 15 pull requests
Browse files Browse the repository at this point in the history
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #706 at 570ab21: Extended door functionality
- Pull request #713 at 5a8da77: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #719 at 56d183c: Upgraded to MonoGame 3.8.0 (+ small update for other libraries)
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at 9cffa6d: Improvements for air brakes
- Pull request #733 at 72947b0: Fixed battery switch sound being repeted
- Pull request #734 at 8f8484c: Fixed battery switch timer not working properly
- Pull request #736 at a845085: Replaced truncated brake token table with lists
- Pull request #740 at b3e66ca: Refactored the circuit breaker and the traction cut-off relay in order to use the same design pattern as the C# signal scripts (compatible with current scripts)
- Pull request #741 at 2dd56ad: Fixed brake controller script not being loaded in timetable mode
- Pull request #743 at 60c8b99: Default filename for include statements 
- Pull request #744 at 3c2dc07: Fixed and improved cabview control conditions related to power supply state
- Pull request #745 at cf5acd2: Fix digital displays in rear 3D cab
  • Loading branch information
openrails-bot committed Nov 10, 2022
Showing 1 changed file with 3 additions and 3 deletions.
Expand Up @@ -3335,7 +3335,7 @@ public ThreeDimentionCabViewer(Viewer viewer, MSTSLocomotive car, MSTSLocomotive
if (style != null && style is CabViewDigitalRenderer)//digits?
{
//DigitParts.Add(key, new DigitalDisplay(viewer, TrainCarShape, iMatrix, parameter, locoViewer.ThreeDimentionCabRenderer.ControlMap[key]));
DigitParts3D.Add(key, new ThreeDimCabDigit(viewer, iMatrix, parameter1, parameter2, this.TrainCarShape, locoViewer.ThreeDimentionCabRenderer.ControlMap[key]));
DigitParts3D.Add(key, new ThreeDimCabDigit(viewer, iMatrix, parameter1, parameter2, this.TrainCarShape, locoViewer.ThreeDimentionCabRenderer.ControlMap[key], Locomotive));
}
else if (style != null && style is CabViewGaugeRenderer)
{
Expand Down Expand Up @@ -3558,7 +3558,7 @@ public class ThreeDimCabDigit
Material AlertMaterial;
float Size;
string AceFile;
public ThreeDimCabDigit(Viewer viewer, int iMatrix, string size, string aceFile, PoseableShape trainCarShape, CabViewControlRenderer c)
public ThreeDimCabDigit(Viewer viewer, int iMatrix, string size, string aceFile, PoseableShape trainCarShape, CabViewControlRenderer c, MSTSLocomotive locomotive)
{

Size = int.Parse(size) * 0.001f;//input size is in mm
Expand Down Expand Up @@ -3586,7 +3586,7 @@ public ThreeDimCabDigit(Viewer viewer, int iMatrix, string size, string aceFile,

//start position is the center of the text
var start = new Vector3(0, 0, 0);
var rotation = 0;
var rotation = locomotive.UsingRearCab ? (float)Math.PI : 0;

//find the left-most of text
Vector3 offset;
Expand Down

0 comments on commit 8ebe0cc

Please sign in to comment.