Skip to content
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.

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

Fix coil/lamp names, bugs, and improve asset library. #444

Closed
wants to merge 84 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
b689717
fix: Additionally map string-parsed IDs when mapping coils.
freezy Aug 20, 2022
4a2cb99
drag-points: Add reverse feature.
freezy Sep 17, 2022
0089d6b
editor: Add "Make Collider" option that speeds up collider-from-mesh …
freezy Sep 18, 2022
91a9080
asset-library: Add "replace selected" feature.
freezy Sep 19, 2022
2ec47ad
assets: Add thumb camera preset setting to asset.
freezy Sep 22, 2022
c6562a1
assets: Add scale and camera preset to details view.
freezy Sep 22, 2022
127ca01
Move the default camera down to fit all posts.
freezy Sep 22, 2022
5cf318d
assets: Load generated thumbs.
freezy Sep 22, 2022
ca80917
assets: Scale image instead of container.
freezy Sep 22, 2022
30e3ace
assets: Update asset detail layout.
freezy Sep 23, 2022
fc46ad9
assets: Create new asset meta as ScriptableObject and proper views.
freezy Sep 23, 2022
c5f4ffb
assets: Start re-writing asset panel with properties.
freezy Sep 25, 2022
a761e86
assets: Properly store data on recycled PropertyDrawers.
freezy Sep 25, 2022
12df17b
assets: Make library item references null-compatible.
freezy Sep 25, 2022
c1c4ee9
assets: Add tag editing support.
freezy Sep 25, 2022
b78d6e5
assets: Add links and fix styling issue.
freezy Sep 25, 2022
7b1c15e
assets: Add data and UI for material variations.
freezy Sep 25, 2022
b4b1bb5
assets: Add first version of object dropdown.
freezy Sep 25, 2022
3e1fa6e
assets: Add UI for editing material variations.
freezy Sep 25, 2022
6447d24
assets: Add preset dropdown.
freezy Sep 26, 2022
186372d
assets: Remove default from preset dropdown.
freezy Sep 27, 2022
a01f019
assets: Swap to new data structure.
freezy Sep 27, 2022
bb7c563
assets: Split detail markup into header, body and footer.
freezy Sep 27, 2022
f267e5c
assets: Remove library from result, since it's now in the asset.
freezy Sep 27, 2022
9466263
assets: Render attributes when read-only.
freezy Sep 28, 2022
c856024
assets: Add read-only elements for links and tags.
freezy Sep 28, 2022
5fc255e
assets: Fix layout in details view.
freezy Sep 28, 2022
ad8eaa3
assets: Fix thumb cam selection and do some cleanup.
freezy Sep 28, 2022
a8edf5d
assets: Generate ID for material overrides.
freezy Sep 29, 2022
2182d55
assets: Make material overrides public.
freezy Sep 29, 2022
a9464fa
assets: Show material overrides in details pane.
freezy Sep 29, 2022
baad16a
assets: Clean up obsolete files.
freezy Sep 29, 2022
938a503
assets: Move parent element of material variations into a custom elem…
freezy Sep 30, 2022
a9191da
assets: Make the material variations act as radio buttons.
freezy Sep 30, 2022
28edcbe
assets: Fix size of preview editor.
freezy Sep 30, 2022
e2806df
assets: Add asset button to toolbox.
freezy Sep 30, 2022
f7fe8ca
assets: Implement add to scene button.
freezy Sep 30, 2022
d5852b4
assets: Apply selected variation when adding.
freezy Sep 30, 2022
2d668a9
assets: Update add button depending on variation selection.
freezy Sep 30, 2022
26ab9bb
chore: Cleanup unused files.
freezy Sep 30, 2022
281596f
assets: Add shortcut for toggling library lock.
freezy Sep 30, 2022
1c9cbde
assets: Fix slot selection.
freezy Oct 1, 2022
149ca2c
assets: Go through all material combinations.
freezy Oct 1, 2022
73db170
assets: Apply material variations through the object directly.
freezy Oct 1, 2022
31c1715
assets: Don't show original under material variations.
freezy Oct 1, 2022
f43be5b
assets: Various bugfixes.
freezy Oct 1, 2022
5075f91
assets: Make replace feature more robust.
freezy Oct 1, 2022
258b1bf
assets: Auto-refresh details view when toggling lock status.
freezy Oct 2, 2022
68bb705
assets: Fix label sizes in variations view.
freezy Oct 2, 2022
9567d6c
assets: Fix bug when adding one-level prefab with variations.
freezy Oct 2, 2022
e40e030
assets: Properly apply variations when adding world-sized items.
freezy Oct 2, 2022
9953705
assets: Fix GUID generation for material override when adding a new e…
freezy Oct 2, 2022
bef9ca8
assets: Use ListView instead of PropertyField for material variations…
freezy Oct 2, 2022
d48ec6b
assets: Add empty material variation instead of cloning last element.
freezy Oct 2, 2022
4ffcc58
assets: Fix thumb generation for assets with no material variation.
freezy Oct 2, 2022
0a169bc
assets: Keep item size across query updates, and truncate overlapping…
freezy Oct 3, 2022
c8fafef
assets: Always bind, plus several UI fixes.
freezy Oct 3, 2022
fe17adc
assets: Properly escape quotes in attribute queries.
freezy Oct 3, 2022
7e0d72f
doc: First page of 3D scan tutorial.
freezy Oct 6, 2022
81dcdd1
doc: Remaining pages of 3D scan tutorial.
freezy Oct 6, 2022
c7aebe2
doc: Minor fixes.
freezy Oct 7, 2022
141f635
assets: Fix bug in attribute query.
freezy Oct 8, 2022
8b64ae0
assets: Add quick way to batch-add or replace attributes.
freezy Oct 9, 2022
28f6e36
assets: Beautify menu.
freezy Oct 9, 2022
a0325d5
assets: Add quick way to batch-add or remove tags.
freezy Oct 15, 2022
c0e72fc
assets: Cache thumbnails.
freezy Oct 15, 2022
51deb1a
assets: Show when loading assets.
freezy Oct 16, 2022
370b387
assets: Refactor attribute prop drawer so we don't need any members.
freezy Oct 16, 2022
2beb99a
assets: Refactor tag prop drawer so we don't need any members.
freezy Oct 16, 2022
ac9ba66
assets: Refactor material variation drawer so we don't need any members.
freezy Oct 16, 2022
8c82f97
assets: Auto-complete McMaster-Carr and Marco URLs when a part number…
freezy Oct 16, 2022
92dbd2f
assets: Add quality label to assets.
freezy Oct 16, 2022
4ee8faa
fix: Additionally map string-parsed IDs when mapping lamps.
freezy Oct 17, 2022
6cd43a7
assets: Unpack prefab when adding and option is enabled.
freezy Oct 17, 2022
58dfe6c
assets: Add missing camera presets.
freezy Oct 18, 2022
428b1aa
assets: Refresh thumbs after regeneration.
freezy Oct 19, 2022
ec90a68
assets: Add thumb object height.
freezy Oct 19, 2022
3de8ab4
assets: Add more copy meta data functions.
freezy Oct 20, 2022
3828195
assets: Refactor batch actions and properly dispose textures when cle…
freezy Oct 21, 2022
d0545d8
fix: Don't crash when asset browser isn't set.
freezy Oct 23, 2022
785a8a0
assets: Sort by name after score.
freezy Oct 24, 2022
7cc782a
asserts: Show tags of selected category in side bar.
freezy Oct 30, 2022
e5106aa
doc: Update asset lib README.
freezy Oct 30, 2022
a191994
assets: Make nested assets available.
freezy Nov 1, 2022
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
16 changes: 16 additions & 0 deletions VisualPinball.Engine/Math/DragPointData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,22 @@ public DragPointData Lerp(DragPointData dp, float pos)
};
}

public DragPointData Clone()
{
return new DragPointData(Center) {
PosZ = PosZ,
IsSmooth = IsSmooth,
IsSlingshot = IsSlingshot,
HasAutoTexture = HasAutoTexture,
TextureCoord = TextureCoord,
IsLocked = IsLocked,
EditorLayer = EditorLayer,
EditorLayerName = EditorLayerName,
EditorLayerVisibility = EditorLayerVisibility,
CalcHeight = CalcHeight,
};
}

#region BIFF

static DragPointData()
Expand Down
8 changes: 8 additions & 0 deletions VisualPinball.Unity/Assets/Presets.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions VisualPinball.Unity/Assets/Presets/Asset Thumbcam.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!181963792 &2655988077585873504
Preset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Close-Up Less
m_TargetType:
m_NativeTypeID: 4
m_ManagedTypePPtr: {fileID: 0}
m_ManagedTypeFallback:
m_Properties:
- target: {fileID: 0}
propertyPath: m_LocalRotation.x
value: 0.27781588
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalRotation.y
value: 0.36497167
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalRotation.z
value: -0.1150751
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalRotation.w
value: 0.8811196
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalPosition.x
value: -0.0339
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalPosition.y
value: 0.0386
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalPosition.z
value: -0.0339
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_ConstrainProportionsScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalEulerAnglesHint.x
value: 35
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalEulerAnglesHint.y
value: 45
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_ExcludedProperties: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 75 additions & 0 deletions VisualPinball.Unity/Assets/Presets/Asset Thumbcam/Close-Up.preset
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!181963792 &2655988077585873504
Preset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Close-Up
m_TargetType:
m_NativeTypeID: 4
m_ManagedTypePPtr: {fileID: 0}
m_ManagedTypeFallback:
m_Properties:
- target: {fileID: 0}
propertyPath: m_LocalRotation.x
value: 0.27781588
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalRotation.y
value: 0.36497167
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalRotation.z
value: -0.1150751
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalRotation.w
value: 0.8811196
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalPosition.x
value: -0.0212
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalPosition.y
value: 0.0235
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalPosition.z
value: -0.0212
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_ConstrainProportionsScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalEulerAnglesHint.x
value: 35
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalEulerAnglesHint.y
value: 45
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_ExcludedProperties: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 75 additions & 0 deletions VisualPinball.Unity/Assets/Presets/Asset Thumbcam/Default.preset
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!181963792 &2655988077585873504
Preset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Default
m_TargetType:
m_NativeTypeID: 4
m_ManagedTypePPtr: {fileID: 0}
m_ManagedTypeFallback:
m_Properties:
- target: {fileID: 0}
propertyPath: m_LocalRotation.x
value: 0.27781588
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalRotation.y
value: 0.36497167
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalRotation.z
value: -0.1150751
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalRotation.w
value: 0.8811196
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalPosition.x
value: -0.06
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalPosition.y
value: 0.0762
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalPosition.z
value: -0.06
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_ConstrainProportionsScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalEulerAnglesHint.x
value: 35
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalEulerAnglesHint.y
value: 45
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_ExcludedProperties: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 75 additions & 0 deletions VisualPinball.Unity/Assets/Presets/Asset Thumbcam/Flipper.preset
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!181963792 &2655988077585873504
Preset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Flipper
m_TargetType:
m_NativeTypeID: 4
m_ManagedTypePPtr: {fileID: 0}
m_ManagedTypeFallback:
m_Properties:
- target: {fileID: 0}
propertyPath: m_LocalRotation.x
value: 0.27781588
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalRotation.y
value: 0.36497167
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalRotation.z
value: -0.1150751
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalRotation.w
value: 0.8811196
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalPosition.x
value: -0.09444
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalPosition.y
value: 0.12913
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalPosition.z
value: -0.13054
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_ConstrainProportionsScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalEulerAnglesHint.x
value: 35
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalEulerAnglesHint.y
value: 45
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_ExcludedProperties: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading