diff --git a/CHANGELOG.md b/CHANGELOG.md index 5740f02cd..2f50f6ae1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,10 @@ Built with Unity 2020.3. ### Added +- Support for dynamic wires, also known as *Fast Flip* ([#330](https://github.com/freezy/VisualPinball.Engine/pull/330), [Documentation](https://docs.visualpinball.org/creators-guide/editor/wire-manager.html#dynamic)). +- Component for light groups, allowing easy grouping of GI lamps. ([#330](https://github.com/freezy/VisualPinball.Engine/pull/330) ([Documentation](https://docs.visualpinball.org/creators-guide/manual/mechanisms/light-groups.html))). - Slingshot component ([#329](https://github.com/freezy/VisualPinball.Engine/pull/329), [Documentation](https://docs.visualpinball.org/creators-guide/manual/mechanisms/slingshots.html)). -- Create insert meshes ([#320](https://github.com/freezy/VisualPinball.Engine/pull/320)) +- Create insert meshes ([#320](https://github.com/freezy/VisualPinball.Engine/pull/320)). - Full support for custom playfield meshes. - Remove Hybrid Renderer ([#316](https://github.com/freezy/VisualPinball.Engine/pull/316)). - Create and use Unity assets when importing ([#320](https://github.com/freezy/VisualPinball.Engine/pull/302)). @@ -37,6 +39,7 @@ Built with Unity 2020.3. - Put game-, mesh-, collision- animation data into separate components ([#227](https://github.com/freezy/VisualPinball.Engine/pull/227), [Documentation](https://docs.visualpinball.org/creators-guide/editor/unity-components.html)). ### Fixed +- Lighting setup. It's now usable ([#330](https://github.com/freezy/VisualPinball.Engine/pull/330)). - Ball passing through collider plane and disappearing. - Alpha channel of color values is now correctly written ([#291](https://github.com/freezy/VisualPinball.Engine/pull/291)). - Layer names are correctly computed when importing a 10.6 file ([#291](https://github.com/freezy/VisualPinball.Engine/pull/291)). diff --git a/VisualPinball.Engine/Game/Engines/GamelogicEngineCoil.cs b/VisualPinball.Engine/Game/Engines/GamelogicEngineCoil.cs index 9b3aa916c..6ddae5e92 100644 --- a/VisualPinball.Engine/Game/Engines/GamelogicEngineCoil.cs +++ b/VisualPinball.Engine/Game/Engines/GamelogicEngineCoil.cs @@ -27,8 +27,8 @@ public class GamelogicEngineCoil : IGamelogicEngineDeviceItem public string Description { get => _description; set => _description = value; } public int InternalId; - public string DeviceHint; - public string DeviceItemHint; + public string DeviceHint { get => _deviceHint; set => _deviceHint = value; } + public string DeviceItemHint { get => _deviceItemHint; set => _deviceItemHint = value; } public bool IsLamp; /// @@ -38,6 +38,8 @@ public class GamelogicEngineCoil : IGamelogicEngineDeviceItem private string _description; private string _id; + private string _deviceHint; + private string _deviceItemHint; public GamelogicEngineCoil(string id) { diff --git a/VisualPinball.Engine/Game/Engines/GamelogicEngineLamp.cs b/VisualPinball.Engine/Game/Engines/GamelogicEngineLamp.cs index 3b63f363b..732faa1ce 100644 --- a/VisualPinball.Engine/Game/Engines/GamelogicEngineLamp.cs +++ b/VisualPinball.Engine/Game/Engines/GamelogicEngineLamp.cs @@ -17,30 +17,78 @@ // ReSharper disable InconsistentNaming using System; +using VisualPinball.Engine.Math; namespace VisualPinball.Engine.Game.Engines { [Serializable] public class GamelogicEngineLamp : IGamelogicEngineDeviceItem { - public string Id { get; set; } - public int InternalId; - public string Description { get; set; } - public string DeviceHint; - public string DeviceItemHint; - public string MainLampIdOfGreen; - public string MainLampIdOfBlue; - - public GamelogicEngineLamp(string id) - { - Id = id; - InternalId = int.TryParse(id, out var internalId) ? internalId : 0; + /// + /// The unique ID of this lamp, as the gamelogic engine addresses it. + /// + public string Id { get => _id; set => _id = value; } + + /// + /// Some gamelogic engines use integers for the ID. In order to avoid repetitive casting, we store it as integer as well. + /// + public int InternalId; + + /// + /// Which channel this lamp corresponds to. + /// + public ColorChannel Channel = ColorChannel.Alpha; + + /// + /// If it's a fading light, this is the value at maximal intensity. + /// + public int FadingSteps; + + /// + /// An optional description of the lamp. + /// + public string Description { get => _description; set => _description = value; } + + /// + /// How the gamelogic engine triggers the lamp. Either through GI or through the normal lamp API. + /// + /// + /// + /// Note that lamps connected to coils will appear under coils. + /// + public LampSource Source = LampSource.Lamp; + + /// + /// A regular expression to match the component on the playfield. + /// + public string DeviceHint { get => _deviceHint; set => _deviceHint = value; } + + /// + /// A regular expression to match the lamp component within the component. + /// + public string DeviceItemHint { get => _deviceItemHint; set => _deviceItemHint = value; } + + private string _description; + private string _id; + private string _deviceHint; + private string _deviceItemHint; + + public GamelogicEngineLamp(string id) + { + Id = id; + InternalId = int.TryParse(id, out var internalId) ? internalId : 0; + } + + public GamelogicEngineLamp(string id, int internalId) + { + Id = id; + InternalId = internalId; + } } - public GamelogicEngineLamp(string id, int internalId) + public enum LampSource { - Id = id; - InternalId = internalId; - } + Lamp = 0, + GI = 1, } } diff --git a/VisualPinball.Engine/Game/Engines/GamelogicEngineSwitch.cs b/VisualPinball.Engine/Game/Engines/GamelogicEngineSwitch.cs index 5697adb3b..f88d61a37 100644 --- a/VisualPinball.Engine/Game/Engines/GamelogicEngineSwitch.cs +++ b/VisualPinball.Engine/Game/Engines/GamelogicEngineSwitch.cs @@ -61,12 +61,15 @@ public class GamelogicEngineSwitch : IGamelogicEngineDeviceItem public string Description { get => _description; set => _description = value; } public string InputActionHint; public string InputMapHint; - public string DeviceHint; - public string DeviceItemHint; + + public string DeviceHint { get => _deviceHint; set => _deviceHint = value; } + public string DeviceItemHint { get => _deviceItemHint; set => _deviceItemHint = value; } public SwitchConstantHint ConstantHint = SwitchConstantHint.None; private string _description; private string _id; + private string _deviceHint; + private string _deviceItemHint; public GamelogicEngineSwitch(string id) { diff --git a/VisualPinball.Engine/Game/Engines/GamelogicEngineWire.cs b/VisualPinball.Engine/Game/Engines/GamelogicEngineWire.cs new file mode 100644 index 000000000..2dd4af532 --- /dev/null +++ b/VisualPinball.Engine/Game/Engines/GamelogicEngineWire.cs @@ -0,0 +1,44 @@ +// Visual Pinball Engine +// Copyright (C) 2021 freezy and VPE Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +// ReSharper disable InconsistentNaming + +using System; + +namespace VisualPinball.Engine.Game.Engines +{ + [Serializable] + public class GamelogicEngineWire + { + public string Description; + public string SourceId; + public string DestinationId; + public DestinationType DestinationType; + + public GamelogicEngineWire(string srcId, string destId, DestinationType type, string description = "") + { + Description = description; + SourceId = srcId; + DestinationId = destId; + DestinationType = type; + } + } + + public enum DestinationType + { + Coil, Lamp, GI + } +} diff --git a/VisualPinball.Engine/Game/Engines/GamelogicEngineWire.cs.meta b/VisualPinball.Engine/Game/Engines/GamelogicEngineWire.cs.meta new file mode 100644 index 000000000..cf4af47a7 --- /dev/null +++ b/VisualPinball.Engine/Game/Engines/GamelogicEngineWire.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 008c0b52a3b92064c8088f04a57f300c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Engine/Game/Engines/IGamelogicEngineDeviceItem.cs b/VisualPinball.Engine/Game/Engines/IGamelogicEngineDeviceItem.cs index 4825356ee..2cd6da680 100644 --- a/VisualPinball.Engine/Game/Engines/IGamelogicEngineDeviceItem.cs +++ b/VisualPinball.Engine/Game/Engines/IGamelogicEngineDeviceItem.cs @@ -20,5 +20,7 @@ public interface IGamelogicEngineDeviceItem { string Id { get; } string Description { get; } + string DeviceHint { get; } + string DeviceItemHint { get; } } } diff --git a/VisualPinball.Engine/Math/Color.cs b/VisualPinball.Engine/Math/Color.cs index 0e6025f75..88df01e34 100644 --- a/VisualPinball.Engine/Math/Color.cs +++ b/VisualPinball.Engine/Math/Color.cs @@ -98,7 +98,25 @@ public enum ColorFormat public enum ColorChannel { - Red, Green, Blue, Alpha + /// + /// The red channel for RGB lamps. + /// + Red, + + /// + /// The green channel for RGB lamps. + /// + Green, + + /// + /// The blue channel for RBG lamps. + /// + Blue, + + /// + /// The intensity for white lamps. + /// + Alpha, } public static class Colors diff --git a/VisualPinball.Engine/VPT/Light/Light.cs b/VisualPinball.Engine/VPT/Light/Light.cs index 3da93a154..cf16973e7 100644 --- a/VisualPinball.Engine/VPT/Light/Light.cs +++ b/VisualPinball.Engine/VPT/Light/Light.cs @@ -14,6 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +using System; using System.IO; using VisualPinball.Engine.Game; using VisualPinball.Engine.Math; @@ -29,6 +30,8 @@ public class Light : Item, IRenderable private readonly LightMeshGenerator _meshGenerator; + public bool IsInsertLight(Table.Table table) => !Data.ShowBulbMesh && string.Equals(Data.OffImage, table.Data.Image, StringComparison.OrdinalIgnoreCase); + public Light(LightData data) : base(data) { _meshGenerator = new LightMeshGenerator(Data); @@ -38,11 +41,9 @@ public Light(BinaryReader reader, string itemName) : this(new LightData(reader, { } - public static Light GetDefault(Table.Table table) + public static Light GetDefault(string name, float x, float y) { - var x = table.Width / 2f; - var y = table.Height / 2f; - var lightData = new LightData(table.GetNewName("Light"), table.Width / 2f, table.Height / 2f) { + var lightData = new LightData(name, x, y) { DragPoints = new[] { new DragPointData(x, y - 50f) {IsSmooth = true }, new DragPointData(x - 50f * MathF.Cos(MathF.PI / 4), y - 50f * MathF.Sin(MathF.PI / 4)) {IsSmooth = true }, @@ -56,6 +57,8 @@ public static Light GetDefault(Table.Table table) }; return new Light(lightData); } + + public static Light GetDefault(Table.Table table) => GetDefault(table.GetNewName("Light"), table.Width / 2f, table.Height / 2f); #region IRenderable diff --git a/VisualPinball.Engine/VPT/Material.cs b/VisualPinball.Engine/VPT/Material.cs index 0fad356e9..5f18d0be8 100644 --- a/VisualPinball.Engine/VPT/Material.cs +++ b/VisualPinball.Engine/VPT/Material.cs @@ -16,6 +16,7 @@ #region ReSharper // ReSharper disable FieldCanBeMadeReadOnly.Global +// ReSharper disable InconsistentNaming #endregion using System; @@ -140,6 +141,7 @@ public Material(string name) : this() BaseColor = new Color(255, 255, 255, 255); Glossiness = new Color(0, 0, 0, 255); ClearCoat = new Color(0, 0, 0, 255); + Opacity = 1f; UpdateData(); } diff --git a/VisualPinball.Engine/VPT/PbrMaterial.cs b/VisualPinball.Engine/VPT/PbrMaterial.cs index b62eff922..c77529d8c 100644 --- a/VisualPinball.Engine/VPT/PbrMaterial.cs +++ b/VisualPinball.Engine/VPT/PbrMaterial.cs @@ -39,6 +39,10 @@ public class PbrMaterial public bool IsOpacityActive => _material?.IsOpacityActive ?? false; public float Opacity => MathF.Min(1, MathF.Max(0, _material?.Opacity ?? 1f)); public float Roughness => _material?.Roughness ?? 0.5f; + + public MaterialType MaterialType = MaterialType.Translucent; + public DiffusionProfileTemplate DiffusionProfile = DiffusionProfileTemplate.None; + private float Edge => _material?.Edge ?? 0f; public const string NameNoMaterial = "__std"; @@ -155,4 +159,20 @@ public enum BlendMode Cutout, Translucent } + + public enum DiffusionProfileTemplate + { + None, + Plastics + } + + public enum MaterialType + { + SubsurfaceScattering = 0, + Standard = 1, + Anisotropy = 2, + Iridescence = 3, + SpecularColor = 4, + Translucent = 5, + } } diff --git a/VisualPinball.Engine/VPT/Table/TableMeshGenerator.cs b/VisualPinball.Engine/VPT/Table/TableMeshGenerator.cs index b3347c1ff..9a712325e 100644 --- a/VisualPinball.Engine/VPT/Table/TableMeshGenerator.cs +++ b/VisualPinball.Engine/VPT/Table/TableMeshGenerator.cs @@ -45,7 +45,9 @@ public Mesh GetMesh(Table table, bool asRightHanded = true) public PbrMaterial GetMaterial(Table table) { - return new PbrMaterial(table.GetMaterial(_data.PlayfieldMaterial), table.GetTexture(_data.Image)); + return new PbrMaterial(table.GetMaterial(_data.PlayfieldMaterial), table.GetTexture(_data.Image)) { + MaterialType = MaterialType.Standard + }; } public void SetFromPrimitive(Primitive.Primitive primitive) diff --git a/VisualPinball.Unity/Assets/Editor/Icons/large_blue/light_flasher.png b/VisualPinball.Unity/Assets/Editor/Icons/large_blue/light_flasher.png new file mode 100644 index 000000000..cbc5bfed5 Binary files /dev/null and b/VisualPinball.Unity/Assets/Editor/Icons/large_blue/light_flasher.png differ diff --git a/VisualPinball.Unity/Assets/Editor/Icons/large_blue/light_flasher.png.meta b/VisualPinball.Unity/Assets/Editor/Icons/large_blue/light_flasher.png.meta new file mode 100644 index 000000000..692ef0196 --- /dev/null +++ b/VisualPinball.Unity/Assets/Editor/Icons/large_blue/light_flasher.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: e6e248795a18ee047a379e32da191a98 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Editor/Icons/large_blue/light_group.png b/VisualPinball.Unity/Assets/Editor/Icons/large_blue/light_group.png new file mode 100644 index 000000000..70b1d144d Binary files /dev/null and b/VisualPinball.Unity/Assets/Editor/Icons/large_blue/light_group.png differ diff --git a/VisualPinball.Unity/Assets/Editor/Icons/large_blue/light_group.png.meta b/VisualPinball.Unity/Assets/Editor/Icons/large_blue/light_group.png.meta new file mode 100644 index 000000000..ca0e3df3e --- /dev/null +++ b/VisualPinball.Unity/Assets/Editor/Icons/large_blue/light_group.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 6a45ecf4c0ab9bb4a9e22f42cf23baeb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Editor/Icons/large_gray/light_flasher.png b/VisualPinball.Unity/Assets/Editor/Icons/large_gray/light_flasher.png new file mode 100644 index 000000000..4ff7f984b Binary files /dev/null and b/VisualPinball.Unity/Assets/Editor/Icons/large_gray/light_flasher.png differ diff --git a/VisualPinball.Unity/Assets/Editor/Icons/large_gray/light_flasher.png.meta b/VisualPinball.Unity/Assets/Editor/Icons/large_gray/light_flasher.png.meta new file mode 100644 index 000000000..fe8c507ea --- /dev/null +++ b/VisualPinball.Unity/Assets/Editor/Icons/large_gray/light_flasher.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: a40b3d2a10078044d89e53806008c529 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Editor/Icons/large_gray/light_group.png b/VisualPinball.Unity/Assets/Editor/Icons/large_gray/light_group.png new file mode 100644 index 000000000..0dc0e9073 Binary files /dev/null and b/VisualPinball.Unity/Assets/Editor/Icons/large_gray/light_group.png differ diff --git a/VisualPinball.Unity/Assets/Editor/Icons/large_gray/light_group.png.meta b/VisualPinball.Unity/Assets/Editor/Icons/large_gray/light_group.png.meta new file mode 100644 index 000000000..aae769e0e --- /dev/null +++ b/VisualPinball.Unity/Assets/Editor/Icons/large_gray/light_group.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 4a2d5ab0736f430459492a0d0a9f685d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Editor/Icons/large_green/light_flasher.png b/VisualPinball.Unity/Assets/Editor/Icons/large_green/light_flasher.png new file mode 100644 index 000000000..5eb92c177 Binary files /dev/null and b/VisualPinball.Unity/Assets/Editor/Icons/large_green/light_flasher.png differ diff --git a/VisualPinball.Unity/Assets/Editor/Icons/large_green/light_flasher.png.meta b/VisualPinball.Unity/Assets/Editor/Icons/large_green/light_flasher.png.meta new file mode 100644 index 000000000..9b3e3740d --- /dev/null +++ b/VisualPinball.Unity/Assets/Editor/Icons/large_green/light_flasher.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 34b11994d23f3534e949a1f4ecbbe740 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Editor/Icons/large_green/light_group.png b/VisualPinball.Unity/Assets/Editor/Icons/large_green/light_group.png new file mode 100644 index 000000000..16b532407 Binary files /dev/null and b/VisualPinball.Unity/Assets/Editor/Icons/large_green/light_group.png differ diff --git a/VisualPinball.Unity/Assets/Editor/Icons/large_green/light_group.png.meta b/VisualPinball.Unity/Assets/Editor/Icons/large_green/light_group.png.meta new file mode 100644 index 000000000..b8d970966 --- /dev/null +++ b/VisualPinball.Unity/Assets/Editor/Icons/large_green/light_group.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: c46067de66c404f44abe1c701ae0c665 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Editor/Icons/large_orange/light_flasher.png b/VisualPinball.Unity/Assets/Editor/Icons/large_orange/light_flasher.png new file mode 100644 index 000000000..81aaf8803 Binary files /dev/null and b/VisualPinball.Unity/Assets/Editor/Icons/large_orange/light_flasher.png differ diff --git a/VisualPinball.Unity/Assets/Editor/Icons/large_orange/light_flasher.png.meta b/VisualPinball.Unity/Assets/Editor/Icons/large_orange/light_flasher.png.meta new file mode 100644 index 000000000..e0b4e3d04 --- /dev/null +++ b/VisualPinball.Unity/Assets/Editor/Icons/large_orange/light_flasher.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: b3f3991fcaffa5b40a6de9c905d49cb6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Editor/Icons/large_orange/light_group.png b/VisualPinball.Unity/Assets/Editor/Icons/large_orange/light_group.png new file mode 100644 index 000000000..5be9ae1af Binary files /dev/null and b/VisualPinball.Unity/Assets/Editor/Icons/large_orange/light_group.png differ diff --git a/VisualPinball.Unity/Assets/Editor/Icons/large_orange/light_group.png.meta b/VisualPinball.Unity/Assets/Editor/Icons/large_orange/light_group.png.meta new file mode 100644 index 000000000..71be46dce --- /dev/null +++ b/VisualPinball.Unity/Assets/Editor/Icons/large_orange/light_group.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: fbc38e515316e10469ebe7069403cf73 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Editor/Icons/small_blue/light_flasher.png b/VisualPinball.Unity/Assets/Editor/Icons/small_blue/light_flasher.png new file mode 100644 index 000000000..4b9a76255 Binary files /dev/null and b/VisualPinball.Unity/Assets/Editor/Icons/small_blue/light_flasher.png differ diff --git a/VisualPinball.Unity/Assets/Editor/Icons/small_blue/light_flasher.png.meta b/VisualPinball.Unity/Assets/Editor/Icons/small_blue/light_flasher.png.meta new file mode 100644 index 000000000..2919386e5 --- /dev/null +++ b/VisualPinball.Unity/Assets/Editor/Icons/small_blue/light_flasher.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: cb303c2839675e640b3c87ce45537e6d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Editor/Icons/small_blue/light_group.png b/VisualPinball.Unity/Assets/Editor/Icons/small_blue/light_group.png new file mode 100644 index 000000000..76a3328a3 Binary files /dev/null and b/VisualPinball.Unity/Assets/Editor/Icons/small_blue/light_group.png differ diff --git a/VisualPinball.Unity/Assets/Editor/Icons/small_blue/light_group.png.meta b/VisualPinball.Unity/Assets/Editor/Icons/small_blue/light_group.png.meta new file mode 100644 index 000000000..4f9711e30 --- /dev/null +++ b/VisualPinball.Unity/Assets/Editor/Icons/small_blue/light_group.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 68aff253cda433f4cac498b99c5dabd0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Editor/Icons/small_gray/light_flasher.png b/VisualPinball.Unity/Assets/Editor/Icons/small_gray/light_flasher.png new file mode 100644 index 000000000..a824e7f9d Binary files /dev/null and b/VisualPinball.Unity/Assets/Editor/Icons/small_gray/light_flasher.png differ diff --git a/VisualPinball.Unity/Assets/Editor/Icons/small_gray/light_flasher.png.meta b/VisualPinball.Unity/Assets/Editor/Icons/small_gray/light_flasher.png.meta new file mode 100644 index 000000000..115099b20 --- /dev/null +++ b/VisualPinball.Unity/Assets/Editor/Icons/small_gray/light_flasher.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 29c771ace0eb9234d90160c29edb4153 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Editor/Icons/small_gray/light_group.png b/VisualPinball.Unity/Assets/Editor/Icons/small_gray/light_group.png new file mode 100644 index 000000000..cc3c5feac Binary files /dev/null and b/VisualPinball.Unity/Assets/Editor/Icons/small_gray/light_group.png differ diff --git a/VisualPinball.Unity/Assets/Editor/Icons/small_gray/light_group.png.meta b/VisualPinball.Unity/Assets/Editor/Icons/small_gray/light_group.png.meta new file mode 100644 index 000000000..ac00ac922 --- /dev/null +++ b/VisualPinball.Unity/Assets/Editor/Icons/small_gray/light_group.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 29b231382b76fca4e8e15c20e58fdaba +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Editor/Icons/small_green/light_flasher.png b/VisualPinball.Unity/Assets/Editor/Icons/small_green/light_flasher.png new file mode 100644 index 000000000..7d414e442 Binary files /dev/null and b/VisualPinball.Unity/Assets/Editor/Icons/small_green/light_flasher.png differ diff --git a/VisualPinball.Unity/Assets/Editor/Icons/small_green/light_flasher.png.meta b/VisualPinball.Unity/Assets/Editor/Icons/small_green/light_flasher.png.meta new file mode 100644 index 000000000..d52d9a093 --- /dev/null +++ b/VisualPinball.Unity/Assets/Editor/Icons/small_green/light_flasher.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: dae644413301ce641bfb313e13d9b2e5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Editor/Icons/small_green/light_group.png b/VisualPinball.Unity/Assets/Editor/Icons/small_green/light_group.png new file mode 100644 index 000000000..4b6d480fc Binary files /dev/null and b/VisualPinball.Unity/Assets/Editor/Icons/small_green/light_group.png differ diff --git a/VisualPinball.Unity/Assets/Editor/Icons/small_green/light_group.png.meta b/VisualPinball.Unity/Assets/Editor/Icons/small_green/light_group.png.meta new file mode 100644 index 000000000..1b50c7d9d --- /dev/null +++ b/VisualPinball.Unity/Assets/Editor/Icons/small_green/light_group.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 5c0bc5111675cea41ba8e8feff34ceae +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Editor/Icons/small_orange/light_flasher.png b/VisualPinball.Unity/Assets/Editor/Icons/small_orange/light_flasher.png new file mode 100644 index 000000000..d43c9b6d6 Binary files /dev/null and b/VisualPinball.Unity/Assets/Editor/Icons/small_orange/light_flasher.png differ diff --git a/VisualPinball.Unity/Assets/Editor/Icons/small_orange/light_flasher.png.meta b/VisualPinball.Unity/Assets/Editor/Icons/small_orange/light_flasher.png.meta new file mode 100644 index 000000000..fc7d35629 --- /dev/null +++ b/VisualPinball.Unity/Assets/Editor/Icons/small_orange/light_flasher.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 03496ff5246298144b02339367e6e448 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Editor/Icons/small_orange/light_group.png b/VisualPinball.Unity/Assets/Editor/Icons/small_orange/light_group.png new file mode 100644 index 000000000..f54371888 Binary files /dev/null and b/VisualPinball.Unity/Assets/Editor/Icons/small_orange/light_group.png differ diff --git a/VisualPinball.Unity/Assets/Editor/Icons/small_orange/light_group.png.meta b/VisualPinball.Unity/Assets/Editor/Icons/small_orange/light_group.png.meta new file mode 100644 index 000000000..9b8d361d7 --- /dev/null +++ b/VisualPinball.Unity/Assets/Editor/Icons/small_orange/light_group.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 8556b8d36238d3945ab0b87bf995aa62 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Resources/Prefabs/Light (Builtin).prefab b/VisualPinball.Unity/Assets/Resources/Prefabs/Light (Builtin).prefab index 9e8f3718f..31b06c212 100644 --- a/VisualPinball.Unity/Assets/Resources/Prefabs/Light (Builtin).prefab +++ b/VisualPinball.Unity/Assets/Resources/Prefabs/Light (Builtin).prefab @@ -9,8 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2649789736405374282} - - component: {fileID: -7726742479185607768} - - component: {fileID: 8134916103503386669} + - component: {fileID: 4750229237398323307} m_Layer: 0 m_Name: Light (Builtin) m_TagString: Untagged @@ -31,10 +30,11 @@ Transform: m_Children: - {fileID: 3878378365098062784} - {fileID: 6343396272821131885} + - {fileID: 4222681214933490337} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &-7726742479185607768 +--- !u!114 &4750229237398323307 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -58,68 +58,6 @@ MonoBehaviour: BlinkInterval: 0 FadeSpeedUp: 0 FadeSpeedDown: 0 ---- !u!108 &8134916103503386669 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 550864702806823459} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 2 - m_Shape: 0 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 47.746483 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 0 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 2 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 1 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 --- !u!1 &3112338884683058496 GameObject: m_ObjectHideFlags: 0 @@ -147,7 +85,7 @@ Transform: m_GameObject: {fileID: 3112338884683058496} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 20, y: 20, z: 20} m_Children: [] m_Father: {fileID: 2649789736405374282} m_RootOrder: 0 @@ -228,7 +166,7 @@ Transform: m_GameObject: {fileID: 6207005947276562095} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 20, y: 20, z: 20} m_Children: [] m_Father: {fileID: 2649789736405374282} m_RootOrder: 1 @@ -282,3 +220,96 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &7031967719973800860 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4222681214933490337} + - component: {fileID: 1799189321192003275} + m_Layer: 0 + m_Name: Source + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4222681214933490337 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7031967719973800860} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.09030962, y: 0.026130915, z: 0.6205269} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2649789736405374282} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!108 &1799189321192003275 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7031967719973800860} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 2 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 47.746483 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 2 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 1 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 diff --git a/VisualPinball.Unity/Assets/Resources/Prefabs/Light (Builtin).prefab.meta b/VisualPinball.Unity/Assets/Resources/Prefabs/Light (Builtin).prefab.meta index 00e8b1d56..777e6675b 100644 --- a/VisualPinball.Unity/Assets/Resources/Prefabs/Light (Builtin).prefab.meta +++ b/VisualPinball.Unity/Assets/Resources/Prefabs/Light (Builtin).prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 24c87dc2ea2263b48b6be1b03f90eb88 +guid: b689c951e6196b44aa743ee7e633846a PrefabImporter: externalObjects: {} userData: diff --git a/VisualPinball.Unity/Assets/Resources/Prefabs/Light - Insert (Builtin).prefab b/VisualPinball.Unity/Assets/Resources/Prefabs/Light - Insert (Builtin).prefab new file mode 100644 index 000000000..473957ee1 --- /dev/null +++ b/VisualPinball.Unity/Assets/Resources/Prefabs/Light - Insert (Builtin).prefab @@ -0,0 +1,207 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &550864702806823459 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2649789736405374282} + - component: {fileID: 4750229237398323307} + m_Layer: 0 + m_Name: Light - Insert (Builtin) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2649789736405374282 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 550864702806823459} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 179995335602121591} + - {fileID: 4222681214933490337} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4750229237398323307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 550864702806823459} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e53d77b7d585c94b89513d95571354e, type: 3} + m_Name: + m_EditorClassIdentifier: + _isLocked: 0 + _editorLayer: 0 + _editorLayerName: + _editorLayerVisibility: 1 + Position: {x: 0, y: 0, z: 0} + _surface: {fileID: 0} + BulbSize: 20 + State: 0 + BlinkPattern: + BlinkInterval: 0 + FadeSpeedUp: 0 + FadeSpeedDown: 0 +--- !u!1 &5987759878404274838 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 179995335602121591} + - component: {fileID: 4762606870770787496} + - component: {fileID: 5251209611439210537} + m_Layer: 0 + m_Name: Insert + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &179995335602121591 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5987759878404274838} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0, y: -0, z: 0.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2649789736405374282} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4762606870770787496 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5987759878404274838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e2a11a120b7da4b4db6fd330516311db, type: 3} + m_Name: + m_EditorClassIdentifier: + InsertHeight: 20 + PositionZ: 0.1 + _dragPoints: [] +--- !u!33 &5251209611439210537 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5987759878404274838} + m_Mesh: {fileID: 0} +--- !u!1 &7031967719973800860 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4222681214933490337} + - component: {fileID: 1799189321192003275} + m_Layer: 0 + m_Name: Source + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4222681214933490337 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7031967719973800860} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -50} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2649789736405374282} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!108 &1799189321192003275 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7031967719973800860} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 0 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 462.10742 + m_Range: 0.1 + m_SpotAngle: 75 + m_InnerSpotAngle: 1 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 2 + m_AreaSize: {x: 0.5, y: 0.5} + m_BounceIntensity: 1 + m_ColorTemperature: 2700 + m_UseColorTemperature: 1 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0.01 + m_ShadowAngle: 0 diff --git a/VisualPinball.Unity/Assets/Resources/Prefabs/Light - Insert (Builtin).prefab.meta b/VisualPinball.Unity/Assets/Resources/Prefabs/Light - Insert (Builtin).prefab.meta new file mode 100644 index 000000000..25e88cf22 --- /dev/null +++ b/VisualPinball.Unity/Assets/Resources/Prefabs/Light - Insert (Builtin).prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d51e304383510344c8e8029ec59eeebc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/Assets/Shaders/Srp/Display/DotMatrixDisplayGraph.shadergraph b/VisualPinball.Unity/Assets/Shaders/Srp/Display/DotMatrixDisplayGraph.shadergraph index b90e6d284..258f5cb91 100644 --- a/VisualPinball.Unity/Assets/Shaders/Srp/Display/DotMatrixDisplayGraph.shadergraph +++ b/VisualPinball.Unity/Assets/Shaders/Srp/Display/DotMatrixDisplayGraph.shadergraph @@ -17,6 +17,9 @@ }, { "m_Id": "355af990f31d4b91969f5a1d85c0e524" + }, + { + "m_Id": "1fcaaabba6354a7ea01b55bbb16087d6" } ], "m_Keywords": [], @@ -83,6 +86,15 @@ }, { "m_Id": "3930f3e174464ad483bf5dfc32f941dd" + }, + { + "m_Id": "c0ef6eda9aa241c089a8c97ea98ccd35" + }, + { + "m_Id": "3e559fc89f98495daa87f9a9a83c3e6d" + }, + { + "m_Id": "43b86669fec34ffebed1498171e47274" } ], "m_GroupDatas": [], @@ -97,7 +109,21 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "5e3f39ce35b74ffcb64ad89380f95b94" + "m_Id": "3e559fc89f98495daa87f9a9a83c3e6d" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "386fcbc47636417199e958b1ab89b4b7" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c0ef6eda9aa241c089a8c97ea98ccd35" }, "m_SlotId": 0 } @@ -133,17 +159,45 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "915771b37c834feb95561bee0773591f" + "m_Id": "3e559fc89f98495daa87f9a9a83c3e6d" }, "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "5989918dd1294dc48c01714e8dab3238" + "m_Id": "5e3f39ce35b74ffcb64ad89380f95b94" }, "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "43b86669fec34ffebed1498171e47274" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "3e559fc89f98495daa87f9a9a83c3e6d" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "915771b37c834feb95561bee0773591f" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c0ef6eda9aa241c089a8c97ea98ccd35" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -256,6 +310,20 @@ "m_SlotId": 3 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c0ef6eda9aa241c089a8c97ea98ccd35" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "5989918dd1294dc48c01714e8dab3238" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -315,8 +383,8 @@ ], "m_VertexContext": { "m_Position": { - "x": 10.66672134399414, - "y": -948.6666259765625 + "x": 154.66656494140626, + "y": -1156.0001220703125 }, "m_Blocks": [ { @@ -332,8 +400,8 @@ }, "m_FragmentContext": { "m_Position": { - "x": 10.66672134399414, - "y": -560.0 + "x": 155.33334350585938, + "y": -629.3334350585938 }, "m_Blocks": [ { @@ -513,6 +581,53 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "1f7989ec260f4a26931027a955db33f0", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "1fcaaabba6354a7ea01b55bbb16087d6", + "m_Guid": { + "m_GuidSerialized": "9acb2d53-46b0-4fad-a7c2-5414a709d865" + }, + "m_Name": "Emission", + "m_DefaultReferenceName": "Vector1_1fcaaabba6354a7ea01b55bbb16087d6", + "m_OverrideReferenceName": "__Emission", + "m_GeneratePropertyBlock": true, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 1.0, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -528,6 +643,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "322004d512c142f29eaaf7eb579ffc83", + "m_Id": 2, + "m_DisplayName": "Intensity", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Intensity", + "m_StageCapability": 3, + "m_Value": 800.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -644,9 +774,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -444.6667785644531, - "y": -948.6666870117188, - "width": 214.6666717529297, + "x": -510.6667785644531, + "y": -958.0001220703125, + "width": 208.0, "height": 374.0 } }, @@ -743,6 +873,49 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.HighDefinition.EmissionNode", + "m_ObjectId": "3e559fc89f98495daa87f9a9a83c3e6d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Emission Node", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -171.33328247070313, + "y": -906.0000610351563, + "width": 229.3333282470703, + "height": 186.0 + } + }, + "m_Slots": [ + { + "m_Id": "80c5b8e752414a589e157a082c1876f0" + }, + { + "m_Id": "322004d512c142f29eaaf7eb579ffc83" + }, + { + "m_Id": "751e5e2717a84b6e95e1d013224de5bf" + }, + { + "m_Id": "a718235381784603bb6c139dea579167" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "_intensityUnit": 0, + "m_NormalizeColor": false +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -766,6 +939,41 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "43b86669fec34ffebed1498171e47274", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1722.666748046875, + "y": -503.3332824707031, + "width": 125.33338165283203, + "height": 34.000003814697269 + } + }, + "m_Slots": [ + { + "m_Id": "f15c0863146c4d569fb25b836a2cacc2" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "1fcaaabba6354a7ea01b55bbb16087d6" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", @@ -1083,6 +1291,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "751e5e2717a84b6e95e1d013224de5bf", + "m_Id": 3, + "m_DisplayName": "Exposure Weight", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Exposure Weight", + "m_StageCapability": 3, + "m_Value": 0.800000011920929, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -1206,6 +1429,36 @@ "inspectorFoldoutMask": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "80c5b8e752414a589e157a082c1876f0", + "m_Id": 1, + "m_DisplayName": "Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Color", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", @@ -1230,6 +1483,30 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "81ac6aeaac01402b8b87d7d8b5117195", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -1318,9 +1595,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -444.0, - "y": -518.0, - "width": 214.66664123535157, + "x": -511.33343505859377, + "y": -528.0000610351563, + "width": 208.0, "height": 374.0 } }, @@ -1472,6 +1749,36 @@ "m_OutputChannel": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "a718235381784603bb6c139dea579167", + "m_Id": 0, + "m_DisplayName": "Output", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Output", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -1700,6 +2007,44 @@ "m_ObjectId": "bdc3a45891fa4a00b64f72f0271fe623" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "c0ef6eda9aa241c089a8c97ea98ccd35", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -188.00006103515626, + "y": -608.6668090820313, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "1f7989ec260f4a26931027a955db33f0" + }, + { + "m_Id": "81ac6aeaac01402b8b87d7d8b5117195" + }, + { + "m_Id": "db45a4406ef4487c9e3bec32ba8ebbf1" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -1876,6 +2221,30 @@ "m_SerializedDescriptor": "VertexDescription.Position" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "db45a4406ef4487c9e3bec32ba8ebbf1", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", @@ -1946,6 +2315,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "f15c0863146c4d569fb25b836a2cacc2", + "m_Id": 0, + "m_DisplayName": "Emission", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", diff --git a/VisualPinball.Unity/Documentation~/creators-guide/editor/advanced/camera-settings.md b/VisualPinball.Unity/Documentation~/creators-guide/editor/advanced/camera-settings.md index 9d2dd7a5f..52bc9bf35 100644 --- a/VisualPinball.Unity/Documentation~/creators-guide/editor/advanced/camera-settings.md +++ b/VisualPinball.Unity/Documentation~/creators-guide/editor/advanced/camera-settings.md @@ -22,11 +22,11 @@ To use the camera controller, select the `Camera` scene object, which is at the - **Distance**: Moves the camera closer to or further away from the pivot point. This is used in conjunction with the FOV to frame the table in view. - **FOV**: Sets the field of view of the camera. High values result in a wide field of view and more depth perspective. Low values narrow and flatten the view. > [!note] - > Adjusting the distance and FOV together will control how much apparent depth there is to tge table. A wide field of view and low distance will give the table a lit of perspective and depth, but will be more challenging to fit in the view without clipping the front, or having a lot of space to the sides in the back. Conversely, moving the camera further away and lowering the FOV will remove much of the perspective allowing the table to fit more evenly in the frame. + > Adjusting the distance and FOV together will control how much apparent depth there is to the table. A wide field of view and low distance will give the table a bit of perspective and depth, but will be more challenging to fit in the view without clipping the front, or having a lot of space to the sides in the back. Conversely, moving the camera further away and lowering the FOV will remove much of the perspective allowing the table to fit more evenly in the frame. - **Orbit**: Controls the camera angle in an orbit around the table. 0 and 360 are standing in front of the table, 90 is on the left, 270 to the right. ## Presets Camera presets are stored camera settings that allow you to rapidly switch between different camera views. This can be useful when developing a table to view specific areas or just to take pretty screenshots. -The preset slider changes between the stored camera views. There are three views included by default. Any preset can be overwritten by changing the parameters and clicking the *Save* button. If *Save* is not pressed, the values will be lost when you cycle to a new preset. New presets can be made by adjusting the values and clicking *Clone*. This preset will be added to the presets at the end. You can delete any preset by setting the slider to that preset and clicking the *Delete* button. \ No newline at end of file +The preset slider changes between the stored camera views. There are three views included by default. Any preset can be overwritten by changing the parameters and clicking the *Save* button. If *Save* is not pressed, the values will be lost when you cycle to a new preset. New presets can be made by adjusting the values and clicking *Clone*. This preset will be added to the presets at the end. You can delete any preset by setting the slider to that preset and clicking the *Delete* button. diff --git a/VisualPinball.Unity/Documentation~/creators-guide/editor/coil-manager-lamp.png b/VisualPinball.Unity/Documentation~/creators-guide/editor/coil-manager-lamp.png index 6b875cb46..f590b6687 100644 Binary files a/VisualPinball.Unity/Documentation~/creators-guide/editor/coil-manager-lamp.png and b/VisualPinball.Unity/Documentation~/creators-guide/editor/coil-manager-lamp.png differ diff --git a/VisualPinball.Unity/Documentation~/creators-guide/editor/coil-manager.md b/VisualPinball.Unity/Documentation~/creators-guide/editor/coil-manager.md index 86e05ce98..4dbe2d771 100644 --- a/VisualPinball.Unity/Documentation~/creators-guide/editor/coil-manager.md +++ b/VisualPinball.Unity/Documentation~/creators-guide/editor/coil-manager.md @@ -1,9 +1,11 @@ --- +uid: coil_manager +title: Coil Manager description: VPE's coil manager lets you hook up the coils of the playfield to the gamelogic engine. --- # Coil Manager -On a real pinball table most moving parts, including the flippers, are triggered by [coils](https://en.wikipedia.org/wiki/Inductor) (also called [solenoids](https://en.wikipedia.org/wiki/Solenoid)). In VPE it's the job of the [gamelogic engine](~/creators-guide/manual/gamelogic-engine.md) to trigger them when needed. +On a real pinball table most moving parts, including the flippers, are triggered by [coils](https://en.wikipedia.org/wiki/Inductor) (also called [solenoids](https://en.wikipedia.org/wiki/Solenoid)). In VPE it's the job of the [gamelogic engine](xref:gamelogic_engine) to trigger them when needed. Just as the coils are physically wired to the power driver board on a regular machine they can be virtually connected in VPE using the coil manager under *Visual Pinball -> Coil Manager*. @@ -29,8 +31,8 @@ The **Description** column is optional. If you're setting up a re-creation, you The **Destination** column defines where the element in the following column is located. There are three options: - *Playfield* lets you select a game element on the playfield that features the coil -- *Device* lets you choose a *coil device*, a mechanism which may include multiple coils, such as a [trough](../manual/mechanisms/troughs.md). -- *Lamp* sets the coil to be configured in the lamp manager (see [flashers in the lamp manager](lamp-manager.md#flashers) for more details). +- *Device* lets you choose a *coil device*, a mechanism which may include multiple coils, such as a [trough](xref:troughs). +- *Lamp* sets the coil to be configured in the lamp manager (see [flashers in the lamp manager](xref:lamp_manager#flashers) for more details). ### Element diff --git a/VisualPinball.Unity/Documentation~/creators-guide/editor/lamp-manager-coil.png b/VisualPinball.Unity/Documentation~/creators-guide/editor/lamp-manager-coil.png index c3b798344..0b784b0ec 100644 Binary files a/VisualPinball.Unity/Documentation~/creators-guide/editor/lamp-manager-coil.png and b/VisualPinball.Unity/Documentation~/creators-guide/editor/lamp-manager-coil.png differ diff --git a/VisualPinball.Unity/Documentation~/creators-guide/editor/lamp-manager-gameplay.gif b/VisualPinball.Unity/Documentation~/creators-guide/editor/lamp-manager-gameplay.gif index be280938e..51c8de3c4 100644 Binary files a/VisualPinball.Unity/Documentation~/creators-guide/editor/lamp-manager-gameplay.gif and b/VisualPinball.Unity/Documentation~/creators-guide/editor/lamp-manager-gameplay.gif differ diff --git a/VisualPinball.Unity/Documentation~/creators-guide/editor/lamp-manager.md b/VisualPinball.Unity/Documentation~/creators-guide/editor/lamp-manager.md index a7a5217e4..2c38c3d7e 100644 --- a/VisualPinball.Unity/Documentation~/creators-guide/editor/lamp-manager.md +++ b/VisualPinball.Unity/Documentation~/creators-guide/editor/lamp-manager.md @@ -1,4 +1,6 @@ --- +uid: lamp_manager +title: Lamp Manager description: The lamp manager lets you configure the lights, flashers, and general illumination of the playfield and connect them to the gamelogic engine. --- # Lamp Manager @@ -43,13 +45,9 @@ The first column, **ID** shows the name that the gamelogic engine exports for ea The **Description** column is optional. If you're setting up a recreation, you would typically use this for the lamp name from the manual. It's purely for your own benefit, and you can leave this empty if you want. -### Destination +### Source -The **Destination** column defines where the lamp is located. Currently, *Playfield* is the only option. - -### Element - -Under the **Element** column, you choose which lamp among the game items on the playfield should be controlled. +GI lights can be emitted as a different type of light from the gamelogic engine. Set the **source** here in order to prevent conflicts of matching IDs between normal lights and GI lights. ### Type @@ -60,9 +58,17 @@ The **Type** column defines how the signal is interpreted by the lamp. This is i - *RGB Multi* - An RGB lamp that can change its color during gameplay. Lamps of this type receive three connections, one from each red, green and blue. Each color channel receives values as a fading lamp. - *RGB* - An RGB lamp that receives its data from a single connection. This is the only mode where the lamp doesn't receive an integer, but an entire color value. -### R G B +### Element -If the type of the previous column has been set to *RGB Multi*, here is where you link each wire to a color. Note that the *red* channel is always the one shown under the *ID* column, so changing the red link will also change the ID (and vice versa). +Under the **Element** column, you choose which lamp among the game items on the playfield should be controlled. + +### Channel + +If the type of the previous column has been set to *RGB Multi*, here is where you define which **color channel** this output corresponds to. + +### Max. Intensity + +For fading lights, VPE expects values between `0` and `255`. However, GI light have usually less variations, typically eight. This column is only enabled for GI lights, and the value is the highest value for a given GI strand that the gamelogic engine will emit. ## Flashers @@ -80,9 +86,7 @@ Note that you cannot change the *ID* of the lamp, because it's still linked to t ## GI Strands -There is currently no special support for GI strands. In Visual Pinball, you can put GI lamps into a collection and address the whole collection at once via script. VPE doesn't have this feature yet. In order to hook up GI lamps, you can add an entry for each lamp and link all of them to the same ID. - -We'd like to make this easier in the future, so we're thinking of integrating this into the editor directly. +In Visual Pinball, you can put GI lamps into a collection and address the whole collection at once via script. VPE provides [light groups](xref:light_groups) as a similar feature. ## Editor vs Runtime diff --git a/VisualPinball.Unity/Documentation~/creators-guide/editor/lamp-manager.png b/VisualPinball.Unity/Documentation~/creators-guide/editor/lamp-manager.png index 84d106f39..e92b2aecb 100644 Binary files a/VisualPinball.Unity/Documentation~/creators-guide/editor/lamp-manager.png and b/VisualPinball.Unity/Documentation~/creators-guide/editor/lamp-manager.png differ diff --git a/VisualPinball.Unity/Documentation~/creators-guide/editor/materials.md b/VisualPinball.Unity/Documentation~/creators-guide/editor/materials.md index ae5577988..a0f1ba8d9 100644 --- a/VisualPinball.Unity/Documentation~/creators-guide/editor/materials.md +++ b/VisualPinball.Unity/Documentation~/creators-guide/editor/materials.md @@ -1,8 +1,11 @@ --- +uid: materials_index title: Materials description: How VPE deals with materials. --- +![Unity Materials](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@13.0/manual/images/HDRPFeatures-LitShader.png) + # Materials Materials are what you apply to an object in order to make it look or behave like something in the real world. Materials are one of the key components of a table, because they define the visuals and the physical behavior. However, the term *material* can be confusing, because it can have different meanings. So let's define them first. @@ -39,6 +42,4 @@ As mentioned above, there are two differences between Visual Pinball and VPE how When importing a `.vpx` file, VPE converts the "visual part" of Visual Pinball materials into materials for the current render pipeline. It does that by creating a new material for every material/texture combination in Visual Pinball. The materials are then written to the `Materials` asset folder of the imported table where they can be easily edited and referenced. Since Visual Pinball uses different shaders than Unity, the results of the conversion are approximations and should be heavily tweaked. -Since VPE uses the same physics engine as Visual Pinball, the physical values of the materials don't need to be converted, they are copied 1:1 into a new physics material and saved in the asset folder. - -In case you're using the Unity editor for authoring a Visual Pinball table, you can still edit the original VPX materials using the materials manager. However, you'll notice that the physical attributes are missing, since they are now handled by physical material assets. That means when exporting, VPE will apply the physics values from the assets to the internal materials (the match between the material editor and the asset is done via name). \ No newline at end of file +Since VPE uses the same physics engine as Visual Pinball, the physical values of the materials don't need to be converted, they are copied 1:1 into a new physics material and saved in the asset folder. \ No newline at end of file diff --git a/VisualPinball.Unity/Documentation~/creators-guide/editor/switch-manager.md b/VisualPinball.Unity/Documentation~/creators-guide/editor/switch-manager.md index 04e3e6fd3..3a31ddc94 100644 --- a/VisualPinball.Unity/Documentation~/creators-guide/editor/switch-manager.md +++ b/VisualPinball.Unity/Documentation~/creators-guide/editor/switch-manager.md @@ -1,9 +1,11 @@ --- +uid: switch_manager +title: Switch Manager description: VPE's switch manager lets you hook up the switches of the playfield to the gamelogic engine. --- # Switch Manager -During gameplay, the [gamelogic engine](~/creators-guide/manual/gamelogic-engine.md) needs to know what is happening on the playfield. For that, real pinball tables have switches on the playfield that signal when a ball rolls over or settles in a certain position. These switches are also built into targets, bumpers, kickers, and other mechanisms (see *[Supported Game Mechanisms](#supported-game-mechanisms)* below). +During gameplay, the [gamelogic engine](xref:gamelogic_engine) needs to know what is happening on the playfield. For that, real pinball tables have switches on the playfield that signal when a ball rolls over or settles in a certain position. These switches are also built into targets, bumpers, kickers, and other mechanisms (see *[Supported Game Mechanisms](#supported-game-mechanisms)* below). Wiring these switches up to the gamelogic engine with code can be a tedious process, so VPE provides a graphical interface where you can do it easily. If you've named them appropriately it can even guess which switch maps to which game item. @@ -53,7 +55,7 @@ The **Source** column defines where the element in the following column originat - *Playfield* lets you choose a game item from the playfield - *Input System* lets you choose an input action from a pre-defined list, e.g. cabinet switches - *Constant* sets the switch once at the beginning of the game to the given value. -- *Device* lets you choose a switch device containing the switch. Switch devices are mechanisms that include multiple switches, for example [troughs](../manual/mechanisms/troughs.md). +- *Device* lets you choose a switch device containing the switch. Switch devices are mechanisms that include multiple switches, for example [troughs](xref:troughs). ### Element diff --git a/VisualPinball.Unity/Documentation~/creators-guide/editor/unity-components.md b/VisualPinball.Unity/Documentation~/creators-guide/editor/unity-components.md index d2d24d8a0..6324c6a96 100644 --- a/VisualPinball.Unity/Documentation~/creators-guide/editor/unity-components.md +++ b/VisualPinball.Unity/Documentation~/creators-guide/editor/unity-components.md @@ -1,14 +1,13 @@ --- +uid: unity_components +title: Unity Components description: Working with mesh, collider and animation components. --- # Unity Components When loading or creating a table in Unity, what you're creating is a hierarchy of [GameObjects](https://docs.unity3d.com/Manual/GameObjects.html), the basic building blocks of Unity scenes. By default we group game items by their type when importing, but you can arrange them however you want. -To give the GameObjects behavior during gameplay, we add [components](https://docs.unity3d.com/Manual/Components.html) onto them. VPE comes with large number of components that are used to set up and control the game mechanisms of the table, and advanced programmers can contibute new ones. - -> [!note] -> During runtime, VPE converts the GameObjects and components into entities in Unity's [DOTS workflow](https://unity.com/dots). There are special components used to control this conversion which we call *Authoring Components*. +To give the GameObjects behavior during gameplay, we add [components](https://docs.unity3d.com/Manual/Components.html) onto them. VPE comes with a large number of components that are used to set up and control the game mechanisms of the table, and advanced programmers can contibute new ones. If you've never heard about GameObjects or components, we recommmend you read through the links in the first two paragraphs. They are short, to the point, and a much better introduction than we could provide here. diff --git a/VisualPinball.Unity/Documentation~/creators-guide/editor/wire-manager.md b/VisualPinball.Unity/Documentation~/creators-guide/editor/wire-manager.md index b77e5c893..2f258b3fb 100644 --- a/VisualPinball.Unity/Documentation~/creators-guide/editor/wire-manager.md +++ b/VisualPinball.Unity/Documentation~/creators-guide/editor/wire-manager.md @@ -1,11 +1,13 @@ --- +uid: wire_manager +title: Wire Manager description: VPE's wire manager lets you directly hook up any switch to any coil or lamp. --- # Wire Manager -Using the [Switch Manager](switch-manager.md), you can wire playfield and cabinet switches to the [Gamelogic Engine](../manual/gamelogic-engine.md). Similarly, the [Coil Manager](coil-manager.md) and [Lamp Manager](#) let you connect playfield elements to the outputs of the Gamelogic Engine. +Using the [Switch Manager](xref:switch_manager), you can wire playfield and cabinet switches to the [Gamelogic Engine](xref:gamelogic_engine). Similarly, the [Coil Manager](xref:coil_manager) and [Lamp Manager](xref:lamp_manager) let you connect playfield elements to the outputs of the Gamelogic Engine. -The **Wire Manager** allows you to *bypass* the gamelogic engine and connect switches directly to coils and lamps. This can be useful for debugging, but also for game logic that might not be covered by the gamelogic engine. +The **Wire Manager** allows you to *bypass* the gamelogic engine and connect switches directly to coils and lamps. Using the *dynamic* wires, this can be used to eliminate the flipper lag often introduced by emulated ROMs. But it also can be useful for debugging, or for game logic that might not be covered by the gamelogic engine. You can open the wire manager under *Visual Pinball -> Wire Manager*. @@ -26,7 +28,7 @@ The **Source** column defines the type of source you are connecting to. There ar - *Playfield* lets you select any game item that qualifies as a source from the playfield. - *Input System* lets you select an input action from a pre-defined list, e.g. cabinet switches. - *Constant* sets the destination to a constant value. -- *Device* lets you select a source device. Such devices are mechanisms that include multiple sources, for example [troughs](../manual/mechanisms/troughs.md). +- *Device* lets you select a source device. Such devices are mechanisms that include multiple sources, for example [troughs](xref:troughs). ### Source Element @@ -45,12 +47,34 @@ Finally, if **Constant** is selected, you select the value that will be permanen Under **Destination** you can select the type of the element that will *receive* the switch changes. There are two types to choose from: - *Playfield* lets you select any game item that qualifies as a destination from the playfield -- *Device* lets you choose a destination device. Such devices are mechanisms that include multiple coils or lamps, for example [troughs](../manual/mechanisms/troughs.md). +- *Device* lets you choose a destination device. Such devices are mechanisms that include multiple coils or lamps, for example [troughs](xref:troughs). ### Destination Element The **Destination Element** column is where you select which specific element in the destination column should receive switch changes. If *Device* was selected in the previous column, both the actual device and the element within the device have to be selected. +### Dynamic + +By checking the **Dynamic** box, the wire dynamically enables and disables depending on the gamelogic engine's output. Used with flippers, this feature is also known as *Fast Flip* and can be used to reduce the lag introduced by an emulated gamelogic engine like PinMAME. + +If it's enabled and a game is started, VPE compares the switches and coils linked to the gamelogic engine and tries to find the switch and coil IDs that correspond to the wire. If found, VPE monitors the coil signals of the gamelogic engine. If the time between the switch and the coil response is below a threshold, the wire is enabled and future coil signals from the gamelogic engine are discarded. In the same way, if the wire is active and no coil signal is received within the threshold, the wire is disabled again. + +> [!note] +> In order to match the switch and coil signals from the gamelogic engine, the switch and the coil need to be linked to the gamelogic engine using the *Switch Manager* and *Coil Manager* respectively. For example, it's not sufficient to just create a flipper button -> flipper coil wire and not link the flipper button to the flipper switch and the flipper coil to the flipper. + +There are a few edge cases that are handled as well. For example, if the wire is active and the gamelogic engine enables the coil without a switch signal (like the Phantom Flip in Monster Bash), the coil event is not discarded (VPE internally keeps a queue of switch events and if the queue is empty, coil events are still processed). + +However, by design, there are two caveats: + +1. When the wire is inactive, the first event always has the gamelogic engine lag, since VPE will only activate the wire when it's sure a coil event is emitted. +2. When the gamelogic engine stops emitting coil events, VPE continues emitting the coil event one more time until it discovers the absence of the coil event and thus sends the negative signal after the threshold to "undo" its mistake. + + +> [!note] +> [MPF](xref:mpf_index) has a similar feature called [Hardware Rules](https://docs.missionpinball.org/en/dev/hardware/hw_rules.html#the-solution-hardware-rules). This is the preferred way, because the gamelogic engine explicitly notifies VPE about which wires to add and remove during gameplay. +> +> However, other gamelogic engines like PinMAME don't have this feature, that's why VPE comes with the *dynamic wire* feature that guesses when wire is active and when not. + ### Pulse Delay Internally, VPE connects switches to events. Some switchable game items only emit the *switch closed* event. Such items are spinners and targets. These are elements where the re-opening of the switch does not have any semantic value. diff --git a/VisualPinball.Unity/Documentation~/creators-guide/editor/wire-manager.png b/VisualPinball.Unity/Documentation~/creators-guide/editor/wire-manager.png index e4bdb438c..e93d26c11 100644 Binary files a/VisualPinball.Unity/Documentation~/creators-guide/editor/wire-manager.png and b/VisualPinball.Unity/Documentation~/creators-guide/editor/wire-manager.png differ diff --git a/VisualPinball.Unity/Documentation~/creators-guide/manual/displays.md b/VisualPinball.Unity/Documentation~/creators-guide/manual/displays.md index e706ef0b2..8f603e3ce 100644 --- a/VisualPinball.Unity/Documentation~/creators-guide/manual/displays.md +++ b/VisualPinball.Unity/Documentation~/creators-guide/manual/displays.md @@ -1,4 +1,5 @@ --- +gui: displays description: How VPE handles dot matrix and segment displays. --- # Displays @@ -8,7 +9,7 @@ Every pinball machine has one or more displays where the score and other importa ![DMD](dmd-game_over.jpg) *A dot matrix display used in the late 90s - Photo © 2009 by [ElHeineken](https://commons.wikimedia.org/wiki/File:Pinball_Dot_Matrix_Display_-_Demolition_Man.JPG)* -VPE supports both segment displays and dot matrix displays (usually referred to as DMDs). During game play displays are driven by the [Gamelogic Engine](gamelogic-engine.md). VPE supports multiple displays per game. +VPE supports both segment displays and dot matrix displays (usually referred to as DMDs). During game play displays are driven by the [Gamelogic Engine](xref:gamelogic_engine). VPE supports multiple displays per game. > [!note] > While the earliest electro-mechanical pinball machines used motorized score reels, and today's are using high resolution LCDs neither are yet supported in VPE. @@ -17,7 +18,7 @@ VPE supports both segment displays and dot matrix displays (usually referred to Displays are lazily bound, meaning that when the game starts the gamelogic engine announces its displays and VPE connects them to objects in your scene that actually render them. Matching is done with an ID and depends on how the gamelogic engine being used manages displays. -For example, in [MPF](../../plugins/mpf/index.md) you name your displays yourself in the machine configuration, while PinMAME uses IDs like `dmd0` and `display0` to identify its DMDs and segment displays. +For example, in [MPF](xref:mpf_index) you name your displays yourself in the machine configuration, while PinMAME uses IDs like `dmd0` and `display0` to identify its DMDs and segment displays. ### Editor diff --git a/VisualPinball.Unity/Documentation~/creators-guide/manual/gamelogic-engine.md b/VisualPinball.Unity/Documentation~/creators-guide/manual/gamelogic-engine.md index 802e4120b..3abcc6ccf 100644 --- a/VisualPinball.Unity/Documentation~/creators-guide/manual/gamelogic-engine.md +++ b/VisualPinball.Unity/Documentation~/creators-guide/manual/gamelogic-engine.md @@ -1,4 +1,6 @@ --- +uid: gamelogic_engine +title: Gamelogic Engine description: VPE's gamelogic engine is the code driving your game's logic. --- # Gamelogic Engine diff --git a/VisualPinball.Unity/Documentation~/creators-guide/manual/mechanisms/light-group-inspector.png b/VisualPinball.Unity/Documentation~/creators-guide/manual/mechanisms/light-group-inspector.png new file mode 100644 index 000000000..20a61c2ba Binary files /dev/null and b/VisualPinball.Unity/Documentation~/creators-guide/manual/mechanisms/light-group-inspector.png differ diff --git a/VisualPinball.Unity/Documentation~/creators-guide/manual/mechanisms/light-groups.md b/VisualPinball.Unity/Documentation~/creators-guide/manual/mechanisms/light-groups.md new file mode 100644 index 000000000..c8d57803d --- /dev/null +++ b/VisualPinball.Unity/Documentation~/creators-guide/manual/mechanisms/light-groups.md @@ -0,0 +1,37 @@ +--- +uid: light_groups +title: Light Groups +description: VPE can group and address multiple lights at once. +--- + +# Light Groups + +Sometimes, a game addresses multiple physical lights as one logical lamp, i.e. all lights are always toggled or faded at the same time. Typical use cases are [GI strips](https://docs.missionpinball.org/en/latest/mechs/lights/gis.html). Instead of creating a link in the [Lamp Manager](xref:lamp_manager) for each light separately, VPE ships with a component called *Lamp Group*. + +A light group is a component you can add to any GameObject. It's recommended to make it parent of the light objects it contains, but you can also keep it outside of the lights hierarchy, since it explicitly references the lights it contains. + +## Setup + + + +To create a new light group, select the GameObject you want to add your light group to, and in the inspector click on *Add Component* and choose *Visual Pinball -> Game Item -> Light Group*. + +Then use the list control to add and remove lights. There are a few button that make this easier. + +### Add Children + +In case you have parented the light groups component to the light GameObjects it should include, this button adds all child lights to the list. Existing lights will remain. + +### Replace With Children + +Similar to *Add Children*, only that the list is cleared before adding new lights. + +### Clear + +Simply clears the list. + +### Select Light Sources + +When working with lights, the GameObject with the actual light source is nested within the main object. This can make adjusting light settings for multiple lights tedious, since you have to drill into each parent in order to select the source. + +This button selects all the source GameObjects for the lights in the light group. \ No newline at end of file diff --git a/VisualPinball.Unity/Documentation~/creators-guide/manual/mechanisms/troughs.md b/VisualPinball.Unity/Documentation~/creators-guide/manual/mechanisms/troughs.md index ac78f9ea6..c2b285dba 100644 --- a/VisualPinball.Unity/Documentation~/creators-guide/manual/mechanisms/troughs.md +++ b/VisualPinball.Unity/Documentation~/creators-guide/manual/mechanisms/troughs.md @@ -1,8 +1,14 @@ +--- +uid: troughs +title: Troughs / Ball Drains +description: How VPE works with troughs (ball drains). +--- + # Troughs / Ball Drains If you are unfamiliar with ball troughs, have a quick look at [MPF's documentation](https://mpf-docs.readthedocs.io/en/latest/mechs/troughs/), which does an excellent job explaining them. -VPE comes with a trough mechanism that simulates the behavior of a real-world ball trough. This is especially important when emulating existing games, since the [gamelogic engine](../gamelogic-engine.md) expects the trough's switches to be in a plausible state, or else it may have errors. +VPE comes with a trough mechanism that simulates the behavior of a real-world ball trough. This is especially important when emulating existing games, since the [gamelogic engine](xref:gamelogic_engine) expects the trough's switches to be in a plausible state, or else it may have errors. ## Creating a Trough @@ -97,13 +103,13 @@ A single ball trough may work [with](https://docs.missionpinball.org/en/latest/m The number of simulated switches in the trough depends on the type of trough and the *Switch Count* property in the inspector panel. For recreations, you can quickly determine the number of trough switches by looking at the switch matrix in the operation manual, it usually matches the number of balls installed in the game. -To configure the switches, open the [switch manager](../../editor/switch-manager.md) and add the trough switches if they're not already there. For *Destination* select "Device", under *Element*, select the trough you've created and which switch to connect. For a modern five-ball trough, it will look something like this: +To configure the switches, open the [switch manager](xref:switch_manager) and add the trough switches if they're not already there. For *Destination* select "Device", under *Element*, select the trough you've created and which switch to connect. For a modern five-ball trough, it will look something like this: ![Switch Manager](trough-switches.png) ## Coil Setup -VPE's trough supports up to two coils, an entry coil which drains the ball from the outhole into the trough, and an eject coil which pushes a new ball into the plunger lane. To configure the coils, open the [coil manager](../../editor/coil-manager.md), find or add the coils, and link them to the trough like you did with the switches: +VPE's trough supports up to two coils, an entry coil which drains the ball from the outhole into the trough, and an eject coil which pushes a new ball into the plunger lane. To configure the coils, open the [coil manager](xref:coil_manager), find or add the coils, and link them to the trough like you did with the switches: ![Coil Manager](trough-coils.png) diff --git a/VisualPinball.Unity/Documentation~/creators-guide/setup/installing-vpe.md b/VisualPinball.Unity/Documentation~/creators-guide/setup/installing-vpe.md index c8be45810..8d235b6bc 100644 --- a/VisualPinball.Unity/Documentation~/creators-guide/setup/installing-vpe.md +++ b/VisualPinball.Unity/Documentation~/creators-guide/setup/installing-vpe.md @@ -76,4 +76,4 @@ Click *Yes*. When complete, you should now have a *Visual Pinball* menu in the e ![Package Manager after installation](unity-packages-after-installation.png) -Now that VPE is installed let's [import a table](running-vpe.md)! +Now that VPE is installed let's [import a table](xref:setup_running_vpe)! diff --git a/VisualPinball.Unity/Documentation~/creators-guide/setup/running-vpe.md b/VisualPinball.Unity/Documentation~/creators-guide/setup/running-vpe.md index 47a267ed2..48f929ce8 100644 --- a/VisualPinball.Unity/Documentation~/creators-guide/setup/running-vpe.md +++ b/VisualPinball.Unity/Documentation~/creators-guide/setup/running-vpe.md @@ -1,4 +1,5 @@ --- +guid: setup_running_vpe description: How to run VPE --- # Running VPE diff --git a/VisualPinball.Unity/Documentation~/creators-guide/toc.yml b/VisualPinball.Unity/Documentation~/creators-guide/toc.yml index f63844590..f62cb5b9c 100644 --- a/VisualPinball.Unity/Documentation~/creators-guide/toc.yml +++ b/VisualPinball.Unity/Documentation~/creators-guide/toc.yml @@ -47,3 +47,5 @@ href: manual/mechanisms/flippers.md - name: Slingshots href: manual/mechanisms/slingshots.md + - name: Light Groups + href: manual/mechanisms/light-groups.md diff --git a/VisualPinball.Unity/Documentation~/docfx.json b/VisualPinball.Unity/Documentation~/docfx.json index fa2e8fe2e..1ea0fa126 100644 --- a/VisualPinball.Unity/Documentation~/docfx.json +++ b/VisualPinball.Unity/Documentation~/docfx.json @@ -4,7 +4,8 @@ "src": [ { "files": [ - "VisualPinball.Unity/**.csproj" + "VisualPinball.Unity/**.csproj", + "VisualPinball.Unity.Patcher/**.csproj" ], "src": "../" } diff --git a/VisualPinball.Unity/Documentation~/plugins/index.md b/VisualPinball.Unity/Documentation~/plugins/index.md index 2b6e1f355..578d8ff1a 100644 --- a/VisualPinball.Unity/Documentation~/plugins/index.md +++ b/VisualPinball.Unity/Documentation~/plugins/index.md @@ -1,4 +1,5 @@ --- +uid: plugins_index title: Plugins description: Visual Pinball for Unity - Plugins --- @@ -8,6 +9,6 @@ description: Visual Pinball for Unity - Plugins VPE has a plug-in system that allows other software to integrate with it. Plugins are typically required on a per-table basis. VPE ships with a number of default plugins which are documented here. -## [Mission Pinball Framework](mpf/index.html) +## [Mission Pinball Framework](xref:mpf_index) The [Mission Pinball Framework](https://missionpinball.org/) is software written in Python that is used to drive real pinball machines. It integrates with VPE as a gamelogic engine. diff --git a/VisualPinball.Unity/Documentation~/plugins/mpf/index.md b/VisualPinball.Unity/Documentation~/plugins/mpf/index.md index c3d005e60..a93ce34a9 100644 --- a/VisualPinball.Unity/Documentation~/plugins/mpf/index.md +++ b/VisualPinball.Unity/Documentation~/plugins/mpf/index.md @@ -1,4 +1,5 @@ --- +uid: mpf_index title: Mission Pinball Framework description: Visual Pinball Engine integration with the Mission Pinball Framework. --- diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Import/VpxSceneConverter.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Import/VpxSceneConverter.cs index 146fb2b48..b66afcc26 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Import/VpxSceneConverter.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Import/VpxSceneConverter.cs @@ -92,7 +92,7 @@ public VpxSceneConverter(FileTableContainer sourceContainer, string fileName = " _sourceContainer = sourceContainer; _sourceTable = sourceContainer.Table; _patcher = PatcherManager.GetPatcher(); - _patcher?.Set(sourceContainer, fileName); + _patcher?.Set(sourceContainer, fileName, this, this); _options = options ?? new ConvertOptions(); } @@ -155,6 +155,11 @@ public GameObject Convert(bool applyPatch = true, string tableName = null) ConfigurePlayer(componentLookup); + // patch + if (_applyPatch) { + _patcher?.PostPatch(_tableGo); + } + return _tableGo; } @@ -261,11 +266,15 @@ private Dictionary UpdateGameItems(Dictionary components) _tableGo.AddComponent(); var dga = _tableGo.AddComponent(); - // add trough if none available - if (!_sourceContainer.HasTrough) { - CreateTrough(components); - } - // populate hardware _tableComponent.RepopulateHardware(dga); } - private void CreateTrough(Dictionary components) - { - var troughData = new TroughData("Trough") { - BallCount = 4, - SwitchCount = 4, - Type = TroughType.ModernMech - }; - if (_sourceContainer.Has("BallRelease")) { - troughData.PlayfieldExitKicker = "BallRelease"; - } - if (_sourceContainer.Has("Drain")) { - troughData.PlayfieldEntrySwitch = "Drain"; - } - var item = new Trough(troughData) { - StorageIndex = _sourceContainer.ItemDatas.Count() - }; - - InstantiateAndPersistPrefab(item, components); - } - private void CreateFileHierarchy() { if (!Directory.Exists("Assets/Tables/")) { diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Inspectors/DotMatrixDisplayInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Inspectors/DotMatrixDisplayInspector.cs index 85fccf124..ef6fb3c5e 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Inspectors/DotMatrixDisplayInspector.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Inspectors/DotMatrixDisplayInspector.cs @@ -68,6 +68,14 @@ public override void OnInspectorGUI() mb.Roundness = roundness; } } + + var emission = EditorGUILayout.Slider("Emission (nits)", _mb.Emission, 1f, 500f); + if (emission != _mb.Emission) { + RecordUndo("Change DMD Dot Emission", this); + foreach (var mb in _mbs) { + mb.Emission = emission; + } + } } [MenuItem("GameObject/Visual Pinball/Dot Matrix Display", false, 12)] diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Coil/CoilListViewItemRenderer.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Coil/CoilListViewItemRenderer.cs index 2cc684f24..30618a602 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Coil/CoilListViewItemRenderer.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Coil/CoilListViewItemRenderer.cs @@ -76,7 +76,7 @@ public void Render(TableComponent tableComponent, CoilListData data, Rect cellRe private void UpdateId(CoilListData data, string id) { if (data.Destination == CoilDestination.Lamp) { - var lampEntry = _tableComponent.MappingConfig.Lamps.FirstOrDefault(l => l.Id == data.Id && l.Source == LampSource.Coils); + var lampEntry = _tableComponent.MappingConfig.Lamps.FirstOrDefault(l => l.Id == data.Id && l.IsCoil); if (lampEntry != null) { lampEntry.Id = id; LampManager.Refresh(); @@ -95,7 +95,7 @@ private void RenderDestination(CoilListData coilListData, Rect cellRect, Action< { if (coilListData.Destination == CoilDestination.Lamp) { - var lampEntry = _tableComponent.MappingConfig.Lamps.FirstOrDefault(l => l.Id == coilListData.Id && l.Source == LampSource.Coils); + var lampEntry = _tableComponent.MappingConfig.Lamps.FirstOrDefault(l => l.Id == coilListData.Id && l.IsCoil); if (lampEntry != null) { _tableComponent.MappingConfig.RemoveLamp(lampEntry); LampManager.Refresh(); @@ -104,7 +104,8 @@ private void RenderDestination(CoilListData coilListData, Rect cellRect, Action< } else if (index == CoilDestination.Lamp) { _tableComponent.MappingConfig.AddLamp(new LampMapping { Id = coilListData.Id, - Source = LampSource.Coils, + Source = LampSource.Lamp, + IsCoil = true, Description = coilListData.Description }); LampManager.Refresh(); diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Coil/CoilManager.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Coil/CoilManager.cs index 6f08d7bf2..61685980f 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Coil/CoilManager.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Coil/CoilManager.cs @@ -138,7 +138,7 @@ protected override void RemoveData(string undoName, CoilListData data) // todo if it's a lamp, also delete the lamp entry. if (data.CoilMapping.Destination == CoilDestination.Lamp) { - var lampEntry = TableComponent.MappingConfig.Lamps.FirstOrDefault(l => l.Id == data.Id && l.Source == LampSource.Coils); + var lampEntry = TableComponent.MappingConfig.Lamps.FirstOrDefault(l => l.Id == data.Id && l.IsCoil); if (lampEntry != null) { TableComponent.MappingConfig.RemoveLamp(lampEntry); LampManager.Refresh(); diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Lamp/LampListData.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Lamp/LampListData.cs index 94e3d596f..36196630b 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Lamp/LampListData.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Lamp/LampListData.cs @@ -15,6 +15,7 @@ // along with this program. If not, see . using VisualPinball.Engine.Game.Engines; +using VisualPinball.Engine.Math; namespace VisualPinball.Unity.Editor { @@ -25,39 +26,44 @@ public class LampListData : IManagerListData, IDeviceListData DeviceComponent => Device; public LampListData(LampMapping lampMapping) { Id = lampMapping.Id; + InternalId = lampMapping.InternalId; + IsCoil = lampMapping.IsCoil; Source = lampMapping.Source; Description = lampMapping.Description; Device = lampMapping.Device; DeviceItem = lampMapping.DeviceItem; Type = lampMapping.Type; - Green = lampMapping.Green; - Blue = lampMapping.Blue; + Channel = lampMapping.Channel; + FadingSteps = lampMapping.FadingSteps; LampMapping = lampMapping; } @@ -65,13 +71,15 @@ public LampListData(LampMapping lampMapping) public void Update() { LampMapping.Id = Id; + LampMapping.InternalId = InternalId; + LampMapping.IsCoil = IsCoil; LampMapping.Source = Source; LampMapping.Description = Description; LampMapping.Device = Device; LampMapping.DeviceItem = DeviceItem; LampMapping.Type = Type; - LampMapping.Green = Green; - LampMapping.Blue = Blue; + LampMapping.Channel = Channel; + LampMapping.FadingSteps = FadingSteps; } } } diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Lamp/LampListViewItemRenderer.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Lamp/LampListViewItemRenderer.cs index 9f17aee45..0cd142f56 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Lamp/LampListViewItemRenderer.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Lamp/LampListViewItemRenderer.cs @@ -19,6 +19,8 @@ using UnityEditor; using UnityEngine; using VisualPinball.Engine.Game.Engines; +using VisualPinball.Engine.Math; +using Color = UnityEngine.Color; namespace VisualPinball.Unity.Editor { @@ -32,9 +34,11 @@ private enum LampListColumn { Id = 0, Description = 1, - Element = 2, + Source = 2, Type = 3, - Color = 4, + Element = 4, + Channel = 5, + FadingSteps = 6, } private readonly List _gleLamps; @@ -56,7 +60,7 @@ public void Render(TableComponent tableComponent, LampListData data, Rect cellRe switch ((LampListColumn)column) { case LampListColumn.Id: - if (data.Source == LampSource.Coils) { + if (data.IsCoil) { RenderCoilId(lampStatuses, data, cellRect); } else { RenderId(lampStatuses, ref data.Id, id => data.Id = id, data, cellRect, updateAction); @@ -65,19 +69,22 @@ public void Render(TableComponent tableComponent, LampListData data, Rect cellRe case LampListColumn.Description: RenderDescription(data, cellRect, updateAction); break; - case LampListColumn.Element: - RenderDevice(data, cellRect, updateAction); + case LampListColumn.Source: + RenderSource(data, cellRect, updateAction); break; case LampListColumn.Type: RenderType(data, cellRect, updateAction); break; - case LampListColumn.Color: - switch (data.Type) { - case LampType.RgbMulti: - RenderRgb(lampStatuses, data, cellRect, updateAction); - break; - } + case LampListColumn.Element: + RenderDevice(data, cellRect, updateAction); + break; + case LampListColumn.Channel: + RenderChannel(data, cellRect, updateAction); break; + case LampListColumn.FadingSteps: + RenderFadingSteps(data, cellRect, updateAction); + break; + } EditorGUI.EndDisabledGroup(); } @@ -85,10 +92,9 @@ public void Render(TableComponent tableComponent, LampListData data, Rect cellRe private void RenderCoilId(Dictionary lampStatuses, LampListData lampListData, Rect cellRect) { // add some padding - cellRect.x += 2; + cellRect.x = cellRect.width - 45; cellRect.width -= 4; - var statusAvail = Application.isPlaying && lampStatuses != null && lampStatuses.ContainsKey(lampListData.Id); var icon = Icons.Coil(IconSize.Small, statusAvail && lampStatuses[lampListData.Id] > 0 ? IconColor.Orange : IconColor.Gray); if (icon != null) { @@ -123,17 +129,40 @@ private void RenderType(LampListData lampListData, Rect cellRect, Action lampStatuses, LampListData data, Rect cellRect, Action updateAction) + private void RenderSource(LampListData lampListData, Rect cellRect, Action updateAction) { - var pad = 2; - var width = cellRect.width / 3; - var c = cellRect; - c.width = width - pad; - RenderId(lampStatuses, ref data.Id, id => data.Id = id, data, c, updateAction); - c.x += width + pad; - RenderId(lampStatuses, ref data.Green, id => data.Green = id, data, c, updateAction); - c.x += width + pad; - RenderId(lampStatuses, ref data.Blue, id => data.Blue = id, data, c, updateAction); + EditorGUI.BeginChangeCheck(); + var source = (LampSource)EditorGUI.EnumPopup(cellRect, lampListData.Source); + if (EditorGUI.EndChangeCheck()) { + lampListData.Source = source; + updateAction(lampListData); + } + } + + private void RenderChannel(LampListData lampListData, Rect cellRect, Action updateAction) + { + if (lampListData.Type != LampType.RgbMulti) { + return; + } + EditorGUI.BeginChangeCheck(); + var channel = (ColorChannel)EditorGUI.EnumPopup(cellRect, lampListData.Channel); + if (EditorGUI.EndChangeCheck()) { + lampListData.Channel = channel; + updateAction(lampListData); + } + } + + private void RenderFadingSteps(LampListData lampListData, Rect cellRect, Action updateAction) + { + if (lampListData.Type != LampType.SingleFading) { + return; + } + EditorGUI.BeginChangeCheck(); + var value = EditorGUI.IntField(cellRect, lampListData.FadingSteps); + if (EditorGUI.EndChangeCheck()) { + lampListData.FadingSteps = value; + updateAction(lampListData); + } } protected override Texture GetIcon(LampListData lampListData) diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Lamp/LampManager.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Lamp/LampManager.cs index 59342eb04..6faf8304c 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Lamp/LampManager.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Lamp/LampManager.cs @@ -16,6 +16,7 @@ using System; using System.Collections.Generic; +using System.Linq; using NLog; using UnityEditor; using UnityEngine; @@ -42,6 +43,8 @@ internal class LampManager : ManagerWindow private LampListViewItemRenderer _listViewItemRenderer; + private ToggleAction _toggleAction = ToggleAction.All; + public static void Refresh() { if (HasOpenInstances()) { @@ -106,6 +109,49 @@ protected override void OnButtonBarGUI() Reload(); } } + + GUILayout.FlexibleSpace(); + + _toggleAction = (ToggleAction)EditorGUILayout.EnumPopup(_toggleAction); + if (GUILayout.Button("Turn On", GUILayout.ExpandWidth(false))) { + Toggle(l => l.enabled = true); + } + if (GUILayout.Button("Turn Off", GUILayout.ExpandWidth(false))) { + Toggle(l => l.enabled = false); + } + if (GUILayout.Button("Select", GUILayout.ExpandWidth(false))) { + var lights = new List(); + Toggle(lights.Add); + Selection.objects = lights.Select(l => l.gameObject as Object).ToArray(); + } + } + + private void Toggle(Action action) + { + if (TableComponent != null) { + IEnumerable selection = _toggleAction switch { + ToggleAction.All => TableComponent.MappingConfig.Lamps, + ToggleAction.Inserts => TableComponent.MappingConfig.Lamps.Where(lm => !lm.IsCoil && lm.Source == LampSource.Lamp), + ToggleAction.GI => TableComponent.MappingConfig.Lamps.Where(lm => lm.Source == LampSource.GI), + ToggleAction.Flasher => TableComponent.MappingConfig.Lamps.Where(lm => lm.IsCoil), + ToggleAction.Selected => _listView.GetSelectedData().Select(lld => lld.LampMapping), + _ => throw new ArgumentOutOfRangeException() + }; + + foreach (var lampMapping in selection) { + if (lampMapping.Device == null) { + continue; + } + + var lights = lampMapping.Device is LightGroupComponent lightGroupComponent + ? lightGroupComponent.Lights.SelectMany(l => l.GetComponentsInChildren()) + : lampMapping.Device.gameObject.GetComponentsInChildren(); + + foreach (var light in lights) { + action(light); + } + } + } } protected override void OnListViewItemRenderer(LampListData data, Rect cellRect, int column) @@ -149,12 +195,13 @@ protected override void CloneData(string undoName, string newName, LampListData TableComponent.MappingConfig.AddLamp(new LampMapping { Id = data.Id, + InternalId = data.InternalId, Description = data.Description, Device = data.Device, DeviceItem = data.DeviceItem, Type = data.Type, - Blue = data.Blue, - Green = data.Green, + Source = data.Source, + IsCoil = data.IsCoil, }); } #endregion @@ -195,4 +242,9 @@ private void RecordUndo(string undoName) #endregion } + + internal enum ToggleAction + { + All, Inserts, GI, Flasher, Selected + } } diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/ManagerWindow.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/ManagerWindow.cs index 3d75b3602..b57b77958 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/ManagerWindow.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/ManagerWindow.cs @@ -67,7 +67,7 @@ protected float RowHeight { protected T _selectedItem; private List _data = new List(); - private ManagerListView _listView; + protected ManagerListView _listView; private TreeViewState _treeViewState; private bool _renaming; private string _renameBuffer = string.Empty; diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Wire/WireListData.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Wire/WireListData.cs index 56687e29a..ca925036b 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Wire/WireListData.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Wire/WireListData.cs @@ -20,6 +20,8 @@ namespace VisualPinball.Unity.Editor { public class WireListData : IManagerListData, IDeviceListData { + public string Id; + [ManagerListColumn(Order = 0, HeaderName = "Description", Width = 150)] public string Name { get; private set; } @@ -27,40 +29,41 @@ public class WireListData : IManagerListData, IDeviceListData Name; set => Name = value; } - public string SourceInputActionMap; public string SourceInputAction; public SwitchConstant SourceConstant; public ISwitchDeviceComponent SourceDevice; public string SourceDeviceItem; + [ManagerListColumn(Order = 3, HeaderName = "Destination Element", Width = 270)] public IWireableComponent DestinationDevice; public string DestinationDeviceItem; + [ManagerListColumn(Order = 4, HeaderName = "Dynamic", Width = 100)] + public bool IsDynamic; + + [ManagerListColumn(Order = 5, HeaderName = "Pulse Delay", Width = 100)] + public int PulseDelay; + + public string Description { get => Name; set => Name = value; } + public readonly WireMapping WireMapping; public IDeviceComponent DeviceComponent => DestinationDevice; public string DeviceItem { get => DestinationDeviceItem; set => DestinationDeviceItem = value; } public int InternalId { get; set; } - public WireListData(WireMapping wireMapping) { + public WireListData(WireMapping wireMapping) + { + Id = wireMapping.Id; Description = wireMapping.Description; - Source = wireMapping.Source; SourceInputActionMap = wireMapping.SourceInputActionMap; SourceInputAction = wireMapping.SourceInputAction; SourceConstant = wireMapping.SourceConstant; SourceDevice = wireMapping.SourceDevice; SourceDeviceItem = wireMapping.SourceDeviceItem; + IsDynamic = wireMapping.IsDynamic; DestinationDevice = wireMapping.DestinationDevice; DestinationDeviceItem = wireMapping.DestinationDeviceItem; @@ -80,6 +83,7 @@ public void Update() WireMapping.SourceConstant = SourceConstant; WireMapping.SourceDevice = SourceDevice; WireMapping.SourceDeviceItem = SourceDeviceItem; + WireMapping.IsDynamic = IsDynamic; WireMapping.DestinationDevice = DestinationDevice; WireMapping.DestinationDeviceItem = DestinationDeviceItem; diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Wire/WireListViewItemRenderer.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Wire/WireListViewItemRenderer.cs index 5e2ff01d4..89ef4ecc7 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Wire/WireListViewItemRenderer.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Wire/WireListViewItemRenderer.cs @@ -17,6 +17,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Unity.Mathematics; using UnityEditor; using UnityEngine; using VisualPinball.Engine.Game.Engines; @@ -27,7 +28,7 @@ public class WireListViewItemRenderer: ListViewItemRenderer GleItems => new List(); protected override IGamelogicEngineDeviceItem InstantiateGleItem(string id) => null; - protected override Texture2D StatusIcon(bool status) => null; + protected override Texture2D StatusIcon(bool status) => Icons.Plug(IconSize.Small, status ? IconColor.Orange : IconColor.Gray); private struct InputSystemEntry { @@ -41,7 +42,8 @@ private enum WireListColumn Source = 1, SourceElement = 2, DestinationElement = 3, - PulseDelay = 4, + Dynamic = 4, + PulseDelay = 5, } private readonly InputManager _inputManager; @@ -59,10 +61,13 @@ public WireListViewItemRenderer(TableComponent tableComponent, InputManager inpu public void Render(TableComponent tableComponent, WireListData data, Rect cellRect, int column, Action updateAction) { - switch ((WireListColumn)column) - { + EditorGUI.BeginDisabledGroup(Application.isPlaying); + var switchStatuses = Application.isPlaying + ? tableComponent.gameObject.GetComponent()?.WireStatuses + : null; + switch ((WireListColumn)column) { case WireListColumn.Description: - RenderDescription(data, cellRect, updateAction); + RenderDescription(switchStatuses, data, cellRect, updateAction); break; case WireListColumn.Source: RenderSource(data, cellRect, updateAction); @@ -73,10 +78,33 @@ public void Render(TableComponent tableComponent, WireListData data, Rect cellRe case WireListColumn.DestinationElement: RenderDestinationElement(data, cellRect, updateAction); break; + case WireListColumn.Dynamic: + RenderIsDynamic(switchStatuses, data, cellRect, updateAction); + break; case WireListColumn.PulseDelay: RenderPulseDelay(data, cellRect, updateAction); break; } + EditorGUI.EndDisabledGroup(); + } + + private void RenderDescription(Dictionary statuses, WireListData listData, Rect cellRect, Action updateAction) + { + if (Application.isPlaying && statuses != null) { + var iconRect = cellRect; + iconRect.width = 20; + if (statuses.ContainsKey(listData.Id)) { + var status = statuses[listData.Id]; + var icon = StatusIcon(status.Item1); + var guiColor = GUI.color; + GUI.color = Color.clear; + EditorGUI.DrawTextureTransparent(iconRect, icon, ScaleMode.ScaleToFit); + GUI.color = guiColor; + } + cellRect.x += 25; + cellRect.width -= 25; + } + base.RenderDescription(listData, cellRect, updateAction); } private void RenderSource(WireListData wireListData, Rect cellRect, Action updateAction) @@ -191,7 +219,7 @@ private void RenderSourceElementDevice(WireListData wireListData, Rect cellRect, }); } - private void RenderSourceElementDeviceItem(WireListData wireListData, Rect cellRect, Action updateAction) + private static void RenderSourceElementDeviceItem(WireListData wireListData, Rect cellRect, Action updateAction) { EditorGUI.BeginDisabledGroup(wireListData.SourceDevice == null); @@ -231,12 +259,35 @@ protected override void RenderDeviceElement(WireListData listData, Rect cellRect }); } - private void RenderPulseDelay(WireListData wireListData, Rect cellRect, Action updateAction) + + private static void RenderIsDynamic(IReadOnlyDictionary statuses, WireListData wireListData, Rect cellRect, Action updateAction) + { + if (Application.isPlaying && statuses != null) { + var status = statuses[wireListData.Id]; + var lag = status.Item2; + var displayLag = math.round(lag * 10000f) / 10f; + if (lag < 0) { + EditorGUI.LabelField(cellRect, "Measuring..."); + return; + } + if (lag > 0) { + EditorGUI.LabelField(cellRect, $"{displayLag} ms"); + return; + } + } + EditorGUI.BeginChangeCheck(); + var isDynamic = EditorGUI.Toggle(cellRect, wireListData.IsDynamic); + if (EditorGUI.EndChangeCheck()) { + wireListData.IsDynamic = isDynamic; + updateAction(wireListData); + } + } + + private static void RenderPulseDelay(WireListData wireListData, Rect cellRect, Action updateAction) { if (wireListData.SourceDevice != null && !string.IsNullOrEmpty(wireListData.SourceDeviceItem)) { var switchable = wireListData.SourceDevice.AvailableSwitches.First(s => s.Id == wireListData.SourceDeviceItem); - if (switchable.IsPulseSwitch) - { + if (switchable.IsPulseSwitch) { var labelRect = cellRect; labelRect.x += labelRect.width - 20; labelRect.width = 20; @@ -257,7 +308,7 @@ private void RenderPulseDelay(WireListData wireListData, Rect cellRect, Action. +using System; using System.Collections.Generic; using NLog; using UnityEditor; using UnityEngine; +using VisualPinball.Engine.Game.Engines; using Logger = NLog.Logger; +using Object = UnityEngine.Object; namespace VisualPinball.Unity.Editor { @@ -91,6 +94,13 @@ protected override bool SetupCompleted() protected override void OnButtonBarGUI() { + if (GUILayout.Button("Populate All", GUILayout.ExpandWidth(false))) + { + RecordUndo("Populate all wire mappings"); + TableComponent.MappingConfig.PopulateWires(GetAvailableEngineWires(), TableComponent); + Reload(); + } + if (GUILayout.Button("Remove All", GUILayout.ExpandWidth(false))) { if (EditorUtility.DisplayDialog("Wire Manager", "Are you sure want to remove all wire mappings?", "Yes", "Cancel")) { @@ -124,7 +134,7 @@ protected override void AddNewData(string undoName, string newName) { RecordUndo(undoName); - TableComponent.MappingConfig.AddWire(new WireMapping()); + TableComponent.MappingConfig.AddWire(new WireMapping().WithId()); } protected override void RemoveData(string undoName, WireListData data) @@ -138,12 +148,19 @@ protected override void CloneData(string undoName, string newName, WireListData { RecordUndo(undoName); - TableComponent.MappingConfig.AddWire(new WireMapping()); + TableComponent.MappingConfig.AddWire(new WireMapping().WithId()); } #endregion #region Helper methods + + private GamelogicEngineWire[] GetAvailableEngineWires() + { + var gle = TableComponent.gameObject.GetComponent(); + return gle == null ? Array.Empty() : gle.AvailableWires; + } + private void DisplayMessage(string message) { GUILayout.BeginHorizontal(); diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Utils/Icons.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Utils/Icons.cs index a23abd9e2..50d9fcb34 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Utils/Icons.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Utils/Icons.cs @@ -40,11 +40,13 @@ public IconVariant(string name, IconSize size, IconColor color) private const string BoltName = "bolt"; private const string CoilName = "coil"; private const string DropTargetName = "drop_target"; + private const string FlasherName = "light_flasher"; private const string FlipperName = "flipper"; private const string GateName = "gate"; private const string HitTargetName = "hit_target"; private const string KeyName = "keyboard"; private const string KickerName = "kicker"; + private const string LightGroupName = "light_group"; private const string LightName = "light"; private const string PlayfieldName = "playfield"; private const string PlungerName = "plunger"; @@ -62,9 +64,9 @@ public IconVariant(string name, IconSize size, IconColor color) private const string SwitchNoName = "switch_no"; private static readonly string[] Names = { - BumperName, BoltName, CoilName, DropTargetName, FlipperName, HitTargetName, GateName, KeyName, KickerName, LightName, PlayfieldName, - PlungerName, PlugName, PrimitiveName, RampName, RubberName, SpinnerName, SurfaceName, TableName, TriggerName, TroughName, - SlingshotName, SwitchNcName, SwitchNoName + BumperName, BoltName, CoilName, DropTargetName, FlasherName, FlipperName, HitTargetName, GateName, KeyName, KickerName, LightGroupName, + LightName, PlayfieldName, PlungerName, PlugName, PrimitiveName, RampName, RubberName, SpinnerName, SurfaceName, TableName, TriggerName, + TroughName, SlingshotName, SwitchNcName, SwitchNoName }; private readonly Dictionary _icons = new Dictionary(); @@ -97,11 +99,13 @@ private Icons() public static Texture2D Bumper(IconSize size = IconSize.Large, IconColor color = IconColor.Gray) => Instance.GetItem(BumperName, size, color); public static Texture2D DropTarget(IconSize size = IconSize.Large, IconColor color = IconColor.Gray) => Instance.GetItem(DropTargetName, size, color); + public static Texture2D Flasher(IconSize size = IconSize.Large, IconColor color = IconColor.Gray) => Instance.GetItem(FlasherName, size, color); public static Texture2D Flipper(IconSize size = IconSize.Large, IconColor color = IconColor.Gray) => Instance.GetItem(FlipperName, size, color); public static Texture2D Gate(IconSize size = IconSize.Large, IconColor color = IconColor.Gray) => Instance.GetItem(GateName, size, color); public static Texture2D HitTarget(IconSize size = IconSize.Large, IconColor color = IconColor.Gray) => Instance.GetItem(HitTargetName, size, color); public static Texture2D Kicker(IconSize size = IconSize.Large, IconColor color = IconColor.Gray) => Instance.GetItem(KickerName, size, color); public static Texture2D Light(IconSize size = IconSize.Large, IconColor color = IconColor.Gray) => Instance.GetItem(LightName, size, color); + public static Texture2D LightGroup(IconSize size = IconSize.Large, IconColor color = IconColor.Gray) => Instance.GetItem(LightGroupName, size, color); public static Texture2D Playfield(IconSize size = IconSize.Large, IconColor color = IconColor.Gray) => Instance.GetItem(PlayfieldName, size, color); public static Texture2D Plunger(IconSize size = IconSize.Large, IconColor color = IconColor.Gray) => Instance.GetItem(PlungerName, size, color); public static Texture2D Plug(IconSize size = IconSize.Large, IconColor color = IconColor.Gray) => Instance.GetItem(PlugName, size, color); @@ -125,11 +129,13 @@ public static Texture2D ByComponent(T mb, IconSize size = IconSize.Large, Ico switch (mb) { case BumperComponent _: return Bumper(size, color); case DropTargetComponent _: return DropTarget(size, color); + //case FlasherComponent _: return Flasher(size, color); case FlipperComponent _: return Flipper(size, color); case GateComponent _: return Gate(size, color); case HitTargetComponent _: return HitTarget(size, color); case KickerComponent _: return Kicker(size, color); case LightComponent _: return Light(size, color); + case LightGroupComponent _: return LightGroup(size, color); case PlungerComponent _: return Plunger(size, color); case PlayfieldComponent _: return Playfield(size, color); case PrimitiveComponent _: return Primitive(size, color); @@ -156,6 +162,7 @@ public static void DisableGizmoIcons() DisableGizmo(); DisableGizmo(); DisableGizmo(); + //DisableGizmo(); DisableGizmo(); DisableGizmo(); DisableGizmo(); @@ -169,6 +176,7 @@ public static void DisableGizmoIcons() DisableGizmo(); DisableGizmo(); DisableGizmo(); + DisableGizmo(); DisableGizmo(); DisableGizmo(); DisableGizmo(); diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Kicker/KickerInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Kicker/KickerInspector.cs index e62a2d528..85f8c37b8 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Kicker/KickerInspector.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Kicker/KickerInspector.cs @@ -16,8 +16,11 @@ // ReSharper disable AssignmentInConditionalExpression +using System; using System.Collections.Generic; +using Unity.Mathematics; using UnityEditor; +using UnityEngine; using VisualPinball.Engine.VPT; using VisualPinball.Engine.VPT.Kicker; @@ -85,5 +88,30 @@ public override void OnInspectorGUI() EndEditing(); } + + private void OnSceneGUI() + { + if (Event.current.type != EventType.Repaint) { + return; + } + + Handles.color = Color.cyan; + var transform = MainComponent.transform; + var position = transform.parent.TransformPoint(MainComponent.GetEditorPosition()); + + foreach (var coil in MainComponent.Coils) { + var from = MainComponent.GetBallCreationPosition().ToUnityVector3(); + var l = 20f * coil.Speed; + var dir = new Vector3( + l * math.cos(math.radians(coil.Angle)), + l * math.sin(math.radians(coil.Angle)), + l * math.sin(math.radians(coil.Inclination)) + ); + var to = from + dir; + var worldDir = transform.TransformDirection(math.normalize( to - from)); + + Handles.ArrowHandleCap(-1, position, Quaternion.LookRotation(worldDir), coil.Speed / 10f, EventType.Repaint); + } + } } } diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Light/LightExtensions.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Light/LightExtensions.cs index fa8974bf4..ba3152d42 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Light/LightExtensions.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Light/LightExtensions.cs @@ -15,14 +15,17 @@ // along with this program. If not, see . using VisualPinball.Engine.VPT.Light; +using VisualPinball.Engine.VPT.Table; namespace VisualPinball.Unity.Editor { public static class LightExtensions { - internal static IVpxPrefab InstantiatePrefab(this Light light) + internal static IVpxPrefab InstantiatePrefab(this Light light, Table table) { - var prefab = RenderPipeline.Current.PrefabProvider.CreateLight(); + var prefab = light.IsInsertLight(table) + ? RenderPipeline.Current.PrefabProvider.CreateInsertLight() + : RenderPipeline.Current.PrefabProvider.CreateLight(); return new VpxPrefab(prefab, light); } } diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Light/LightGroupInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Light/LightGroupInspector.cs new file mode 100644 index 000000000..9598519bf --- /dev/null +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Light/LightGroupInspector.cs @@ -0,0 +1,90 @@ +// Visual Pinball Engine +// Copyright (C) 2021 freezy and VPE Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +// ReSharper disable AssignmentInConditionalExpression + +using System.Collections.Generic; +using System.Linq; +using UnityEditor; +using UnityEngine; + +namespace VisualPinball.Unity.Editor +{ + [CustomEditor(typeof(LightGroupComponent)), CanEditMultipleObjects] + public class LightGroupInspector : ItemInspector + { + private LightGroupComponent _lightGroupComponent; + private SerializedProperty _lightGroupProperty; + + protected override MonoBehaviour UndoTarget => target as MonoBehaviour; + + protected override void OnEnable() + { + base.OnEnable(); + + _lightGroupComponent = target as LightGroupComponent; + _lightGroupProperty = serializedObject.FindProperty(nameof(LightGroupComponent.Lights)); + } + + public override void OnInspectorGUI() + { + BeginEditing(); + + OnPreInspectorGUI(); + + PropertyField(_lightGroupProperty, "Lights"); + + GUILayout.Space(10); + if (GUILayout.Button("Add Children")) { + var lights = _lightGroupComponent.GetComponentsInChildren(); + foreach (var light in lights) { + if (_lightGroupComponent.Lights.ToList().Contains(light)) { + continue; + } + _lightGroupProperty.InsertArrayElementAtIndex(_lightGroupProperty.arraySize); + _lightGroupProperty.GetArrayElementAtIndex(_lightGroupProperty.arraySize - 1).objectReferenceValue = light; + } + } + + if (GUILayout.Button("Replace With Children")) { + var lights = _lightGroupComponent.GetComponentsInChildren(); + _lightGroupProperty.ClearArray(); + foreach (var light in lights) { + _lightGroupProperty.InsertArrayElementAtIndex(_lightGroupProperty.arraySize); + _lightGroupProperty.GetArrayElementAtIndex(_lightGroupProperty.arraySize - 1).objectReferenceValue = light; + } + } + + if (GUILayout.Button("Clear")) { + _lightGroupProperty.ClearArray(); + } + + base.OnInspectorGUI(); + + EndEditing(); + + GUILayout.Space(10); + if (GUILayout.Button("Select Light Sources")) { + var selection = new List(); + foreach (var lightComponent in _lightGroupComponent.Lights) { + selection.AddRange(lightComponent.GetComponentsInChildren().Select(l => l.gameObject)); + } + + Selection.objects = selection.ToArray(); + } + } + } +} diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Light/LightGroupInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Light/LightGroupInspector.cs.meta new file mode 100644 index 000000000..1aba2e750 --- /dev/null +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Light/LightGroupInspector.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 94ce8eed531658b4cbdf8ce9cda376fa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Light/LightInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Light/LightInspector.cs index de1c861b4..b546a100a 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Light/LightInspector.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Light/LightInspector.cs @@ -16,9 +16,13 @@ // ReSharper disable AssignmentInConditionalExpression +using System.Collections.Generic; +using System.Linq; using UnityEditor; +using UnityEngine; using VisualPinball.Engine.VPT; using VisualPinball.Engine.VPT.Light; +using Light = VisualPinball.Engine.VPT.Light.Light; namespace VisualPinball.Unity.Editor { @@ -79,6 +83,14 @@ public override void OnInspectorGUI() base.OnInspectorGUI(); EndEditing(); + + GUILayout.Space(10); + if (GUILayout.Button("Select Light Source")) { + Selection.objects = MainComponent + .GetComponentsInChildren() + .Select(l => l.gameObject as Object) + .ToArray(); + } } } } diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/TransformInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/TransformInspector.cs index ceefc9fdb..6548edc05 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/TransformInspector.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/TransformInspector.cs @@ -71,8 +71,8 @@ protected virtual void OnEnable() var item = itemTransform.GetComponent(); - useDefault = useDefault && itemTransform.GetComponentInParent() == null; _itemSelected = itemTransform.GetComponent() != null; + useDefault = useDefault && !_itemSelected && itemTransform.GetComponent() == null; // must be main but not the table itself if (item != null && !(item is TableComponent)) { diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Trough/TroughExtensions.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Trough/TroughExtensions.cs index dbe8bca21..eaad4a58f 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Trough/TroughExtensions.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Trough/TroughExtensions.cs @@ -23,7 +23,7 @@ public static class TroughExtensions { internal static IVpxPrefab InstantiatePrefab(this Trough trough) { - var prefab = UnityEngine.Resources.Load("Prefabs/Trough"); + var prefab = Resources.Load("Prefabs/Trough"); return new VpxPrefab(prefab, trough); } } diff --git a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/Item/ItemMatchAttribute.cs b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/Item/ItemMatchAttribute.cs index 1bc3fcb38..81fbd9a46 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/Item/ItemMatchAttribute.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/Item/ItemMatchAttribute.cs @@ -16,7 +16,6 @@ using System; using UnityEngine; -using VisualPinball.Engine.Game; using VisualPinball.Engine.VPT.Table; namespace VisualPinball.Unity.Patcher @@ -29,6 +28,8 @@ public abstract class ItemMatchAttribute : Attribute /// public string Ref; + public float FloatParam; + public abstract bool Matches(FileTableContainer tableContainer, GameObject obj); } } diff --git a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/Item/NameMatchAttribute.cs b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/Item/NameMatchAttribute.cs index c5e8fba01..ccb05b9c4 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/Item/NameMatchAttribute.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/Item/NameMatchAttribute.cs @@ -16,7 +16,6 @@ using System; using UnityEngine; -using VisualPinball.Engine.Game; using VisualPinball.Engine.VPT.Table; namespace VisualPinball.Unity.Patcher @@ -35,11 +34,14 @@ public NameMatchAttribute(string name) _name = name; } - public override bool Matches(FileTableContainer tableContainer, GameObject obj) + public override bool Matches(FileTableContainer tableContainer, GameObject go) { + if (!go) { + return false; + } return IgnoreCase - ? string.Equals(obj.name, _name, StringComparison.CurrentCultureIgnoreCase) - : obj.name == _name; + ? string.Equals(go.name, _name, StringComparison.CurrentCultureIgnoreCase) + : go.name == _name; } } } diff --git a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/Item/RenderPipelineAttribute.cs b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/Item/RenderPipelineAttribute.cs index 062e63532..cbe9baaee 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/Item/RenderPipelineAttribute.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/Item/RenderPipelineAttribute.cs @@ -15,7 +15,6 @@ // along with this program. If not, see . using UnityEngine; -using VisualPinball.Engine.Game; using VisualPinball.Engine.VPT.Table; namespace VisualPinball.Unity.Patcher.Matcher.Item diff --git a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/TablePatcher.cs b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/TablePatcher.cs new file mode 100644 index 000000000..6368230fe --- /dev/null +++ b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/TablePatcher.cs @@ -0,0 +1,430 @@ +// Visual Pinball Engine +// Copyright (C) 2021 freezy and VPE Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +using System; +using System.Collections.Generic; +using System.Linq; +using UnityEditor; +using UnityEngine; +using VisualPinball.Engine.VPT; +using VisualPinball.Engine.VPT.Light; +using VisualPinball.Engine.VPT.Table; +using VisualPinball.Engine.VPT.Trough; +using VisualPinball.Unity.Editor; +using Light = UnityEngine.Light; +using Object = UnityEngine.Object; + +namespace VisualPinball.Unity.Patcher +{ + [Api] + public abstract class TablePatcher + { + public TableContainer TableContainer; + public ITextureProvider TextureProvider; + public IMaterialProvider MaterialProvider; + + /// + /// This method is executed once after all element-specific patches had + /// been applied.

+ /// + /// Override this method when you need to create new objects or make global + /// changes to the project. + ///

+ /// GameObject of the table. + public virtual void PostPatch(GameObject tableGo) + { + CreateTrough(tableGo, Playfield(tableGo)); + } + + #region GameObject Helpers + + /// + /// Returns the playfield of a given table game object. + /// + /// Table game object + /// + protected static GameObject Playfield(GameObject tableGo) + { + var pf = tableGo.GetComponentInChildren(); + if (pf) { + return pf.gameObject; + } + + Debug.LogWarning($"Cannot find playfield of \"{tableGo.name}\"."); + return tableGo; + + } + + /// + /// Creates an empty game object. + /// + /// Parent of the new game object + /// Name of the new game object + /// + protected static GameObject CreateEmptyGameObject(GameObject parentGo, string name) + { + var newGo = new GameObject(name); + newGo.transform.SetParent(parentGo.transform, false); + return newGo; + } + + protected static GameObject GetOrCreateGameObject(GameObject parentGo, string name) + { + for (var i = 0; i < parentGo.transform.childCount; i++) { + if (parentGo.transform.GetChild(i).gameObject.name == name) { + return parentGo.transform.GetChild(i).gameObject; + } + } + + return CreateEmptyGameObject(parentGo, name); + } + + #endregion + + #region Element Helpers + + /// + /// Creates a trough. + /// + /// Table game object, for retrieving references + /// Parent game object of the new trough + /// Name of the new trough + /// Name of the exit kicker + /// Name of the entry switch + protected static TroughComponent CreateTrough(GameObject tableGo, GameObject parentGo, + string name = "Trough", string exitKicker = "BallRelease", string entrySwitch = "Drain") + { + var trough = new Trough(new TroughData { + BallCount = 4, + SwitchCount = 4, + Type = TroughType.ModernMech, + }); + + var troughGo = trough.InstantiateEditorPrefab(parentGo.transform); + var troughComponent = troughGo.GetComponent(); + + var kickers = tableGo.GetComponentsInChildren(); + foreach (var kicker in kickers) { + if (string.Equals(kicker.name, exitKicker, StringComparison.OrdinalIgnoreCase)) { + troughComponent.PlayfieldExitKicker = kicker; + troughComponent.PlayfieldExitKickerItem = kicker.AvailableCoils.First().Id; + } + if (string.Equals(kicker.name, entrySwitch, StringComparison.OrdinalIgnoreCase)) { + troughComponent.PlayfieldEntrySwitch = kicker; + troughComponent.PlayfieldEntrySwitchItem = kicker.AvailableSwitches.First().Id; + } + } + + if (troughComponent.PlayfieldEntrySwitch == null) { + var triggers = tableGo.GetComponentsInChildren(); + foreach (var trigger in triggers) { + + if (string.Equals(trigger.name, entrySwitch, StringComparison.OrdinalIgnoreCase)) { + troughComponent.PlayfieldEntrySwitch = trigger; + } + } + } + + troughGo.name = name; + return troughComponent; + } + + #endregion + + #region Light Helpers + + /// + /// Adds a light group component to an existing game object. + /// + /// Table game object for retrieving light references. + /// Game object to which the light group is added to. + /// A list of light names that are part of the light group. + protected static LightGroupComponent AddLightGroup(GameObject tableGo, GameObject go, params string[] names) + { + var nameIndex = new HashSet(names); + var lightComponentGroup = go.AddComponent(); + var lights = tableGo + .GetComponentsInChildren() + .Where(lc => nameIndex.Contains(lc.name)); + lightComponentGroup.Lights = lights.ToArray(); + + return lightComponentGroup; + } + + /// + /// Sets the light color of a light source. + /// + /// + /// Supports multiple light sources. + /// + /// Game object of the light source + /// New color of the light source + protected static void LightColor(GameObject go, Color color) + { + var lights = go.GetComponentsInChildren(); + foreach (var light in lights) { + RenderPipeline.Current.LightConverter.SetColor(light, color); + } + } + + /// + /// Sets the temperature of the light. + /// + /// Game object of the light + /// Temperature in Kelvin + protected static void LightTemperature(GameObject go, float temp) + { + foreach (var l in go.GetComponentsInChildren()) { + RenderPipeline.Current.LightConverter.SetTemperature(l, temp); + } + } + + /// + /// Sets the angle of a spot light. + /// + /// + /// Supports multiple light sources. + /// + /// Game object of the spot light + /// Outer angle of the spot + /// Inner angle of the spot, in percent of the outer angle + protected static void SpotAngle(GameObject go, float outer, float inner) + { + var lights = go.GetComponentsInChildren(); + foreach (var light in lights) { + RenderPipeline.Current.LightConverter.SpotLight(light, outer, inner); + } + } + + /// + /// Sets a light source to pyramid spotlight and sets its parameters. + /// + /// + /// Supports multiple light sources. + /// + /// Game object of the light source + /// Angle of the pyramid + /// Aspect ratio of the pyramid + protected static void PyramidAngle(GameObject go, float angle, float ar) + { + var lights = go.GetComponentsInChildren(); + foreach (var light in lights) { + RenderPipeline.Current.LightConverter.PyramidAngle(light, angle, ar); + } + } + + /// + /// Sets the intensity of a light source in lumen. + /// + /// + /// Supports multiple light sources. + /// + /// Game object of the light source + /// Intensity of the light in lumen + protected static void LightIntensity(GameObject go, float intensityLumen) + { + var lights = go.GetComponentsInChildren(); + foreach (var light in lights) { + RenderPipeline.Current.LightConverter.SetIntensity(light, intensityLumen); + } + } + + /// + /// Sets the range of the light. + /// + /// Game object of the light + /// Range in meters + protected static void LightRange(GameObject go, float range) + { + var lights = go.GetComponentsInChildren(); + foreach (var light in lights) { + RenderPipeline.Current.LightConverter.SetRange(light, range); + } + } + + /// + /// Sets the shadow of the light. + /// + /// Game object of the light + /// Whether to enable or disable shadows. + /// If true, update on each frame. + /// Distance from when on shadows are cast. + protected static void LightShadow(GameObject go, bool enabled, bool isDynamic, float nearPlane = 0.01f) + { + var lights = go.GetComponentsInChildren(); + foreach (var light in lights) { + RenderPipeline.Current.LightConverter.SetShadow(light, enabled, isDynamic, nearPlane); + } + } + + /// + /// Sets the light position. + /// + /// + /// Supports multiple light sources. Note that this only applies to the light source, not to the light itself. + /// + /// Game object of the light source + /// X-position of the source relative to the light + /// Y-position of the source relative to the light + /// Z-position of the source relative to the light + protected static void LightPos(GameObject go, float x, float y, float z) + { + var light = go.GetComponentInChildren(); + if (light != null) { + light.gameObject.transform.localPosition = new Vector3(x, y, z); + } + } + + /// + /// Creates a point light. + /// + /// Name of the new light + /// X-position on the playfield + /// Y-position on the playfield + /// Game object to parent to (usually "Lights") + /// + protected static LightComponent CreateLight(string name, float x, float y, GameObject parentGo) + { + var light = Engine.VPT.Light.Light.GetDefault(name, x, y); + light.Data.ShowBulbMesh = false; + + var prefab = RenderPipeline.Current.PrefabProvider.CreateLight(); + var lightGo = PrefabUtility.InstantiatePrefab(prefab, parentGo.transform) as GameObject; + if (!lightGo) { + return null; + } + lightGo.name = name; + var lightTransform = lightGo.transform; + var lightComponent = lightGo.GetComponent(); + lightComponent.SetData(light.Data); + lightComponent.UpdateTransforms(); + lightTransform.Find("Bulb").gameObject.SetActive(false); + lightTransform.Find("Socket").gameObject.SetActive(false); + return lightComponent; + } + + /// + /// Converts a normal light to an insert light, by deleting and re-creating the insert prefab. + /// + /// Light component to convert + /// New converted game object + protected GameObject ConvertToInsertLight(LightComponent lo) + { + var name = lo.name; + var parent = lo.transform.parent.gameObject; + Object.DestroyImmediate(lo.gameObject); + return CreateInsertLight(TableContainer.Get(name).Data, parent); + } + + /// + /// Creates an insert light based on existing light data. + /// + /// + /// + private GameObject CreateInsertLight(LightData data, GameObject parentGo) + { + var prefab = RenderPipeline.Current.PrefabProvider.CreateInsertLight(); + var go = PrefabUtility.InstantiatePrefab(prefab, parentGo.transform) as GameObject; + go!.name = data.Name; + data.OffImage = TableContainer.Table.Data.Image; + var lc = go.GetComponent(); + lc.SetData(data); + lc.SetReferencedData(data, TableContainer.Table, MaterialProvider, TextureProvider, null); + + EditorUtility.SetDirty(go); + PrefabUtility.RecordPrefabInstancePropertyModifications(lc); + + return go; + } + + /// + /// Duplicates a light source. + /// + /// Game object of the light source + /// X-position of the new light source, relative to the lamp + /// Y-position of the new light source, relative to the lamp + /// Z-position of the new light source, relative to the lamp + protected static void DuplicateLight(GameObject go, float x, float y, float z) + { + var light = go.GetComponentInChildren(); + if (light != null) { + var newGo = Object.Instantiate(light.gameObject, go.transform, true); + newGo.transform.localPosition = new Vector3(x, y, z); + } + } + + /// + /// Creates a light group with the given light names + /// + /// GameObject to add the light group to. + /// Names of the light GameObjects. They must be sister objects of the first parameter. + protected static void LinkLights(GameObject go, params string[] lightNames) + { + var parentTransform = go.transform.parent; + var lightComponents = lightNames + .Select(n => parentTransform.Find(n).GetComponent()) + .Where(c => c != null); + var lg = go.AddComponent(); + lg.Lights = lightComponents.ToArray(); + } + + #endregion + + #region Mapping Helpers + + /// + /// Links a coil device to an existing coil mapping if it matches a given name. + /// + /// Table component for retrieving mappings. + /// The name that the coil device's GameObject has to match in order to be linked. + /// The ID of the coil mapping that the coil device will be linked to + /// The coil device to be linked + protected static void LinkCoil(TableComponent tableComponent, string elementName, string coilId, ICoilDeviceComponent coilDevice) + { + if (!string.Equals(coilDevice.gameObject.name, elementName, StringComparison.OrdinalIgnoreCase)) { + return; + } + var coilMapping = tableComponent.MappingConfig.Coils.FirstOrDefault(cm => cm.Id == coilId); + if (coilMapping == null) { + return; + } + coilMapping.Device = coilDevice; + coilMapping.DeviceItem = coilDevice.AvailableCoils.First().Id; + } + + /// + /// Links a switch device to an existing switch mapping if it matches a given name. + /// + /// Table component for retrieving mappings. + /// The name that the switch device's GameObject has to match in order to be linked. + /// The ID of the switch mapping that the switch device will be linked to + /// The switch device to be linked + protected static void LinkSwitch(TableComponent tableComponent, string elementName, string switchId, ISwitchDeviceComponent switchDevice) + { + if (!string.Equals(switchDevice.gameObject.name, elementName, StringComparison.OrdinalIgnoreCase)) { + return; + } + var switchMapping = tableComponent.MappingConfig.Switches.FirstOrDefault(sw => sw.Id == switchId); + if (switchMapping == null) { + return; + } + switchMapping.Device = switchDevice; + switchMapping.DeviceItem = switchDevice.AvailableSwitches.First().Id; + } + + #endregion + } +} diff --git a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/TablePatcher.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/TablePatcher.cs.meta new file mode 100644 index 000000000..dc0d95ed9 --- /dev/null +++ b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Matcher/TablePatcher.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f2db227803e55c64fac564f27a2464b2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Patcher.cs b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Patcher.cs index e0e3ab6f5..521bd560e 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Patcher.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Patcher.cs @@ -22,23 +22,27 @@ using System.Reflection; using NLog; using UnityEngine; -using VisualPinball.Engine.Game; -using VisualPinball.Engine.VPT; using VisualPinball.Engine.VPT.Table; using Logger = NLog.Logger; namespace VisualPinball.Unity.Patcher { - public class Patcher : IPatcher + public sealed class Patcher : IPatcher { private readonly List _patchers = new List(); private FileTableContainer _tableContainer; + private IMaterialProvider _materialProvider; + private ITextureProvider _textureProvider; + private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); - public void Set(FileTableContainer tableContainer, string fileName) + public void Set(FileTableContainer tableContainer, string fileName, IMaterialProvider materialProvider, ITextureProvider textureProvider) { _tableContainer = tableContainer; + _materialProvider = materialProvider; + _textureProvider = textureProvider; + var types = typeof(Patcher).Assembly.GetTypes(); foreach (var type in types) { var classMatchers = type @@ -59,6 +63,13 @@ public void ApplyPatches(GameObject gameObject, GameObject tableGameObject) { foreach (var patcher in _patchers) { var methods = patcher.GetType().GetMembers().Where(member => member.MemberType == MemberTypes.Method); + + if (patcher is TablePatcher tp) { + tp.TableContainer = _tableContainer; + tp.MaterialProvider = _materialProvider; + tp.TextureProvider = _textureProvider; + } + foreach (var method in methods) { var methodMatchers = Attribute .GetCustomAttributes(method, typeof(ItemMatchAttribute)) @@ -68,6 +79,10 @@ public void ApplyPatches(GameObject gameObject, GameObject tableGameObject) var methodInfo = method as MethodInfo; if (methodInfo != null) { foreach (var methodMatcher in methodMatchers) { + // if the game object has been destroyed by a patcher, exit. + if (!gameObject) { + return; + } if (methodMatcher.Matches(_tableContainer, gameObject)) { var validArgs = true; var patcherParamInfos = methodInfo.GetParameters(); @@ -115,6 +130,10 @@ public void ApplyPatches(GameObject gameObject, GameObject tableGameObject) } else if (pi.ParameterType == typeof(FileTableContainer)) { patcherParams[pi.Position] = _tableContainer; + // param from matcher + } else if (pi.ParameterType == typeof(float) && pi.Name == "param") { + patcherParams[pi.Position] = methodMatcher.FloatParam; + } else { Logger.Warn($"Unknown parameter {pi.ParameterType} {pi.Name} in patch method {patcher.GetType()}.{methodInfo.Name}(), skipping."); validArgs = false; @@ -135,5 +154,14 @@ public void ApplyPatches(GameObject gameObject, GameObject tableGameObject) } } } + + public void PostPatch(GameObject go) + { + foreach (var patcher in _patchers) { + if (patcher is TablePatcher p) { + p.PostPatch(go); + } + } + } } } diff --git a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/CreatureFromTheBlackLagoon.cs b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/CreatureFromTheBlackLagoon.cs index cc2f249d4..498756f0a 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/CreatureFromTheBlackLagoon.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/CreatureFromTheBlackLagoon.cs @@ -15,13 +15,15 @@ // along with this program. If not, see . // ReSharper disable StringLiteralTypo +// ReSharper disable UnusedType.Global +// ReSharper disable UnusedMember.Global using UnityEngine; namespace VisualPinball.Unity.Patcher { [MetaMatch(TableName = "Creature From The Black Lagoon", AuthorName = "fuzzel, flupper1, rothbauerw")] - public class CreatureFromTheBlackLagoon + public class CreatureFromTheBlackLagoon : TablePatcher { [NameMatch("batleft", Ref = "Playfield/Flippers/LeftFlipper")] [NameMatch("batright", Ref = "Playfield/Flippers/RightFlipper")] diff --git a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/Goldorak.cs b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/Goldorak.cs index df26bf556..9276d9264 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/Goldorak.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/Goldorak.cs @@ -15,14 +15,15 @@ // along with this program. If not, see . // ReSharper disable StringLiteralTypo +// ReSharper disable UnusedType.Global +// ReSharper disable UnusedMember.Global using UnityEngine; -using VisualPinball.Engine.VPT.Primitive; namespace VisualPinball.Unity.Patcher { [MetaMatch(TableName = "Goldorak", AuthorName = "Rom (Future PinBall) Javier VPX")] - public class Goldorak + public class Goldorak : TablePatcher { [NameMatch("LFLogo", Ref = "Playfield/Flippers/LeftFlipper")] [NameMatch("RFLogo", Ref = "Playfield/Flippers/RightFlipper")] diff --git a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/IndianaJones.cs b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/IndianaJones.cs index d17554eee..c2252b4f7 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/IndianaJones.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/IndianaJones.cs @@ -15,15 +15,16 @@ // along with this program. If not, see . // ReSharper disable StringLiteralTypo +// ReSharper disable UnusedType.Global +// ReSharper disable UnusedMember.Global using UnityEngine; using UnityEngine.Rendering; -using VisualPinball.Engine.VPT.Primitive; namespace VisualPinball.Unity.Patcher { [MetaMatch(TableName = "Indiana Jones - The Pinball Adventure", AuthorName = "ninuzzu,tom tower")] - public class IndianaJones + public class IndianaJones : TablePatcher { [NameMatch("LeftFlipperSh", IgnoreCase = false)] [NameMatch("RightFlipperSh")] diff --git a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/JurassicPark.cs b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/JurassicPark.cs index 3daf52e35..1b2e95f7f 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/JurassicPark.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/JurassicPark.cs @@ -24,7 +24,7 @@ namespace VisualPinball.Unity.Patcher { [MetaMatch(TableName = "Jurassic Park (Data East)", AuthorName = "Dark & Friends")] - public class JurassicPark + public class JurassicPark : TablePatcher { #region Shader Properties diff --git a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/Mississippi.cs b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/Mississippi.cs index deffbc61c..d4d9caafc 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/Mississippi.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/Mississippi.cs @@ -23,7 +23,7 @@ namespace VisualPinball.Unity.Patcher { [MetaMatch(TableName = "Mississipi", AuthorName = "jpsalas, akiles50000, Loserman")] - public class Mississippi + public class Mississippi : TablePatcher { [NameMatch("lrail1", Ref = "Playfield/Ramps/lrail1/LeftWall")] // left outside wall to the left [NameMatch("rrail1", Ref = "Playfield/Ramps/rrail1/LeftWall")] // left inside wall to the right diff --git a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/Terminator2.cs b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/Terminator2.cs index 2e9d8cea3..f4efcefae 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/Terminator2.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/Terminator2.cs @@ -15,38 +15,834 @@ // along with this program. If not, see . // ReSharper disable StringLiteralTypo +// ReSharper disable InconsistentNaming +// ReSharper disable UnusedMember.Global +// ReSharper disable UnusedType.Global + +using System.Linq; +using UnityEditor; +using UnityEngine; +using VisualPinball.Engine.Math; +using VisualPinball.Engine.VPT; +using Color = UnityEngine.Color; namespace VisualPinball.Unity.Patcher { - [MetaMatch(TableName = "Terminator 2 (Williams 1991)", AuthorName = "NFOZZY")] - public class Terminator2 + [MetaMatch(TableName = "Terminator 2 - Judgment Day (Williams 1991)", AuthorName = "g5k")] + public class Terminator2 : TablePatcher { - [NameMatch("LeftRampCover")] - [NameMatch("LeftRampSign")] - [NameMatch("RightRampCover")] - [NameMatch("RightRampSign")] - [NameMatch("Plastics_LVL2")] - [NameMatch("BumperCaps")] - [NameMatch("RightRamp")] - public void FixZPosition(PrimitiveComponent primitive) + #region Global + + public override void PostPatch(GameObject tableGo) { - primitive.Position.z = 0; + var playfieldGo = Playfield(tableGo); + playfieldGo.isStatic = true; + + // playfield material + RenderPipeline.Current.MaterialConverter.SetSmoothness(playfieldGo.GetComponent().sharedMaterial, 0.96f); + + // missing lights + CreateFlasher28(playfieldGo); + + SetupTrough(tableGo, playfieldGo); + SetupPinMame(tableGo, playfieldGo); + SetupDmd(tableGo); + SetupMapping(tableGo); + + // slingshots + SetupLeftSlingshot(playfieldGo.transform.Find("Walls/LeftSlingshot").gameObject); + SetupRightSlingshot(playfieldGo.transform.Find("Walls/RightSlingshot").gameObject); } - [NameMatch("Drain")] - public void FixDrain(KickerComponent kickerComponent) + private static void SetupTrough(GameObject tableGo, GameObject playfieldGo) { - kickerComponent.Coils[0].Name = "Drain"; - kickerComponent.Coils[0].Speed = 15; - kickerComponent.Coils[0].Angle = 60; + var troughComponent = CreateTrough(tableGo, playfieldGo); + troughComponent.Type = TroughType.TwoCoilsNSwitches; + troughComponent.BallCount = 3; + troughComponent.SwitchCount = 3; + troughComponent.JamSwitch = false; + troughComponent.RollTime = 300; + } + + private static void SetupPinMame(GameObject tableGo, GameObject playfieldGo) + { + #if !NO_PINMAME + var tableComponent = tableGo.GetComponent(); + + // GLE + Object.DestroyImmediate(tableGo.GetComponent()); + var pinmameGle = tableGo.AddComponent(); + pinmameGle.Game = new Engine.PinMAME.Games.Terminator2(); + pinmameGle.romId = "t2_l82"; + tableComponent.RepopulateHardware(pinmameGle); + TableSelector.Instance.TableUpdated(); + + // create GI light groups + var gi = CreateEmptyGameObject(playfieldGo, "GI"); + var gi1 = CreateEmptyGameObject(gi, "CPU"); + var gi2 = CreateEmptyGameObject(gi, "Left Playfield"); + var gi3 = CreateEmptyGameObject(gi, "Right Playfield"); + var giCpu = AddLightGroup(tableGo, gi1, "Light2", "Light3", "Light4", "Light5"); + var giLeftPlayfield = AddLightGroup(tableGo, gi2, "GI_35", "GI_1", "GI_3", "GI_4", "GI_12", "GI_7", + "GI_8", "GI_9", "GI_13", "GI_14", "GI_23", "GI_24", "GI_25", "GI_38"); + var giRightPlayfield = AddLightGroup(tableGo, gi3, "GI_36", "GI_2", "GI_5", "GI_6", "GI_10", "GI_11", "GI_15", "GI_16", "GI_18", "GI_19", "GI_17", + "GI_20", "GI_21", "GI_22", "GI_26", "GI_27", "GI_28", "GI_30", "GI_29", "GI_31", "GI_32", "GI_33", "GI_34", "GI_37", "B1", "B2", "B3"); + + // map GI light groups + tableComponent.MappingConfig.Lamps.First(lm => lm.Id == "2").Device = giRightPlayfield; + tableComponent.MappingConfig.Lamps.First(lm => lm.Id == "3").Device = giCpu; + tableComponent.MappingConfig.Lamps.First(lm => lm.Id == "4").Device = giLeftPlayfield; + #endif + } + + private static void SetupMapping(GameObject tableGo) + { + var tc = tableGo.GetComponent(); + + var kickers = tableGo.GetComponentsInChildren(); + foreach (var kicker in kickers) { + + // shooter + LinkSwitch(tc, "sw78", "78", kicker); + LinkCoil(tc, "sw78", "09", kicker); + } + } + + private static void SetupDmd(GameObject tableGo) + { + const float scale = 0.43f; + var cabinetGo = tableGo.transform.Find("Cabinet").gameObject; + var go = new GameObject { + name = "Dot Matrix Display", + transform = { + localEulerAngles = new Vector3(5.963f, 0, 0), + localPosition = new Vector3(0f, 0.513f, 1.0329f), + localScale = new Vector3(scale, scale, scale) + } + }; + go.transform.SetParent(cabinetGo.transform, false); + + var dmd = go.AddComponent(); + dmd.UpdateDimensions(128, 32); + dmd.Emission = 100f; + } + + #endregion + + #region Geometry + + [NameMatch("_Apron")] + [NameMatch("_BackWall")] + [NameMatch("_Bulbs (GI - visible)")] + [NameMatch("_ChromeRails")] + [NameMatch("_ClearPlastics")] + [NameMatch("_CliffyPosts")] + [NameMatch("_HKShip")] + [NameMatch("_LeftOVerBits")] + [NameMatch("_LeftRampMetal")] + [NameMatch("_MetalPosts")] + [NameMatch("_Plastics")] + [NameMatch("_Posts")] + [NameMatch("_RedPlastics")] + [NameMatch("_RightRampPlastic")] + [NameMatch("_Rubbers")] + [NameMatch("_Screws")] + [NameMatch("_StarPosts")] + [NameMatch("_SteelBits")] + [NameMatch("_SteelWalls")] + [NameMatch("_Switches")] + [NameMatch("_Timber")] + [NameMatch("_Washers")] + [NameMatch("_WireSwitches")] + [NameMatch("_Wireforms")] + [NameMatch("_popbumperassy")] + [NameMatch("_wires")] + public void MakeStatic(GameObject go) + { + go.isStatic = true; + } + + [NameMatch("RubberPostPrim001")] + [NameMatch("RubberPostPrim002")] + [NameMatch("RubberPostPrim003")] + [NameMatch("RubberPostPrim004")] + [NameMatch("RubberPostPrim005")] + [NameMatch("RubberPostPrim006")] + [NameMatch("RubberPostPrim007")] + [NameMatch("RubberPostPrim008")] + [NameMatch("RubberPostPrim009")] + [NameMatch("RubberPostPrim010")] + [NameMatch("RubberPostPrim011")] + [NameMatch("RubberPostPrim012")] + [NameMatch("RubberPostPrim013")] + [NameMatch("RubberPostPrim014")] + [NameMatch("RubberPostPrim015")] + [NameMatch("RubberPostPrim016")] + public void PrimitiveCollider(GameObject go) + { + go.isStatic = true; + Object.DestroyImmediate(go.GetComponent()); + Object.DestroyImmediate(go.GetComponent()); + Object.DestroyImmediate(go.GetComponent()); + } + + [NameMatch("EndPointLp")] + [NameMatch("EndPointRp")] + [NameMatch("batleftshadow")] + [NameMatch("batrightshadow")] + [NameMatch("FlasherT1")] + [NameMatch("FlasherT2")] + public void Disable(GameObject go) + { + go.SetActive(false); + } + + #endregion + + #region Flippers + + [NameMatch("batleft", Ref = "Playfield/Flippers/LeftFlipper")] + [NameMatch("batright", Ref = "Playfield/Flippers/RightFlipper")] + public void ReparentFlippers(PrimitiveComponent flipper, GameObject gameObject, ref GameObject parent) + { + PatcherUtil.Reparent(gameObject, parent); + + flipper.Position.x = 0; + flipper.Position.y = 0; + + flipper.ObjectRotation.z = 0; + } + + [NameMatch("LeftFlipper")] + [NameMatch("RightFlipper")] + public void DeleteFlipperMeshes(GameObject go) + { + go.GetComponentInChildren().gameObject.SetActive(false); + go.GetComponentInChildren().gameObject.SetActive(false); + } + + #endregion + + #region Slingshots + + [NameMatch("LSling2")] + [NameMatch("RSling2")] + [NameMatch("_SteelBits")] + public void DisableObsoleteSlingshotElements(GameObject go) + { + go.SetActive(false); + } + + [NameMatch("LSling")] + public void AddLeftSlingshotDragPoints(RubberComponent rubberComponent) + { + var dp = rubberComponent.DragPoints.ToList(); + dp.RemoveAt(9); + dp.RemoveAt(10); + dp.Insert(9, new DragPointData(208.9f, 1597.3f)); + dp.Insert(10, new DragPointData(202.9f, 1580.6f)); + rubberComponent.DragPoints = dp.ToArray(); } - [NameMatch("sw17")] + [NameMatch("RSling")] + public void AddRightSlingshotDragPoints(RubberComponent rubberComponent) + { + var dp = rubberComponent.DragPoints.ToList(); + dp.RemoveAt(4); + dp.RemoveAt(5); + dp.Insert(4, new DragPointData(661.6f, 1583f)); + dp.Insert(5, new DragPointData(657f, 1595.7f)); + rubberComponent.DragPoints = dp.ToArray(); + } + + [NameMatch("SLING1")] + [NameMatch("SLING2")] + public void EnableSlingshotArm(GameObject go) + { + go.GetComponent().enabled = true; + } + + private static void SetupLeftSlingshot(GameObject go) + { + var playfieldGo = go.GetComponentInParent().gameObject; + var ssParentGo = GetOrCreateGameObject(playfieldGo, "Slingshots"); + + var ssGo = PrefabUtility.InstantiatePrefab(SlingshotComponent.LoadPrefab(), ssParentGo.transform) as GameObject; + var ss = ssGo!.GetComponent(); + + ss.name = "Left Slingshot"; + ss.SlingshotSurface = go.GetComponent(); + ss.RubberOff = playfieldGo.transform.Find("Rubbers/LSling").GetComponent(); + ss.RubberOn = playfieldGo.transform.Find("Rubbers/LSling1").GetComponent(); + //ss.CoilArm = playfieldGo.transform.Find("Primitives/SLING2").GetComponent(); + + EditorUtility.SetDirty(ssGo); + PrefabUtility.RecordPrefabInstancePropertyModifications(ss); + + ss.RebuildMeshes(); + } + + private static void SetupRightSlingshot(GameObject go) + { + var playfieldGo = go.GetComponentInParent().gameObject; + var ssParentGo = GetOrCreateGameObject(playfieldGo, "Slingshots"); + + var ssGo = PrefabUtility.InstantiatePrefab(SlingshotComponent.LoadPrefab(), ssParentGo.transform) as GameObject; + var ss = ssGo!.GetComponent(); + + ss.name = "Right Slingshot"; + ss.SlingshotSurface = go.GetComponent(); + ss.RubberOff = playfieldGo.transform.Find("Rubbers/RSling").GetComponent(); + ss.RubberOn = playfieldGo.transform.Find("Rubbers/RSling1").GetComponent(); + //ss.CoilArm = playfieldGo.transform.Find("Primitives/SLING1").GetComponent(); + + EditorUtility.SetDirty(ssGo); + PrefabUtility.RecordPrefabInstancePropertyModifications(ss); + + ss.RebuildMeshes(); + } + + #endregion + + #region Kickers + + [NameMatch("BallRelease")] public void FixSw17(KickerComponent kickerComponent) { kickerComponent.Coils[0].Name = "Eject"; kickerComponent.Coils[0].Speed = 5; kickerComponent.Coils[0].Angle = 60; } + + [NameMatch("sw78")] + public void Shooter(KickerComponent kickerComponent) + { + kickerComponent.Coils[0].Name = "kicker_coil"; + kickerComponent.Coils[0].Speed = 50; + kickerComponent.Coils[0].Angle = 0; + } + + [NameMatch("sw76")] + public void SkullKicker(KickerComponent kickerComponent) + { + kickerComponent.Coils[0].Name = "kicker_coil"; + kickerComponent.Coils[0].Speed = 15; + kickerComponent.Coils[0].Angle = 72; + } + + #endregion + + #region Materials + + [NameMatch("_Plastics")] + [NameMatch("_RightRampPlastic")] + public void FixPlasticsMaterial(GameObject go) + { + var material = go.GetComponent().sharedMaterial; + RenderPipeline.Current.MaterialConverter.SetDiffusionProfile(material, DiffusionProfileTemplate.Plastics); + RenderPipeline.Current.MaterialConverter.SetMaterialType(material, MaterialType.Translucent); + } + + [NameMatch("_HKShip")] + public void FixShip(GameObject go) + { + var material = go.GetComponent().sharedMaterial; + RenderPipeline.Current.MaterialConverter.SetMaterialType(material, MaterialType.Standard); + RenderPipeline.Current.MaterialConverter.SetSmoothness(material, 1f); + } + + #endregion + + #region Lights + + #region Flashers + + [NameMatch("F118", FloatParam = 10000f)] + [NameMatch("F119", FloatParam = 10000f)] + [NameMatch("F120", FloatParam = 10000f)] + [NameMatch("F121", FloatParam = 10000f)] + [NameMatch("F122", FloatParam = 20000f)] + [NameMatch("F123", FloatParam = 20000f)] + [NameMatch("F125", FloatParam = 10000f)] + [NameMatch("F126", FloatParam = 10000f)] + [NameMatch("F126a", FloatParam = 10000f)] + [NameMatch("F127", FloatParam = 10000f)] + [NameMatch("F127a", FloatParam = 10000f)] + public void FlasherIntensities(GameObject go, LightComponent lc, float param) + { + foreach (var l in go.GetComponentsInChildren()) { + lc.FadeSpeedUp = 0f; + lc.FadeSpeedDown = 0f; + RenderPipeline.Current.LightConverter.SetIntensity(l, param); + RenderPipeline.Current.LightConverter.SetTemperature(l, 3000); + RenderPipeline.Current.LightConverter.SetShadow(l, true, true, 0.001f); + } + } + + [NameMatch("F120")] + public void F120Pos(GameObject go) => LightPos(go, -160.8f, 17.6f, -6f); + [NameMatch("F121")] public void F121Pos(GameObject go) => LightPos(go, 0f, -12.5f, 15.7f); + [NameMatch("F122")] public void F122Pos(GameObject go) => LightPos(go, -4f, 97f, 25f); + [NameMatch("F123")] public void F123Pos(GameObject go) + { + LightPos(go, -6.9f, -21.9f, 94.1f); + LightRange(go, 0.3f); + } + [NameMatch("F125")] public void F125Pos(GameObject go) + { + LightPos(go, 42.5f, -75.8f, 12.8f); + LightRange(go, 0.17f); + } + [NameMatch("F126")] public void F126(GameObject go, LightComponent lightComponent) + { + LightPos(go, 51.6f, 34.5f, 5f); + LinkLights(go, lightComponent.name, "F126a"); + } + [NameMatch("F126a")] public void F126aPos(GameObject go) => LightPos(go, -28.1f, 61.1f, 37f); + + [NameMatch("F127")] public void F127(GameObject go, LightComponent lightComponent) + { + LightPos(go, -33.2f, 2.9f, 5f); + LinkLights(go, lightComponent.name, "F127a"); + } + [NameMatch("F127a")] public void F127aPos(GameObject go) => LightPos(go, -31.5f, 89.5f, 37f); + + private static void CreateFlasher28(GameObject playfieldGo) + { + var parent = GetOrCreateGameObject(playfieldGo, "Lights"); + var lightComponent = CreateLight("F128", 302.4f, 361.4f, parent); + var go = lightComponent.gameObject; + SpotAngle(go, 104f, 53.4f); + LightPos(go, 0, 0, -79f); + LightIntensity(go, 10000f); + LightTemperature(go, 3400f); + LightRange(go, 0.11f); + } + + #endregion + + #region Global Illumination + + [NameMatch("B1")] + [NameMatch("B2")] + [NameMatch("B3")] + [NameMatch("GI_1")] + [NameMatch("GI_2")] + [NameMatch("GI_3")] + [NameMatch("GI_4")] + [NameMatch("GI_5")] + [NameMatch("GI_6")] + [NameMatch("GI_7")] + [NameMatch("GI_8")] + [NameMatch("GI_9")] + [NameMatch("GI_10")] + [NameMatch("GI_11")] + [NameMatch("GI_12")] + [NameMatch("GI_13")] + [NameMatch("GI_14")] + [NameMatch("GI_15")] + [NameMatch("GI_16")] + [NameMatch("GI_17")] + [NameMatch("GI_18")] + [NameMatch("GI_19")] + [NameMatch("GI_20")] + [NameMatch("GI_21")] + [NameMatch("GI_22")] + [NameMatch("GI_23")] + [NameMatch("GI_24")] + [NameMatch("GI_25")] + [NameMatch("GI_26")] + [NameMatch("GI_27")] + [NameMatch("GI_28")] + [NameMatch("GI_29")] + [NameMatch("GI_30")] + [NameMatch("GI_31")] + [NameMatch("GI_32")] + [NameMatch("GI_33")] + [NameMatch("GI_34")] + [NameMatch("GI_35")] + [NameMatch("GI_36")] + [NameMatch("GI_37")] + [NameMatch("GI_38")] + public void GiIntensity(GameObject go) + { + foreach (var l in go.GetComponentsInChildren()) { + RenderPipeline.Current.LightConverter.SetIntensity(l, 200f); + RenderPipeline.Current.LightConverter.SetTemperature(l, 2700); + } + } + + [NameMatch("GI_3", FloatParam = 0.01f)] + [NameMatch("GI_4", FloatParam = 0.01f)] + [NameMatch("GI_5", FloatParam = 0.02f)] + [NameMatch("GI_6", FloatParam = 0.01f)] + + public void GiDynamicShadow(GameObject go, float param) => LightShadow(go, true, true, param); + + [NameMatch("GI_10", FloatParam = 0.01f)] + [NameMatch("GI_11", FloatParam = 0.01f)] + [NameMatch("GI_12", FloatParam = 0.01f)] + [NameMatch("GI_15", FloatParam = 0.02f)] + [NameMatch("GI_16", FloatParam = 0.02f)] + [NameMatch("GI_18", FloatParam = 0.01f)] + [NameMatch("GI_19", FloatParam = 0.02f)] + [NameMatch("GI_20", FloatParam = 0.02f)] + [NameMatch("GI_33", FloatParam = 0.02f)] + [NameMatch("GI_34", FloatParam = 0.02f)] + [NameMatch("GI_37", FloatParam = 0.01f)] + [NameMatch("GI_38", FloatParam = 0.01f)] + [NameMatch("GI_7", FloatParam = 0.01f)] // leaks + [NameMatch("GI_8", FloatParam = 0.01f)] // leaks + [NameMatch("GI_9", FloatParam = 0.01f)] // leaks + [NameMatch("GI_13", FloatParam = 0.01f)] // leaks + [NameMatch("GI_14", FloatParam = 0.01f)] // leaks + [NameMatch("GI_22", FloatParam = 0.01f)] // leaks + [NameMatch("GI_23", FloatParam = 0.01f)] // leaks + [NameMatch("GI_24", FloatParam = 0.01f)] // leaks (not too badly) + [NameMatch("GI_25", FloatParam = 0.01f)] // leaks (not too badly) + [NameMatch("GI_29", FloatParam = 0.01f)] // leaks + [NameMatch("GI_30", FloatParam = 0.01f)] // leaks + [NameMatch("GI_31", FloatParam = 0.01f)] // leaks + [NameMatch("GI_32", FloatParam = 0.01f)] // leaks + [NameMatch("GI_35", FloatParam = 0.01f)] // leaks (not too badly) + public void GiStaticShadow(GameObject go, float param) => LightShadow(go, true, false, param); + + [NameMatch("GI_27")] + [NameMatch("GI_28")] + public void GiDisable(GameObject go) => go.SetActive(false); + + #endregion + + #region Insert Links + + [NameMatch("L22a")] public void Link22(GameObject go) => LinkLights(go, "L22a", "L22b"); + [NameMatch("L51a")] public void Link51(GameObject go) => LinkLights(go, "L51a", "L51b"); + + [NameMatch("L481")] + [NameMatch("L581")] + public void MakeInsert481(LightComponent lo) + { + var go = ConvertToInsertLight(lo); + // those don't actually need a light source, because the first light shines through the insert mesh. + go.transform.Find("Source").gameObject.SetActive(false); + } + + [NameMatch("L43")] + [NameMatch("L44")] + [NameMatch("L45")] + [NameMatch("L46")] + [NameMatch("L47")] + [NameMatch("L48")] + [NameMatch("L481")] + [NameMatch("L53")] + [NameMatch("L54")] + [NameMatch("L55")] + [NameMatch("L56")] + [NameMatch("L57")] + [NameMatch("L58")] + [NameMatch("L581")] + public void Rectangles(GameObject go) + { + SpotAngle(go, 122f, 48f); + LightIntensity(go, 4500f); + } + + [NameMatch("L16")] + [NameMatch("L22a")] + [NameMatch("L22b")] + [NameMatch("L23")] + [NameMatch("L24")] + public void MidSizedCircles(GameObject go) + { + SpotAngle(go, 64f, 67f); + LightIntensity(go, 1200f); + } + + [NameMatch("L76")] + [NameMatch("L77")] + [NameMatch("L78")] + public void SmallSizedCircles(GameObject go) + { + SpotAngle(go, 45f, 13f); + LightIntensity(go, 700f); + } + + [NameMatch("L61")] + [NameMatch("L62")] + [NameMatch("L63")] + [NameMatch("L64")] + [NameMatch("L65")] + [NameMatch("L71")] + [NameMatch("L72")] + [NameMatch("L73")] + [NameMatch("L74")] + [NameMatch("L75")] + public void InnerYellowCircles(GameObject go) + { + LightColor(go, Color.yellow); + } + + [NameMatch("L11")] + [NameMatch("L12")] + [NameMatch("L13")] + [NameMatch("L14")] + [NameMatch("L15")] + [NameMatch("L21")] + [NameMatch("L25")] + [NameMatch("L26")] + [NameMatch("L27")] + [NameMatch("L28")] + [NameMatch("L41")] + [NameMatch("L42")] + [NameMatch("L66")] + [NameMatch("L67")] + [NameMatch("L68")] + [NameMatch("L81")] + [NameMatch("L82")] + [NameMatch("L83")] + [NameMatch("L85")] + public void MidSizedTriangles(GameObject go) + { + SpotAngle(go, 96.4f, 47.8f); + } + + [NameMatch("L31")] + [NameMatch("L32")] + [NameMatch("L33")] + [NameMatch("L34")] + [NameMatch("L35")] + [NameMatch("L36")] + [NameMatch("L37")] + [NameMatch("L38")] + public void SmallSizedTriangles(GameObject go) + { + SpotAngle(go, 80f, 45f); + } + + [NameMatch("L36")] + [NameMatch("L37")] + [NameMatch("L38")] + public void SmallSizedTrianglesRed(GameObject go) + { + LightIntensity(go, 1000f); + } + + [NameMatch("L31")] + [NameMatch("L32")] + [NameMatch("L33")] + [NameMatch("L34")] + [NameMatch("L35")] + public void SmallSizedTrianglesWhite(GameObject go) + { + LightIntensity(go, 700f); + LightColor(go, Color.white); + } + + [NameMatch("L11")] + [NameMatch("L12")] + [NameMatch("L14")] + [NameMatch("L15")] + [NameMatch("L26")] + [NameMatch("L41")] + [NameMatch("L66")] + public void MidSizedTrianglesGreen(GameObject go) + { + LightIntensity(go, 3400f); + } + + [NameMatch("L13")] + [NameMatch("L21")] + [NameMatch("L27")] + [NameMatch("L81")] + [NameMatch("L82")] + public void MidSizedTrianglesRed(GameObject go) + { + LightIntensity(go, 1850f); + } + + [NameMatch("L85")] + public void MidSizedTrianglesWhite(GameObject go) + { + LightIntensity(go, 1850f); + LightColor(go, Color.white); + } + + [NameMatch("L28")] + public void MidSizedTrianglesBlue(GameObject go) + { + LightIntensity(go, 12000f); + LightColor(go, new Color(0f, 0.4f, 1)); + } + + [NameMatch("L25")] + [NameMatch("L42")] + [NameMatch("L67")] + public void MidSizedTrianglesYellow(GameObject go) + { + LightIntensity(go, 1850f); + LightColor(go, Color.yellow); + } + + #endregion + + #region Insert Positions + + [NameMatch("L11")] public void Insert2xPos(GameObject go) => LightPos(go, 28.6f, 9.6f, -50f); + [NameMatch("L12")] public void Insert4xPos(GameObject go) => LightPos(go, 22.4f, 25.1f, -50f); + [NameMatch("L13")] public void InsertHoldBonus(GameObject go) => LightPos(go, 0f, 35f, -50f); + [NameMatch("L14")] public void Insert6xPos(GameObject go) => LightPos(go, -24.7f, 25.1f, -50f); + [NameMatch("L15")] public void Insert8xPos(GameObject go) => LightPos(go, -31.3f, 10.7f, -50f); + [NameMatch("L16")] public void BallSave(GameObject go) => LightPos(go, 0, -19.6f, -50f); + + [NameMatch("L17")] + public void T2Mouth(GameObject go) + { + LightPos(go, 0f, 0f, -50f); + SpotAngle(go, 73f, 10f); + LightIntensity(go, 340f); + } + + [NameMatch("L21")] + public void Kickback(GameObject go) => LightPos(go, -3f, -13.5f, -50f); + + [NameMatch("L22a")] + [NameMatch("L22b")] + public void Special(GameObject go) => LightPos(go, 0, -15f, -50f); + + [NameMatch("L23")] + [NameMatch("L24")] + public void HurryUp(GameObject go) => LightPos(go, 0, -16f, -50f); + + [NameMatch("L25")] + [NameMatch("L26")] + [NameMatch("L27")] + [NameMatch("L28")] + [NameMatch("L85")] + public void LockLane(GameObject go) => LightPos(go, -6f, -35f, -50f); + + + [NameMatch("F117")] + public void AutoFire(GameObject go) + { + SpotAngle(go, 70f, 15f); + LightIntensity(go, 4000f); + + LightPos(go, -52f, 3.3f, -50f); + DuplicateLight(go, -18f, 0f, -50f); + DuplicateLight(go, 16f, 0f, -50f); + DuplicateLight(go, 52f, 3.3f, -50f); + } + + [NameMatch("L31")] + [NameMatch("L32")] + [NameMatch("L33")] + [NameMatch("L34")] + [NameMatch("L35")] + public void LeftSmallTriangles(GameObject go) => LightPos(go, -21f, -10f, -50f); + + [NameMatch("L36")] + [NameMatch("L37")] + [NameMatch("L38")] + public void TopSmallTriangles(GameObject go) => LightPos(go, 1.7f, -25f, -50f); + + [NameMatch("L41")] + [NameMatch("L42")] + public void LockVideo(GameObject go) => LightPos(go, -8.2f, -35f, -50f); + + [NameMatch("L43")] + [NameMatch("L44")] + [NameMatch("L45")] + [NameMatch("L46")] + [NameMatch("L47")] + public void LeftRedRect(GameObject go) => LightPos(go, -6.1f, -12.3f, -50f); + + [NameMatch("L48")] + public void LeftBottomRedRect(GameObject go) => LightPos(go, -2.4f, 16.6f, -50f); + + + [NameMatch("L51a")] + [NameMatch("L51b")] + public void T2Eyes(GameObject go) + { + LightPos(go, -2.2f, 0.8f, -50f); + SpotAngle(go, 27f, 60f); + LightIntensity(go, 1000f); + } + + [NameMatch("L53")] + [NameMatch("L54")] + [NameMatch("L55")] + [NameMatch("L56")] + [NameMatch("L57")] + [NameMatch("L58")] + public void RightRedRect(GameObject go) => LightPos(go, 8.5f, -11.7f, -50f); + + [NameMatch("L61")] + [NameMatch("L62")] + [NameMatch("L63")] + [NameMatch("L64")] + [NameMatch("L65")] + public void LeftYellowCircle(GameObject go) => LightPos(go, -4.3f, -18.2f, -50f); + + [NameMatch("L66")] + [NameMatch("L67")] + public void LeftOuterTriangles(GameObject go) => LightPos(go, -14f, -24f, -50f); + + [NameMatch("L68")] + public void Million(GameObject go) => LightPos(go, -6.6f, -31f, -50f); + + [NameMatch("L71")] + [NameMatch("L72")] + [NameMatch("L73")] + [NameMatch("L74")] + [NameMatch("L75")] + public void RightYellowCircle(GameObject go) => LightPos(go, 2.6f, -15.9f, -50f); + + [NameMatch("L76")] + [NameMatch("L77")] + [NameMatch("L78")] + public void LiteKickback(GameObject go) => LightPos(go, -10.6f, 0f, -50f); + + [NameMatch("L81")] public void L81(GameObject go) => LightPos(go, 15f, -40f, -50f); + [NameMatch("L82")] public void L82(GameObject go) => LightPos(go, 10f, -28f, -50f); + [NameMatch("L83")] public void L83(GameObject go) => LightPos(go, 13f, -37f, -50f); + + [NameMatch("L86")] + [NameMatch("L87")] + [NameMatch("L88")] + public void TopTriangles(GameObject go) + { + LightPos(go, 0f, 6f, -50f); + LightIntensity(go, 6700f); + SpotAngle(go, 80f, 40f); + } + + [NameMatch("Light2")] + [NameMatch("Light3")] + [NameMatch("Light4")] + [NameMatch("Light5")] + public void Boxes(GameObject go) + { + LightPos(go, 0f, -7, -50f); + PyramidAngle(go, 40f, 2.74f); + } + + [NameMatch("Light4")] + public void BlueBox(GameObject go) + { + LightIntensity(go, 12000f); + LightColor(go, new Color(0f, 0.4f, 1)); + } + + [NameMatch("Light5")] + public void YellowBox(GameObject go) + { + LightIntensity(go, 670f); + LightColor(go, Color.yellow); + } + + #endregion + + #endregion } } diff --git a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/TomAndJerry.cs b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/TomAndJerry.cs index 702b90f12..84403f5bd 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/TomAndJerry.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/TomAndJerry.cs @@ -24,7 +24,7 @@ namespace VisualPinball.Unity.Patcher { [TableNameMatch("TomandJerry")] - public class TomAndJerry + public class TomAndJerry : TablePatcher { [NameMatch("ShadowsRamp")] [NameMatch("JerryHAMMERshadow")] diff --git a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/WipeOut.cs b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/WipeOut.cs index 2127aa09d..4330218b6 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/WipeOut.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Patcher/Patcher/Tables/WipeOut.cs @@ -19,12 +19,11 @@ // ReSharper disable UnusedMember.Global using UnityEngine; -using VisualPinball.Engine.VPT.Primitive; namespace VisualPinball.Unity.Patcher { [MetaMatch(TableName = "Wipe Out Premier 1993", AuthorName = "Edizzle & Kiwi")] - public class WipeOut + public class WipeOut : TablePatcher { [NameMatch("Prim_RightFlipper", Ref="Playfield/Flippers/RightFlipper")] [NameMatch("Prim_LeftFlipper", Ref="Playfield/Flippers/LeftFlipper")] diff --git a/VisualPinball.Unity/VisualPinball.Unity.Patcher/VisualPinball.Unity.Patcher.asmdef b/VisualPinball.Unity/VisualPinball.Unity.Patcher/VisualPinball.Unity.Patcher.asmdef index 1cf9828d9..74b35105d 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Patcher/VisualPinball.Unity.Patcher.asmdef +++ b/VisualPinball.Unity/VisualPinball.Unity.Patcher/VisualPinball.Unity.Patcher.asmdef @@ -1,19 +1,21 @@ -{ - "name": "VisualPinball.Unity.Patcher", - "rootNamespace": "", - "references": [ - "VisualPinball.Engine", - "VisualPinball.Unity" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file +{ + "name": "VisualPinball.Unity.Patcher", + "rootNamespace": "VisualPinball.Unity.Patcher", + "references": [ + "VisualPinball.Engine", + "VisualPinball.Unity", + "VisualPinball.Engine.PinMAME.Unity", + "Unity.Entities.Hybrid" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} diff --git a/VisualPinball.Unity/VisualPinball.Unity.Test/Mappings/CoilPopulationTests.cs b/VisualPinball.Unity/VisualPinball.Unity.Test/Mappings/CoilPopulationTests.cs index 0d53f05f0..60d083bb1 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Test/Mappings/CoilPopulationTests.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Test/Mappings/CoilPopulationTests.cs @@ -169,7 +169,7 @@ public void ShouldAddLamps() tableComponent.MappingConfig.Coils.Count.Should().Be(1); tableComponent.MappingConfig.Lamps.Count.Should().Be(1); tableComponent.MappingConfig.Lamps[0].Id.Should().Be("yyy"); - tableComponent.MappingConfig.Lamps[0].Source.Should().Be(LampSource.Coils); + tableComponent.MappingConfig.Lamps[0].IsCoil.Should().Be(true); } [Test] diff --git a/VisualPinball.Unity/VisualPinball.Unity.Test/Mappings/LampPopulationTests.cs b/VisualPinball.Unity/VisualPinball.Unity.Test/Mappings/LampPopulationTests.cs index eb0d2ecc3..1be443979 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Test/Mappings/LampPopulationTests.cs +++ b/VisualPinball.Unity/VisualPinball.Unity.Test/Mappings/LampPopulationTests.cs @@ -18,6 +18,7 @@ using FluentAssertions; using NUnit.Framework; using VisualPinball.Engine.Game.Engines; +using VisualPinball.Engine.Math; using VisualPinball.Engine.VPT.Table; using VisualPinball.Unity.Editor; @@ -132,50 +133,28 @@ public void ShouldMapAnRgbLamp() var tableComponent = go.GetComponent(); var gameEngineLamps = new[] { - new GamelogicEngineLamp("rgb") { Description = "RGB", DeviceHint = "rgb"}, - new GamelogicEngineLamp("g") { MainLampIdOfGreen = "rgb"}, - new GamelogicEngineLamp("b") { MainLampIdOfBlue = "rgb"} + new GamelogicEngineLamp("r") { Description = "red", DeviceHint = "rgb", Channel = ColorChannel.Red}, + new GamelogicEngineLamp("g") { Description = "green", DeviceHint = "rgb", Channel = ColorChannel.Green}, + new GamelogicEngineLamp("b") { Description = "blue", DeviceHint = "rgb", Channel = ColorChannel.Blue}, }; tableComponent.MappingConfig.Clear(); tableComponent.MappingConfig.PopulateLamps(gameEngineLamps, tableComponent); - tableComponent.MappingConfig.Lamps.Should().HaveCount(1); - tableComponent.MappingConfig.Lamps[0].Id.Should().Be("rgb"); - tableComponent.MappingConfig.Lamps[0].Green.Should().Be("g"); - tableComponent.MappingConfig.Lamps[0].Blue.Should().Be("b"); - tableComponent.MappingConfig.Lamps[0].Description.Should().Be("RGB"); + tableComponent.MappingConfig.Lamps.Should().HaveCount(3); + tableComponent.MappingConfig.Lamps[2].Id.Should().Be("r"); + tableComponent.MappingConfig.Lamps[2].Channel.Should().Be(ColorChannel.Red); + tableComponent.MappingConfig.Lamps[1].Id.Should().Be("g"); + tableComponent.MappingConfig.Lamps[1].Channel.Should().Be(ColorChannel.Green); + tableComponent.MappingConfig.Lamps[0].Id.Should().Be("b"); + tableComponent.MappingConfig.Lamps[0].Channel.Should().Be(ColorChannel.Blue); + tableComponent.MappingConfig.Lamps[0].Device.name.Should().Be("my_rgb_light"); + tableComponent.MappingConfig.Lamps[1].Device.name.Should().Be("my_rgb_light"); + tableComponent.MappingConfig.Lamps[2].Device.name.Should().Be("my_rgb_light"); tableComponent.MappingConfig.Lamps[0].DeviceItem.Should().Be(LightComponent.LampIdDefault); } - [Test] - public void ShouldCreateMapAnRgbLampIfRisMissing() - { - var table = new TableBuilder() - .AddLight("my_rgb_light") - .Build(); - - var go = VpxImportEngine.ImportIntoScene(table, options: ConvertOptions.SkipNone); - var tableComponent = go.GetComponent(); - - var gameEngineLamps = new[] { - new GamelogicEngineLamp("g") { Description = "RGB", MainLampIdOfGreen = "rgb"}, - new GamelogicEngineLamp("b") { MainLampIdOfBlue = "rgb"} - }; - - tableComponent.MappingConfig.Clear(); - tableComponent.MappingConfig.PopulateLamps(gameEngineLamps, tableComponent); - - tableComponent.MappingConfig.Lamps.Should().HaveCount(1); - tableComponent.MappingConfig.Lamps[0].Id.Should().Be("rgb"); - tableComponent.MappingConfig.Lamps[0].Green.Should().Be("g"); - tableComponent.MappingConfig.Lamps[0].Blue.Should().Be("b"); - tableComponent.MappingConfig.Lamps[0].Description.Should().BeEmpty(); - tableComponent.MappingConfig.Lamps[0].Device.Should().BeNull(); - tableComponent.MappingConfig.Lamps[0].DeviceItem.Should().BeEmpty(); - } - [Test] public void ShouldReturnAllLampIds() { diff --git a/VisualPinball.Unity/VisualPinball.Unity.Test/TestProject~/ProjectSettings/ProjectSettings.asset b/VisualPinball.Unity/VisualPinball.Unity.Test/TestProject~/ProjectSettings/ProjectSettings.asset index fc810ffdf..72fa309c7 100644 --- a/VisualPinball.Unity/VisualPinball.Unity.Test/TestProject~/ProjectSettings/ProjectSettings.asset +++ b/VisualPinball.Unity/VisualPinball.Unity.Test/TestProject~/ProjectSettings/ProjectSettings.asset @@ -579,7 +579,8 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 - scriptingDefineSymbols: {} + scriptingDefineSymbols: + 1: NO_PINMAME additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} diff --git a/VisualPinball.Unity/VisualPinball.Unity/Display/DotMatrixDisplayComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Display/DotMatrixDisplayComponent.cs index dda247ea4..26c9b2695 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Display/DotMatrixDisplayComponent.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Display/DotMatrixDisplayComponent.cs @@ -47,6 +47,7 @@ public override float AspectRatio { [SerializeField] private int _height = 32; [SerializeField] private float _padding = 0.2f; [SerializeField] private float _roundness = 0.35f; + [SerializeField] private float _emission = 100f; [NonSerialized] private DisplayFrameFormat _frameFormat = DisplayFrameFormat.Dmd4; [NonSerialized] private Color32[] _colorBuffer; @@ -58,6 +59,7 @@ public override float AspectRatio { private static readonly int DimensionsProp = Shader.PropertyToID("__Dimensions"); private static readonly int PaddingProp = Shader.PropertyToID("__Padding"); private static readonly int RoundnessProp = Shader.PropertyToID("__Roundness"); + private static readonly int EmissionProp = Shader.PropertyToID("__Emission"); public int Width { @@ -116,6 +118,18 @@ public float Roundness } } + public float Emission + { + get => _emission; + set { + _emission = value; + var mr = gameObject.GetComponent(); + if (mr != null) { + mr.sharedMaterial.SetFloat(EmissionProp, value); + } + } + } + public override void UpdateDimensions(int width, int height, bool flipX = false) { Logger.Info($"Updating dimensions for DMD \"{_id}\" to {width}x{height}."); diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/CameraController.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/CameraController.cs index 2bea86cc4..862757c43 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Game/CameraController.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Game/CameraController.cs @@ -139,8 +139,6 @@ public void FixedUpdate() if(Mouse.current != null) { - Debug.Log("I has mouse"); - var trans = Camera.transform; var altitude = trans.transform.parent; var azimuth = altitude.parent; diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/CoilPlayer.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/CoilPlayer.cs index a284be581..326706187 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Game/CoilPlayer.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Game/CoilPlayer.cs @@ -15,6 +15,7 @@ // along with this program. If not, see . using System.Collections.Generic; +using System.Linq; using NLog; namespace VisualPinball.Unity @@ -34,6 +35,7 @@ public class CoilPlayer private TableComponent _tableComponent; private IGamelogicEngine _gamelogicEngine; private LampPlayer _lampPlayer; + private WirePlayer _wirePlayer; private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); @@ -43,11 +45,12 @@ public class CoilPlayer internal IApiCoil Coil(ICoilDeviceComponent component, string coilItem) => _coilDevices.ContainsKey(component) ? _coilDevices[component].Coil(coilItem) : null; - public void Awake(TableComponent tableComponent, IGamelogicEngine gamelogicEngine, LampPlayer lampPlayer) + public void Awake(TableComponent tableComponent, IGamelogicEngine gamelogicEngine, LampPlayer lampPlayer, WirePlayer wirePlayer) { _tableComponent = tableComponent; _gamelogicEngine = gamelogicEngine; _lampPlayer = lampPlayer; + _wirePlayer = wirePlayer; } public void OnStart() @@ -74,16 +77,17 @@ public void OnStart() var device = _coilDevices[coilMapping.Device]; var coil = device.Coil(coilMapping.DeviceItem); if (coil != null) { - AssignCoilMapping(coilMapping.Id, coilMapping.Device, coilMapping.DeviceItem); + AssignCoilMapping(coilMapping, false); } else { Logger.Error($"Unknown coil \"{coilMapping.DeviceItem}\" in coil device \"{coilMapping.Device}\"."); } break; - case CoilDestination.Lamp: - AssignCoilMapping(coilMapping.Id, coilMapping.Device, coilMapping.DeviceItem, isLampCoil: true); + case CoilDestination.Lamp: { + AssignCoilMapping(coilMapping, true); break; + } } } @@ -93,13 +97,17 @@ public void OnStart() } } - private void AssignCoilMapping(string id, ICoilDeviceComponent device, string deviceCoilId, bool isLampCoil = false) + private void AssignCoilMapping(CoilMapping coilMapping, bool isLampCoil) { - if (!_coilAssignments.ContainsKey(id)) { - _coilAssignments[id] = new List(); + if (!_coilAssignments.ContainsKey(coilMapping.Id)) { + _coilAssignments[coilMapping.Id] = new List(); } - _coilAssignments[id].Add(new CoilDestConfig(device, deviceCoilId, isLampCoil)); - CoilStatuses[id] = false; + var hasDynamicWire = _tableComponent.MappingConfig.Wires.FirstOrDefault(w => + w.DestinationDevice == coilMapping.Device && + w.DestinationDeviceItem == coilMapping.DeviceItem) != null; + + _coilAssignments[coilMapping.Id].Add(new CoilDestConfig(coilMapping.Device, coilMapping.DeviceItem, isLampCoil, hasDynamicWire)); + CoilStatuses[coilMapping.Id] = false; } private void HandleCoilEvent(object sender, CoilEventArgs coilEvent) @@ -109,8 +117,14 @@ private void HandleCoilEvent(object sender, CoilEventArgs coilEvent) foreach (var destConfig in _coilAssignments[coilEvent.Id]) { + if (destConfig.HasDynamicWire) { + // goes back through the wire mapping, which will decide whether it has already sent the event or not + _wirePlayer.HandleCoilEvent(coilEvent.Id, coilEvent.IsEnabled); + continue; + } + if (destConfig.IsLampCoil) { - _lampPlayer.HandleLampEvent(new LampEventArgs(coilEvent.Id, coilEvent.IsEnabled ? 1 : 0, LampSource.Coils)); + _lampPlayer.HandleLampEvent(new LampEventArgs(coilEvent.Id, coilEvent.IsEnabled ? 1 : 0, true)); continue; } @@ -159,17 +173,19 @@ internal class CoilDestConfig public readonly ICoilDeviceComponent Device; public readonly string DeviceItem; public readonly bool IsLampCoil; + public readonly bool HasDynamicWire; - public CoilDestConfig(ICoilDeviceComponent device, string deviceItem, bool isLampCoil) + public CoilDestConfig(ICoilDeviceComponent device, string deviceItem, bool isLampCoil, bool hasDynamicWire) { Device = device; DeviceItem = deviceItem; IsLampCoil = isLampCoil; + HasDynamicWire = hasDynamicWire; } public override string ToString() { - return $"coil destination (device = {Device}, coild id = {DeviceItem}, lamp = {IsLampCoil})"; + return $"coil destination (device = {Device}, coild id = {DeviceItem}, lamp = {IsLampCoil}, wire = {HasDynamicWire})"; } } } diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/Engine/DefaultGamelogicEngine.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/Engine/DefaultGamelogicEngine.cs index 9993e46b5..08e31e031 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Game/Engine/DefaultGamelogicEngine.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Game/Engine/DefaultGamelogicEngine.cs @@ -17,14 +17,20 @@ // ReSharper disable ConditionIsAlwaysTrueOrFalse using System; +using System.Collections; using System.Collections.Generic; using System.Diagnostics; using NLog; using UnityEngine; +using UnityEngine.InputSystem; using VisualPinball.Engine.Common; using VisualPinball.Engine.Game.Engines; +using Debug = UnityEngine.Debug; using Logger = NLog.Logger; +// uncomment to simulate dual-wound flippers +// #define DUAL_WOUND_FLIPPERS + namespace VisualPinball.Unity { /// @@ -36,7 +42,7 @@ namespace VisualPinball.Unity [AddComponentMenu("Visual Pinball/Game Logic Engine/Default Game Logic")] public class DefaultGamelogicEngine : MonoBehaviour, IGamelogicEngine { - public string Name { get; } = "Default Game Engine"; + public string Name => "Default Game Engine"; public event EventHandler OnCoilChanged; public event EventHandler OnLampChanged; @@ -45,8 +51,6 @@ public class DefaultGamelogicEngine : MonoBehaviour, IGamelogicEngine public event EventHandler OnDisplaysAvailable; public event EventHandler OnDisplayFrame; - private const bool DualWoundFlippers = false; - private const int DmdWidth = 128; private const int DmdHeight = 32; private const string DisplayDmd = "dmd0"; @@ -94,6 +98,11 @@ public class DefaultGamelogicEngine : MonoBehaviour, IGamelogicEngine new GamelogicEngineCoil(CoilTroughEntry) { Description = "Trough Entry", DeviceHint = "^Trough\\s*\\d?", DeviceItemHint = TroughComponent.EntryCoilId}, }; + public GamelogicEngineWire[] AvailableWires { get; } = { + new GamelogicEngineWire(SwLeftFlipper, CoilLeftFlipperMain, DestinationType.Coil, "Left Flipper"), + new GamelogicEngineWire(SwRightFlipper, CoilRightFlipperMain, DestinationType.Coil, "Right Flipper"), + }; + private const string GiSlingshotRightLower = "gi_1"; private const string GiSlingshotRightUpper = "gi_2"; private const string GiSlingshotLeftLower = "gi_3"; @@ -135,18 +144,22 @@ public class DefaultGamelogicEngine : MonoBehaviour, IGamelogicEngine private Player _player; private BallManager _ballManager; - private bool _frameSent = false; + private bool _frameSent; private PlayfieldComponent _playfieldComponent; + private const float FlipperLag = 0.5f; private readonly Dictionary _switchTime = new Dictionary(); private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); + [NonSerialized] + private bool _flippersEnabled = true; + public DefaultGamelogicEngine() { Logger.Info("New Gamelogic engine instantiated."); - if (DualWoundFlippers) { + #if DUAL_WOUND_FLIPPERS _availableCoils.AddRange(new [] { new GamelogicEngineCoil(CoilLeftFlipperHold) { Description = "Left Flipper (Hold)", DeviceHint = "^(LeftFlipper|LFlipper|FlipperLeft|FlipperL)$", DeviceItemHint = FlipperComponent.HoldCoilItem }, new GamelogicEngineCoil(CoilRightFlipperHold) { Description = "Right Flipper (Hold)", DeviceHint = "^(RightFlipper|RFlipper|FlipperRight|FlipperR)$", DeviceItemHint = FlipperComponent.HoldCoilItem }, @@ -156,7 +169,7 @@ public DefaultGamelogicEngine() new GamelogicEngineSwitch(SwLeftFlipperEos) { Description = "Left Flipper (EOS)", DeviceHint = "^(LeftFlipper|LFlipper|FlipperLeft|FlipperL)$"}, new GamelogicEngineSwitch(SwRightFlipperEos) { Description = "Right Flipper (EOS)", DeviceHint = "^(RightFlipper|RFlipper|FlipperRight|FlipperR)$"}, }); - } + #endif } public void OnInit(Player player, TableApi tableApi, BallManager ballManager) @@ -187,6 +200,16 @@ private void Update() _frameSent = true; } + + if (Keyboard.current.fKey.wasPressedThisFrame) { + Debug.Log("Flippers disabled"); + _flippersEnabled = false; + } + + if (Keyboard.current.fKey.wasReleasedThisFrame) { + Debug.Log("Flippers enabled"); + _flippersEnabled = true; + } } public void OnDestroy() @@ -266,7 +289,7 @@ private void Flip(string id, bool isClosed) switch (id) { case SwLeftFlipper: - if (DualWoundFlippers) { + #if DUAL_WOUND_FLIPPERS if (isClosed) { OnCoilChanged?.Invoke(this, new CoilEventArgs(CoilLeftFlipperMain, true)); @@ -277,23 +300,24 @@ private void Flip(string id, bool isClosed) : new CoilEventArgs(CoilLeftFlipperMain, false) ); } - } else { - OnCoilChanged?.Invoke(this, new CoilEventArgs(CoilLeftFlipperMain, isClosed)); - } - + #else + if (_flippersEnabled) { + Wait(FlipperLag, () => OnCoilChanged?.Invoke(this, new CoilEventArgs(CoilLeftFlipperMain, isClosed))); + } + #endif break; case SwLeftFlipperEos: - if (DualWoundFlippers) { + #if DUAL_WOUND_FLIPPERS if (isClosed) { OnCoilChanged?.Invoke(this, new CoilEventArgs(CoilLeftFlipperMain, false)); OnCoilChanged?.Invoke(this, new CoilEventArgs(CoilLeftFlipperHold, true)); } - } + #endif break; case SwRightFlipper: - if (DualWoundFlippers) { + #if DUAL_WOUND_FLIPPERS if (isClosed) { OnCoilChanged?.Invoke(this, new CoilEventArgs(CoilRightFlipperMain, true)); } else { @@ -303,20 +327,29 @@ private void Flip(string id, bool isClosed) : new CoilEventArgs(CoilRightFlipperMain, false) ); } - } else { - OnCoilChanged?.Invoke(this, new CoilEventArgs(CoilRightFlipperMain, isClosed)); - } + #else + if (_flippersEnabled) { + Wait(FlipperLag, () => OnCoilChanged?.Invoke(this, new CoilEventArgs(CoilRightFlipperMain, isClosed))); + } + #endif break; case SwRightFlipperEos: - if (DualWoundFlippers) { + #if DUAL_WOUND_FLIPPERS if (isClosed) { OnCoilChanged?.Invoke(this, new CoilEventArgs(CoilRightFlipperMain, false)); OnCoilChanged?.Invoke(this, new CoilEventArgs(CoilRightFlipperHold, true)); } - } + #endif break; } } + + private void Wait(float seconds, Action action) => StartCoroutine(_wait(seconds, action)); + + private static IEnumerator _wait(float time, Action callback){ + yield return new WaitForSeconds(time); + callback(); + } } } diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/Engine/IGamelogicEngine.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/Engine/IGamelogicEngine.cs index b5110e621..3ae0e9364 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Game/Engine/IGamelogicEngine.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Game/Engine/IGamelogicEngine.cs @@ -96,6 +96,15 @@ public interface IGamelogicEngine event EventHandler OnCoilChanged; #endregion + + #region Wires + + /// + /// A list of *dynamic* wires. + /// + GamelogicEngineWire[] AvailableWires { get; } + + #endregion } public class AvailableDisplays @@ -204,18 +213,25 @@ public readonly struct LampEventArgs /// public readonly LampSource Source; - public LampEventArgs(string id, int value) + /// + /// True if it was triggered by a coil. + /// + public readonly bool IsCoil; + + public LampEventArgs(string id, int value, LampSource source = LampSource.Lamp) { Id = id; Value = value; - Source = LampSource.Lamps; + Source = source; + IsCoil = false; } - public LampEventArgs(string id, int value, LampSource source) + public LampEventArgs(string id, int value, bool isCoil) { Id = id; Value = value; - Source = source; + Source = LampSource.Lamp; + IsCoil = isCoil; } } diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/LampPlayer.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/LampPlayer.cs index cfa7fc4ca..435a3a5ae 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Game/LampPlayer.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Game/LampPlayer.cs @@ -16,6 +16,7 @@ using System; using System.Collections.Generic; +using System.Security.Authentication.ExtendedProtection; using NLog; using VisualPinball.Engine.Math; using Color = UnityEngine.Color; @@ -25,8 +26,19 @@ namespace VisualPinball.Unity { public class LampPlayer { + /// + /// List of all registered lamp APIs. + /// private readonly Dictionary _lamps = new Dictionary(); + + /// + /// Links the GLE's IDs to the lamps. + /// private readonly Dictionary> _lampAssignments = new Dictionary>(); + + /// + /// Links the GLE's IDs to the mappings. + /// private readonly Dictionary> _lampMappings = new Dictionary>(); private TableComponent _tableComponent; @@ -53,20 +65,15 @@ public void OnStart() if (lampMapping.Device == null) { Logger.Warn($"Ignoring unassigned lamp \"{lampMapping.Id}\"."); - break; + continue; } - AssignLampMapping(lampMapping.Id, lampMapping); + AssignLampMapping(lampMapping); - if (lampMapping.Type == LampType.RgbMulti) { - if (!string.IsNullOrEmpty(lampMapping.Green)) { - AssignLampMapping(lampMapping.Green, lampMapping); - } - if (!string.IsNullOrEmpty(lampMapping.Blue)) { - AssignLampMapping(lampMapping.Blue, lampMapping); - } + // turn it off + if (_lamps.ContainsKey(lampMapping.Device)) { + _lamps[lampMapping.Device].OnLamp(0f, ColorChannel.Alpha); } - } if (_lampAssignments.Count > 0) { @@ -79,11 +86,65 @@ public void OnStart() public void HandleLampEvent(LampEventArgs lampEvent) { - HandleLampEvent(null, lampEvent); + if (_lampAssignments.ContainsKey(lampEvent.Id)) { + foreach (var component in _lampAssignments[lampEvent.Id]) { + var mapping = _lampMappings[lampEvent.Id][component]; + if (mapping.Source != lampEvent.Source || mapping.IsCoil != lampEvent.IsCoil) { + // so, if we have a coil here that happens to have the same name as a lamp, + // or a GI light with the same name as an other lamp, skip. + continue; + } + if (_lamps.ContainsKey(component)) { + var lamp = _lamps[component]; + var value = 0f; + var channel = ColorChannel.Alpha; + switch (mapping.Type) { + case LampType.SingleOnOff: + value = lampEvent.Value > 0 ? 1f : 0f; + break; + + case LampType.Rgb: + value = lampEvent.Value / 255f; // todo test + + break; + case LampType.RgbMulti: + value = lampEvent.Value / 255f; // todo test + channel = mapping.Channel; + break; + + case LampType.SingleFading: + value = lampEvent.Value / (float)mapping.FadingSteps; + break; + + default: + Logger.Error($"Unknown mapping type \"{mapping.Type}\" of lamp ID {lampEvent.Id} for light {component}."); + break; + } + + lamp.OnLamp(value, channel); + LampStatuses[lampEvent.Id] = value; + + } + } +#if UNITY_EDITOR + UnityEditorInternal.InternalEditorUtility.RepaintAllViews(); +#endif + } } - private void AssignLampMapping(string id, LampMapping lampMapping) + public void OnDestroy() + { + if (_lampAssignments.Count > 0 && _gamelogicEngine != null) { + _gamelogicEngine.OnLampColorChanged -= HandleLampColorEvent; + _gamelogicEngine.OnLampChanged -= HandleLampEvent; + _gamelogicEngine.OnLampsChanged -= HandleLampsEvent; + } + } + + + private void AssignLampMapping(LampMapping lampMapping) { + var id = lampMapping.Id; if (!_lampAssignments.ContainsKey(id)) { _lampAssignments[id] = new List(); } @@ -127,23 +188,7 @@ private void HandleLampsEvent(object sender, LampsEventArgs lampsEvent) var colors = new Dictionary(); var lamps = new Dictionary(); foreach (var lampEvent in lampsEvent.LampsChanged) { - HandleLampEvent(lampEvent, (lamp, mapping, itemName) => { - var color = colors.ContainsKey(mapping.Id) ? colors[mapping.Id] : lamp.Color; - if (lampEvent.Id == mapping.Id) { - color.r = lampEvent.Value / 255f; - - } else if (lampEvent.Id == mapping.Green) { - color.g = lampEvent.Value / 255f; - - } else if (lampEvent.Id == mapping.Blue) { - color.b = lampEvent.Value / 255f; - - } else { - Logger.Error($"Cannot assign lamp {lampEvent.Id} to an RGB value of light {itemName}"); - } - colors[mapping.Id] = color; - lamps[mapping.Id] = lamp; - }); + HandleLampEvent(lampEvent); } foreach (var mappingId in colors.Keys) { @@ -154,77 +199,7 @@ private void HandleLampsEvent(object sender, LampsEventArgs lampsEvent) private void HandleLampEvent(object sender, LampEventArgs lampEvent) { - HandleLampEvent(lampEvent, (lamp, mapping, itemName) => { - if (lampEvent.Id == mapping.Id) { - lamp.OnLamp(lampEvent.Value / 255f, ColorChannel.Red); - - } else if (lampEvent.Id == mapping.Green) { - lamp.OnLamp(lampEvent.Value / 255f, ColorChannel.Green); - - } else if (lampEvent.Id == mapping.Blue) { - lamp.OnLamp(lampEvent.Value / 255f, ColorChannel.Blue); - - } else { - Logger.Error($"Cannot assign lamp {lampEvent.Id} to an RGB value of light {itemName}"); - } - LampStatuses[lampEvent.Id] = lamp.Color.grayscale; - }); - } - - private void HandleLampEvent(LampEventArgs lampEvent, Action handleRgb) - { - if (_lampAssignments.ContainsKey(lampEvent.Id)) { - foreach (var component in _lampAssignments[lampEvent.Id]) { - var mapping = _lampMappings[lampEvent.Id][component]; - if (mapping.Source != lampEvent.Source) { - // so, if we have a coil here that happens to have the same name as a lamp, - // skip if the source isn't the same. - continue; - } - if (_lamps.ContainsKey(component)) { - var lamp = _lamps[component]; - switch (mapping.Type) { - case LampType.SingleOnOff: { - var value = lampEvent.Value > 0 ? 1f : 0f; - lamp.OnLamp(value, ColorChannel.Alpha); - LampStatuses[lampEvent.Id] = value; - break; - } - - case LampType.Rgb: - case LampType.SingleFading: { - var value = lampEvent.Value / 255f; - lamp.OnLamp(value, ColorChannel.Alpha); - LampStatuses[lampEvent.Id] = value; - break; - } - - case LampType.RgbMulti: - handleRgb(lamp, mapping, component); - break; - - default: - Logger.Error($"Unknown mapping type \"{mapping.Type}\" of lamp ID {lampEvent.Id} for light {component}."); - break; - } - - } else { - Logger.Error($"Cannot trigger unknown lamp {component}."); - } - } -#if UNITY_EDITOR - UnityEditorInternal.InternalEditorUtility.RepaintAllViews(); -#endif - } - } - - public void OnDestroy() - { - if (_lampAssignments.Count > 0 && _gamelogicEngine != null) { - _gamelogicEngine.OnLampColorChanged -= HandleLampColorEvent; - _gamelogicEngine.OnLampChanged -= HandleLampEvent; - _gamelogicEngine.OnLampsChanged -= HandleLampsEvent; - } + HandleLampEvent(lampEvent); } } } diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/Player.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/Player.cs index 6591491b0..ecdf5dd3a 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Game/Player.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Game/Player.cs @@ -43,6 +43,8 @@ public class Player : MonoBehaviour [NonSerialized] public BallManager BallManager; + public event EventHandler OnUpdate; + [HideInInspector] [SerializeField] public string debugUiId; [HideInInspector] [SerializeField] public string physicsEngineId; @@ -94,10 +96,12 @@ public class Player : MonoBehaviour internal IApiSwitch Switch(ISwitchDeviceComponent component, string switchItem) => component != null ? _switchPlayer.Switch(component, switchItem) : null; internal IApiCoil Coil(ICoilDeviceComponent component, string coilItem) => component != null ? _coilPlayer.Coil(component, coilItem) : null; internal IApiWireDeviceDest WireDevice(IWireableComponent c) => _wirePlayer.WireDevice(c); + internal void HandleWireSwitchChange(WireDestConfig wireConfig, bool isEnabled) => _wirePlayer.HandleSwitchChange(wireConfig, isEnabled); public Dictionary SwitchStatusesClosed => _switchPlayer.SwitchStatusesClosed; public Dictionary CoilStatuses => _coilPlayer.CoilStatuses; public Dictionary LampStatuses => _lampPlayer.LampStatuses; + public Dictionary WireStatuses => _wirePlayer.WireStatuses; public float3 Gravity => _playfieldComponent.Gravity; #endregion @@ -124,9 +128,9 @@ private void Awake() if (engineComponent != null) { GamelogicEngine = engineComponent; _lampPlayer.Awake(_tableComponent, GamelogicEngine); - _coilPlayer.Awake(_tableComponent, GamelogicEngine, _lampPlayer); + _coilPlayer.Awake(_tableComponent, GamelogicEngine, _lampPlayer, _wirePlayer); _switchPlayer.Awake(_tableComponent, GamelogicEngine, _inputManager); - _wirePlayer.Awake(_tableComponent, _inputManager, _switchPlayer); + _wirePlayer.Awake(_tableComponent, _inputManager, _switchPlayer, this); _displayPlayer.Awake(GamelogicEngine); } @@ -157,6 +161,11 @@ private void Start() } } + private void Update() + { + OnUpdate?.Invoke(this, EventArgs.Empty); + } + private void OnDestroy() { foreach (var i in _apis) { @@ -221,7 +230,17 @@ public void RegisterKicker(KickerComponent component, Entity entity, Entity pare public void RegisterLamp(LightComponent component) { - Register(new LightApi(component.gameObject, this), component); + Register(component.GetApi(this), component); + } + + public void RegisterLampGroup(LightGroupComponent component) + { + Register(new LightGroupApi(component.Lights.Select(l => l.GetApi(this)).ToArray()), component); + } + + public void RegisterMech(CannonComponent component) + { + Register(new CannonApi(component.gameObject, this), component); } public void RegisterPlunger(PlungerComponent component, Entity entity, Entity parentEntity, InputActionReference actionRef) @@ -409,7 +428,7 @@ public void OnEvent(in EventData eventData) #region API - public void AddDynamicWire(string switchId, string coilId) + public void AddHardwareRule(string switchId, string coilId) { var switchMapping = _tableComponent.MappingConfig.Switches.FirstOrDefault(c => c.Id == switchId); var coilMapping = _tableComponent.MappingConfig.Coils.FirstOrDefault(c => c.Id == coilId); @@ -422,14 +441,14 @@ public void AddDynamicWire(string switchId, string coilId) return; } - var wireMapping = new WireMapping($"Hardware rule: {switchId} -> {coilId}", switchMapping, coilMapping); + var wireMapping = new WireMapping($"Hardware rule: {switchId} -> {coilId}", switchMapping, coilMapping).WithId(); _wirePlayer.AddWire(wireMapping); // this is for showing it in the editor during runtime only _tableComponent.MappingConfig.AddWire(wireMapping); } - public void RemoveDynamicWire(string switchId, string coilId) + public void RemoveHardwareRule(string switchId, string coilId) { var switchMapping = _tableComponent.MappingConfig.Switches.FirstOrDefault(c => c.Id == switchId); var coilMapping = _tableComponent.MappingConfig.Coils.FirstOrDefault(c => c.Id == coilId); @@ -442,6 +461,7 @@ public void RemoveDynamicWire(string switchId, string coilId) return; } + // todo this can be done more elegantly with Ids now. var wireMapping = new WireMapping($"Hardware rule: {switchId} -> {coilId}", switchMapping, coilMapping); _wirePlayer.RemoveWire(wireMapping); diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/SwitchHandler.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/SwitchHandler.cs index 7576983b7..055d7f05b 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Game/SwitchHandler.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Game/SwitchHandler.cs @@ -84,7 +84,7 @@ public void AddWireDest(WireDestConfig wireConfig) public void RemoveWireDest(string destId) { foreach (var wire in _wires) { - if (wire.IsDynamic && wire.DeviceItem == destId) { + if (wire.IsHardwareRule && wire.DeviceItem == destId) { _wires.Remove(wire); return; } @@ -123,23 +123,7 @@ internal void OnSwitch(bool enabled) // handle switch -> wire if (_wires != null) { foreach (var wireConfig in _wires) { - var device = _player.WireDevice(wireConfig.Device); - if (device != null) { - var dest = device.Wire(wireConfig.DeviceItem); - if (dest != null) { - - // close the switch now - dest.OnChange(enabled); - - // if it's pulse, schedule to re-open - if (enabled && wireConfig.IsPulseSource) { - SimulationSystemGroup.ScheduleAction(wireConfig.PulseDelay, () => dest.OnChange(false)); - } - } - - } else { - Logger.Warn($"Cannot find wire device \"{wireConfig.Device}\"."); - } + _player.HandleWireSwitchChange(wireConfig, enabled); } } diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/WirePlayer.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/WirePlayer.cs index 630210c20..4f1135c8f 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Game/WirePlayer.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Game/WirePlayer.cs @@ -14,10 +14,14 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +using System; using System.Collections.Generic; using System.Linq; using NLog; +using Unity.Entities; +using UnityEngine; using UnityEngine.InputSystem; +using Logger = NLog.Logger; namespace VisualPinball.Unity { @@ -28,27 +32,38 @@ public class WirePlayer /// private readonly Dictionary _wireDevices = new Dictionary(); private readonly Dictionary> _keyWireAssignments = new Dictionary>(); + private readonly Dictionary> _gleDestAssignments = new Dictionary>(); + private readonly Dictionary> _gleSrcAssignments = new Dictionary>(); + private readonly Dictionary>> _gleSignals = new Dictionary>>(); + private Player _player; private TableComponent _tableComponent; private InputManager _inputManager; private SwitchPlayer _switchPlayer; + private static VisualPinballSimulationSystemGroup SimulationSystemGroup => World.DefaultGameObjectInjectionWorld.GetOrCreateSystem(); private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); + internal Dictionary WireStatuses { get; } = new Dictionary(); internal IApiWireDeviceDest WireDevice(IWireableComponent c) => _wireDevices.ContainsKey(c) ? _wireDevices[c] : null; internal void RegisterWireDevice(IWireableComponent component, IApiWireDeviceDest wireDeviceApi) => _wireDevices[component] = wireDeviceApi; - public void Awake(TableComponent tableComponent, InputManager inputManager, SwitchPlayer switchPlayer) + #region Lifecycle + + public void Awake(TableComponent tableComponent, InputManager inputManager, SwitchPlayer switchPlayer, Player player) { _tableComponent = tableComponent; _inputManager = inputManager; _switchPlayer = switchPlayer; + _player = player; } public void OnStart() { - var config = _tableComponent.MappingConfig; + _player.OnUpdate += OnUpdate; _keyWireAssignments.Clear(); + _gleDestAssignments.Clear(); + var config = _tableComponent.MappingConfig; foreach (var wireData in config.Wires) { AddWire(wireData); } @@ -56,8 +71,42 @@ public void OnStart() _inputManager.Enable(HandleKeyInput); } - internal void AddWire(WireMapping wireMapping, bool isDynamic = false) + private void OnUpdate(object sender, EventArgs e) + { + foreach (var wireConfig in _gleSignals.Keys) { + if (!wireConfig.IsActive) { + continue; + } + foreach (var isEnabled in _gleSignals[wireConfig].Keys) { + var queue = _gleSignals[wireConfig][isEnabled]; + if (queue.Count == 0) { + continue; + } + var lagSec = Time.realtimeSinceStartup - queue.Peek(); + if (lagSec > WireDestConfig.DynamicThresholdSec) { + Logger.Info($"Disabling dynamic wire to {wireConfig.DeviceItem} @ {wireConfig.Device.gameObject.name} due to inactivity."); + _wireDevices[wireConfig.Device].Wire(wireConfig.DeviceItem).OnChange(!isEnabled); + wireConfig.IsActive = false; + } + } + } + } + + public void OnDestroy() + { + if (_keyWireAssignments.Count > 0) { + _inputManager.Disable(HandleKeyInput); + } + _player.OnUpdate -= OnUpdate; + } + + #endregion + + #region Setup + + internal void AddWire(WireMapping wireMapping, bool isHardwareRule = false) { + WireStatuses[wireMapping.Id] = (false, 0); switch (wireMapping.Source) { case SwitchSource.Playfield: { @@ -75,7 +124,7 @@ internal void AddWire(WireMapping wireMapping, bool isDynamic = false) var deviceSwitch = _switchPlayer.Switch(wireMapping.SourceDevice, wireMapping.SourceDeviceItem); if (deviceSwitch != null) { - deviceSwitch.AddWireDest(new WireDestConfig(wireMapping) { IsDynamic = isDynamic }); + deviceSwitch.AddWireDest(SetupWireDestConfig(wireMapping, isHardwareRule)); Logger.Info($"Wiring device switch \"{wireMapping.Src}\" to \"{wireMapping.Dst}\""); } else { @@ -88,11 +137,12 @@ internal void AddWire(WireMapping wireMapping, bool isDynamic = false) if (!_keyWireAssignments.ContainsKey(wireMapping.SourceInputAction)) { _keyWireAssignments[wireMapping.SourceInputAction] = new List(); } - _keyWireAssignments[wireMapping.SourceInputAction].Add(new WireDestConfig(wireMapping) { IsDynamic = isDynamic }); + _keyWireAssignments[wireMapping.SourceInputAction].Add(SetupWireDestConfig(wireMapping, isHardwareRule)); break; } case SwitchSource.Constant: + // todo break; default: @@ -101,6 +151,56 @@ internal void AddWire(WireMapping wireMapping, bool isDynamic = false) } } + private WireDestConfig SetupWireDestConfig(WireMapping wireMapping, bool isHardwareRule) + { + var wireDest = new WireDestConfig(wireMapping) { IsHardwareRule = isHardwareRule }; + if (!wireMapping.IsDynamic) { + return wireDest; + } + if (GetGamelogicEngineIds(wireMapping, out var srcId, out var destId)) { + + _gleSignals[wireDest] = new Dictionary> { + [true] = new Queue(), + [false] = new Queue() + }; + + // reference the queue both by src and dest + if (!_gleSrcAssignments.ContainsKey(srcId)) { + _gleSrcAssignments[srcId] = new List(); + } + _gleSrcAssignments[srcId].Add(wireDest); + + if (!_gleDestAssignments.ContainsKey(destId)) { + _gleDestAssignments[destId] = new List(); + } + _gleDestAssignments[destId].Add(wireDest); + + Logger.Warn($"Added dynamic wire \"{wireMapping.Description}\" ({srcId} -> {destId})."); + + } else { + Logger.Warn($"GLE IDs not found for dynamic wire {wireMapping.Description} ({srcId} -> {destId})."); + } + return wireDest; + } + + private bool GetGamelogicEngineIds(WireMapping wireMapping, out string src, out string dest) + { + var sourceMapping = _tableComponent.MappingConfig.Switches.FirstOrDefault(switchMapping => { + return switchMapping.Source switch { + SwitchSource.InputSystem => switchMapping.InputActionMap == wireMapping.SourceInputActionMap && switchMapping.InputAction == wireMapping.SourceInputAction, + SwitchSource.Playfield => switchMapping.Device == wireMapping.SourceDevice && switchMapping.DeviceItem == wireMapping.SourceDeviceItem, + _ => false + }; + }); + var destMapping = _tableComponent.MappingConfig.Coils.FirstOrDefault(coilMapping => + coilMapping.Device == wireMapping.DestinationDevice && + coilMapping.DeviceItem == wireMapping.DestinationDeviceItem); + + src = sourceMapping?.Id; + dest = destMapping?.Id; + return sourceMapping != null && destMapping != null; + } + internal void RemoveWire(WireMapping wireMapping) { switch (wireMapping.Source) { @@ -132,7 +232,7 @@ internal void RemoveWire(WireMapping wireMapping) _keyWireAssignments[wireMapping.SourceInputAction] = new List(); } var assignment = _keyWireAssignments[wireMapping.SourceInputAction] - .FirstOrDefault(a => a.IsDynamic && a.Device == wireMapping.DestinationDevice && a.DeviceItem == wireMapping.DestinationDeviceItem); + .FirstOrDefault(a => a.IsHardwareRule && a.Device == wireMapping.DestinationDevice && a.DeviceItem == wireMapping.DestinationDeviceItem); _keyWireAssignments[wireMapping.SourceInputAction].Remove(assignment); break; } @@ -146,6 +246,10 @@ internal void RemoveWire(WireMapping wireMapping) } } + #endregion + + #region Runtime + private void HandleKeyInput(object obj, InputActionChange change) { switch (change) { @@ -154,14 +258,34 @@ private void HandleKeyInput(object obj, InputActionChange change) var action = (InputAction)obj; if (_keyWireAssignments != null && _keyWireAssignments.ContainsKey(action.name)) { foreach (var wireConfig in _keyWireAssignments[action.name]) { - if (_wireDevices.ContainsKey(wireConfig.Device)) { - var device = _wireDevices[wireConfig.Device]; - var wire = device.Wire(wireConfig.DeviceItem); - if (wire != null) { - wire.OnChange(change == InputActionChange.ActionStarted); + if (!_wireDevices.ContainsKey(wireConfig.Device)) { + continue; + } + + var device = _wireDevices[wireConfig.Device]; + var wire = device.Wire(wireConfig.DeviceItem); + if (wire != null) { + var isEnabled = change == InputActionChange.ActionStarted; + if (!wireConfig.IsDynamic) { + wire.OnChange(isEnabled); + WireStatuses[wireConfig.Id] = (isEnabled, 0); + } else { - Logger.Warn($"Unknown wire \"{wireConfig.DeviceItem}\" in wire device \"{wireConfig.Device}\"."); + _gleSignals[wireConfig][isEnabled].Enqueue(Time.realtimeSinceStartup); + if (wireConfig.IsActive) { + // the dynamic wire is active, so trigger directly. + wire.OnChange(isEnabled); + WireStatuses[wireConfig.Id] = (isEnabled, -2); + + } else { + WireStatuses[wireConfig.Id] = (WireStatuses[wireConfig.Id].Item1, -1); + } } + #if UNITY_EDITOR + UnityEditorInternal.InternalEditorUtility.RepaintAllViews(); + #endif + } else { + Logger.Warn($"Unknown wire \"{wireConfig.DeviceItem}\" in wire device \"{wireConfig.Device}\"."); } } } @@ -169,35 +293,221 @@ private void HandleKeyInput(object obj, InputActionChange change) } } - public void OnDestroy() + public void HandleSwitchChange(WireDestConfig wireConfig, bool isEnabled) { - if (_keyWireAssignments.Count > 0) { - _inputManager.Disable(HandleKeyInput); + var device = _player.WireDevice(wireConfig.Device); + if (device != null) { + var wire = device.Wire(wireConfig.DeviceItem); + if (wire != null) { + + if (!wireConfig.IsDynamic) { + wire.OnChange(isEnabled); + WireStatuses[wireConfig.Id] = (isEnabled, 0); + + // if it's pulse, schedule to re-open + if (isEnabled && wireConfig.IsPulseSource) { + SimulationSystemGroup.ScheduleAction(wireConfig.PulseDelay, () => { + wire.OnChange(false); + WireStatuses[wireConfig.Id] = (false, 0); + #if UNITY_EDITOR + UnityEditorInternal.InternalEditorUtility.RepaintAllViews(); + #endif + }); + } + + } else { + _gleSignals[wireConfig][isEnabled].Enqueue(Time.realtimeSinceStartup); + if (wireConfig.IsActive) { + // the dynamic wire is active, so trigger directly. + wire.OnChange(isEnabled); + WireStatuses[wireConfig.Id] = (isEnabled, -2); + + // if it's pulse, schedule to re-open + if (isEnabled && wireConfig.IsPulseSource) { + SimulationSystemGroup.ScheduleAction(wireConfig.PulseDelay, () => { + wire.OnChange(false); + WireStatuses[wireConfig.Id] = (false, -2); + #if UNITY_EDITOR + UnityEditorInternal.InternalEditorUtility.RepaintAllViews(); + #endif + }); + } + + } else { + WireStatuses[wireConfig.Id] = (WireStatuses[wireConfig.Id].Item1, -1); + } + } + #if UNITY_EDITOR + UnityEditorInternal.InternalEditorUtility.RepaintAllViews(); + #endif + } + + } else { + Logger.Warn($"Cannot find wire device \"{wireConfig.Device}\"."); + } + } + + /// + /// Gets called by the GLE for coils linked to a dynamic wire. + /// + /// GLE ID of the coil + /// Whether to enable or disable the coil. + public void HandleCoilEvent(string id, bool isEnabled) + { + foreach (var wireConfig in _gleDestAssignments[id]) { + if (!_wireDevices.ContainsKey(wireConfig.Device)) { + continue; + } + var now = Time.realtimeSinceStartup; + var device = _wireDevices[wireConfig.Device]; + var wire = device.Wire(wireConfig.DeviceItem); + if (wire != null) { + var lagSec = GetLag(wireConfig, isEnabled); + if (lagSec > 0) { + + // switch event was less than threshold ago, so let's check if the wire is active + if (!wireConfig.IsActive) { + // it wasn't active. so let's activate it + Logger.Info($"Enabling dynamic wire from {id} to {wireConfig.DeviceItem} @ {wireConfig.Device.gameObject.name} ({lagSec}ms)."); + wireConfig.IsActive = true; + wireConfig.ActiveSince = now; + + // since it wasn't active before, we need to emit, because the wire didn't catch it. + wire.OnChange(isEnabled); + WireStatuses[wireConfig.Id] = (isEnabled, lagSec); + + } else { + // just update lag time + WireStatuses[wireConfig.Id] = (WireStatuses[wireConfig.Id].Item1, lagSec); + } + + // if it was already active, do nothing, since it was emitted by the wire already, + // but that's only the case if it was *after* it became active. otherwise, emit. + if (now - lagSec < wireConfig.ActiveSince) { + wire.OnChange(isEnabled); + WireStatuses[wireConfig.Id] = (isEnabled, lagSec); + } + + #if UNITY_EDITOR + UnityEditorInternal.InternalEditorUtility.RepaintAllViews(); + #endif + + } else { + // so we got a coil with no or too old switch in the queue. we assume this comes from the GLE + // without a corresponding switch event. + wire.OnChange(isEnabled); + } + + } else { + Logger.Warn($"Unknown dynamic wire \"{wireConfig.DeviceItem}\" in wire device \"{wireConfig.Device}\"."); + } } } + + private float GetLag(WireDestConfig wireConfig, bool isEnabled) + { + var timeNow = Time.realtimeSinceStartup; + var queue = _gleSignals[wireConfig][isEnabled]; + var lagSec = -1f; + var numDequeue = 0; + while (queue.Count > 0) { + numDequeue++; + var timeQueue = queue.Dequeue(); + lagSec = timeNow - timeQueue; + if (lagSec < WireDestConfig.DynamicThresholdSec) { + return lagSec; + } + lagSec = -1f - numDequeue; + } + return lagSec; + } + + #endregion } public class WireDestConfig { + /// + /// Threshold in milliseconds within a confirming signal from the GLE + /// is expected. Should the signal arrive outside the threshold, the + /// dynamic wire's enabled status will be toggled. + /// + public const float DynamicThresholdSec = 600 / 1000f; + + /// + /// ID reference from the wire, to easily identify the wire. + /// + public readonly string Id; + + /// + /// Reference to the destination device. + /// public readonly IWireableComponent Device; + + /// + /// The item within the device. + /// public readonly string DeviceItem; - public readonly int PulseDelay; + + /// + /// If true, this is a pulse source, in which case there is only the + /// enable event and the disable event is automatically triggered + /// after milliseconds. + /// public bool IsPulseSource; /// - /// If the destination is dynamic, it means it was added during - /// gameplay. MPF does this, and it's called a "hardware rule". We tag + /// If it's a pulse source, the pulse delay in milliseconds. + /// + public readonly int PulseDelay; + + /// + /// Wires that are added during gameplay (MPF does this). We tag /// it as such here so we can filter when removing the wire. /// - public bool IsDynamic; + public bool IsHardwareRule; + + /// + /// Unlike hardware rules, dynamic wires are permanently added, but + /// they dynamically enable and disable depending on the GLE.

+ /// + /// If a dynamic wire is enabled, it stays active until the output + /// signal isn't received from the GLE within a certain threshold + /// (). If it's disabled, no signal + /// is sent until we get it from the GLE. + ///

+ /// + /// + /// The goal is to compensate lag introduced by the GLE. The typical + /// use case are flippers. By additionally linking the flipper button + /// switch to the flipper coil with a dynamic wire, VPE will instantly + /// trigger the flipper coil and only stop doing so if no coil signal + /// is received from the GLE. + /// + public readonly bool IsDynamic; + + /// + /// Status flag for dynamic wires. If true, the wire will emit events + /// to the destination, otherwise it won't. + /// + internal bool IsActive; + + /// + /// Status flag for dynamic wires. Timestamp () + /// when the wire became active. + /// + internal float ActiveSince; public WireDestConfig(WireMapping wireMapping) { + Id = wireMapping.Id; Device = wireMapping.DestinationDevice; DeviceItem = wireMapping.DestinationDeviceItem; PulseDelay = wireMapping.PulseDelay; + IsDynamic = wireMapping.IsDynamic; IsPulseSource = false; - IsDynamic = false; + IsHardwareRule = false; + IsActive = !wireMapping.IsDynamic; } public WireDestConfig WithPulse(bool isPulseSource) diff --git a/VisualPinball.Unity/VisualPinball.Unity/Import/PatcherManager.cs b/VisualPinball.Unity/VisualPinball.Unity/Import/PatcherManager.cs index 24f812e12..6a3428f56 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Import/PatcherManager.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Import/PatcherManager.cs @@ -7,8 +7,9 @@ namespace VisualPinball.Unity { public interface IPatcher { - void Set(FileTableContainer tableContainer, string filename); + void Set(FileTableContainer tableContainer, string filename, IMaterialProvider materialProvider, ITextureProvider textureProvider); void ApplyPatches(GameObject gameObject, GameObject tableGameObject); + void PostPatch(GameObject tableGameObject); } public static class PatcherManager diff --git a/VisualPinball.Unity/VisualPinball.Unity/Mappings/LampMapping.cs b/VisualPinball.Unity/VisualPinball.Unity/Mappings/LampMapping.cs index 222a5fc8e..eaaef8de5 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Mappings/LampMapping.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Mappings/LampMapping.cs @@ -17,6 +17,9 @@ // ReSharper disable InconsistentNaming using System; +using UnityEngine; +using VisualPinball.Engine.Game.Engines; +using VisualPinball.Engine.Math; namespace VisualPinball.Unity { @@ -25,18 +28,24 @@ public class LampMapping { public string Id = string.Empty; - public LampSource Source = LampSource.Lamps; + public int InternalId; + + public LampSource Source = LampSource.Lamp; + + public int FadingSteps; + + public bool IsCoil; public string Description = string.Empty; - public ILampDeviceComponent Device; + [SerializeReference] + public MonoBehaviour _device; + public ILampDeviceComponent Device { get => _device as ILampDeviceComponent; set => _device = value as MonoBehaviour; } public string DeviceItem = string.Empty; public LampType Type = LampType.SingleOnOff; - public string Green = string.Empty; - - public string Blue = string.Empty; + public ColorChannel Channel = ColorChannel.Alpha; } } diff --git a/VisualPinball.Unity/VisualPinball.Unity/Mappings/MappingConfig.cs b/VisualPinball.Unity/VisualPinball.Unity/Mappings/MappingConfig.cs index be3a8ab5e..37374f866 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Mappings/MappingConfig.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Mappings/MappingConfig.cs @@ -23,6 +23,7 @@ using UnityEngine; using VisualPinball.Engine.Common; using VisualPinball.Engine.Game.Engines; +using VisualPinball.Engine.Math; namespace VisualPinball.Unity { @@ -36,12 +37,17 @@ public class MappingConfig public bool IsEmpty() => (Coils == null || Coils.Count == 0) && (Switches == null || Switches.Count == 0) && (Lamps == null || Lamps.Count == 0); - public void Clear() + public void Clear(bool clearWires = true) { Switches.Clear(); Coils.Clear(); - Wires.Clear(); Lamps.Clear(); + + if (clearWires) { + RemoveAllWires(); + } else { + RemoveDynamicWires(); + } } #region Switches @@ -207,6 +213,7 @@ public void RemoveAllSwitches() public void PopulateCoils(GamelogicEngineCoil[] engineCoils, TableComponent tableComponent) { var coilDevices = tableComponent.GetComponentsInChildren(); + var lamps = tableComponent.GetComponentsInChildren().OrderBy(LampTypePriority).ToArray(); foreach (var engineCoil in GetCoils(engineCoils)) { var coilMapping = Coils.FirstOrDefault(mappingsCoilData => mappingsCoilData.Id == engineCoil.Id); @@ -214,7 +221,7 @@ public void PopulateCoils(GamelogicEngineCoil[] engineCoils, TableComponent tabl continue; } - var destination = GuessCoilDestination(engineCoil); + var destination = GuessCoilDestination(engineCoil, lamps); var description = string.IsNullOrEmpty(engineCoil.Description) ? string.Empty : engineCoil.Description; var device = destination == CoilDestination.Playfield ? GuessCoilDevice(coilDevices, engineCoil) : null; var deviceItem = destination == CoilDestination.Playfield && device != null ? GuessCoilDeviceItem(engineCoil, device) : null; @@ -235,22 +242,27 @@ public void PopulateCoils(GamelogicEngineCoil[] engineCoils, TableComponent tabl } } - private CoilDestination GuessCoilDestination(GamelogicEngineCoil engineCoil) + private CoilDestination GuessCoilDestination(GamelogicEngineCoil engineCoil, ILampDeviceComponent[] lampDevices) { if (!engineCoil.IsLamp) { return CoilDestination.Playfield; } // if it's a lamp, add a new entry to the lamps. + var lampDevice = GuessLampDevice(lampDevices, engineCoil); + var lampDeviceItem = lampDevice != null ? GuessLampDeviceItem(engineCoil, lampDevice) : null; AddLamp(new LampMapping { Id = engineCoil.Id, Description = engineCoil.Description, - Source = LampSource.Coils + Source = LampSource.Lamp, + IsCoil = true, + Device = lampDevice, + DeviceItem = lampDeviceItem != null ? lampDeviceItem.Id : string.Empty, }); return CoilDestination.Lamp; } - private static ICoilDeviceComponent GuessCoilDevice(ICoilDeviceComponent[] coilDevices, GamelogicEngineCoil engineCoil) + private static ICoilDeviceComponent GuessCoilDevice(IEnumerable coilDevices, IGamelogicEngineDeviceItem engineCoil) { foreach (var device in coilDevices) { if (string.Equals(device.name, engineCoil.Id, StringComparison.OrdinalIgnoreCase)) { @@ -267,7 +279,7 @@ private static ICoilDeviceComponent GuessCoilDevice(ICoilDeviceComponent[] coilD return null; } - private static GamelogicEngineCoil GuessCoilDeviceItem(GamelogicEngineCoil engineCoil, ICoilDeviceComponent device) + private static GamelogicEngineCoil GuessCoilDeviceItem(IGamelogicEngineDeviceItem engineCoil, ICoilDeviceComponent device) { // if only one device item available, it's the one. if (device.AvailableCoils.Count() == 1 && string.IsNullOrEmpty(engineCoil.DeviceItemHint)) { @@ -323,7 +335,7 @@ public void RemoveCoil(CoilMapping coilMapping) { Coils.Remove(coilMapping); if (coilMapping.Destination == CoilDestination.Lamp) { - var lamp = Lamps.FirstOrDefault(l => l.Id == coilMapping.Id && l.Source == LampSource.Coils); + var lamp = Lamps.FirstOrDefault(l => l.Id == coilMapping.Id && l.IsCoil); if (lamp != null) { Lamps.Remove(lamp); } @@ -333,13 +345,49 @@ public void RemoveCoil(CoilMapping coilMapping) public void RemoveAllCoils() { Coils.Clear(); - Lamps = Lamps.Where(l => l.Source != LampSource.Coils).ToList(); + Lamps = Lamps.Where(l => !l.IsCoil).ToList(); } #endregion #region Wires + public void PopulateWires(GamelogicEngineWire[] engineWires, TableComponent tableComponent) + { + foreach (var engineWire in engineWires) { + var srcMapping = Switches.FirstOrDefault(switchMapping => switchMapping.Id == engineWire.SourceId); + if (srcMapping == null) { + continue; + } + + switch (engineWire.DestinationType) { + case DestinationType.Coil: { + var destMapping = Coils.FirstOrDefault(coilMapping => coilMapping.Id == engineWire.DestinationId); + if (destMapping != null) { + AddWire(new WireMapping(engineWire.Description, srcMapping, destMapping).Dynamic().WithId()); + } + break; + } + case DestinationType.Lamp: { + var destMapping = Lamps.FirstOrDefault(lampMapping => lampMapping.Id == engineWire.DestinationId && lampMapping.Source == LampSource.Lamp); + if (destMapping != null) { + AddWire(new WireMapping(engineWire.Description, srcMapping, destMapping).Dynamic().WithId()); + } + break; + } + case DestinationType.GI: { + var destMapping = Lamps.FirstOrDefault(lampMapping => lampMapping.Id == engineWire.DestinationId && lampMapping.Source == LampSource.GI); + if (destMapping != null) { + AddWire(new WireMapping(engineWire.Description, srcMapping, destMapping).Dynamic().WithId()); + } + break; + } + default: + throw new ArgumentOutOfRangeException(); + } + } + } + public void AddWire(WireMapping wireMapping) { Wires.Add(wireMapping); @@ -350,6 +398,11 @@ public void RemoveWire(WireMapping wireMapping) Wires.Remove(wireMapping); } + public void RemoveDynamicWires() + { + Wires = Wires.Where(w => !w.IsDynamic).ToList(); + } + public void RemoveAllWires() { Wires.Clear(); @@ -359,7 +412,7 @@ public void RemoveAllWires() #region Lamps - /// + /// /// Auto-matches the lamps provided by the gamelogic engine with the /// lamps on the playfield. /// @@ -367,57 +420,37 @@ public void RemoveAllWires() /// Table component public void PopulateLamps(GamelogicEngineLamp[] engineLamps, TableComponent tableComponent) { - var lamps = tableComponent.GetComponentsInChildren(); - var gbLamps = new List(); + var lamps = tableComponent.GetComponentsInChildren().OrderBy(LampTypePriority).ToArray(); foreach (var engineLamp in GetLamps(engineLamps)) { - - var lampMapping = Lamps.FirstOrDefault(mappingsLampData => mappingsLampData.Id == engineLamp.Id && mappingsLampData.Source != LampSource.Coils); + var lampMapping = Lamps.FirstOrDefault(mappingsLampData => mappingsLampData.Id == engineLamp.Id && !mappingsLampData.IsCoil); if (lampMapping != null) { continue; } - // we'll handle those in a second loop when all the R lamps are added - if (!string.IsNullOrEmpty(engineLamp.MainLampIdOfGreen) || !string.IsNullOrEmpty(engineLamp.MainLampIdOfBlue)) { - gbLamps.Add(engineLamp); - continue; - } - var description = string.IsNullOrEmpty(engineLamp.Description) ? string.Empty : engineLamp.Description; var device = GuessLampDevice(lamps, engineLamp); var deviceItem = device != null ? GuessLampDeviceItem(engineLamp, device) : null; AddLamp(new LampMapping { Id = engineLamp.Id, + InternalId = engineLamp.InternalId, + Channel = engineLamp.Channel, + Source = engineLamp.Source, Description = description, Device = device, DeviceItem = deviceItem != null ? deviceItem.Id : string.Empty, + Type = GuessLampType(engineLamp), + FadingSteps = engineLamp.FadingSteps, }); } - - foreach (var gbLamp in gbLamps) { - var rLampId = !string.IsNullOrEmpty(gbLamp.MainLampIdOfGreen) ? gbLamp.MainLampIdOfGreen : gbLamp.MainLampIdOfBlue; - var rLamp = Lamps.FirstOrDefault(c => c.Id == rLampId); - if (rLamp == null) { - var device = GuessLampDevice(lamps, gbLamp); - var deviceItem = GuessLampDeviceItem(gbLamp, device); - rLamp = new LampMapping { - Id = rLampId, - Device = device, - DeviceItem = deviceItem != null ? deviceItem.Id : string.Empty, - }; - AddLamp(rLamp); - } - - rLamp.Type = LampType.RgbMulti; - if (!string.IsNullOrEmpty(gbLamp.MainLampIdOfGreen)) { - rLamp.Green = gbLamp.Id; - - } else { - rLamp.Blue = gbLamp.Id; - } - } } + private int LampTypePriority(ILampDeviceComponent comp) => comp switch { + LightGroupComponent _ => 0, + LightComponent _ => 1, + _ => 10 + }; + /// /// Returns a sorted list of lamp names from the gamelogic engine, /// appended with the additional names in the lamp mapping. In short, @@ -443,7 +476,7 @@ public IEnumerable GetLamps(GamelogicEngineLamp[] engineLam return lamps; } - private static ILampDeviceComponent GuessLampDevice(ILampDeviceComponent[] lamps, GamelogicEngineLamp engineLamp) + private static ILampDeviceComponent GuessLampDevice(ILampDeviceComponent[] lamps, IGamelogicEngineDeviceItem engineLamp) { // first, match by regex if hint provided if (!string.IsNullOrEmpty(engineLamp.DeviceHint)) { @@ -457,13 +490,13 @@ private static ILampDeviceComponent GuessLampDevice(ILampDeviceComponent[] lamps // second, match by "lXX" or name var matchKey = int.TryParse(engineLamp.Id, out var numericLampId) - ? $"l{numericLampId}" - : engineLamp.Id; - - return lamps.FirstOrDefault(l => l.name == matchKey); + ? $"^l{numericLampId}a?$" + : $"^{engineLamp.Id}$"; + var nameRegex = new Regex(matchKey, RegexOptions.IgnoreCase); + return lamps.FirstOrDefault(l => nameRegex.Match(l.name).Success); } - private static GamelogicEngineLamp GuessLampDeviceItem(GamelogicEngineLamp engineLamp, ILampDeviceComponent device) + private static GamelogicEngineLamp GuessLampDeviceItem(IGamelogicEngineDeviceItem engineLamp, ILampDeviceComponent device) { if (device == null) { return null; @@ -489,6 +522,17 @@ private static GamelogicEngineLamp GuessLampDeviceItem(GamelogicEngineLamp engin return null; } + private static LampType GuessLampType(GamelogicEngineLamp engineLamp) + { + if (engineLamp.Channel != ColorChannel.Alpha) { + return LampType.RgbMulti; + } + + return engineLamp.FadingSteps > 0 + ? LampType.SingleFading + : LampType.SingleOnOff; + } + public void AddLamp(LampMapping lampMapping) { Lamps.Add(lampMapping); @@ -501,7 +545,7 @@ public void RemoveLamp(LampMapping lampMapping) public void RemoveAllLamps() { - Lamps = Lamps.Where(l => l.Source == LampSource.Coils).ToList(); + Lamps = Lamps.Where(l => l.IsCoil).ToList(); } #endregion diff --git a/VisualPinball.Unity/VisualPinball.Unity/Mappings/MappingEnums.cs b/VisualPinball.Unity/VisualPinball.Unity/Mappings/MappingEnums.cs index 42d2aa927..df128f8df 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Mappings/MappingEnums.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Mappings/MappingEnums.cs @@ -48,12 +48,6 @@ public enum WireType Pulse = 1, } - public enum LampSource - { - Lamps = 0, - Coils = 1, - } - public enum LampType { SingleOnOff = 0, diff --git a/VisualPinball.Unity/VisualPinball.Unity/Mappings/WireMapping.cs b/VisualPinball.Unity/VisualPinball.Unity/Mappings/WireMapping.cs index 57085eb4c..41be5c2c0 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Mappings/WireMapping.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Mappings/WireMapping.cs @@ -25,6 +25,8 @@ namespace VisualPinball.Unity [Serializable] public class WireMapping { + public string Id; + public string Description = string.Empty; /* Source */ @@ -51,12 +53,28 @@ public class WireMapping public int PulseDelay = 250; + public bool IsDynamic; + public WireMapping() { } [ExcludeFromCodeCoverage] - public WireMapping(string description, SwitchMapping switchMapping, CoilMapping coilMapping) + public WireMapping(string description, SwitchMapping switchMapping, CoilMapping coilMapping) : this(description, switchMapping) + { + DestinationDevice = coilMapping.Device; + DestinationDeviceItem = coilMapping.DeviceItem; + } + + [ExcludeFromCodeCoverage] + public WireMapping(string description, SwitchMapping switchMapping, LampMapping lampMapping) : this(description, switchMapping) + { + DestinationDevice = lampMapping.Device; + DestinationDeviceItem = lampMapping.DeviceItem; + } + + [ExcludeFromCodeCoverage] + private WireMapping(string description, SwitchMapping switchMapping) { Description = description; Source = switchMapping.Source; @@ -64,8 +82,18 @@ public WireMapping(string description, SwitchMapping switchMapping, CoilMapping SourceDeviceItem = switchMapping.DeviceItem; SourceInputAction = switchMapping.InputAction; SourceInputActionMap = switchMapping.InputActionMap; - DestinationDevice = coilMapping.Device; - DestinationDeviceItem = coilMapping.DeviceItem; + } + + public WireMapping WithId() + { + Id = $"wire_{Guid.NewGuid().ToString().Substring(0, 8)}"; + return this; + } + + public WireMapping Dynamic() + { + IsDynamic = true; + return this; } [ExcludeFromCodeCoverage] diff --git a/VisualPinball.Unity/VisualPinball.Unity/Rendering/ILightConverter.cs b/VisualPinball.Unity/VisualPinball.Unity/Rendering/ILightConverter.cs index 77116cd77..25703205f 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Rendering/ILightConverter.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Rendering/ILightConverter.cs @@ -14,6 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +using UnityEngine; using VisualPinball.Engine.VPT.Light; using Light = UnityEngine.Light; @@ -29,6 +30,37 @@ public interface ILightConverter /// /// Which light to update /// VPX light data - void UpdateLight(Light light, LightData data); + /// If set, light is an insert. + void UpdateLight(Light light, LightData data, bool isInsert); + + /// + /// Sets the color of a given light. + /// + /// Which light to update + /// New color + void SetColor(Light light, Color color); + + void SetShadow(Light light, bool enabled, bool isDynamic, float nearPlane = 0.01f); + + void SetRange(Light light, float range); + + /// + /// Sets the intensity of a given light. + /// + /// Which light to update + /// Intensity in Lumen + void SetIntensity(Light light, float intensityLumen); + + void SetTemperature(Light light, float temperature); + + /// + /// Converts the light to a spotlight. + /// + /// Which light to update + /// Outer angle + /// Inner angle in percent of outer angle + void SpotLight(Light light, float outer, float innerPercent); + + void PyramidAngle(Light light, float angle, float aspectRatio); } } diff --git a/VisualPinball.Unity/VisualPinball.Unity/Rendering/IMaterialConverter.cs b/VisualPinball.Unity/VisualPinball.Unity/Rendering/IMaterialConverter.cs index 6028bcde9..8d17c2c8f 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Rendering/IMaterialConverter.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Rendering/IMaterialConverter.cs @@ -57,6 +57,12 @@ public interface IMaterialConverter /// Merged material Material MergeMaterials(PbrMaterial vpxMaterial, Material unityTextureMaterial); + void SetDiffusionProfile(Material material, DiffusionProfileTemplate template); + + void SetMaterialType(Material material, MaterialType materialType); + + void SetSmoothness(Material material, float smoothness); + int NormalMapProperty { get; } } } diff --git a/VisualPinball.Unity/VisualPinball.Unity/Rendering/IPrefabProvider.cs b/VisualPinball.Unity/VisualPinball.Unity/Rendering/IPrefabProvider.cs index 1692db5cd..751eccc77 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Rendering/IPrefabProvider.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Rendering/IPrefabProvider.cs @@ -51,6 +51,12 @@ public interface IPrefabProvider /// Prefab of the light (still needs to be instantiated) GameObject CreateLight(); + /// + /// Creates an insert light prefab. + /// + /// Prefab of the light (still needs to be instantiated) + GameObject CreateInsertLight(); + /// /// Creates a spinner prefab. /// diff --git a/VisualPinball.Unity/VisualPinball.Unity/Rendering/Standard/StandardLightConverter.cs b/VisualPinball.Unity/VisualPinball.Unity/Rendering/Standard/StandardLightConverter.cs index ea000fc07..81e24b947 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Rendering/Standard/StandardLightConverter.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Rendering/Standard/StandardLightConverter.cs @@ -25,7 +25,7 @@ namespace VisualPinball.Unity { public class StandardLightConverter : ILightConverter { - public void UpdateLight(Light light, LightData data) + public void UpdateLight(Light light, LightData data, bool isInsert) { // Set color and position light.color = data.Color2.ToUnityColor(); @@ -39,5 +39,39 @@ public void UpdateLight(Light light, LightData data) light.shadowBias = 0f; light.shadowNearPlane = 0f; } + + public void SetColor(Light light, Color color) + { + light.color = color; + } + public void SetShadow(Light light, bool enabled, bool isDynamic, float nearPlane = 0.01f) + { + light.shadows = enabled ? LightShadows.Soft : LightShadows.None; + light.shadowNearPlane = nearPlane; + } + + public void SetRange(Light light, float range) + { + light.range = range; + } + + public void SetIntensity(Light light, float intensityLumen) + { + light.intensity = intensityLumen; + } + public void SetTemperature(Light light, float temperature) + { + + } + + public void SpotLight(Light light, float outer, float innerPercent) + { + light.type = LightType.Spot; + light.spotAngle = outer; + light.innerSpotAngle = outer * innerPercent * 0.01f; + } + public void PyramidAngle(Light light, float angle, float aspectRatio) + { + } } } diff --git a/VisualPinball.Unity/VisualPinball.Unity/Rendering/Standard/StandardMaterialConverter.cs b/VisualPinball.Unity/VisualPinball.Unity/Rendering/Standard/StandardMaterialConverter.cs index c7b2051e1..ccd1802a0 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Rendering/Standard/StandardMaterialConverter.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Rendering/Standard/StandardMaterialConverter.cs @@ -24,8 +24,8 @@ namespace VisualPinball.Unity { public class StandardMaterialConverter : IMaterialConverter { - public Material DotMatrixDisplay => UnityEngine.Resources.Load("Materials/Dot Matrix Display (Builtin)"); - public Material SegmentDisplay => UnityEngine.Resources.Load("Materials/Segment Display (Builtin)"); + public Material DotMatrixDisplay => Resources.Load("Materials/Dot Matrix Display (Builtin)"); + public Material SegmentDisplay => Resources.Load("Materials/Segment Display (Builtin)"); public int NormalMapProperty => NormalMap; @@ -58,11 +58,11 @@ public static Material GetDefaultMaterial(BlendMode blendMode) switch (blendMode) { case BlendMode.Opaque: - return UnityEngine.Resources.Load("Materials/Table Opaque (Builtin)"); + return Resources.Load("Materials/Table Opaque (Builtin)"); case BlendMode.Cutout: - return UnityEngine.Resources.Load("Materials/Table Cutout (Builtin)"); + return Resources.Load("Materials/Table Cutout (Builtin)"); case BlendMode.Translucent: - return UnityEngine.Resources.Load("Materials/Table Translucent (Builtin)"); + return Resources.Load("Materials/Table Translucent (Builtin)"); default: throw new ArgumentOutOfRangeException("Undefined blend mode " + blendMode); } @@ -107,7 +107,7 @@ public Material CreateMaterial(PbrMaterial vpxMaterial, ITextureProvider texture unityMaterial.SetFloat(Metallic, metallicValue); // roughness / glossiness - unityMaterial.SetFloat(Smoothness, vpxMaterial.Roughness); + SetSmoothness(unityMaterial, vpxMaterial.Roughness); // map if (vpxMaterial.HasMap && textureProvider != null) { @@ -127,7 +127,7 @@ public Material CreateMaterial(PbrMaterial vpxMaterial, ITextureProvider texture public Material MergeMaterials(PbrMaterial vpxMaterial, Material texturedMaterial) { - var nonTexturedMaterial = CreateMaterial(vpxMaterial, null, null); + var nonTexturedMaterial = CreateMaterial(vpxMaterial, null); var mergedMaterial = new Material(GetShader()); mergedMaterial.CopyPropertiesFromMaterial(texturedMaterial); @@ -138,5 +138,19 @@ public Material MergeMaterials(PbrMaterial vpxMaterial, Material texturedMateria return mergedMaterial; } + + public void SetSmoothness(Material unityMaterial, float smoothness) + { + unityMaterial.SetFloat(Smoothness, smoothness); + } + + public void SetDiffusionProfile(Material material, DiffusionProfileTemplate template) + { + // don't think that standard renderer supports this.. + } + + public void SetMaterialType(Material material, MaterialType materialType) + { + } } } diff --git a/VisualPinball.Unity/VisualPinball.Unity/Rendering/Standard/StandardPrefabProvider.cs b/VisualPinball.Unity/VisualPinball.Unity/Rendering/Standard/StandardPrefabProvider.cs index 6b6780a53..79085f635 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/Rendering/Standard/StandardPrefabProvider.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/Rendering/Standard/StandardPrefabProvider.cs @@ -24,19 +24,19 @@ public class StandardPrefabProvider : IPrefabProvider { public GameObject CreateBumper() { - return UnityEngine.Resources.Load("Prefabs/Bumper (Builtin)"); + return Resources.Load("Prefabs/Bumper (Builtin)"); } public GameObject CreateGate(int type) { switch (type) { case GateType.GateLongPlate: - return UnityEngine.Resources.Load("Prefabs/Gate - Long Plate (Builtin)"); + return Resources.Load("Prefabs/Gate - Long Plate (Builtin)"); case GateType.GatePlate: - return UnityEngine.Resources.Load("Prefabs/Gate - Plate (Builtin)"); + return Resources.Load("Prefabs/Gate - Plate (Builtin)"); case GateType.GateWireRectangle: - return UnityEngine.Resources.Load("Prefabs/Gate - Wire Rectangle (Builtin)"); + return Resources.Load("Prefabs/Gate - Wire Rectangle (Builtin)"); case GateType.GateWireW: - return UnityEngine.Resources.Load("Prefabs/Gate - Wire W (Builtin)"); + return Resources.Load("Prefabs/Gate - Wire W (Builtin)"); default: throw new ArgumentException(nameof(type), $"Unknown gate type {type}."); } @@ -46,48 +46,54 @@ public GameObject CreateKicker(int type) { switch (type) { case KickerType.KickerCup: - return UnityEngine.Resources.Load("Prefabs/Kicker - Cup (Builtin)"); + return Resources.Load("Prefabs/Kicker - Cup (Builtin)"); case KickerType.KickerCup2: - return UnityEngine.Resources.Load("Prefabs/Kicker - Cup 2 (Builtin)"); + return Resources.Load("Prefabs/Kicker - Cup 2 (Builtin)"); case KickerType.KickerGottlieb: - return UnityEngine.Resources.Load("Prefabs/Kicker - Gottlieb (Builtin)"); + return Resources.Load("Prefabs/Kicker - Gottlieb (Builtin)"); case KickerType.KickerHole: - return UnityEngine.Resources.Load("Prefabs/Kicker - Hole (Builtin)"); + return Resources.Load("Prefabs/Kicker - Hole (Builtin)"); case KickerType.KickerHoleSimple: - return UnityEngine.Resources.Load("Prefabs/Kicker - Simple Hole (Builtin)"); + return Resources.Load("Prefabs/Kicker - Simple Hole (Builtin)"); case KickerType.KickerWilliams: - return UnityEngine.Resources.Load("Prefabs/Kicker - Williams (Builtin)"); + return Resources.Load("Prefabs/Kicker - Williams (Builtin)"); case KickerType.KickerInvisible: - return UnityEngine.Resources.Load("Prefabs/Kicker - Invisible (Builtin)"); + return Resources.Load("Prefabs/Kicker - Invisible (Builtin)"); default: throw new ArgumentException(nameof(type), $"Unknown kicker type {type}."); } } + public GameObject CreateLight() { - return UnityEngine.Resources.Load("Prefabs/Light (Builtin)"); + return Resources.Load("Prefabs/Light (Builtin)"); + } + + public GameObject CreateInsertLight() + { + return Resources.Load("Prefabs/Light - Insert (Builtin)"); } public GameObject CreateSpinner() { - return UnityEngine.Resources.Load("Prefabs/Spinner (Builtin)"); + return Resources.Load("Prefabs/Spinner (Builtin)"); } public GameObject CreateHitTarget(int type) { switch (type) { case TargetType.HitFatTargetRectangle: - return UnityEngine.Resources.Load("Prefabs/Hit Target - Rectangle Fat (Builtin)"); + return Resources.Load("Prefabs/Hit Target - Rectangle Fat (Builtin)"); case TargetType.HitFatTargetSlim: - return UnityEngine.Resources.Load("Prefabs/Hit Target - Rectangle Fat Narrow (Builtin)"); + return Resources.Load("Prefabs/Hit Target - Rectangle Fat Narrow (Builtin)"); case TargetType.HitFatTargetSquare: - return UnityEngine.Resources.Load("Prefabs/Hit Target - Square Fat (Builtin)"); + return Resources.Load("Prefabs/Hit Target - Square Fat (Builtin)"); case TargetType.HitTargetRectangle: - return UnityEngine.Resources.Load("Prefabs/Hit Target - Rectangle (Builtin)"); + return Resources.Load("Prefabs/Hit Target - Rectangle (Builtin)"); case TargetType.HitTargetRound: - return UnityEngine.Resources.Load("Prefabs/Hit Target - Round (Builtin)"); + return Resources.Load("Prefabs/Hit Target - Round (Builtin)"); case TargetType.HitTargetSlim: - return UnityEngine.Resources.Load("Prefabs/Hit Target - Narrow (Builtin)"); + return Resources.Load("Prefabs/Hit Target - Narrow (Builtin)"); default: throw new ArgumentException(nameof(type), $"Unknown hit target type {type}."); } @@ -97,11 +103,11 @@ public GameObject CreateDropTarget(int type) { switch (type) { case TargetType.DropTargetBeveled: - return UnityEngine.Resources.Load("Prefabs/Drop Target - Beveled (Builtin)"); + return Resources.Load("Prefabs/Drop Target - Beveled (Builtin)"); case TargetType.DropTargetFlatSimple: - return UnityEngine.Resources.Load("Prefabs/Drop Target - Simple Flat (Builtin)"); + return Resources.Load("Prefabs/Drop Target - Simple Flat (Builtin)"); case TargetType.DropTargetSimple: - return UnityEngine.Resources.Load("Prefabs/Drop Target - Simple (Builtin)"); + return Resources.Load("Prefabs/Drop Target - Simple (Builtin)"); default: throw new ArgumentException(nameof(type), $"Unknown drop target type {type}."); } diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/IApi.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/IApi.cs index daaa208ee..c76362684 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/VPT/IApi.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/IApi.cs @@ -27,9 +27,11 @@ namespace VisualPinball.Unity /// public interface IApi { - void OnDestroy(); + public event EventHandler Init; void OnInit(BallManager ballManager); + + void OnDestroy(); } /// diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightApi.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightApi.cs index 428a61dec..be14b0ae4 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightApi.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightApi.cs @@ -38,6 +38,7 @@ public int State { private int _state; private readonly LightComponent _lightComponent; + private bool _initialized; void IApiWireDest.OnChange(bool enabled) => Set( enabled ? LightStatus.LightStateOn : LightStatus.LightStateOff, @@ -49,6 +50,10 @@ void IApiWireDest.OnChange(bool enabled) => Set( void IApiLamp.OnLamp(float value, ColorChannel channel) { + if (!_initialized) { + // might have disabled some lights in the editor.. + return; + } switch (channel) { case ColorChannel.Alpha: { Set(value == 0.0f ? LightStatus.LightStateOff : LightStatus.LightStateOn, value); @@ -93,7 +98,7 @@ private void Set(int lightStatus, float value) switch (lightStatus) { case LightStatus.LightStateOff: { if (MainComponent.FadeSpeedDown > 0) { - _lightComponent.FadeTo(MainComponent.FadeSpeedDown, 0); + _lightComponent.FadeTo(0); } else { _lightComponent.Enabled = false; @@ -103,7 +108,7 @@ private void Set(int lightStatus, float value) case LightStatus.LightStateOn: { if (MainComponent.FadeSpeedUp > 0) { - _lightComponent.FadeTo(MainComponent.FadeSpeedUp, value); + _lightComponent.FadeTo(value); } else { _lightComponent.Enabled = true; @@ -128,6 +133,7 @@ void IApi.OnInit(BallManager ballManager) { base.OnInit(ballManager); Init?.Invoke(this, EventArgs.Empty); + _initialized = true; } void IApi.OnDestroy() diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightComponent.cs index 455d4eaca..77708df20 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightComponent.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightComponent.cs @@ -58,6 +58,7 @@ public class LightComponent : MainRenderableComponent, ILampDeviceCom public float FadeSpeedUp; public float FadeSpeedDown; + private bool IsFlasher => FadeSpeedUp == 0f && FadeSpeedDown == 0f; #endregion @@ -81,6 +82,15 @@ public class LightComponent : MainRenderableComponent, ILampDeviceCom #endregion + #region API + + public LightApi GetApi(Player player) => _api ??= new LightApi(gameObject, player); + + [NonSerialized] + private LightApi _api; + + #endregion + #region Wiring public IEnumerable AvailableLamps => new[] { @@ -130,19 +140,25 @@ public override void UpdateTransforms() #region Runtime - private UnityEngine.Light _unityLight; + private UnityEngine.Light[] _unityLights; private float _fullIntensity; public bool Enabled { set { StopAllCoroutines(); - _unityLight.enabled = value; + foreach (var unityLight in _unityLights) { + unityLight.enabled = value; + } } } public Color Color { - get => _unityLight.color; - set => _unityLight.color = value; + get => _unityLights[0].color; + set { + foreach (var unityLight in _unityLights) { + unityLight.color = value; + } + } } private void Awake() @@ -154,14 +170,41 @@ private void Awake() } player.RegisterLamp(this); - _unityLight = GetComponentInChildren(); - _fullIntensity = _unityLight.intensity; + _unityLights = GetComponentsInChildren(); + + // remember intensity + if (_unityLights.Length > 0) { + _fullIntensity = _unityLights[0].intensity; + } + // enable at 0 + foreach (var unityLight in _unityLights) { + if (IsFlasher) { + unityLight.enabled = false; + + } else { + unityLight.enabled = true; + unityLight.intensity = 0; + } + } } - public void FadeTo(float seconds, float value) + public void FadeTo(float value) { - StopAllCoroutines(); - StartCoroutine(nameof(Fade), value); + if (IsFlasher) { + foreach (var unityLight in _unityLights) { + if (value > 0) { + unityLight.intensity = value * _fullIntensity; + unityLight.enabled = true; + + } else { + unityLight.enabled = false; + } + } + + } else { + StopAllCoroutines(); + StartCoroutine(nameof(Fade), value); + } } public void StartBlinking() @@ -193,7 +236,7 @@ private IEnumerator Fade(float value) { var counter = 0f; - var a = _unityLight.intensity; + var a = _unityLights[0].intensity; var b = _fullIntensity * value; var duration = a < b ? FadeSpeedUp * (_fullIntensity - a) / _fullIntensity @@ -201,7 +244,9 @@ private IEnumerator Fade(float value) while (counter < duration) { counter += Time.deltaTime; - _unityLight.intensity = Mathf.Lerp(a, b, counter / duration); + foreach (var unityLight in _unityLights) { + unityLight.intensity = Mathf.Lerp(a, b, counter / duration); + } yield return null; } } @@ -225,18 +270,18 @@ public override IEnumerable SetData(LightData data) FadeSpeedUp = data.FadeSpeedUp; FadeSpeedDown = data.FadeSpeedDown; - // physical params - var unityLight = GetComponentInChildren(true); - if (unityLight) { - RenderPipeline.Current.LightConverter.UpdateLight(unityLight, data); - } - // insert mesh var insertMeshComponent = GetComponentInChildren(); if (insertMeshComponent) { insertMeshComponent.DragPoints = data.DragPoints; } + // physical params + var unityLight = GetComponentInChildren(true); + if (unityLight) { + RenderPipeline.Current.LightConverter.UpdateLight(unityLight, data, insertMeshComponent); + } + return updatedComponents; } diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightGroupApi.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightGroupApi.cs new file mode 100644 index 000000000..9700fb4ef --- /dev/null +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightGroupApi.cs @@ -0,0 +1,86 @@ +// Visual Pinball Engine +// Copyright (C) 2021 freezy and VPE Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +using System; +using VisualPinball.Engine.Math; +using Color = UnityEngine.Color; + +namespace VisualPinball.Unity +{ + public class LightGroupApi : IApi, IApiLamp, IApiWireDeviceDest + { + private readonly LightApi[] _apis; + + public LightGroupApi(LightApi[] apis) + { + _apis = apis; + } + + #region IApi + + /// + /// Event emitted when the table is started. + /// + public event EventHandler Init; + + void IApi.OnInit(BallManager ballManager) + { + Init?.Invoke(this, EventArgs.Empty); + } + + void IApi.OnDestroy() + { + } + + #endregion + + #region IApiLamp + + public Color Color + { + get => _color; + set { + _color = value; + Do(l => l.Color = value); + } + } + + private Color _color; + + void IApiWireDest.OnChange(bool enabled) => Do(l => l.OnChange(enabled)); + + void IApiLamp.OnLamp(float value, ColorChannel channel) => Do(l => l.OnLamp(value, channel)); + + void IApiLamp.OnLampColor(Color color) => Do(l => l.OnLampColor(color)); + + #endregion + + #region IApiWireDeviceDest + + IApiWireDest IApiWireDeviceDest.Wire(string deviceItem) => this; + + #endregion + + private void Do(Action action) + { + foreach (var api in _apis) { + if (api is T t) { + action(t); + } + } + } + } +} diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightGroupApi.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightGroupApi.cs.meta new file mode 100644 index 000000000..3cbc15dcd --- /dev/null +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightGroupApi.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: baa09739346fe9f449d17e9f91528d81 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightGroupComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightGroupComponent.cs new file mode 100644 index 000000000..5054117b6 --- /dev/null +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightGroupComponent.cs @@ -0,0 +1,64 @@ +// Visual Pinball Engine +// Copyright (C) 2021 freezy and VPE Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +// ReSharper disable InconsistentNaming + +using System; +using System.Collections.Generic; +using NLog; +using UnityEngine; +using VisualPinball.Engine.Game.Engines; +using Logger = NLog.Logger; + +namespace VisualPinball.Unity +{ + [AddComponentMenu("Visual Pinball/Game Item/Light Group")] + public class LightGroupComponent : MonoBehaviour, ILampDeviceComponent + { + public LightComponent[] Lights = Array.Empty(); + + #region Wiring + + public IEnumerable AvailableLamps => new[] { + new GamelogicEngineLamp(LightComponent.LampIdDefault), + }; + + public IEnumerable AvailableDeviceItems => AvailableLamps; + IEnumerable IWireableComponent.AvailableWireDestinations => AvailableLamps; + IEnumerable IDeviceComponent.AvailableDeviceItems => AvailableLamps; + + #endregion + + #region Runtime + + private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); + + private void Awake() + { + var player = GetComponentInParent(); + if (player == null) { + Logger.Error($"Cannot find player for lamp group {name}."); + return; + } + + player.RegisterLampGroup(this); + } + + #endregion + + + } +} diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightGroupComponent.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightGroupComponent.cs.meta new file mode 100644 index 000000000..52c35ae2f --- /dev/null +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightGroupComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9a14cb1b4771bcf4ea644878f499a6a1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 8556b8d36238d3945ab0b87bf995aa62, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightInsertMeshComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightInsertMeshComponent.cs index 3ca2c0abc..8e2555d0d 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightInsertMeshComponent.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightInsertMeshComponent.cs @@ -42,8 +42,6 @@ public class LightInsertMeshComponent : MeshComponent #endregion - public const string InsertObjectName = "Insert"; - public override IEnumerable ValidParents => Type.EmptyTypes; protected override Mesh GetMesh(LightData data) @@ -56,6 +54,15 @@ protected override Mesh GetMesh(LightData data) } protected override PbrMaterial GetMaterial(LightData data, Table table) - => new PbrMaterial(table.GetMaterial(table.Data.PlayfieldMaterial), table.GetTexture(table.Data.Image)); + { + var mat = table.GetMaterial(table.Data.PlayfieldMaterial); + if (mat != null) { + mat.Name += " (Playfield Insert)"; + return new PbrMaterial(mat, table.GetTexture(table.Data.Image)); + } + + mat = new Engine.VPT.Material("Playfield Insert"); + return new PbrMaterial(mat, table.GetTexture(table.Data.Image)) { DiffusionProfile = DiffusionProfileTemplate.Plastics }; + } } } diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech.meta b/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech.meta new file mode 100644 index 000000000..c7fc81b2b --- /dev/null +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc99a8c7acdb34bd08620e3062324648 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech/CannonApi.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech/CannonApi.cs new file mode 100644 index 000000000..2bc6f3448 --- /dev/null +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech/CannonApi.cs @@ -0,0 +1,161 @@ +using System; +using Logger = NLog.Logger; +using NLog; +using UnityEngine; + +namespace VisualPinball.Unity +{ + public class CannonApi : IApi, IApiSwitchDevice, IApiCoilDevice + { + private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); + + public const int Length = 240; + + private enum Direction + { + Forward = 0, + Reverse = 1 + } + + private readonly CannonComponent _cannonComponent; + private Player _player; + + private DeviceCoil GunMotorCoil; + + public DeviceSwitch GunHomeSwitch; + public DeviceSwitch GunMarkSwitch; + + public event EventHandler Init; + + private bool _enabled; + private float _position; + private Direction _direction; + + internal CannonApi(GameObject go, Player player) + { + _cannonComponent = go.GetComponentInChildren(); + _player = player; + } + + IApiCoil IApiCoilDevice.Coil(string deviceItem) + { + return deviceItem == CannonComponent.GunMotorCoilItem ? GunMotorCoil : null; + } + + IApiSwitch IApiSwitchDevice.Switch(string deviceItem) + { + if (deviceItem == CannonComponent.GunHomeSwitchItem) + { + return GunHomeSwitch; + } + else if (deviceItem == CannonComponent.GunMarkSwitchItem) + { + return GunMarkSwitch; + } + + return null; + } + + void IApi.OnInit(BallManager ballManager) + { + _enabled = false; + _position = 0; + _direction = Direction.Forward; + + GunMotorCoil = new DeviceCoil(OnGunMotorCoilEnabled, OnGunMotorCoilDisabled); + + GunHomeSwitch = new DeviceSwitch(CannonComponent.GunHomeSwitchItem, false, SwitchDefault.NormallyOpen, _player); + GunHomeSwitch.SetSwitch(true); + + GunMarkSwitch = new DeviceSwitch(CannonComponent.GunMarkSwitchItem, false, SwitchDefault.NormallyOpen, _player); + GunMarkSwitch.SetSwitch(false); + + _player.OnUpdate += OnUpdate; + + Init?.Invoke(this, EventArgs.Empty); + } + + private void OnGunMotorCoilEnabled() + { + _enabled = true; + + Logger.Info("OnGunMotorCoilEnabled"); + } + + private void OnGunMotorCoilDisabled() + { + _enabled = false; + + Logger.Info("OnGunMotorCoilDisabled"); + } + + private void OnUpdate(object sender, EventArgs eventArgs) + { + if (!_enabled) + { + return; + } + + float speed = (Length * 2 / 6.5f) * Time.deltaTime; + + if (_direction == Direction.Forward) + { + _position += speed; + + if (_position >= Length) + { + _position = Length - (_position - Length); + + _direction = Direction.Reverse; + } + } + else + { + _position -= speed; + + if (_position <= 0) + { + _position = -_position; + + _direction = Direction.Forward; + } + } + + if (_position >= 0 && _position <= 5) + { + if (!GunHomeSwitch.IsEnabled) + { + GunHomeSwitch.SetSwitch(true); + } + } + else if (GunHomeSwitch.IsEnabled) + { + GunHomeSwitch.SetSwitch(false); + } + + if (_position >= 98 && _position <= 105) + { + if (!GunMarkSwitch.IsEnabled) + { + GunMarkSwitch.SetSwitch(true); + } + } + else if (GunMarkSwitch.IsEnabled) + { + GunMarkSwitch.SetSwitch(false); + } + + _cannonComponent.UpdateRotation(_position / Length); + + Logger.Debug($"Cannon position={_position}"); + } + + void IApi.OnDestroy() + { + _player.OnUpdate -= OnUpdate; + + Logger.Info("Destroying cannon!"); + } + } +} + diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech/CannonApi.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech/CannonApi.cs.meta new file mode 100644 index 000000000..70bfb520b --- /dev/null +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech/CannonApi.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 22e0181ba659a436ab6bb57d9744d241 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech/CannonComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech/CannonComponent.cs new file mode 100644 index 000000000..1dba7989e --- /dev/null +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech/CannonComponent.cs @@ -0,0 +1,61 @@ +using System.Collections.Generic; +using UnityEngine; +using VisualPinball.Engine.Game.Engines; +using Logger = NLog.Logger; +using NLog; + +namespace VisualPinball.Unity +{ + [AddComponentMenu("Visual Pinball/Game Item/Cannon")] + public class CannonComponent : MonoBehaviour, ISwitchDeviceComponent, ICoilDeviceComponent + { + private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); + + public const string GunMotorCoilItem = "gun_motor_coil"; + + public IEnumerable AvailableCoils => new[] { + new GamelogicEngineCoil(GunMotorCoilItem) { + Description = "Gun Motor" + } + }; + + public const string GunMarkSwitchItem = "gun_mark_switch"; + public const string GunHomeSwitchItem = "gun_home_switch"; + + public IEnumerable AvailableSwitches => new[] { + new GamelogicEngineSwitch(GunMarkSwitchItem) { + Description = "Gun Mark" + }, + new GamelogicEngineSwitch(GunHomeSwitchItem) { + Description = "Gun Home" + } + }; + + public SwitchDefault SwitchDefault => SwitchDefault.NormallyOpen; + + IEnumerable IDeviceComponent.AvailableDeviceItems => AvailableCoils; + IEnumerable IDeviceComponent.AvailableDeviceItems => AvailableSwitches; + IEnumerable IWireableComponent.AvailableWireDestinations => AvailableCoils; + IEnumerable IDeviceComponent.AvailableDeviceItems => AvailableCoils; + + private void Awake() + { + var player = GetComponentInParent(); + if (player == null) + { + Logger.Error($"Cannot find player for cannon {name}."); + return; + } + + player.RegisterMech(this); + } + + public void UpdateRotation(float y) + { + var rotation = transform.rotation; + rotation.y = -(y * 0.65f); + + transform.rotation = rotation; + } + } +} diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech/CannonComponent.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech/CannonComponent.cs.meta new file mode 100644 index 000000000..384ef875c --- /dev/null +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech/CannonComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3f853fba4c41e47bfb470ad3b384e3c9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Surface/SlingshotComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Surface/SlingshotComponent.cs index 7670e4d91..22501b46f 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Surface/SlingshotComponent.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Surface/SlingshotComponent.cs @@ -74,7 +74,9 @@ private void Start() return; } var slingshotSurfaceApi = player.TableApi.Surface(SlingshotSurface.MainComponent); - slingshotSurfaceApi.Slingshot += OnSlingshot; + if (slingshotSurfaceApi != null) { + slingshotSurfaceApi.Slingshot += OnSlingshot; + } } private void OnDestroy() @@ -181,6 +183,7 @@ private Mesh GetMesh() .GetTransformedMesh(pf.PlayfieldHeight, r0.Height, pf.PlayfieldDetailLevel) .ToUnityMesh(); + mesh.name = $"{name} (Mesh)"; _meshes[pos] = mesh; return mesh; @@ -212,6 +215,8 @@ public void SetEditorScale(Vector3 pos) { } #endregion + public static GameObject LoadPrefab() => Resources.Load("Prefabs/Slingshot"); + private DragPointData[] DragPointsAt(float pos) { if (RubberOn == null || RubberOff == null) { diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Table/TableApi.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Table/TableApi.cs index 0a4ea8b19..1c8e1a5da 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Table/TableApi.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Table/TableApi.cs @@ -33,6 +33,7 @@ public class TableApi : IApi private readonly Dictionary _hitTargetsByName = new Dictionary(); private readonly Dictionary _kickersByName = new Dictionary(); private readonly Dictionary _lightsByName = new Dictionary(); + private readonly Dictionary _lightGroupsByName = new Dictionary(); private readonly Dictionary _plungersByName = new Dictionary(); private readonly Dictionary _rampsByName = new Dictionary(); private readonly Dictionary _rubbersByName = new Dictionary(); @@ -41,6 +42,7 @@ public class TableApi : IApi private readonly Dictionary _triggersByName = new Dictionary(); private readonly Dictionary _troughsByName = new Dictionary(); private readonly Dictionary _primitivesByName = new Dictionary(); + private readonly Dictionary _mechsByName = new Dictionary(); private readonly Dictionary _bumpersByComponent = new Dictionary(); private readonly Dictionary _flippersByComponent = new Dictionary(); @@ -49,6 +51,7 @@ public class TableApi : IApi private readonly Dictionary _hitTargetsByComponent = new Dictionary(); private readonly Dictionary _kickersByComponent = new Dictionary(); private readonly Dictionary _lightsByComponent = new Dictionary(); + private readonly Dictionary _lightGroupsByComponent = new Dictionary(); private readonly Dictionary _plungersByComponent = new Dictionary(); private readonly Dictionary _rampsByComponent = new Dictionary(); private readonly Dictionary _rubbersByComponent = new Dictionary(); @@ -57,6 +60,7 @@ public class TableApi : IApi private readonly Dictionary _triggersByComponent = new Dictionary(); private readonly Dictionary _troughsByComponent = new Dictionary(); private readonly Dictionary _primitivesByComponent = new Dictionary(); + private readonly Dictionary _mechsByComponent = new Dictionary(); #endregion @@ -187,6 +191,14 @@ public TableApi(Player player) public TroughApi Trough(string name) => Get(name); public TroughApi Trough(MonoBehaviour component) => Get(component); + /// + /// Returns a mech by name. + /// + /// Name of the mech + /// Primitive or `null` if no mech with that name exists. + public CannonApi Cannon(string name) => Get(name); + public CannonApi Cannon(MonoBehaviour component) => Get(component); + #endregion #region Registration @@ -217,6 +229,7 @@ private Dictionary GetNameDictionary(Type t) where T : IApi if (t == typeof(HitTargetApi)) return _hitTargetsByName as Dictionary; if (t == typeof(KickerApi)) return _kickersByName as Dictionary; if (t == typeof(LightApi)) return _lightsByName as Dictionary; + if (t == typeof(LightGroupApi)) return _lightGroupsByName as Dictionary; if (t == typeof(PlungerApi)) return _plungersByName as Dictionary; if (t == typeof(RampApi)) return _rampsByName as Dictionary; if (t == typeof(RubberApi)) return _rubbersByName as Dictionary; @@ -225,6 +238,7 @@ private Dictionary GetNameDictionary(Type t) where T : IApi if (t == typeof(TriggerApi)) return _triggersByName as Dictionary; if (t == typeof(TroughApi)) return _troughsByName as Dictionary; if (t == typeof(PrimitiveApi)) return _primitivesByName as Dictionary; + if (t == typeof(CannonApi)) return _mechsByName as Dictionary; throw new ArgumentException($"Unknown API type {t}."); } @@ -237,6 +251,7 @@ private Dictionary GetComponentDictionary(Type t) where T : if (t == typeof(HitTargetApi)) return _hitTargetsByComponent as Dictionary; if (t == typeof(KickerApi)) return _kickersByComponent as Dictionary; if (t == typeof(LightApi)) return _lightsByComponent as Dictionary; + if (t == typeof(LightGroupApi)) return _lightGroupsByComponent as Dictionary; if (t == typeof(PlungerApi)) return _plungersByComponent as Dictionary; if (t == typeof(RampApi)) return _rampsByComponent as Dictionary; if (t == typeof(RubberApi)) return _rubbersByComponent as Dictionary; @@ -245,6 +260,7 @@ private Dictionary GetComponentDictionary(Type t) where T : if (t == typeof(TriggerApi)) return _triggersByComponent as Dictionary; if (t == typeof(TroughApi)) return _troughsByComponent as Dictionary; if (t == typeof(PrimitiveApi)) return _primitivesByComponent as Dictionary; + if (t == typeof(CannonApi)) return _mechsByComponent as Dictionary; throw new ArgumentException($"Unknown API type {t}."); } diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Table/TableComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Table/TableComponent.cs index 60c1104ac..88b1c7649 100644 --- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Table/TableComponent.cs +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Table/TableComponent.cs @@ -21,6 +21,7 @@ using System; using System.Collections.Generic; +using System.Linq; using UnityEngine; using VisualPinball.Engine.Common; using VisualPinball.Engine.VPT; @@ -137,26 +138,27 @@ public Bounds GetTableBounds() public void RepopulateHardware(IGamelogicEngine gle) { - MappingConfig.RemoveAllSwitches(); + MappingConfig.Clear(false); MappingConfig.PopulateSwitches(gle.AvailableSwitches, this); - - MappingConfig.RemoveAllCoils(); - MappingConfig.PopulateCoils(gle.AvailableCoils, this); - - MappingConfig.RemoveAllLamps(); MappingConfig.PopulateLamps(gle.AvailableLamps, this); + MappingConfig.PopulateCoils(gle.AvailableCoils, this); + MappingConfig.PopulateWires(gle.AvailableWires, this); // hook up plunger var plunger = GetComponentInChildren(); if (plunger) { - MappingConfig.AddWire(new WireMapping { - Description = "Manual Plunger", - Source = SwitchSource.InputSystem, - SourceInputActionMap = InputConstants.MapCabinetSwitches, - SourceInputAction = InputConstants.ActionPlunger, - DestinationDevice = plunger, - DestinationDeviceItem = PlungerComponent.PullCoilId - }); + const string description = "Manual Plunger"; + var plungerMapping = MappingConfig.Wires.FirstOrDefault(mc => mc.Description == description); + if (plungerMapping == null) { + var mapping = new WireMapping().WithId(); + mapping.Description = description; + mapping.Source = SwitchSource.InputSystem; + mapping.SourceInputActionMap = InputConstants.MapCabinetSwitches; + mapping.SourceInputAction = InputConstants.ActionPlunger; + mapping.DestinationDevice = plunger; + mapping.DestinationDeviceItem = PlungerComponent.PullCoilId; + MappingConfig.AddWire(mapping); + } } } } diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Trough/TroughExtensions.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trough/TroughExtensions.cs new file mode 100644 index 000000000..7a5567244 --- /dev/null +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trough/TroughExtensions.cs @@ -0,0 +1,40 @@ +// Visual Pinball Engine +// Copyright (C) 2021 freezy and VPE Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +using UnityEngine; +using VisualPinball.Engine.VPT.Trough; + +namespace VisualPinball.Unity.Editor +{ + public static class TroughExtensions + { + #if UNITY_EDITOR + + public static GameObject InstantiateEditorPrefab(this Trough trough, Transform parent) + { + var prefab = Resources.Load("Prefabs/Trough"); + var troughGo = UnityEditor.PrefabUtility.InstantiatePrefab(prefab, parent) as GameObject; + if (!troughGo) { + return troughGo; + } + var troughComponent = troughGo.GetComponent(); + troughComponent.SetData(trough.Data); + return troughGo; + } + + #endif + } +} diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Trough/TroughExtensions.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trough/TroughExtensions.cs.meta new file mode 100644 index 000000000..d60d562c1 --- /dev/null +++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trough/TroughExtensions.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d3b53362f5dd54443b525fef2aac51a8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: