Skip to content

Commit 9614d1b

Browse files
committed
assets: Ditch top light setting.
1 parent 7d36eb3 commit 9614d1b

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/Asset.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,14 @@ public class Asset : ScriptableObject
6464
public List<AssetMaterialVariation> MaterialVariations;
6565

6666
[SerializeField]
67-
public string ThumbBackgroundObjectName;
67+
public string EnvironmentGameObjectName;
6868

6969
[SerializeReference]
7070
public Preset ThumbCameraPreset;
7171

7272
[SerializeField]
7373
public float ThumbCameraHeight;
7474

75-
[SerializeField]
76-
public bool ThumbTopLight;
77-
7875
[SerializeField]
7976
public bool UnpackPrefab;
8077

VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public void Bind(Asset asset)
171171

172172
private void BindBackgroundObjects()
173173
{
174-
var bgo = _body.Q<ObjectDropdownElement>("background-object-field");
174+
var bgo = _body.Q<ObjectDropdownElement>("environment-field");
175175
var bgParent = SceneManager.GetActiveScene().GetRootGameObjects()
176176
.FirstOrDefault(go => go.name == "_BackgroundObjects");
177177

@@ -180,14 +180,14 @@ private void BindBackgroundObjects()
180180
return;
181181
}
182182
bgo.visible = true;
183-
bgo.Value = _asset.ThumbBackgroundObjectName != null ? bgParent.transform.Find(_asset.ThumbBackgroundObjectName)?.gameObject : null;
183+
bgo.Value = _asset.EnvironmentGameObjectName != null ? bgParent.transform.Find(_asset.EnvironmentGameObjectName)?.gameObject : null;
184184
bgo.AddObjectsToDropdown<MeshRenderer>(bgParent, true);
185-
bgo.RegisterValueChangedCallback(OnThumbBackgroundObjectChanged);
185+
bgo.RegisterValueChangedCallback(OnThumbEnvironmentChanged);
186186
}
187187

188-
private void OnThumbBackgroundObjectChanged(Object obj)
188+
private void OnThumbEnvironmentChanged(Object obj)
189189
{
190-
_asset.ThumbBackgroundObjectName = obj.name;
190+
_asset.EnvironmentGameObjectName = obj.name;
191191
}
192192

193193
private void BindInfo(Asset asset)

VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails_Body.uxml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@
3333
<!-- Geometry -->
3434
<ui:Foldout text="Thumbnail Settings">
3535
<ui:VisualElement class="left-indent">
36-
<uivpe:ObjectDropdownElement name="background-object-field" label="On Object" />
36+
<uivpe:ObjectDropdownElement name="environment-field" label="Environment" />
3737
<uivpe:PresetDropdownElement name="thumb-camera-preset" binding-path="ThumbCameraPreset" label="Camera" preset-path="Packages/org.visualpinball.engine.unity/VisualPinball.Unity/Assets/Presets/Asset Thumbcam" />
3838
<uie:PropertyField binding-path="ThumbCameraHeight" label="Z-Position" />
39-
<uie:PropertyField binding-path="ThumbTopLight" label="Enable Top Light" />
4039
</ui:VisualElement>
4140
</ui:Foldout>
4241

VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Kicker/KickerInspector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ private void OnSceneGUI()
101101
var localPos = MainComponent.GetEditorPosition();
102102
localPos.z = MainComponent.PositionZ;
103103

104-
var worldPos = transform.parent.TransformPoint(localPos);
104+
var worldPos = transform.parent == null ? localPos : transform.parent.TransformPoint(localPos);
105105

106106
foreach (var coil in MainComponent.Coils) {
107107
var from = MainComponent.GetBallCreationPosition().ToUnityVector3();

0 commit comments

Comments
 (0)