Skip to content

Commit 345afcf

Browse files
openrails-botopenrails-bot
committed
Automatic merge of T1.5.1-972-g193ebe1d0 and 15 pull requests
- Pull request #799 at dfc715e: Consolidated wind simulation - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at 537db1a: Blueprint/train car operations UI window - Pull request #891 at 9a1d6b2: Auto save - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #900 at c27f32d: DMI updates - Pull request #903 at c296b32: Downloading route content (Github, zip) - Pull request #912 at df43405: New Triple Valve Features Vol. 2 - Pull request #919 at 26cc6a8: Added mouse wheel support for controls which can be moved by pressing t… - Pull request #922 at abe2e52: Autopilot for timetable mode - Pull request #923 at 4c27204: Add curve squeal to route - Pull request #943 at 27fb483: Dynamic Brakes Behavior & Display Improvements - Pull request #944 at 6ecdc1b: Colorless Light Texture Replacement
17 parents 844efa0 + 193ebe1 + dfc715e + d00beb9 + f92de76 + 537db1a + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + c296b32 + df43405 + 26cc6a8 + abe2e52 + 4c27204 + 27fb483 + 6ecdc1b commit 345afcf

File tree

4 files changed

+64
-64
lines changed

4 files changed

+64
-64
lines changed

‎Source/RunActivity/Content/TrainOperations/TrainOperationsMap.png‎

-87 Bytes
Loading

‎Source/RunActivity/Content/TrainOperations/TrainOperationsMap32.png‎

-90 Bytes
Loading

‎Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -182,49 +182,49 @@ protected internal override void Initialize()
182182
{
183183
// texture rectangles : X, Y, width, height
184184
Rectangle BattAlwaysOnRect = new Rectangle(0, 0, 32, 32);
185-
Rectangle BattOffRect = new Rectangle(33, 0, 32, 32);
186-
Rectangle BattOnRect = new Rectangle(66, 0, 32, 32);
185+
Rectangle BattOffRect = new Rectangle(32, 0, 32, 32);
186+
Rectangle BattOnRect = new Rectangle(64, 0, 32, 32);
187187

188-
Rectangle EmptyRect = new Rectangle(99, 0, 32, 32);
188+
Rectangle EmptyRect = new Rectangle(96, 0, 32, 32);
189189

190-
Rectangle BleedOffValveNotAvailableRect = new Rectangle(0, 33, 32, 32);
191-
Rectangle BleedOffValveClosedRect = new Rectangle(33, 33, 32, 32);
192-
Rectangle BleedOffValveOpenedRect = new Rectangle(66, 33, 32, 32);
190+
Rectangle BleedOffValveNotAvailableRect = new Rectangle(0, 32, 32, 32);
191+
Rectangle BleedOffValveClosedRect = new Rectangle(32, 32, 32, 32);
192+
Rectangle BleedOffValveOpenedRect = new Rectangle(64, 32, 32, 32);
193193

194-
Rectangle BrakeHoseConRect = new Rectangle(0, 66, 32, 32);
195-
Rectangle BrakeHoseDisRect = new Rectangle(33, 66, 32, 32);
196-
Rectangle BrakeHoseFirstDisRect = new Rectangle(66, 66, 32, 32);
197-
Rectangle BrakeHoseLastDisRect = new Rectangle(99, 66, 32, 32);
194+
Rectangle BrakeHoseConRect = new Rectangle(0, 64, 32, 32);
195+
Rectangle BrakeHoseDisRect = new Rectangle(32, 64, 32, 32);
196+
Rectangle BrakeHoseFirstDisRect = new Rectangle(64, 64, 32, 32);
197+
Rectangle BrakeHoseLastDisRect = new Rectangle(96, 64, 32, 32);
198198

199-
Rectangle CouplerNotAvailableRect = new Rectangle(0, 99, 32, 32);
200-
Rectangle CouplerFrontRect = new Rectangle(33, 99, 32, 32);
201-
Rectangle CouplerRect = new Rectangle(66, 99, 32, 32);
202-
Rectangle CouplerRearRect = new Rectangle(99, 99, 32, 32);
199+
Rectangle CouplerNotAvailableRect = new Rectangle(0, 96, 32, 32);
200+
Rectangle CouplerFrontRect = new Rectangle(32, 96, 32, 32);
201+
Rectangle CouplerRect = new Rectangle(64, 96, 32, 32);
202+
Rectangle CouplerRearRect = new Rectangle(96, 96, 32, 32);
203203

204-
Rectangle LocoSymbolRect = new Rectangle(0, 132, 64, 32);
205-
Rectangle LocoSymbolGreenRect = new Rectangle(66, 132, 64, 32);
206-
Rectangle LocoSymbolRedRect = new Rectangle(0, 264, 64, 32);
204+
Rectangle LocoSymbolRect = new Rectangle(0, 128, 64, 32);
205+
Rectangle LocoSymbolGreenRect = new Rectangle(64, 128, 64, 32);
206+
Rectangle LocoSymbolRedRect = new Rectangle(0, 256, 64, 32);
207207

208-
Rectangle HandBrakeNotAvailableRect = new Rectangle(0, 165, 32, 32);
209-
Rectangle HandBrakeSetRect = new Rectangle(33, 165, 32, 32);
210-
Rectangle HandBrakeNotSetRect = new Rectangle(66, 165, 32, 32);
208+
Rectangle HandBrakeNotAvailableRect = new Rectangle(0, 160, 32, 32);
209+
Rectangle HandBrakeSetRect = new Rectangle(32, 160, 32, 32);
210+
Rectangle HandBrakeNotSetRect = new Rectangle(64, 160, 32, 32);
211211

212-
Rectangle ETSconnected32Rect = new Rectangle(0, 198, 32, 32);
213-
Rectangle ETSdisconnected32Rect = new Rectangle(33, 198, 32, 32);
214-
Rectangle MUconnectedRect = new Rectangle(66, 198, 32, 32);
215-
Rectangle MUdisconnectedRect = new Rectangle(99, 198, 32, 32);
212+
Rectangle ETSconnected32Rect = new Rectangle(0, 192, 32, 32);
213+
Rectangle ETSdisconnected32Rect = new Rectangle(32, 192, 32, 32);
214+
Rectangle MUconnectedRect = new Rectangle(64, 192, 32, 32);
215+
Rectangle MUdisconnectedRect = new Rectangle(96, 192, 32, 32);
216216

217-
Rectangle FrontAngleCockClosedRect = new Rectangle(0, 231, 32, 32);
218-
Rectangle RearAngleCockClosedRect = new Rectangle(33, 231, 32, 32);
219-
Rectangle FrontAngleCockOpenedRect = new Rectangle(66, 231, 32, 32);
220-
Rectangle RearAngleCockOpenedRect = new Rectangle(99, 231, 32, 32);
217+
Rectangle FrontAngleCockClosedRect = new Rectangle(0, 224, 32, 32);
218+
Rectangle RearAngleCockClosedRect = new Rectangle(32, 224, 32, 32);
219+
Rectangle FrontAngleCockOpenedRect = new Rectangle(64, 224, 32, 32);
220+
Rectangle RearAngleCockOpenedRect = new Rectangle(96, 224, 32, 32);
221221

222-
Rectangle PowerOnRect = new Rectangle(0, 297, 32, 32);
223-
Rectangle PowerOffRect = new Rectangle(33, 297, 32, 32);
224-
Rectangle PowerChangingRect = new Rectangle(66, 297, 32, 32);
222+
Rectangle PowerOnRect = new Rectangle(0, 288, 32, 32);
223+
Rectangle PowerOffRect = new Rectangle(32, 288, 32, 32);
224+
Rectangle PowerChangingRect = new Rectangle(64, 288, 32, 32);
225225

226-
Rectangle ResetBrakesOffRect = new Rectangle(66, 264, 32, 32);
227-
Rectangle ResetBrakesOnRect = new Rectangle(99, 264, 32, 32);
226+
Rectangle ResetBrakesOffRect = new Rectangle(64, 256, 32, 32);
227+
Rectangle ResetBrakesOnRect = new Rectangle(96, 256, 32, 32);
228228

229229
var GraphicsDeviceRender = Owner.Viewer.RenderProcess.GraphicsDevice;
230230
var TrainOperationsPath = System.IO.Path.Combine(Owner.Viewer.ContentPath, "TrainOperations\\TrainOperationsMap32.png");

‎Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -183,46 +183,46 @@ protected internal override void Initialize()
183183
if (Coupler == null)
184184
{
185185
// texture rectangles : X, Y, width, height
186-
Rectangle ArrowLeftRect = new Rectangle(51, 119, 16, 16);
187-
Rectangle ArrowRightRect = new Rectangle(51, 68, 16, 16);
186+
Rectangle ArrowLeftRect = new Rectangle(48, 112, 16, 16);
187+
Rectangle ArrowRightRect = new Rectangle(48, 64, 16, 16);
188188

189189
Rectangle BattAlwaysOnRect = new Rectangle(0, 0, 16, 16);
190-
Rectangle BattOffRect = new Rectangle(17, 0, 16, 16);
191-
Rectangle BattOnRect = new Rectangle(34, 0, 16, 16);
190+
Rectangle BattOffRect = new Rectangle(16, 0, 16, 16);
191+
Rectangle BattOnRect = new Rectangle(32, 0, 16, 16);
192192

193-
Rectangle EmptyRect = new Rectangle(51, 0, 16, 16);
193+
Rectangle EmptyRect = new Rectangle(48, 0, 16, 16);
194194

195-
Rectangle BleedOffValveNotAvailableRect = new Rectangle(0, 17, 16, 16);
196-
Rectangle BleedOffValveClosedRect = new Rectangle(17, 17, 16, 16);
197-
Rectangle BleedOffValveOpenedRect = new Rectangle(34, 17, 16, 16);
195+
Rectangle BleedOffValveNotAvailableRect = new Rectangle(0, 16, 16, 16);
196+
Rectangle BleedOffValveClosedRect = new Rectangle(16, 16, 16, 16);
197+
Rectangle BleedOffValveOpenedRect = new Rectangle(32, 16, 16, 16);
198198

199-
Rectangle BrakeHoseConRect = new Rectangle(0, 34, 16, 16);
200-
Rectangle BrakeHoseDisRect = new Rectangle(17, 34, 16, 16);
201-
Rectangle BrakeHoseFirstDisRect = new Rectangle(34, 34, 16, 16);
202-
Rectangle BrakeHoseLastDisRect = new Rectangle(51, 34, 16, 16);
199+
Rectangle BrakeHoseConRect = new Rectangle(0, 32, 16, 16);
200+
Rectangle BrakeHoseDisRect = new Rectangle(16, 32, 16, 16);
201+
Rectangle BrakeHoseFirstDisRect = new Rectangle(32, 32, 16, 16);
202+
Rectangle BrakeHoseLastDisRect = new Rectangle(48, 32, 16, 16);
203203

204-
Rectangle CouplerNotAvailableRect = new Rectangle(0, 51, 16, 16);
205-
Rectangle CouplerFrontRect = new Rectangle(17, 51, 16, 16);
206-
Rectangle CouplerRect = new Rectangle(34, 51, 16, 16);
207-
Rectangle CouplerRearRect = new Rectangle(51, 51, 16, 16);
204+
Rectangle CouplerNotAvailableRect = new Rectangle(0, 48, 16, 16);
205+
Rectangle CouplerFrontRect = new Rectangle(16, 48, 16, 16);
206+
Rectangle CouplerRect = new Rectangle(32, 48, 16, 16);
207+
Rectangle CouplerRearRect = new Rectangle(48, 48, 16, 16);
208208

209-
Rectangle HandBrakeNotAvailableRect = new Rectangle(0, 68, 16, 16);
210-
Rectangle HandBrakeSetRect = new Rectangle(17, 68, 16, 16);
211-
Rectangle HandBrakeNotSetRect = new Rectangle(34, 68, 16, 16);
209+
Rectangle HandBrakeNotAvailableRect = new Rectangle(0, 64, 16, 16);
210+
Rectangle HandBrakeSetRect = new Rectangle(16, 64, 16, 16);
211+
Rectangle HandBrakeNotSetRect = new Rectangle(32, 64, 16, 16);
212212

213-
Rectangle ETSconnectedRect = new Rectangle(0, 85, 16, 16);
214-
Rectangle ETSdisconnectedRect = new Rectangle(17, 85, 16, 16);
215-
Rectangle MUconnectedRect = new Rectangle(34, 85, 16, 16);
216-
Rectangle MUdisconnectedRect = new Rectangle(51, 85, 16, 16);
213+
Rectangle ETSconnectedRect = new Rectangle(0, 80, 16, 16);
214+
Rectangle ETSdisconnectedRect = new Rectangle(16, 80, 16, 16);
215+
Rectangle MUconnectedRect = new Rectangle(32, 80, 16, 16);
216+
Rectangle MUdisconnectedRect = new Rectangle(48, 80, 16, 16);
217217

218-
Rectangle FrontAngleCockClosedRect = new Rectangle(0, 102, 16, 16);
219-
Rectangle RearAngleCockClosedRect = new Rectangle(17, 102, 16, 16);
220-
Rectangle FrontAngleCockOpenedRect = new Rectangle(34, 102, 16, 16);
221-
Rectangle RearAngleCockOpenedRect = new Rectangle(51, 102, 16, 16);
218+
Rectangle FrontAngleCockClosedRect = new Rectangle(0, 96, 16, 16);
219+
Rectangle RearAngleCockClosedRect = new Rectangle(16, 96, 16, 16);
220+
Rectangle FrontAngleCockOpenedRect = new Rectangle(32, 96, 16, 16);
221+
Rectangle RearAngleCockOpenedRect = new Rectangle(48, 96, 16, 16);
222222

223-
Rectangle PowerOnRect = new Rectangle(0, 119, 16, 16);
224-
Rectangle PowerOffRect = new Rectangle(17, 119, 16, 16);
225-
Rectangle PowerChangingRect = new Rectangle(34, 119, 16, 16);
223+
Rectangle PowerOnRect = new Rectangle(0, 112, 16, 16);
224+
Rectangle PowerOffRect = new Rectangle(16, 112, 16, 16);
225+
Rectangle PowerChangingRect = new Rectangle(32, 112, 16, 16);
226226

227227
var GraphicsDeviceRender = Owner.Viewer.RenderProcess.GraphicsDevice;
228228
var TrainOperationsPath = System.IO.Path.Combine(Owner.Viewer.ContentPath, "TrainOperations\\TrainOperationsMap.png");
@@ -244,7 +244,7 @@ protected internal override void Initialize()
244244

245245
BrakeHoseCon = SharedTextureManager.Get(GraphicsDeviceRender, TrainOperationsPath, BrakeHoseConRect);
246246
BrakeHoseDis = SharedTextureManager.Get(GraphicsDeviceRender, TrainOperationsPath, BrakeHoseDisRect);
247-
BrakeHoseFirstDis = SharedTextureManager.Get(GraphicsDeviceRender, TrainOperationsPath, BrakeHoseLastDisRect);
247+
BrakeHoseFirstDis = SharedTextureManager.Get(GraphicsDeviceRender, TrainOperationsPath, BrakeHoseFirstDisRect);
248248
BrakeHoseLastDis = SharedTextureManager.Get(GraphicsDeviceRender, TrainOperationsPath, BrakeHoseLastDisRect);
249249

250250
FrontAngleCockOpened = SharedTextureManager.Get(GraphicsDeviceRender, TrainOperationsPath, FrontAngleCockOpenedRect);

0 commit comments

Comments
 (0)