fix: SamplingFilter.None now correctly respects the sampling scale setting

mob-sakai · mob-sakai · commit bc1578b0ca91 · 2025-01-23T16:29:10.000+09:00
diff --git a/Packages/src/Runtime/UIEffect.cs b/Packages/src/Runtime/UIEffect.cs
@@ -290,9 +290,7 @@ public float samplingScale
             }
         }
 
-        public override float actualSamplingScale => samplingFilter != SamplingFilter.None
-            ? Mathf.Clamp(m_SamplingScale, 0.01f, 100)
-            : 1;
+        public override float actualSamplingScale => Mathf.Clamp(m_SamplingScale, 0.01f, 100);
 
         public override bool canModifyShape => m_AllowToModifyMeshShape;
 
diff --git a/Packages/src/Runtime/UIEffectReplica.cs b/Packages/src/Runtime/UIEffectReplica.cs
@@ -54,9 +54,7 @@ public float samplingScale
             }
         }
 
-        public override float actualSamplingScale => target && target.samplingFilter != SamplingFilter.None
-            ? Mathf.Clamp(m_SamplingScale, 0.01f, 100)
-            : 1;
+        public override float actualSamplingScale => Mathf.Clamp(m_SamplingScale, 0.01f, 100);
 
         public override bool canModifyShape => m_AllowToModifyMeshShape;
 

Original file line number	Diff line number	Diff line change
`@@ -290,9 +290,7 @@ public float samplingScale`
`290`	`290`	`}`
`291`	`291`	`}`
`292`	`292`
`293`		`- public override float actualSamplingScale => samplingFilter != SamplingFilter.None`
`294`		`- ? Mathf.Clamp(m_SamplingScale, 0.01f, 100)`
`295`		`- : 1;`
	`293`	`+ public override float actualSamplingScale => Mathf.Clamp(m_SamplingScale, 0.01f, 100);`
`296`	`294`
`297`	`295`	`public override bool canModifyShape => m_AllowToModifyMeshShape;`
`298`	`296`
Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,7 @@ public float samplingScale`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`- public override float actualSamplingScale => target && target.samplingFilter != SamplingFilter.None`
`58`		`- ? Mathf.Clamp(m_SamplingScale, 0.01f, 100)`
`59`		`- : 1;`
	`57`	`+ public override float actualSamplingScale => Mathf.Clamp(m_SamplingScale, 0.01f, 100);`
`60`	`58`
`61`	`59`	`public override bool canModifyShape => m_AllowToModifyMeshShape;`
`62`	`60`