Simplify linear drag (#67)

iTris666 · julienf-unity · commit 02ac3a0c4f8a · 2020-11-16T15:54:16.000+01:00
* Simplify linear drag

* Fix warning
diff --git a/com.unity.visualeffectgraph/Editor/Models/Blocks/Implementations/Forces/Drag.cs b/com.unity.visualeffectgraph/Editor/Models/Blocks/Implementations/Forces/Drag.cs
@@ -54,10 +54,10 @@ public override string source
                 string source = string.Empty;
                 if (UseParticleSize)
                 {
-                    source = string.Format(@"
-float2 side = {0};
+                    source = @"
+float2 side = size * float2(scaleX, scaleY);
 dragCoefficient *= side.x * side.y;
-", UseParticleSize ? "size * (scaleX, scaleY)" : VFXAttribute.kDefaultSize + " * float2(1, 1)");
+";
                 }
 
                 return source + "velocity *= max(0.0,(1.0 - (dragCoefficient * deltaTime) / mass));";

Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,10 @@ public override string source`
`54`	`54`	`string source = string.Empty;`
`55`	`55`	`if (UseParticleSize)`
`56`	`56`	`{`
`57`		`- source = string.Format(@"`
`58`		`-float2 side = {0};`
	`57`	`+ source = @"`
	`58`	`+float2 side = size * float2(scaleX, scaleY);`
`59`	`59`	`dragCoefficient = side.x side.y;`
`60`		`-", UseParticleSize ? "size * (scaleX, scaleY)" : VFXAttribute.kDefaultSize + " * float2(1, 1)");`
	`60`	`+";`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`return source + "velocity = max(0.0,(1.0 - (dragCoefficient deltaTime) / mass));";`