From c394057e340c9ae63ad78e8547a333b776a9a911 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Tue, 16 Jul 2019 16:17:01 +0200 Subject: [PATCH] [unity] Restructuring cleanup - moved shaders to unified location. Updated CHANGELOG LWRP section and added section about restructuring changes. --- CHANGELOG.md | 10 +++++++++- .../SkeletonGraphic/{Shaders.meta => Materials.meta} | 0 .../{Shaders => Materials}/SkeletonGraphicDefault.mat | 0 .../SkeletonGraphicDefault.mat.meta | 0 .../SkeletonGraphicTintBlack.mat | 0 .../SkeletonGraphicTintBlack.mat.meta | 0 .../Spine-SkeletonGraphic-TintBlack.shader | 0 .../Spine-SkeletonGraphic-TintBlack.shader.meta | 0 .../SkeletonGraphic}/Spine-SkeletonGraphic.shader | 0 .../SkeletonGraphic}/Spine-SkeletonGraphic.shader.meta | 0 10 files changed, 9 insertions(+), 1 deletion(-) rename spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/{Shaders.meta => Materials.meta} (100%) rename spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/{Shaders => Materials}/SkeletonGraphicDefault.mat (100%) rename spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/{Shaders => Materials}/SkeletonGraphicDefault.mat.meta (100%) rename spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/{Shaders => Materials}/SkeletonGraphicTintBlack.mat (100%) rename spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/{Shaders => Materials}/SkeletonGraphicTintBlack.mat.meta (100%) rename spine-unity/Assets/Spine/Runtime/spine-unity/{Modules/SkeletonGraphic/Shaders => Shaders/SkeletonGraphic}/Spine-SkeletonGraphic-TintBlack.shader (100%) rename spine-unity/Assets/Spine/Runtime/spine-unity/{Modules/SkeletonGraphic/Shaders => Shaders/SkeletonGraphic}/Spine-SkeletonGraphic-TintBlack.shader.meta (100%) rename spine-unity/Assets/Spine/Runtime/spine-unity/{Modules/SkeletonGraphic/Shaders => Shaders/SkeletonGraphic}/Spine-SkeletonGraphic.shader (100%) rename spine-unity/Assets/Spine/Runtime/spine-unity/{Modules/SkeletonGraphic/Shaders => Shaders/SkeletonGraphic}/Spine-SkeletonGraphic.shader.meta (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a41c0ecca..f3579599b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -148,8 +148,16 @@ * **Usage:** The package provides two shaders specifically built for the lightweight render pipeline: * `Lightweight Render Pipeline/Spine/Skeleton Lit`, as a lightweight variant of the `Spine/Skeleton Lit` shader and * `Lightweight Render Pipeline/Spine/Sprite`, as a lightweight variant of the `Spine/Sprite/Vertex Lit` and `Pixel Lit` shaders, which were not functioning in the lightweight render pipeline. The shaders can be assigned to materials as usual and will respect your settings of the assigned `LightweightRenderPipelineAsset` under `Project Settings - Graphics`. - * **Example:** You can find an example scene in the package under `com.esotericsoftware.spine.lwrp-shaders-3.8/Examples/LWRP Shaders.unity` that demonstrates the use of the above shaders. + * **Restrictions** As all Spine shaders, the LWRP shaders **do not support `Premultiply alpha` (PMA) atlas textures in Linear color space**. Please export your atlas textures as `straight alpha` textures with disabled `Premultiply alpha` setting when using Linear color space. You can check the current color space via `Project Settings - Player - Other Settings - Color Space.`. + * **Example:** You can find an example scene in the package under `com.esotericsoftware.spine.lwrp-shaders-3.8/Examples/LWRP Shaders.unity` that demonstrates usage of the LWRP shaders. +* **Restructuring (Non-Breaking)** + + Note: The following changes will most likely not affect users of the Spine-Unity runtime as the API remains unchanged and no references are invalidated. + * Removed duplicates of `.cginc` files in `Modules/Shaders/Sprite` that were also present in the `Modules/Shaders/Sprite/CGIncludes` directory. + * Moved shaders from `Modules/Shaders` to `Shaders` directory. + * Moved shaders from `Modules/SkeletonGraphic/Shaders` to `Shaders/SkeletonGraphic`. + ### XNA/MonoGame * Updated to latest MonoGame version 3.7.1 * Rewrote example project to be cleaner and better demonstrate basic Spine features. diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders.meta b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Materials.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders.meta rename to spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Materials.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/SkeletonGraphicDefault.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Materials/SkeletonGraphicDefault.mat similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/SkeletonGraphicDefault.mat rename to spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Materials/SkeletonGraphicDefault.mat diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/SkeletonGraphicDefault.mat.meta b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Materials/SkeletonGraphicDefault.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/SkeletonGraphicDefault.mat.meta rename to spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Materials/SkeletonGraphicDefault.mat.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/SkeletonGraphicTintBlack.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Materials/SkeletonGraphicTintBlack.mat similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/SkeletonGraphicTintBlack.mat rename to spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Materials/SkeletonGraphicTintBlack.mat diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/SkeletonGraphicTintBlack.mat.meta b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Materials/SkeletonGraphicTintBlack.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/SkeletonGraphicTintBlack.mat.meta rename to spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Materials/SkeletonGraphicTintBlack.mat.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic-TintBlack.shader b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic/Spine-SkeletonGraphic-TintBlack.shader similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic-TintBlack.shader rename to spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic/Spine-SkeletonGraphic-TintBlack.shader diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic-TintBlack.shader.meta b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic/Spine-SkeletonGraphic-TintBlack.shader.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic-TintBlack.shader.meta rename to spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic/Spine-SkeletonGraphic-TintBlack.shader.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic.shader b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic/Spine-SkeletonGraphic.shader similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic.shader rename to spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic/Spine-SkeletonGraphic.shader diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic.shader.meta b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic/Spine-SkeletonGraphic.shader.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic.shader.meta rename to spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic/Spine-SkeletonGraphic.shader.meta