Skip to content

Commit c274e2c

Browse files
committed
Automatic merge of T1.5.1-757-gef6c1a8c8 and 16 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 #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 #882 at a055bca: Blueprint/train car operations UI window - Pull request #885 at d9ce84b: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - Pull request #888 at b20b888: docs: Document player application model - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #893 at bf8876b: Signal errors - Pull request #894 at 5ff1e73: 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 0a9d939: feat: Improved system information collection - Pull request #898 at e271395: Extra line with all the arguments for debugging purposes in logfile - Pull request #899 at 0c11dc0: Duplex steam engines - Booster Engine addition
18 parents 0e472d0 + ef6c1a8 + 3539862 + d00beb9 + f8dbeab + 43bf33e + f92de76 + a055bca + d9ce84b + 6c0785b + b20b888 + 1f5ba4c + bf8876b + 5ff1e73 + 5866028 + 0a9d939 + e271395 + 0c11dc0 commit c274e2c

File tree

4 files changed

+299
-29
lines changed

4 files changed

+299
-29
lines changed

Source/Contrib/TrackViewer/Drawing/Labels/DrawLabels.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ private void CreateContextMenu()
155155
ContextMenu.Items.Add(EditLabelMenuItem);
156156

157157
SetLocationMenuItem = new MenuItem() { Header = "View scene here" };
158+
SetLocationMenuItem.Icon = TrackViewer.menuControl.ThreeDSceneIcon;
158159
SetLocationMenuItem.Click += new RoutedEventHandler((sender, e) => TrackViewer.menuControl.MenuSceneWindow_Click(sender, e));
159160
SetLocationMenuItem.Click += new RoutedEventHandler(async (sender, e) => await TrackViewer.SceneView?.SetCameraLocation(
160161
SetLocationMenuItem.CommandParameter as WorldLocation? ?? new WorldLocation()));

Source/Contrib/TrackViewer/UserInterface/MenuControl.xaml

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,36 @@
6262
<Separator/>
6363
<MenuItem Header="Anti aliasing (needs restart)" Name="menuDoAntiAliasing" IsCheckable="True" Click="MenuDoAntiAliasing_Click"/>
6464
<Separator/>
65-
<MenuItem Header="Scene" Name="menuSceneWindow" IsCheckable="False" Click="MenuSceneWindow_Click"/>
65+
<MenuItem Header="Scene" Name="menuSceneWindow" IsCheckable="False" Click="MenuSceneWindow_Click">
66+
<MenuItem.Icon>
67+
<Rectangle Width="16 " Height="16" Name="ThreeDSceneIcon">
68+
<Rectangle.Resources>
69+
<SolidColorBrush x:Key="canvas3D" Opacity="0" />
70+
<SolidColorBrush x:Key="light-defaultgrey-103D" Color="#212121" Opacity="0.1" />
71+
<SolidColorBrush x:Key="light-defaultgrey3D" Color="#212121" Opacity="1" />
72+
</Rectangle.Resources>
73+
<Rectangle.Fill>
74+
<DrawingBrush Stretch="None">
75+
<DrawingBrush.Drawing>
76+
<DrawingGroup>
77+
<DrawingGroup x:Name="canvas3D">
78+
<GeometryDrawing Brush="{DynamicResource canvas3D}" Geometry="F1M16,16H0V0H16Z" />
79+
</DrawingGroup>
80+
<DrawingGroup x:Name="level_13D">
81+
<GeometryDrawing Brush="{DynamicResource light-defaultgrey-103D}" Geometry="F1M11.5,8.953V13L8,15.015,4.5,13V8.953L8,6.932Z" />
82+
<GeometryDrawing Brush="{DynamicResource light-defaultgrey3D}" Geometry="F1M11.75,8.521,8.25,6.5h-.5L4.25,8.521,4,8.953v4.041l.25.433,3.5,2.021h.5l3.5-2.021.25-.433V8.953ZM7.5,14.15,5,12.705V9.86L7.5,11.3ZM8,10.438,5.465,8.974,8,7.51l2.535,1.464Zm3,2.267L8.5,14.15V11.3L11,9.86Z" />
83+
<GeometryDrawing Brush="{DynamicResource light-defaultgrey-103D}" Geometry="F1M4,11.466C2.582,11.307,1.5,10.49,1.5,9.5l3-7L6.519,7.211,4.25,8.521,4,8.953Z" />
84+
<GeometryDrawing Brush="{DynamicResource light-defaultgrey3D}" Geometry="F1M4,11.965C2.285,11.8,1,10.78,1,9.5l.041-.2,3-7h.918L6.932,6.972l-.849.491L4.5,3.77,2.005,9.592c.071.671.919,1.238,2,1.375Z" />
85+
<GeometryDrawing Brush="{DynamicResource light-defaultgrey-103D}" Geometry="F1M15.5,7A3.5,3.5,0,0,1,12,10.5V8.953l-.25-.432L8.534,6.664A3.491,3.491,0,0,1,15.5,7Z" />
86+
<GeometryDrawing Brush="{DynamicResource light-defaultgrey3D}" Geometry="F1M16,7a4,4,0,0,1-4,4V10A3,3,0,1,0,9.006,6.937L8.25,6.5h-.2A3.99,3.99,0,0,1,16,7Z" />
87+
</DrawingGroup>
88+
</DrawingGroup>
89+
</DrawingBrush.Drawing>
90+
</DrawingBrush>
91+
</Rectangle.Fill>
92+
</Rectangle>
93+
</MenuItem.Icon>
94+
</MenuItem>
6695
</MenuItem>
6796
<MenuItem Header="Track _items" Name="menuTrackItems">
6897
<MenuItem Header="Show all items" Name="menuShowAll" IsCheckable="False" Click="MenuShowAll_Click"/>

0 commit comments

Comments
 (0)