Skip to content

Commit 4de820a

Browse files
committed
Automatic merge of T1.5.1-689-g9d41208f0 and 19 pull requests
- Pull request #570 at c59c788: 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 #865 at 67014b7: Dispatcher window improvements - Pull request #874 at f8dbeab: Dynamic brake controller refactoring - Pull request #875 at 43bf33e: Bug fix for https://bugs.launchpad.net/or/+bug/2036346 Player train switching doesn't work with 3D cabs - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #878 at 8a6acee: Implement Polach Adhesion - Pull request #882 at 7fbe46c: Blueprint/train car operations UI window - Pull request #883 at edcc2dd: SwitchPanel disconnect/connect handling - Pull request #885 at c81447b: feat: Add notifications to Menu - Pull request #886 at 228f0f0: Scene viewer extension to TrackViewer - Pull request #888 at d7daf62: docs: Document player application model - Pull request #889 at 43341cf: No speed update - Pull request #890 at 39a9fa4: Allow depart early - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #893 at bf8876b: Signal errors - Pull request #894 at 794fddf: Correct Decrease Colour - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #897 at 64a29c8: feat: Improved system information collection
21 parents a3fdf24 + 9d41208 + c59c788 + d00beb9 + 67014b7 + f8dbeab + 43bf33e + f92de76 + 8a6acee + 7fbe46c + edcc2dd + c81447b + 228f0f0 + d7daf62 + 43341cf + 39a9fa4 + 1f5ba4c + bf8876b + 794fddf + 5866028 + 64a29c8 commit 4de820a

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

Source/Documentation/Manual/physics.rst

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -254,14 +254,21 @@ simplicity, only one axle model is computed (and animated). A tilting
254254
feature and the independent axle adhesion model will be introduced in the
255255
future.
256256

257-
The advanced adhesion model uses two alternate algorithims to calculate the
258-
wheel adhesion. The first model is based upon an algorithim by Pacha, whilst the second
259-
uses an algorithim developed by Polach. The Polach algorithim provides
257+
The advanced adhesion model uses two alternate algorithms to calculate the
258+
wheel adhesion. The first model is based upon an algorithm by Pacha, whilst the second
259+
uses an algorithm developed by Polach. The Polach algorithm provides
260260
a more accurate outcome and facilitates the future inclusion of track conditions.
261-
However it is more CPU load intensive then the Pacha one. This can produce low
262-
frame rates for the screen display. Hence OR automatically sense the CPU load,
263-
and switches to the Pacha algorithim at high loads and to the Polach algorithim
264-
under lower CPU loads.
261+
However due to the number of algorithm steps required to calculate the wheel adhesion
262+
value, it is more CPU load intensive then the Pacha one. This can produce low
263+
frame rates for the screen display in machines with low performance specifications.
264+
265+
Hence OR automatically senses the CPU load, and switches to the Pacha algorithm at
266+
high loads and to the Polach algorithm under lower CPU loads. In this way OR attempts
267+
to support the operation of lower specification computers. When OR is using the
268+
Pacha algorithm, the "Wheel Adh (Max)" values will both read 99%, whereas when the
269+
Polach algorithm is being used these values will be around the expected values of 30-55%.
270+
271+
265272

266273
The heart of the adhesion algorithim is the slip characteristics (pictured below).
267274

0 commit comments

Comments
 (0)