Skip to content

Commit 6d23001

Browse files
committed
Automatic merge of T1.5.1-870-ge0bf062eb and 18 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting - 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 9c456aa: Blueprint/train car operations UI window - Pull request #885 at 8f94333: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - 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 #897 at 42f1dd9: feat: Improved system information collection - Pull request #903 at 9bead33: Downloading route content (Github, zip) - Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel - Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR - Pull request #912 at d595703: New Triple Valve Features Vol. 2 - Pull request #914 at 2ffadd6: Adjustments to Duplex steam - Pull request #915 at 6d911d7: Correct calculation error with curve friction - Pull request #917 at 3bbf66e: Lighting Configuration Enhancements - Pull request #919 at 7aafe02: Added mouse wheel support for controls which can be moved by pressing t… - Pull request #920 at a94e403: Update RailDriver in Manual
20 parents f4c1169 + e0bf062 + 3539862 + d00beb9 + f92de76 + 9c456aa + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 42f1dd9 + 9bead33 + 9b0b04f + 6834af0 + d595703 + 2ffadd6 + 6d911d7 + 3bbf66e + 7aafe02 + a94e403 commit 6d23001

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2050,15 +2050,7 @@ public CabViewDiscreteRenderer(Viewer viewer, MSTSLocomotive locomotive, CVCWith
20502050
default:
20512051
ChangedValue = (value) =>
20522052
{
2053-
if (UserInput.IsMouseLeftButtonDown)
2054-
{
2055-
return value + NormalizedMouseMovement();
2056-
}
2057-
else
2058-
{
2059-
// mousewheel
2060-
return value + (float)UserInput.MouseWheelChange / 1500;
2061-
}
2053+
return value + NormalizedMouseMovement();
20622054
};
20632055
break;
20642056
}
@@ -2375,8 +2367,8 @@ float NormalizedMouseMovement()
23752367
{
23762368
// mousewheel
23772369
return (ControlDiscrete.Orientation > 0
2378-
? (float)UserInput.MouseWheelChange / (float)Control.Height
2379-
: (float)UserInput.MouseWheelChange / (float)Control.Width)
2370+
? (float)UserInput.MouseWheelChange / (float)1500
2371+
: (float)UserInput.MouseWheelChange / (float)1500)
23802372
* (ControlDiscrete.Direction > 0 ? -1 : 1);
23812373
}
23822374
}

0 commit comments

Comments
 (0)