Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 12 additions & 11 deletions Assets/Resources/Prefabs/Flipper.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8e6fc321830c03547890119a04997404, type: 3}
m_Name:
m_EditorClassIdentifier:
_playfieldDimensions: {x: 0, y: 0}
_instanceID: 51956
--- !u!33 &4778019510121147183
MeshFilter:
Expand Down Expand Up @@ -99,6 +100,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 89e3c1c147bb7a049b0510709f1ad9f2, type: 3}
m_Name:
m_EditorClassIdentifier:
_playfieldDimensions: {x: 0, y: 0}
_instanceID: 51936
--- !u!33 &8383588224779965405
MeshFilter:
Expand Down Expand Up @@ -156,14 +158,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 545ad741f74d2444faf5d2882fba6b69, type: 3}
m_Name:
m_EditorClassIdentifier:
_isLocked: 0
_editorLayer: 0
_editorLayerName:
_editorLayerVisibility: 1
Position: {x: 0, y: 0}
_startAngle: 121
EndAngle: 70
_surface: {fileID: 0}
IsEnabled: 1
IsDualWound: 0
_height: 50
Expand All @@ -175,7 +173,6 @@ MonoBehaviour:
_rubberHeight: 19
_rubberWidth: 24
InstantiateAsPrefab: 0
_originalRotateZ: 0
--- !u!114 &8750544366699972018
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -192,6 +189,7 @@ MonoBehaviour:
ShowColliderMesh: 1
ShowColliderOctree: 0
ShowAabbs: 0
_isKinematic: 0
Mass: 1
Strength: 2200
Elasticity: 0.8
Expand All @@ -203,6 +201,7 @@ MonoBehaviour:
TorqueDampingAngle: 6
Scatter: 0
FlipperCorrection: {fileID: 11400000, guid: f8799be363ab20a459dd185669ece8aa, type: 2}
TriggerItemId: 0
useFlipperTricksPhysics: 0
SOSRampUp: 2.5
SOSEM: 0.85
Expand Down Expand Up @@ -232,9 +231,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b1b4677b6b0e8bc419afb6cd7a22cf3a, type: 3}
m_Name:
m_EditorClassIdentifier:
_soundAsset: {fileID: 11400000, guid: e410f0a19022a1a49b7a2dd9226ae7d1, type: 2}
_interrupt: 0
_volume: 1
_startWhen: 0
_stopWhen: 0
_coilName: main_coil
SoundAsset: {fileID: 0}
MultiPlayMode: 0
Volume: 1
Priority: 2
CalloutMaxQueueTime: -1
StartWhen: 0
StopWhen: 0
CoilName: main_coil
53 changes: 35 additions & 18 deletions Assets/Resources/Prefabs/Plunger.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 2688967276888975725}
- component: {fileID: 8461769246571476234}
- component: {fileID: 4360165373544367127}
- component: {fileID: 5176043116475604806}
- component: {fileID: 758323825446027854}
- component: {fileID: 6875191637992584632}
m_Layer: 0
Expand Down Expand Up @@ -49,15 +50,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c1591b5a0bc15604fb622d417b509185, type: 3}
m_Name:
m_EditorClassIdentifier:
_isLocked: 0
_editorLayer: 0
_editorLayerName:
_editorLayerVisibility: 1
Position: {x: 0, y: 0}
Width: 25
Height: 20
ZAdjust: 0
_surface: {fileID: 0}
analogPlungerAction: {fileID: 0}
--- !u!114 &4360165373544367127
MonoBehaviour:
Expand All @@ -75,6 +72,7 @@ MonoBehaviour:
ShowColliderMesh: 1
ShowColliderOctree: 0
ShowAabbs: 0
_isKinematic: 0
SpeedPull: 0.5
SpeedFire: 80
Stroke: 80
Expand All @@ -84,6 +82,19 @@ MonoBehaviour:
MechStrength: 85
MomentumXfer: 1
ParkPosition: 0.16666667
--- !u!114 &5176043116475604806
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3492958815385962431}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c6b1de2c064d491a918191247fa07588, type: 3}
m_Name:
m_EditorClassIdentifier:
_emitter: {fileID: 0}
--- !u!114 &758323825446027854
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -96,12 +107,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b1b4677b6b0e8bc419afb6cd7a22cf3a, type: 3}
m_Name:
m_EditorClassIdentifier:
_soundAsset: {fileID: 11400000, guid: 29e4e44178845b941a136cf944a6b484, type: 2}
_interrupt: 0
_volume: 1
_startWhen: 0
_stopWhen: 0
_coilName: c_pull
SoundAsset: {fileID: 0}
MultiPlayMode: 0
Volume: 1
Priority: 2
CalloutMaxQueueTime: -1
StartWhen: 0
StopWhen: 0
CoilName: c_pull
--- !u!114 &6875191637992584632
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -114,12 +127,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b1b4677b6b0e8bc419afb6cd7a22cf3a, type: 3}
m_Name:
m_EditorClassIdentifier:
_soundAsset: {fileID: 11400000, guid: 1db86f03e09f46740a32096157585e5d, type: 2}
_interrupt: 0
_volume: 1
_startWhen: 1
_stopWhen: 0
_coilName: c_pull
SoundAsset: {fileID: 0}
MultiPlayMode: 0
Volume: 1
Priority: 2
CalloutMaxQueueTime: -1
StartWhen: 0
StopWhen: 0
CoilName: c_pull
--- !u!1 &3501041183407321805
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -165,7 +180,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8506b0486aacff543b92dd7de914f936, type: 3}
m_Name:
m_EditorClassIdentifier:
_instanceID: 53948
_playfieldDimensions: {x: 0, y: 0}
_instanceID: 573442
SpringDiam: 0.77
SpringGauge: 1.38
SpringLoops: 8
Expand Down Expand Up @@ -223,7 +239,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6e7622b4c6837354c8190ee471830c31, type: 3}
m_Name:
m_EditorClassIdentifier:
_instanceID: 53944
_playfieldDimensions: {x: 0, y: 0}
_instanceID: 573438
RodDiam: 0.6
RingGap: 2
RingDiam: 0.94
Expand Down
51 changes: 30 additions & 21 deletions Editor/PrefabProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace VisualPinball.Engine.Unity.Hdrp
{
public class PrefabProvider : IPrefabProvider
{
const string AssetLibraryPath = "Packages/org.visualpinball.unity.assetlibrary/Assets/Library";
const string AssetLibraryPath = "Packages/org.visualpinball.unity.assets/Assets/Library";

public GameObject CreateBumper()
{
Expand All @@ -36,13 +36,13 @@ public GameObject CreateGate(int type)
var gatesPath = $"{AssetLibraryPath}/Gates/VPX";
switch (type) {
case GateType.GateLongPlate:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{gatesPath}/Gate - Plate, Long (VPX).prefab");
return AssetDatabase.LoadAssetAtPath<GameObject>($"{gatesPath}/Gate, Plate, Long (VPX).prefab");
case GateType.GatePlate:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{gatesPath}/Gate - Plate (VPX).prefab");
return AssetDatabase.LoadAssetAtPath<GameObject>($"{gatesPath}/Gate, Plate (VPX).prefab");
case GateType.GateWireRectangle:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{gatesPath}/Gate - Wire, Rectangle (VPX).prefab");
return AssetDatabase.LoadAssetAtPath<GameObject>($"{gatesPath}/Gate, Wire, Rectangle (VPX).prefab");
case GateType.GateWireW:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{gatesPath}/Gate - Wire, W (VPX).prefab");
return AssetDatabase.LoadAssetAtPath<GameObject>($"{gatesPath}/Gate, Wire, W (VPX).prefab");
default:
throw new ArgumentException(nameof(type), $"Unknown gate type {type}.");
}
Expand All @@ -53,19 +53,19 @@ public GameObject CreateKicker(int type)
var kickerPath = $"{AssetLibraryPath}/Kickers/VPX";
switch (type) {
case KickerType.KickerCup:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{kickerPath}/Kicker - Cup 1 (VPX).prefab");
return AssetDatabase.LoadAssetAtPath<GameObject>($"{kickerPath}/Kicker, Cup 1 (VPX).prefab");
case KickerType.KickerCup2:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{kickerPath}/Kicker - Cup 2 (VPX).prefab");
return AssetDatabase.LoadAssetAtPath<GameObject>($"{kickerPath}/Kicker, Cup 2 (VPX).prefab");
case KickerType.KickerGottlieb:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{kickerPath}/Kicker - Gottlieb (VPX).prefab");
return AssetDatabase.LoadAssetAtPath<GameObject>($"{kickerPath}/Kicker, Gottlieb (VPX).prefab");
case KickerType.KickerHole:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{kickerPath}/Kicker - Hole (VPX).prefab");
return AssetDatabase.LoadAssetAtPath<GameObject>($"{kickerPath}/Kicker, Hole (VPX).prefab");
case KickerType.KickerHoleSimple:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{kickerPath}/Kicker - Hole, Simple (VPX).prefab");
return AssetDatabase.LoadAssetAtPath<GameObject>($"{kickerPath}/Kicker, Hole, Simple (VPX).prefab");
case KickerType.KickerWilliams:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{kickerPath}/Kicker - Williams (VPX).prefab");
return AssetDatabase.LoadAssetAtPath<GameObject>($"{kickerPath}/Kicker, Williams (VPX).prefab");
case KickerType.KickerInvisible:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{kickerPath}/Kicker - Invisible.prefab");
return AssetDatabase.LoadAssetAtPath<GameObject>($"{kickerPath}/Kicker, Invisible.prefab");
default:
throw new ArgumentException(nameof(type), $"Unknown kicker type {type}.");
}
Expand All @@ -91,17 +91,23 @@ public GameObject CreateHitTarget(int type)
var targetsPath = $"{AssetLibraryPath}/Targets/VPX";
switch (type) {
case TargetType.HitFatTargetRectangle:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target - Rectangle, Fat (VPX).prefab");
// -6.65565 mm
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target, Rectangle, Fat (VPX).prefab");
case TargetType.HitFatTargetSlim:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target - Narrow, Fat (VPX).prefab");
// -6.31809 mm
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target, Narrow, Fat (VPX).prefab");
case TargetType.HitFatTargetSquare:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target - Square, Fat (VPX).prefab");
// -6.67557 mm
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target, Square, Fat (VPX).prefab");
case TargetType.HitTargetRectangle:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target - Rectangle (VPX).prefab");
// -4.96337 mm
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target, Rectangle (VPX).prefab");
case TargetType.HitTargetRound:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target - Round (VPX).prefab");
// -4.97161 mm
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target, Round (VPX).prefab");
case TargetType.HitTargetSlim:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target - Narrow (VPX).prefab");
// -7.94514 mm
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target, Narrow (VPX).prefab");
default:
throw new ArgumentException(nameof(type), $"Unknown hit target type {type}.");
}
Expand All @@ -112,11 +118,14 @@ public GameObject CreateDropTarget(int type)
var targetsPath = $"{AssetLibraryPath}/Targets/VPX";
switch (type) {
case TargetType.DropTargetBeveled:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Drop Target - Beveled (VPX).prefab");
// -5.22032 mm
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Drop Target, Beveled (VPX).prefab");
case TargetType.DropTargetFlatSimple:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Drop Target - Simple, Flat (VPX).prefab");
// -8.58968 mm
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Drop Target, Simple, Flat (VPX).prefab");
case TargetType.DropTargetSimple:
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Drop Target - Simple (VPX).prefab");
// -5.12326 mm
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Drop Target, Simple (VPX).prefab");
default:
throw new ArgumentException(nameof(type), $"Unknown drop target type {type}.");
}
Expand Down
4 changes: 4 additions & 0 deletions LookDev~/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[*]
end_of_line = crlf
insert_final_newline = true
indent_style = tab
83 changes: 83 additions & 0 deletions LookDev~/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Uu]ser[Ss]ettings/

# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/

# Asset meta data should only be ignored when the corresponding asset is also ignored
!/[Aa]ssets/**/*.meta

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*

# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio cache directory
.vs/

# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.aab
*.unitypackage

# Crashlytics generated file
crashlytics-build.properties

# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*

/UIElementsSchema/*
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*
/[Aa]ssets/Asset Cleaner/*
/[Aa]ssets/TextMesh Pro/*
/[Aa]ssets/Samples/*
/[Aa]ssets/Tables/*
/[Aa]ssets/Tables.meta
Build~/**

.idea/**
*.blend1
ProjectSettings/RiderScriptEditorPersistedState.asset
*.assbin
*.spp
15 changes: 15 additions & 0 deletions LookDev~/Assets/DefaultVolumeProfile.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
m_Name: DefaultVolumeProfile
m_EditorClassIdentifier:
components: []
Loading