UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed Spine/Skeleton Lit shader not being affected by point lights. Closes #1550. Also fixed outline 4 vs 8 neighbourhood parameter being ignored (due to #pragma multi_compile / #pragma shader_feature not being evaluated in included cginc files, too late in preprocessor stage).

Browse Source
This commit is contained in:
Harald Csaszar 2019-11-19 17:10:35 +01:00
parent c90ca1b08c
commit 0006cd8b3c
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/CGIncludes/Spine-Skeleton-Lit-Common.cginc
View File

@ -12,7 +12,6 @@
#define LIGHT_LOOP_LIMIT unity_VertexLightParams.x #define LIGHT_LOOP_LIMIT unity_VertexLightParams.x
#endif #endif
#pragma multi_compile __ POINT SPOT
//////////////////////////////////////// ////////////////////////////////////////
// Alpha Clipping // Alpha Clipping

1
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Outline/CGIncludes/Spine-Outline-Pass.cginc
View File

@ -1,7 +1,6 @@
#ifndef SPINE_OUTLINE_PASS_INCLUDED #ifndef SPINE_OUTLINE_PASS_INCLUDED
#define SPINE_OUTLINE_PASS_INCLUDED #define SPINE_OUTLINE_PASS_INCLUDED
#pragma shader_feature _ _USE8NEIGHBOURHOOD_ON
#include "UnityCG.cginc" #include "UnityCG.cginc"
#ifdef SKELETON_GRAPHIC #ifdef SKELETON_GRAPHIC

1
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Outline/SkeletonGraphic/Spine-SkeletonGraphic-Outline.shader
View File

@ -62,6 +62,7 @@ Shader "Spine/Outline/SkeletonGraphic"
#pragma vertex vertOutlineGraphic #pragma vertex vertOutlineGraphic
#pragma fragment fragOutline #pragma fragment fragOutline
#define SKELETON_GRAPHIC #define SKELETON_GRAPHIC
#pragma shader_feature _ _USE8NEIGHBOURHOOD_ON
#include "../CGIncludes/Spine-Outline-Pass.cginc" #include "../CGIncludes/Spine-Outline-Pass.cginc"
ENDCG ENDCG
} }

1
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Outline/Spine-Skeleton-Outline.shader
View File

@ -38,6 +38,7 @@ Shader "Spine/Outline/Skeleton" {
CGPROGRAM CGPROGRAM
#pragma vertex vertOutline #pragma vertex vertOutline
#pragma fragment fragOutline #pragma fragment fragOutline
#pragma shader_feature _ _USE8NEIGHBOURHOOD_ON
#include "CGIncludes/Spine-Outline-Pass.cginc" #include "CGIncludes/Spine-Outline-Pass.cginc"
ENDCG ENDCG
} }

1
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Spine-Skeleton-Lit-ZWrite.shader
View File

@ -47,6 +47,7 @@ Shader "Spine/Skeleton Lit ZWrite" {
#pragma target 2.0 #pragma target 2.0
#define _ALPHA_CLIP #define _ALPHA_CLIP
#pragma multi_compile __ POINT SPOT
#include "CGIncludes/Spine-Skeleton-Lit-Common.cginc" #include "CGIncludes/Spine-Skeleton-Lit-Common.cginc"
ENDCG ENDCG

1
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Spine-Skeleton-Lit.shader
View File

@ -45,6 +45,7 @@ Shader "Spine/Skeleton Lit" {
#pragma fragment frag #pragma fragment frag
#pragma target 2.0 #pragma target 2.0
#pragma multi_compile __ POINT SPOT
#include "CGIncludes/Spine-Skeleton-Lit-Common.cginc" #include "CGIncludes/Spine-Skeleton-Lit-Common.cginc"
ENDCG ENDCG