Skip to content

Initial trough implementation#228

Closed
ecurtz wants to merge 130 commits into
freezy:masterfrom
ecurtz:master
Closed

Initial trough implementation#228
ecurtz wants to merge 130 commits into
freezy:masterfrom
ecurtz:master

Conversation

@ecurtz
Copy link
Copy Markdown
Collaborator

@ecurtz ecurtz commented Oct 28, 2020

The only changes to actual code were making the TableApi object accessible in Player and ItemApi and modifying ItemInspector for a generic way of linking to other VPE "Authoring" classes. The rest of it is new trough code. It is NOT fully functional at this point, but that's partially because KickerApi is still WIP.

ecurtz and others added 30 commits August 30, 2020 21:57
…MeshRenderer instead of regular MeshRenderer.
# Conflicts:
#	VisualPinball.Engine.Test/VPT/Primitive/PrimitiveMeshTests.cs
freezy and others added 27 commits October 25, 2020 01:38
* feature/trough:
  Generic inspector field for references between ItemAuthoring ocmponents.
  More empty boilerplate trough classes
  Minimal boilerplate for new trough items.
  Reverse local change to match upstream master
  Moved game object to item name compare from EditorApplication.hierarchyChanged to OnPreInspectorGUI
  project: Update authors.
  project: Add Microsoft.NET.Test.Sdk to test project.
  primtive: Add test coverage for reading animated mesh data.
  Simple OBJ sequence for testing model animation. Cube that expands and contracts on X, then Y, then Z.
  Added Vector3 extension methods to Mesh.VertData
  Remove Mesh.VertData dependency on UnityEngine.Vector3
  Changed argument for Material.toUnityMaterial()
  Added (inexplicably) required calls to RecalculateNormals() and  RecalculateTangents() when building blendshapes.
  Add blendshape data to meshes with vertex animation and use a SkinnedMeshRenderer instead of regular MeshRenderer.
  Fixed struct size of Mesh.VertData and tag for BiffAnimation.
  Added BiffAnimationAttribute to PrimitiveData and Mesh.VertexData for loading and storing mesh animations.

# Conflicts:
#	VisualPinball.Unity/VisualPinball.Unity.Editor/Resources/Icons/large_orange/trough.png.meta
#	VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/ItemInspector.cs
* feature/multi-component: (111 commits)
  Post rebase cleanup of Trough classes.
  Generic inspector field for references between ItemAuthoring ocmponents.
  chore: Fix imports.
  components: Check sub components when validating parenting.
  components: Allow primitive colliders to be parented to primitives.
  component: Fix parented collider position.
  components: Properely unparent when parenting isn't supported.
  components: Don't parent on import if parenting isn't supported.
  fix: Various small fixes.
  components: Move component destruction to converter.
  editor: Don't disable gizmos, only icons on recompilation.
  import: Refactor object creation.
  components: Fix patcher.
  physics: Measure and print kd-tree creation.
  fix: Only add active colliders.
  fix: Set mesh invisible, if it's... invisible.
  Copyedit pass on Unity Components document
  doc: Update components doc.
  components: Update name and visibility when restoring based on hierarchy.
  components: Add remaining inspectors.
  ...

# Conflicts:
#	VisualPinball.Unity/VisualPinball.Unity.Editor/EditorTool.meta
#	VisualPinball.Unity/VisualPinball.Unity.Editor/Physics.meta
#	VisualPinball.Unity/VisualPinball.Unity.Editor/Utils/Icons.cs
#	VisualPinball.Unity/VisualPinball.Unity.Editor/VPT.meta
#	VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/ItemColliderInspector.cs
#	VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/ItemInspector.cs
#	VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/ItemMainInspector.cs
#	VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/ItemMeshInspector.cs
#	VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/ItemMovementInspector.cs
#	VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Rubber.meta
#	VisualPinball.Unity/VisualPinball.Unity/Import/VpxConverter.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperExtensions.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Flipper/FlipperAuthoring.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Flipper/FlipperExtensions.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateColliderAuthoring.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateExtensions.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/IHittableAuthoring.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/IItemColliderAuthoring.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/IItemMovementAuthoring.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/ItemMainAuthoring.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightAuthoring.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Light/LightExtensions.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Playfield.meta
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerAuthoring.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerExtensions.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Ramp/RampAuthoring.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Ramp/RampExtensions.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerExtensions.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Surface/SurfaceExtensions.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Table/PlayfieldAuthoring.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Table/TableExtensions.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Trough.meta
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Trough/TroughBallData.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Trough/TroughExtensions.cs
#	VisualPinball.Unity/VisualPinball.Unity/VPT/Trough/TroughStaticData.cs
@freezy freezy mentioned this pull request Oct 30, 2020
7 tasks
@freezy
Copy link
Copy Markdown
Owner

freezy commented Oct 30, 2020

Closing in favor of #229.

@freezy freezy closed this Oct 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants