Merge pull request #417 from jonas-or/AnimatedClocks_RegByHands

Animated Clocks recognized by ClockHands without extern Files
http://www.elvastower.com/forums/index.php?/topic/29546-station-clocks/page__view__findpost__p__271797

Author: cjakeman

Source/Documentation/Manual/features-route.rst

@@ -922,10 +922,6 @@ You will need:
 
    For each shape of clock in the route, a reference to the shape file in the reference file.
 
-#. Animated Clocks List File
-
-   A file listing the shape file for each clock that Open Rails is to animate.
-
 #. World File
 
    The location of each clock in the world must be given in the world file.
@@ -990,26 +986,6 @@ Details
 	    Description ( "ChurchClock" )
     )	
 
-#. Animated Clocks List File
-
-   Create a file ROUTES\\<route_name>\\animated.clocks-or file the file for each shape of clock that Open Rails will animate.
-   The type parameter is always "analog" as "digital" types are not yet supported.::		
-   
-      [
-         {
-            "Name": "Clock01.s",
-            "ClockType": "analog"
-         },
-         {
-            "Name": "ChurchClock.s",
-            "ClockType": "analog"
-         },
-         {
-            "Name": "PlatformClock.s",
-            "ClockType": "analog"
-         }
-      ]
-
 #. World File
 
    Use a route editor to locate the clocks in the world file. 

Source/RunActivity/Viewer3D/Scenery.cs

@@ -51,6 +51,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace Orts.Viewer3D
 {
@@ -327,7 +328,6 @@ public WorldFile(Viewer viewer, int tileX, int tileZ, bool visible)
 
                 var shadowCaster = (worldObject.StaticFlags & (uint)StaticFlag.AnyShadow) != 0 || viewer.Settings.ShadowAllShapes;
                 var animated = (worldObject.StaticFlags & (uint)StaticFlag.Animate) != 0;
-                var isAnalogClock = GetClockType(worldObject.FileName) == ClockType.Analog;
                 var global = (worldObject is TrackObj) || (worldObject is HazardObj) || (worldObject.StaticFlags & (uint)StaticFlag.Global) != 0;
 
                 // TransferObj have a FileName but it is not a shape, so we need to avoid sanity-checking it as if it was.
@@ -480,7 +480,11 @@ public WorldFile(Viewer viewer, int tileX, int tileZ, bool visible)
                     }
                     else if (worldObject.GetType() == typeof(StaticObj))
                     {
-                        if (isAnalogClock)
+                        //          preTestShape for lookup if it is an animated clock shape with subobjects named as clock hands 
+                        StaticShape preTestShape = (new StaticShape(viewer, shapeFilePath, worldMatrix, shadowCaster ? ShapeFlags.ShadowCaster : ShapeFlags.None));
+                        var animNodes = preTestShape.SharedShape.Animations?[0]?.anim_nodes ?? new List<anim_node>();
+                        var isAnimatedClock = animNodes.Exists(node => Regex.IsMatch(node.Name, @"^orts_[hmsc]hand_clock", RegexOptions.IgnoreCase));
+                        if (isAnimatedClock)
                         {
                             sceneryObjects.Add(new AnalogClockShape(viewer, shapeFilePath, worldMatrix, shadowCaster ? ShapeFlags.ShadowCaster : ShapeFlags.None));
                         }