Animated Clocks recognized by ClockHands without extern Files

Author: jonas-or

Source/RunActivity/Viewer3D/Scenery.cs

@@ -327,7 +327,7 @@ 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 isAnimatedClock = false; //Declare and preset shape is not an animated clock 
                 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,28 @@ public WorldFile(Viewer viewer, int tileX, int tileZ, bool visible)
                     }
                     else if (worldObject.GetType() == typeof(StaticObj))
                     {
-                        if (isAnalogClock)
+                        isAnimatedClock = false;                                                              //Preset
+                        //          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));
+                        if (preTestShape.SharedShape.Animations != null)                                      // shape has an Animation at all
+                        {
+                            if (preTestShape.SharedShape.Animations[0].anim_nodes.Count > 1)                  // shape has more than 1 anim node
+                            {
+                                //lookup in all anim nodes of the shape for subobjects named as clock hands
+                                foreach (var animNodes in preTestShape.SharedShape.Animations[0].anim_nodes)
+                                {
+                                    if (animNodes.Name.ToLowerInvariant().IndexOf("hand_clock") == 6)        //Shape anim node name contains "hand_clock"
+                                    {
+                                        if (animNodes.Name.ToLowerInvariant().IndexOf("orts_") == 0)         //Shape anim node name begins with "ORTS_"
+                                        {
+                                            isAnimatedClock = true;                                          //Shape is animated clock
+                                            break;                                                           //Exit because of find a clock hand subobject
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        if (isAnimatedClock)
                         {
                             sceneryObjects.Add(new AnalogClockShape(viewer, shapeFilePath, worldMatrix, shadowCaster ? ShapeFlags.ShadowCaster : ShapeFlags.None));
                         }