Skip to content

Commit 55b6f1e

Browse files
author
FluffyFishGames
committed
Fixed an error which resulted in background layer not showing the image when loading a pattern
Replaced SkiaSharp with ImageSharp for cross platform compatibility. Removed all native code handling textures.
1 parent 5317d6c commit 55b6f1e

File tree

645 files changed

+112
-84657
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

645 files changed

+112
-84657
lines changed

‎Assembly-CSharp-Editor.csproj‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -415,14 +415,6 @@
415415
<HintPath>C:\Program Files\Unity\Hub\Editor\2022.3.62f3\Editor\Data\PlaybackEngines\LinuxStandaloneSupport\UnityEditor.LinuxStandalone.Extensions.dll</HintPath>
416416
<Private>False</Private>
417417
</Reference>
418-
<Reference Include="Svg.Custom">
419-
<HintPath>Assets\SkiaSharp\Library\Svg.Custom.dll</HintPath>
420-
<Private>False</Private>
421-
</Reference>
422-
<Reference Include="System.Runtime.CompilerServices.Unsafe">
423-
<HintPath>Assets\SkiaSharp\Dependencies\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
424-
<Private>False</Private>
425-
</Reference>
426418
<Reference Include="Newtonsoft.Json">
427419
<HintPath>Library\PackageCache\com.unity.nuget.newtonsoft-json@3.2.2\Runtime\Newtonsoft.Json.dll</HintPath>
428420
<Private>False</Private>
@@ -431,8 +423,8 @@
431423
<HintPath>Assets\Plugins\System.Drawing.Design.dll</HintPath>
432424
<Private>False</Private>
433425
</Reference>
434-
<Reference Include="ExCSS">
435-
<HintPath>Assets\SkiaSharp\Library\ExCSS.dll</HintPath>
426+
<Reference Include="SixLabors.ImageSharp">
427+
<HintPath>Assets\Plugins\ImageSharp\SixLabors.ImageSharp.dll</HintPath>
436428
<Private>False</Private>
437429
</Reference>
438430
<Reference Include="nunit.framework">
@@ -1045,10 +1037,6 @@
10451037
<Project>{5C89FB5E-CA59-9015-1888-CE1075FE7F63}</Project>
10461038
<Name>Assembly-CSharp</Name>
10471039
</ProjectReference>
1048-
<ProjectReference Include="SkiaSharp.Unity.csproj">
1049-
<Project>{D20DDA70-7CFA-B636-5750-CCBE1B9C66C1}</Project>
1050-
<Name>SkiaSharp.Unity</Name>
1051-
</ProjectReference>
10521040
<ProjectReference Include="Coffee.SoftMaskForUGUI.csproj">
10531041
<Project>{D94783F7-0FD3-A128-25DC-C7F57F91191B}</Project>
10541042
<Name>Coffee.SoftMaskForUGUI</Name>
@@ -1057,10 +1045,6 @@
10571045
<Project>{68444641-A1CD-96A9-8A60-14A1B1671263}</Project>
10581046
<Name>Coffee.SoftMaskForUGUI.Editor</Name>
10591047
</ProjectReference>
1060-
<ProjectReference Include="SkiaSharp.csproj">
1061-
<Project>{742A405C-72A8-28E1-8910-13338132FBC4}</Project>
1062-
<Name>SkiaSharp</Name>
1063-
</ProjectReference>
10641048
</ItemGroup>
10651049
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
10661050
<Target Name="GenerateTargetFrameworkMonikerAttribute" />

‎Assembly-CSharp-firstpass.csproj‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,8 @@
427427
</ItemGroup>
428428
<ItemGroup>
429429
<None Include="Assets\Plugins\System.Memory.dll" />
430+
<None Include="Assets\Plugins\ImageSharp\SixLabors.ImageSharp.dll" />
431+
<None Include="Assets\Plugins\ImageSharp\System.Runtime.CompilerServices.Unsafe.dll" />
430432
<None Include="Assets\Plugins\System.Buffers.dll" />
431433
<None Include="Assets\Plugins\Windows\x64\libwebp_x64.dll" />
432434
<None Include="Assets\Plugins\System.Drawing.Design.dll" />
@@ -766,12 +768,8 @@
766768
<HintPath>C:\Program Files\Unity\Hub\Editor\2022.3.62f3\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll</HintPath>
767769
<Private>False</Private>
768770
</Reference>
769-
<Reference Include="Svg.Custom">
770-
<HintPath>Assets\SkiaSharp\Library\Svg.Custom.dll</HintPath>
771-
<Private>False</Private>
772-
</Reference>
773771
<Reference Include="System.Runtime.CompilerServices.Unsafe">
774-
<HintPath>Assets\SkiaSharp\Dependencies\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
772+
<HintPath>Assets\Plugins\ImageSharp\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
775773
<Private>False</Private>
776774
</Reference>
777775
<Reference Include="Newtonsoft.Json">
@@ -782,8 +780,8 @@
782780
<HintPath>Assets\Plugins\System.Drawing.Design.dll</HintPath>
783781
<Private>False</Private>
784782
</Reference>
785-
<Reference Include="ExCSS">
786-
<HintPath>Assets\SkiaSharp\Library\ExCSS.dll</HintPath>
783+
<Reference Include="SixLabors.ImageSharp">
784+
<HintPath>Assets\Plugins\ImageSharp\SixLabors.ImageSharp.dll</HintPath>
787785
<Private>False</Private>
788786
</Reference>
789787
<Reference Include="UnityEditor.iOS.Extensions.Xcode">
@@ -1376,10 +1374,6 @@
13761374
</Reference>
13771375
</ItemGroup>
13781376
<ItemGroup>
1379-
<ProjectReference Include="SkiaSharp.Unity.csproj">
1380-
<Project>{D20DDA70-7CFA-B636-5750-CCBE1B9C66C1}</Project>
1381-
<Name>SkiaSharp.Unity</Name>
1382-
</ProjectReference>
13831377
<ProjectReference Include="Coffee.SoftMaskForUGUI.csproj">
13841378
<Project>{D94783F7-0FD3-A128-25DC-C7F57F91191B}</Project>
13851379
<Name>Coffee.SoftMaskForUGUI</Name>
@@ -1388,10 +1382,6 @@
13881382
<Project>{68444641-A1CD-96A9-8A60-14A1B1671263}</Project>
13891383
<Name>Coffee.SoftMaskForUGUI.Editor</Name>
13901384
</ProjectReference>
1391-
<ProjectReference Include="SkiaSharp.csproj">
1392-
<Project>{742A405C-72A8-28E1-8910-13338132FBC4}</Project>
1393-
<Name>SkiaSharp</Name>
1394-
</ProjectReference>
13951385
</ItemGroup>
13961386
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
13971387
<Target Name="GenerateTargetFrameworkMonikerAttribute" />

‎Assembly-CSharp.csproj‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,10 @@
154154
<None Include="Assets\Meshs\Clothing.shader" />
155155
<None Include="Assets\Coffee\UIExtensions\SoftMaskForUGUI\Shaders\TMP_SDF (SoftMaskable).shader" />
156156
<None Include="Assets\log.txt" />
157-
<None Include="Assets\SkiaSharp\Library\System.Buffers.dll" />
158157
<None Include="Assets\Coffee\UIExtensions\SoftMaskForUGUI\Shaders\TMP_Sprite (SoftMaskable).shader" />
159158
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface-Mobile.shader" />
160-
<None Include="Assets\SkiaSharp\Library\Svg.Custom.dll" />
161159
<None Include="Assets\Meshs\StandardShader-DoubleSided.shader" />
162-
<None Include="Assets\SkiaSharp\Library\win-x86\libHarfBuzzSharp.dll" />
163160
<None Include="Assets\Coffee\UIExtensions\SoftMaskForUGUI\Shaders\TMP_SDF-Mobile (SoftMaskable).shader" />
164-
<None Include="Assets\SkiaSharp\Dependencies\System.Runtime.CompilerServices.Unsafe.dll" />
165161
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface.shader" />
166162
<None Include="Assets\TextMesh Pro\Sprites\EmojiOne Attribution.txt" />
167163
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_Bitmap-Custom-Atlas.shader" />
@@ -171,20 +167,15 @@
171167
<None Include="Assets\Coffee\UIExtensions\SoftMaskForUGUI\Shaders\Resources\SoftMask.shader" />
172168
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMPro_Properties.cginc" />
173169
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMPro_Surface.cginc" />
174-
<None Include="Assets\SkiaSharp\Library\win-x86\libSkiaSharp.dll" />
175170
<None Include="Assets\TextMesh Pro\Resources\LineBreaking Following Characters.txt" />
176-
<None Include="Assets\SkiaSharp\Library\win-x64\libSkiaSharp.dll" />
177171
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Mobile Masking.shader" />
178172
<None Include="Assets\Meshs\ClothingSecondUV.shader" />
179-
<None Include="Assets\SkiaSharp\Library\win-x64\libHarfBuzzSharp.dll" />
180173
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF Overlay.shader" />
181174
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_Bitmap-Mobile.shader" />
182175
<None Include="Assets\TextMesh Pro\Fonts\LiberationSans - OFL.txt" />
183-
<None Include="Assets\SkiaSharp\Library\ExCSS.dll" />
184176
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Mobile.shader" />
185177
<None Include="Assets\Meshs\ClothingNoNormal.shader" />
186178
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_Sprite.shader" />
187-
<None Include="Assets\SkiaSharp\Library\System.Memory.dll" />
188179
</ItemGroup>
189180
<ItemGroup>
190181
<Reference Include="UnityEngine">
@@ -519,12 +510,8 @@
519510
<HintPath>C:\Program Files\Unity\Hub\Editor\2022.3.62f3\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll</HintPath>
520511
<Private>False</Private>
521512
</Reference>
522-
<Reference Include="Svg.Custom">
523-
<HintPath>Assets\SkiaSharp\Library\Svg.Custom.dll</HintPath>
524-
<Private>False</Private>
525-
</Reference>
526513
<Reference Include="System.Runtime.CompilerServices.Unsafe">
527-
<HintPath>Assets\SkiaSharp\Dependencies\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
514+
<HintPath>Assets\Plugins\ImageSharp\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
528515
<Private>False</Private>
529516
</Reference>
530517
<Reference Include="Newtonsoft.Json">
@@ -535,8 +522,8 @@
535522
<HintPath>Assets\Plugins\System.Drawing.Design.dll</HintPath>
536523
<Private>False</Private>
537524
</Reference>
538-
<Reference Include="ExCSS">
539-
<HintPath>Assets\SkiaSharp\Library\ExCSS.dll</HintPath>
525+
<Reference Include="SixLabors.ImageSharp">
526+
<HintPath>Assets\Plugins\ImageSharp\SixLabors.ImageSharp.dll</HintPath>
540527
<Private>False</Private>
541528
</Reference>
542529
<Reference Include="UnityEditor.iOS.Extensions.Xcode">
@@ -1133,10 +1120,6 @@
11331120
<Project>{356C4B64-D7D1-189B-3FF8-726D611C6685}</Project>
11341121
<Name>Assembly-CSharp-firstpass</Name>
11351122
</ProjectReference>
1136-
<ProjectReference Include="SkiaSharp.Unity.csproj">
1137-
<Project>{D20DDA70-7CFA-B636-5750-CCBE1B9C66C1}</Project>
1138-
<Name>SkiaSharp.Unity</Name>
1139-
</ProjectReference>
11401123
<ProjectReference Include="Coffee.SoftMaskForUGUI.csproj">
11411124
<Project>{D94783F7-0FD3-A128-25DC-C7F57F91191B}</Project>
11421125
<Name>Coffee.SoftMaskForUGUI</Name>
@@ -1145,10 +1128,6 @@
11451128
<Project>{68444641-A1CD-96A9-8A60-14A1B1671263}</Project>
11461129
<Name>Coffee.SoftMaskForUGUI.Editor</Name>
11471130
</ProjectReference>
1148-
<ProjectReference Include="SkiaSharp.csproj">
1149-
<Project>{742A405C-72A8-28E1-8910-13338132FBC4}</Project>
1150-
<Name>SkiaSharp</Name>
1151-
</ProjectReference>
11521131
</ItemGroup>
11531132
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
11541133
<Target Name="GenerateTargetFrameworkMonikerAttribute" />

‎Assets/Editor/PreBuild.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ public void OnPreprocessBuild(BuildReport report)
1919
{
2020
linkerFlags += "comdlg32.lib";
2121
}
22-
PlayerSettings.SetAdditionalIl2CppArgs((additionalLibraries != "" ? "--additional-libraries \""+additionalLibraries+"\"" : "") + (compilerFlags != "" ? "--compiler-flags=\"" + compilerFlags + "\" " : "") + (linkerFlags != "" ? "--linker-flags=\"" + linkerFlags + "\"" : ""));
22+
PlayerSettings.SetAdditionalIl2CppArgs("--generic-virtual-method-iterations=5 " + (additionalLibraries != "" ? "--additional-libraries \""+additionalLibraries+"\"" : "") + (compilerFlags != "" ? "--compiler-flags=\"" + compilerFlags + "\" " : "") + (linkerFlags != "" ? "--linker-flags=\"" + linkerFlags + "\"" : ""));
2323
}
2424
}

0 commit comments

Comments
 (0)