From 4a4da01727a09a32559c630fc2765b3f189dde7d Mon Sep 17 00:00:00 2001 From: freezy Date: Mon, 26 Jul 2021 21:55:52 +0200 Subject: [PATCH 1/2] fix: API changes due to refactoring. --- Runtime/MaterialConverter.cs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Runtime/MaterialConverter.cs b/Runtime/MaterialConverter.cs index 6f36800..d38e0cf 100644 --- a/Runtime/MaterialConverter.cs +++ b/Runtime/MaterialConverter.cs @@ -41,8 +41,6 @@ public class MaterialConverter : IMaterialConverter private static readonly int Smoothness = Shader.PropertyToID("_Smoothness"); private static readonly int BaseMap = Shader.PropertyToID("_BaseMap"); private static readonly int NormalMap = Shader.PropertyToID("_BumpMap"); - private static readonly int UVChannelVertices = Shader.PropertyToID("_UVChannelVertices"); - private static readonly int UVChannelNormals = Shader.PropertyToID("_UVChannelNormals"); #endregion @@ -53,9 +51,7 @@ public Shader GetShader() private Shader GetShader(PbrMaterial vpxMaterial) { - return vpxMaterial.VertexLerpWithUvEnabled - ? Shader.Find("Visual Pinball/Srp/LerpVertex") - : GetShader(); + return GetShader(); } public static Material GetDefaultMaterial(BlendMode blendMode) @@ -82,11 +78,6 @@ public Material CreateMaterial(PbrMaterial vpxMaterial, ITextureProvider texture unityMaterial.CopyPropertiesFromMaterial(defaultMaterial); unityMaterial.name = vpxMaterial.Id; - if (vpxMaterial.VertexLerpWithUvEnabled) { - unityMaterial.SetFloat(UVChannelVertices, Mesh.AnimationUVChannelVertices); - unityMaterial.SetFloat(UVChannelNormals, Mesh.AnimationUVChannelNormals); - } - // apply some basic manipulations to the color. this just makes very // very white colors be clipped to 0.8204 aka 204/255 is 0.8 // this is to give room to lighting values. so there is more modulation From 114c8ec4c5d6dba03c0b319fdb2612886eb5c642 Mon Sep 17 00:00:00 2001 From: freezy Date: Wed, 28 Jul 2021 22:10:54 +0200 Subject: [PATCH 2/2] ball: Fix ball size. --- Assets/Resources/Prefabs/DefaultBall.prefab | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/Resources/Prefabs/DefaultBall.prefab b/Assets/Resources/Prefabs/DefaultBall.prefab index a09ad46..0303ca7 100644 --- a/Assets/Resources/Prefabs/DefaultBall.prefab +++ b/Assets/Resources/Prefabs/DefaultBall.prefab @@ -26,8 +26,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2309223392540829464} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 434, y: 1648, z: 37.9} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0