Visual Scripting Changes

.gitignore

@@ -367,7 +367,7 @@ MigrationBackup/
 # Vi swap files
 *.swp
 
-**/Plugins/**
+/VisualPinball.Unity/Plugins/**
 
 obj.meta
 VisualPinball.Unity/VisualPinball.Unity.Test/TestProject~/*.vpx
@@ -386,4 +386,4 @@ VisualPinball.Unity/VisualPinball.Unity.Test/TestProject~/VisualPinball.Unity.cs
 VisualPinball.Unity/VisualPinball.Unity.Test/TestProject~/editmode-results.xml
 
 .DS_Store
-
+

VisualPinball.Engine.Test/VisualPinball.Engine.Test.csproj

@@ -24,14 +24,14 @@
     <None Remove="Fixtures*/*" Visible="false" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="3.1.0">
+    <PackageReference Include="coverlet.msbuild" Version="3.1.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211130-02" />
-    <PackageReference Include="FluentAssertions" Version="6.3.0" ExcludeAssets="Compile" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0-preview-20220131-20" />
+    <PackageReference Include="FluentAssertions" Version="6.5.1" ExcludeAssets="Compile" />
     <PackageReference Include="JeremyAnsel.Media.WavefrontObj" Version="2.0.19" />
   </ItemGroup>
   <ItemGroup>
@@ -40,7 +40,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="FluentAssertions">
-      <HintPath>$(NuGetPackageRoot)\fluentassertions\6.3.0\lib\netstandard2.1\FluentAssertions.dll</HintPath>
+      <HintPath>$(NuGetPackageRoot)\fluentassertions\6.5.1\lib\netstandard2.1\FluentAssertions.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Target Name="PluginsDeploy" AfterTargets="Build">

VisualPinball.Engine/Common/Constants.cs

@@ -148,6 +148,10 @@ public static class InputConstants
 		public const string ActionCoinDoorDown = "Coin Door Down (WPC)";
 		public const string ActionCoinDoorUp = "Coin Door Up (WPC)";
 		public const string ActionCoinDoorEnter = "Coin Door Enter (WPC)";
+		public const string ActionCoinDoorBack = "Coin Door Back (SAM)";
+		public const string ActionCoinDoorMinus = "Coin Door Minus (-) (SAM)";
+		public const string ActionCoinDoorPlus = "Coin Door Plus (+) (SAM)";
+		public const string ActionCoinDoorSelect = "Coin Door Select (SAM)";
 		public const string ActionCoinDoorAdvance = "Coin Door Advance";
 		public const string ActionCoinDoorUpDown = "Coin Door Up/Down";
 		public const string ActionSlamTilt = "Slam Tilt";

VisualPinball.Engine/Game/Engines/GamelogicEngineLamp.cs

@@ -107,4 +107,92 @@ public enum LampType
 		RgbMulti = 2,
 		Rgb = 3,
 	}
+
+	public enum LampStatus
+	{
+		Off = 0,
+		On = 1,
+		Blinking = 2,
+	}
+
+	public class LampState
+	{
+		public LampStatus Status {
+			get => _status;
+			set {
+				if (value != LampStatus.Off) {
+					_lastOnStatus = value;
+				}
+				_status = value;
+			}
+		}
+
+		public bool IsOn {
+			get => _status is LampStatus.On or LampStatus.Blinking;
+			set => _status = value ? _lastOnStatus : LampStatus.Off;
+		}
+
+		public float Intensity {
+			get => Color.A;
+			set => Color = Color.WithAlpha(value);
+		}
+
+		public Color Color;
+
+		private LampStatus _status;
+		private LampStatus _lastOnStatus = LampStatus.On;
+
+		public LampState(LampStatus status, Color color)
+		{
+			Status = status;
+			Color = color;
+		}
+
+		public LampState(float intensity)
+		{
+			if (intensity == 0f) {
+				_status = LampStatus.Off;
+				Color = new Color(255, 255, 255, 255);
+
+			} else {
+				_status = LampStatus.On;
+				Color = new Color(255, 255, 255, (int)(intensity * 255));
+			}
+		}
+
+		public LampState(Color color)
+		{
+			_status = color.A > 0 ? LampStatus.On : LampStatus.Off;
+			Color = color;
+		}
+
+		public void SetChannel(ColorChannel channel, float value)
+		{
+			switch (channel) {
+
+				case ColorChannel.Red:
+					Color.R = value;
+					break;
+				case ColorChannel.Green:
+					Color.G = value;
+					break;
+				case ColorChannel.Blue:
+					Color.B = value;
+					break;
+				case ColorChannel.Alpha:
+					Color.A = value;
+					break;
+
+				default:
+					throw new ArgumentOutOfRangeException(nameof(channel), channel, null);
+			}
+		}
+
+		public override string ToString()
+		{
+			return $"[{_status}] {Color}";
+		}
+
+		public static LampState Default => new LampState(LampStatus.Off, Colors.White);
+	}
 }

VisualPinball.Engine/Math/Color.cs

@@ -14,10 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+// ReSharper disable InconsistentNaming
+
 using System;
 
 namespace VisualPinball.Engine.Math
 {
+	// todo make struct
 	[Serializable]
 	public class Color
 	{
@@ -26,10 +29,10 @@ public class Color
 		public int Blue;
 		public int Alpha = 0xff;
 
-		public float R => Red / 255f;
-		public float G => Green / 255f;
-		public float B => Blue / 255f;
-		public float A => Alpha / 255f;
+		public float R { get => Red / 255f; set => Red = (int)(value * 255f); }
+		public float G { get => Green / 255f; set => Green = (int)(value * 255f); }
+		public float B { get => Blue / 255f; set => Blue = (int)(value * 255f); }
+		public float A { get => Alpha / 255f; set => Alpha = (int)(value * 255f); }
 
 		public uint Bgr => (uint)Alpha * 16777216 + (uint)Blue * 65536 + (uint)Green * 256 + (uint)Red;
 
@@ -69,11 +72,23 @@ public Color WithAlpha(int alpha)
 			return new Color(Red, Green, Blue, alpha);
 		}
 
+		public Color WithAlpha(float alpha)
+		{
+			return new Color(Red, Green, Blue, (int)(alpha * 255f));
+		}
+
 		public bool IsGray()
 		{
 			return Red == Green && Green == Blue;
 		}
 
+		public void SetColorWithoutAlpha(Color color)
+		{
+			Red = color.Red;
+			Green = color.Green;
+			Blue = color.Blue;
+		}
+
 		public override string ToString()
 		{
 			return $"rgba({System.Math.Round(R, 3)}, {System.Math.Round(G, 3)}, {System.Math.Round(B, 3)}, {System.Math.Round(A, 3)})";

VisualPinball.Engine/VisualPinball.Engine.csproj

@@ -28,12 +28,12 @@
     <None Remove="obj\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NLog" Version="4.7.13" />
+    <PackageReference Include="NLog" Version="4.7.14" />
     <PackageReference Include="OpenMcdf" Version="2.2.1.9" />
     <PackageReference Include="NetMiniZ" Version="1.3.0-preview.1" />
     <PackageReference Include="NetMiniZ.Native" Version="1.3.0" />
     <PackageReference Include="NetVips" Version="2.1.0" />
-    <PackageReference Include="NetVips.Native" Version="8.12.1" />
+    <PackageReference Include="NetVips.Native" Version="8.12.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VisualPinball.Resources\VisualPinball.Resources.csproj" />
@@ -60,7 +60,7 @@
     </ItemGroup>
     <ItemGroup Condition="'$(RuntimeIdentifier)' != 'ios-arm64' And '$(RuntimeIdentifier)' != 'android-arm64-v8a'">
       <Plugins Include="$(NuGetPackageRoot)\netminiz.native.$(RuntimeIdentifier)\1.3.0\runtimes\$(RuntimeIdentifier)\native\*" />
-      <Plugins Include="$(NuGetPackageRoot)\netvips.native.$(RuntimeIdentifier)\8.12.1\runtimes\$(RuntimeIdentifier)\native\*" />
+      <Plugins Include="$(NuGetPackageRoot)\netvips.native.$(RuntimeIdentifier)\8.12.2\runtimes\$(RuntimeIdentifier)\native\*" />
     </ItemGroup>
     <Message Text="PluginsDeploy: @(Plugins)" />
     <Copy SourceFiles="@(Plugins)" DestinationFolder="..\VisualPinball.Unity\Plugins\$(RuntimeIdentifier)\" SkipUnchangedFiles="true" />