Skip to content

Bumper fixes #528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
freezy merged 4 commits into from
Mar 17, 2025
Merged

Bumper fixes #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
433908c
Fix compile error
arthurkehrwald Mar 16, 2025
08e6e74
Remove unneccessary HideInInspector attributes
arthurkehrwald Mar 16, 2025
1642ffc
Fix: Bumper coil was not triggering status events
arthurkehrwald Mar 16, 2025
fda49fc
Fix: Bumper coil is named after bumper game object
arthurkehrwald Mar 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion VisualPinball.Unity/VisualPinball.Unity/Sound/CoilSoundComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ namespace VisualPinball.Unity
[AddComponentMenu("Pinball/Sound/Coil Sound")]
public class CoilSoundComponent : BinaryEventSoundComponent<IApiCoil, NoIdCoilEventArgs>, IPackable
{
[HideInInspector]
public string CoilName;

public override Type GetRequiredType() => typeof(ICoilDeviceComponent);
Expand Down
1 change: 0 additions & 1 deletion VisualPinball.Unity/VisualPinball.Unity/Sound/SwitchSoundComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ namespace VisualPinball.Unity
[AddComponentMenu("Pinball/Sound/Switch Sound")]
public class SwitchSoundComponent : BinaryEventSoundComponent<IApiSwitch, SwitchEventArgs>, IPackable
{
[HideInInspector]
public string SwitchName;

public override Type GetRequiredType() => typeof(ISwitchDeviceComponent);
Expand Down
2 changes: 2 additions & 0 deletions VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ void IApiCoil.OnCoil(bool enabled)
BumperCollider.PushBallAway(ref ballState, in bumperState.Static, ref collEvent, in physicsMaterialData, ref state);
}
}

CoilStatusChanged?.Invoke(this, new NoIdCoilEventArgs(enabled));
}

void IApiWireDest.OnChange(bool enabled) => (this as IApiCoil).OnCoil(enabled);
Expand Down
3 changes: 2 additions & 1 deletion VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ public void UnpackReferences(byte[] data, Transform root, PackagedRefs refs, Pac
public const float DataMeshScale = 100f;

public const string SocketSwitchItem = "socket_switch";
public const string RingCoilItem = "ring_coil";

#endregion

Expand Down Expand Up @@ -144,7 +145,7 @@ private void Start()
public SwitchDefault SwitchDefault => SwitchDefault.Configurable;

public IEnumerable<GamelogicEngineCoil> AvailableCoils => new[] {
new GamelogicEngineCoil(name) {
new GamelogicEngineCoil(RingCoilItem) {
Description = "Ring Coil"
}
};
Expand Down
4 changes: 3 additions & 1 deletion VisualPinball.Unity/VisualPinball.Unity/VPT/Surface/SurfaceColliderGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
// ReSharper disable CompareOfFloatsByEqualityOperator

using Unity.Mathematics;
using VisualPinball.Engine.Math;
using VisualPinball.Engine.VPT.Surface;

namespace VisualPinball.Unity
Expand All @@ -34,7 +35,8 @@ public SurfaceColliderGenerator(SurfaceApi surfaceApi, SurfaceComponent componen

var data = new SurfaceData();
component.CopyDataTo(data, null, null, false);
_meshGen = new SurfaceMeshGenerator(data);
var pos = new Vertex3D(matrix.c3.x, matrix.c3.y, matrix.c3.z);
_meshGen = new SurfaceMeshGenerator(data, pos);
}

internal void GenerateColliders(ref ColliderReference colliders)
Expand Down