Merge pull request #1051 from pzgulyas/cabmouse

Mouse wheel support for cabview controls + refactor

Author: cjakeman

Source/RunActivity/Viewer3D/Cameras.cs

@@ -270,7 +270,7 @@ protected void ZoomByMouseWheel(float speed)
         {
             // Will not zoom-in-out when help windows is up.
             // TODO: Property input processing through WindowManager.
-            if (UserInput.IsMouseWheelChanged && !Viewer.HelpWindow.Visible)
+            if (UserInput.IsMouseWheelChanged && !Viewer.HelpWindow.Visible && !Viewer.RenderProcess.IsMouseVisible)
             {
                 var fieldOfView = MathHelper.Clamp(FieldOfView - speed * UserInput.MouseWheelChange / 10, 1, 135);
                 new FieldOfViewCommand(Viewer.Log, fieldOfView);

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

@@ -2336,8 +2336,8 @@ public virtual int GetDrawIndex()
         float NormalizedMouseMovement()
         {
             return (ControlDiscrete.Orientation > 0
-                ? (float)UserInput.MouseMoveY / (float)Control.Height
-                : (float)UserInput.MouseMoveX / (float)Control.Width)
+                ? (float)(UserInput.MouseMoveY + UserInput.MouseWheelChange) / (float)Control.Height
+                : (float)(UserInput.MouseMoveX + UserInput.MouseWheelChange) / (float)Control.Width)
                 * (ControlDiscrete.Direction > 0 ? -1 : 1);
         }
 
@@ -3367,10 +3367,15 @@ public ThreeDimentionCabViewer(Viewer viewer, MSTSLocomotive car, MSTSLocomotive
                             break;
                     }
 
+                    // This is the case for .s files, for glTF-s it will not be true
+                    var targetNode = iMatrix;
+
                     if (style != null && style is CabViewDigitalRenderer)//digits?
                     {
                         //DigitParts.Add(key, new DigitalDisplay(viewer, TrainCarShape, iMatrix, parameter, locoViewer.ThreeDimentionCabRenderer.ControlMap[key]));
                         DigitParts3D.Add(key, new ThreeDimCabDigit(viewer, iMatrix, parameter1, parameter2, this.TrainCarShape, locoViewer.ThreeDimentionCabRenderer.ControlMap[key], Locomotive));
+                        if (!TrainCarShape.SharedShape.StoredResultMatrixes.ContainsKey(targetNode))
+                            TrainCarShape.SharedShape.StoredResultMatrixes.Add(targetNode, Matrix.Identity);
                     }
                     else if (style != null && style is CabViewGaugeRenderer)
                     {
@@ -3379,6 +3384,8 @@ public ThreeDimentionCabViewer(Viewer viewer, MSTSLocomotive car, MSTSLocomotive
                         if (CVFR.GetGauge().ControlStyle != CABViewControlStyles.POINTER) //pointer will be animated, others will be drawn dynamicaly
                         {
                             Gauges.Add(key, new ThreeDimCabGaugeNative(viewer, iMatrix, parameter1, parameter2, this.TrainCarShape, locoViewer.ThreeDimentionCabRenderer.ControlMap[key]));
+                            if (!TrainCarShape.SharedShape.StoredResultMatrixes.ContainsKey(targetNode))
+                                TrainCarShape.SharedShape.StoredResultMatrixes.Add(targetNode, Matrix.Identity);
                         }
                         else
                         {//for pointer animation
@@ -3390,11 +3397,15 @@ public ThreeDimentionCabViewer(Viewer viewer, MSTSLocomotive car, MSTSLocomotive
                             }
                             else tmpPart = AnimateParts[key];
                             tmpPart.AddMatrix(iMatrix); //tmpPart.SetPosition(false);
+                            if (!TrainCarShape.SharedShape.StoredResultMatrixes.ContainsKey(targetNode))
+                                TrainCarShape.SharedShape.StoredResultMatrixes.Add(targetNode, Matrix.Identity);
                         }
                     }
                     else if (style != null && style is DistributedPowerInterfaceRenderer)
                     {
                         DPIDisplays3D.Add(key, new ThreeDimCabDPI(viewer, iMatrix, parameter1, parameter2, this.TrainCarShape, locoViewer.ThreeDimentionCabRenderer.ControlMap[key]));
+                        if (!TrainCarShape.SharedShape.StoredResultMatrixes.ContainsKey(targetNode))
+                            TrainCarShape.SharedShape.StoredResultMatrixes.Add(targetNode, Matrix.Identity);
                     }
                     else
                     {
@@ -3406,6 +3417,8 @@ public ThreeDimentionCabViewer(Viewer viewer, MSTSLocomotive car, MSTSLocomotive
                         }
                         else tmpPart = AnimateParts[key];
                         tmpPart.AddMatrix(iMatrix); //tmpPart.SetPosition(false);
+                        if (!TrainCarShape.SharedShape.StoredResultMatrixes.ContainsKey(targetNode))
+                            TrainCarShape.SharedShape.StoredResultMatrixes.Add(targetNode, Matrix.Identity);
                     }
                 }
             }

Source/RunActivity/Viewer3D/Shapes.cs

@@ -1976,6 +1976,11 @@ public class SharedShape : IDisposable
         public string SoundFileName = "";
         public float CustomAnimationFPS = 8;
 
+        /// <summary>
+        /// Store for matrixes needed to be reused in later calculations, e.g. for 3d cabview mouse control
+        /// </summary>
+        public readonly Dictionary<int, Matrix> StoredResultMatrixes = new Dictionary<int, Matrix>();
+
 
         readonly Viewer Viewer;
         public readonly string FilePath;
@@ -2610,6 +2615,9 @@ public void PrepareFrame(RenderFrame frame, WorldPosition location, Matrix[] ani
                         }
                         Matrix.Multiply(ref xnaMatrix, ref xnaDTileTranslation, out xnaMatrix);
 
+                        if (StoredResultMatrixes.ContainsKey(shapePrimitive.HierarchyIndex))
+                            StoredResultMatrixes[shapePrimitive.HierarchyIndex] = xnaMatrix;
+
                         // TODO make shadows depend on shape overrides
 
                         var interior = (flags & ShapeFlags.Interior) != 0;