diff --git a/Scripts/XatlasLightmapPacker.cs b/Scripts/XatlasLightmapPacker.cs index e64ff22..cd7475a 100644 --- a/Scripts/XatlasLightmapPacker.cs +++ b/Scripts/XatlasLightmapPacker.cs @@ -139,14 +139,14 @@ public void Execute(bool clearStream, bool regenerateData, bool directlyToUv2 = { var indicies = new NativeArray(sm.GetIndices(j), Allocator.TempJob); - var areaMultiplier = new CalculateChartsAreaMultiplierJob(verts, uvs, modelMatrix, indicies, scale, result); + var areaMultiplier = new CalculateChartsAreaMultiplierJob(verts, uvs, modelMatrix, indicies, result); areaMultiplier.Run(indicies.Length/3); indicies.Dispose(); } float area = result[0]; float uvArea = result[1]; - float finalScale = math.sqrt(area) / math.sqrt(uvArea); + float finalScale = (math.sqrt(area) / math.sqrt(uvArea)) * scale; var scaleJob = new ScaleUVsJob(uvs, finalScale); scaleJob.Run(uvs.Length); @@ -486,13 +486,12 @@ float determinant(float2 c, float2 c2, float2 c3) [BurstCompile(CompileSynchronously = true, DisableSafetyChecks = true)] private struct CalculateChartsAreaMultiplierJob : IJobParallelFor { - public CalculateChartsAreaMultiplierJob(NativeArray verts, NativeArray uvs, Matrix4x4 modelMatrix, NativeArray indices, float scaleMultiplier, NativeArray result) + public CalculateChartsAreaMultiplierJob(NativeArray verts, NativeArray uvs, Matrix4x4 modelMatrix, NativeArray indices, NativeArray result) { this.verts = verts; this.uvs = uvs; this.modelMatrix = modelMatrix; this.indices = indices; - this.scaleMultiplier = scaleMultiplier; this.result = result; } @@ -500,7 +499,6 @@ public CalculateChartsAreaMultiplierJob(NativeArray verts, NativeArray verts; public NativeArray uvs; public float4x4 modelMatrix; - public float scaleMultiplier; public NativeArray result; // length 2 diff --git a/package.json b/package.json index b9c6f5c..7d3a395 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.z3y.xatlaslightmap", "description": "Xatlas lightmap uv packer for bakery lightmapper", - "version": "0.1.4", + "version": "0.1.5", "unity": "2019.4", "displayName": "Xatlas Lightmap", "hideInEditor": false