From b37e5c25c3da6a5c33cc0ff971b60ca703ddbc53 Mon Sep 17 00:00:00 2001 From: ww-rm Date: Thu, 13 Mar 2025 13:30:35 +0800 Subject: [PATCH] rename --- .../Spine/{BlendMode.cs => BlendModeSFML.cs} | 2 +- .../Spine/Implementations/Spine/Spine21.cs | 16 ++++++++-------- .../Spine/Implementations/Spine/Spine36.cs | 14 +++++++------- .../Spine/Implementations/Spine/Spine37.cs | 14 +++++++------- .../Spine/Implementations/Spine/Spine38.cs | 14 +++++++------- .../Spine/Implementations/Spine/Spine40.cs | 14 +++++++------- .../Spine/Implementations/Spine/Spine41.cs | 14 +++++++------- .../Spine/Implementations/Spine/Spine42.cs | 14 +++++++------- 8 files changed, 51 insertions(+), 51 deletions(-) rename SpineViewer/Spine/{BlendMode.cs => BlendModeSFML.cs} (98%) diff --git a/SpineViewer/Spine/BlendMode.cs b/SpineViewer/Spine/BlendModeSFML.cs similarity index 98% rename from SpineViewer/Spine/BlendMode.cs rename to SpineViewer/Spine/BlendModeSFML.cs index 75ffdcf..a8142bb 100644 --- a/SpineViewer/Spine/BlendMode.cs +++ b/SpineViewer/Spine/BlendModeSFML.cs @@ -9,7 +9,7 @@ namespace SpineViewer.Spine /// /// SFML 混合模式 /// - public static class BlendMode + public static class BlendModeSFML { /// /// Alpha Blend diff --git a/SpineViewer/Spine/Implementations/Spine/Spine21.cs b/SpineViewer/Spine/Implementations/Spine/Spine21.cs index 7787993..38fe6cf 100644 --- a/SpineViewer/Spine/Implementations/Spine/Spine21.cs +++ b/SpineViewer/Spine/Implementations/Spine/Spine21.cs @@ -236,14 +236,14 @@ namespace SpineViewer.Spine.Implementations.Spine skeleton.UpdateWorldTransform(); } - //private SFML.Graphics.BlendMode GetSFMLBlendMode(SpineRuntime21.BlendMode spineBlendMode) + //private SFML.Graphics.BlendMode GetSFMLBlendMode(BlendMode spineBlendMode) //{ // return spineBlendMode switch // { - // SpineRuntime21.BlendMode.Normal => BlendMode.Normal, - // SpineRuntime21.BlendMode.Additive => BlendMode.Additive, - // SpineRuntime21.BlendMode.Multiply => BlendMode.Multiply, - // SpineRuntime21.BlendMode.Screen => BlendMode.Screen, + // BlendMode.Normal => BlendMode.Normal, + // BlendMode.Additive => BlendMode.Additive, + // BlendMode.Multiply => BlendMode.Multiply, + // BlendMode.Screen => BlendMode.Screen, // _ => throw new NotImplementedException($"{spineBlendMode}"), // }; //} @@ -313,14 +313,14 @@ namespace SpineViewer.Spine.Implementations.Spine } // 似乎 2.1.x 也没有 BlendMode - SFML.Graphics.BlendMode blendMode = slot.Data.AdditiveBlending ? BlendMode.Additive : BlendMode.Normal; + SFML.Graphics.BlendMode blendMode = slot.Data.AdditiveBlending ? BlendModeSFML.Additive : BlendModeSFML.Normal; states.Texture ??= texture; if (states.BlendMode != blendMode || states.Texture != texture) { if (vertexArray.VertexCount > 0) { - if (UsePremultipliedAlpha && (states.BlendMode == BlendMode.Normal || states.BlendMode == BlendMode.Additive)) + if (UsePremultipliedAlpha && (states.BlendMode == BlendModeSFML.Normal || states.BlendMode == BlendModeSFML.Additive)) states.Shader = FragmentShader; else states.Shader = null; @@ -365,7 +365,7 @@ namespace SpineViewer.Spine.Implementations.Spine //clipping.ClipEnd(slot); } - if (UsePremultipliedAlpha && (states.BlendMode == BlendMode.Normal || states.BlendMode == BlendMode.Additive)) + if (UsePremultipliedAlpha && (states.BlendMode == BlendModeSFML.Normal || states.BlendMode == BlendModeSFML.Additive)) states.Shader = FragmentShader; else states.Shader = null; diff --git a/SpineViewer/Spine/Implementations/Spine/Spine36.cs b/SpineViewer/Spine/Implementations/Spine/Spine36.cs index bc8e387..892ed7b 100644 --- a/SpineViewer/Spine/Implementations/Spine/Spine36.cs +++ b/SpineViewer/Spine/Implementations/Spine/Spine36.cs @@ -194,14 +194,14 @@ namespace SpineViewer.Spine.Implementations.Spine skeleton.UpdateWorldTransform(); } - private SFML.Graphics.BlendMode GetSFMLBlendMode(SpineRuntime36.BlendMode spineBlendMode) + private SFML.Graphics.BlendMode GetSFMLBlendMode(BlendMode spineBlendMode) { return spineBlendMode switch { - SpineRuntime36.BlendMode.Normal => BlendMode.Normal, - SpineRuntime36.BlendMode.Additive => BlendMode.Additive, - SpineRuntime36.BlendMode.Multiply => BlendMode.Multiply, - SpineRuntime36.BlendMode.Screen => BlendMode.Screen, + BlendMode.Normal => BlendModeSFML.Normal, + BlendMode.Additive => BlendModeSFML.Additive, + BlendMode.Multiply => BlendModeSFML.Multiply, + BlendMode.Screen => BlendModeSFML.Screen, _ => throw new NotImplementedException($"{spineBlendMode}"), }; } @@ -276,7 +276,7 @@ namespace SpineViewer.Spine.Implementations.Spine { if (vertexArray.VertexCount > 0) { - if (UsePremultipliedAlpha && (states.BlendMode == BlendMode.Normal || states.BlendMode == BlendMode.Additive)) + if (UsePremultipliedAlpha && (states.BlendMode == BlendModeSFML.Normal || states.BlendMode == BlendModeSFML.Additive)) states.Shader = FragmentShader; else states.Shader = null; @@ -321,7 +321,7 @@ namespace SpineViewer.Spine.Implementations.Spine clipping.ClipEnd(slot); } - if (UsePremultipliedAlpha && (states.BlendMode == BlendMode.Normal || states.BlendMode == BlendMode.Additive)) + if (UsePremultipliedAlpha && (states.BlendMode == BlendModeSFML.Normal || states.BlendMode == BlendModeSFML.Additive)) states.Shader = FragmentShader; else states.Shader = null; diff --git a/SpineViewer/Spine/Implementations/Spine/Spine37.cs b/SpineViewer/Spine/Implementations/Spine/Spine37.cs index 08afb90..90b7b3b 100644 --- a/SpineViewer/Spine/Implementations/Spine/Spine37.cs +++ b/SpineViewer/Spine/Implementations/Spine/Spine37.cs @@ -201,14 +201,14 @@ namespace SpineViewer.Spine.Implementations.Spine skeleton.UpdateWorldTransform(); } - private SFML.Graphics.BlendMode GetSFMLBlendMode(SpineRuntime37.BlendMode spineBlendMode) + private SFML.Graphics.BlendMode GetSFMLBlendMode(BlendMode spineBlendMode) { return spineBlendMode switch { - SpineRuntime37.BlendMode.Normal => BlendMode.Normal, - SpineRuntime37.BlendMode.Additive => BlendMode.Additive, - SpineRuntime37.BlendMode.Multiply => BlendMode.Multiply, - SpineRuntime37.BlendMode.Screen => BlendMode.Screen, + BlendMode.Normal => BlendModeSFML.Normal, + BlendMode.Additive => BlendModeSFML.Additive, + BlendMode.Multiply => BlendModeSFML.Multiply, + BlendMode.Screen => BlendModeSFML.Screen, _ => throw new NotImplementedException($"{spineBlendMode}"), }; } @@ -284,7 +284,7 @@ namespace SpineViewer.Spine.Implementations.Spine if (vertexArray.VertexCount > 0) { // XXX: 实测不用设置 sampler2D 的值也正确 - if (UsePremultipliedAlpha && (states.BlendMode == BlendMode.Normal || states.BlendMode == BlendMode.Additive)) + if (UsePremultipliedAlpha && (states.BlendMode == BlendModeSFML.Normal || states.BlendMode == BlendModeSFML.Additive)) states.Shader = FragmentShader; else states.Shader = null; @@ -329,7 +329,7 @@ namespace SpineViewer.Spine.Implementations.Spine clipping.ClipEnd(slot); } - if (UsePremultipliedAlpha && (states.BlendMode == BlendMode.Normal || states.BlendMode == BlendMode.Additive)) + if (UsePremultipliedAlpha && (states.BlendMode == BlendModeSFML.Normal || states.BlendMode == BlendModeSFML.Additive)) states.Shader = FragmentShader; else states.Shader = null; diff --git a/SpineViewer/Spine/Implementations/Spine/Spine38.cs b/SpineViewer/Spine/Implementations/Spine/Spine38.cs index ac0dc83..8606f39 100644 --- a/SpineViewer/Spine/Implementations/Spine/Spine38.cs +++ b/SpineViewer/Spine/Implementations/Spine/Spine38.cs @@ -204,14 +204,14 @@ namespace SpineViewer.Spine.Implementations.Spine skeleton.UpdateWorldTransform(); } - private SFML.Graphics.BlendMode GetSFMLBlendMode(SpineRuntime38.BlendMode spineBlendMode) + private SFML.Graphics.BlendMode GetSFMLBlendMode(BlendMode spineBlendMode) { return spineBlendMode switch { - SpineRuntime38.BlendMode.Normal => BlendMode.Normal, - SpineRuntime38.BlendMode.Additive => BlendMode.Additive, - SpineRuntime38.BlendMode.Multiply => BlendMode.Multiply, - SpineRuntime38.BlendMode.Screen => BlendMode.Screen, + BlendMode.Normal => BlendModeSFML.Normal, + BlendMode.Additive => BlendModeSFML.Additive, + BlendMode.Multiply => BlendModeSFML.Multiply, + BlendMode.Screen => BlendModeSFML.Screen, _ => throw new NotImplementedException($"{spineBlendMode}"), }; } @@ -287,7 +287,7 @@ namespace SpineViewer.Spine.Implementations.Spine if (vertexArray.VertexCount > 0) { // XXX: 实测不用设置 sampler2D 的值也正确 - if (UsePremultipliedAlpha && (states.BlendMode == BlendMode.Normal || states.BlendMode == BlendMode.Additive)) + if (UsePremultipliedAlpha && (states.BlendMode == BlendModeSFML.Normal || states.BlendMode == BlendModeSFML.Additive)) states.Shader = FragmentShader; else states.Shader = null; @@ -332,7 +332,7 @@ namespace SpineViewer.Spine.Implementations.Spine clipping.ClipEnd(slot); } - if (UsePremultipliedAlpha && (states.BlendMode == BlendMode.Normal || states.BlendMode == BlendMode.Additive)) + if (UsePremultipliedAlpha && (states.BlendMode == BlendModeSFML.Normal || states.BlendMode == BlendModeSFML.Additive)) states.Shader = FragmentShader; else states.Shader = null; diff --git a/SpineViewer/Spine/Implementations/Spine/Spine40.cs b/SpineViewer/Spine/Implementations/Spine/Spine40.cs index 4192d04..152f456 100644 --- a/SpineViewer/Spine/Implementations/Spine/Spine40.cs +++ b/SpineViewer/Spine/Implementations/Spine/Spine40.cs @@ -203,14 +203,14 @@ namespace SpineViewer.Spine.Implementations.Spine skeleton.UpdateWorldTransform(); } - private SFML.Graphics.BlendMode GetSFMLBlendMode(SpineRuntime40.BlendMode spineBlendMode) + private SFML.Graphics.BlendMode GetSFMLBlendMode(BlendMode spineBlendMode) { return spineBlendMode switch { - SpineRuntime40.BlendMode.Normal => BlendMode.Normal, - SpineRuntime40.BlendMode.Additive => BlendMode.Additive, - SpineRuntime40.BlendMode.Multiply => BlendMode.Multiply, - SpineRuntime40.BlendMode.Screen => BlendMode.Screen, + BlendMode.Normal => BlendModeSFML.Normal, + BlendMode.Additive => BlendModeSFML.Additive, + BlendMode.Multiply => BlendModeSFML.Multiply, + BlendMode.Screen => BlendModeSFML.Screen, _ => throw new NotImplementedException($"{spineBlendMode}"), }; } @@ -286,7 +286,7 @@ namespace SpineViewer.Spine.Implementations.Spine if (vertexArray.VertexCount > 0) { // XXX: 实测不用设置 sampler2D 的值也正确 - if (UsePremultipliedAlpha && (states.BlendMode == BlendMode.Normal || states.BlendMode == BlendMode.Additive)) + if (UsePremultipliedAlpha && (states.BlendMode == BlendModeSFML.Normal || states.BlendMode == BlendModeSFML.Additive)) states.Shader = FragmentShader; else states.Shader = null; @@ -331,7 +331,7 @@ namespace SpineViewer.Spine.Implementations.Spine clipping.ClipEnd(slot); } - if (UsePremultipliedAlpha && (states.BlendMode == BlendMode.Normal || states.BlendMode == BlendMode.Additive)) + if (UsePremultipliedAlpha && (states.BlendMode == BlendModeSFML.Normal || states.BlendMode == BlendModeSFML.Additive)) states.Shader = FragmentShader; else states.Shader = null; diff --git a/SpineViewer/Spine/Implementations/Spine/Spine41.cs b/SpineViewer/Spine/Implementations/Spine/Spine41.cs index fdd5ae0..44b4f3c 100644 --- a/SpineViewer/Spine/Implementations/Spine/Spine41.cs +++ b/SpineViewer/Spine/Implementations/Spine/Spine41.cs @@ -203,14 +203,14 @@ namespace SpineViewer.Spine.Implementations.Spine skeleton.UpdateWorldTransform(); } - private SFML.Graphics.BlendMode GetSFMLBlendMode(SpineRuntime41.BlendMode spineBlendMode) + private SFML.Graphics.BlendMode GetSFMLBlendMode(BlendMode spineBlendMode) { return spineBlendMode switch { - SpineRuntime41.BlendMode.Normal => BlendMode.Normal, - SpineRuntime41.BlendMode.Additive => BlendMode.Additive, - SpineRuntime41.BlendMode.Multiply => BlendMode.Multiply, - SpineRuntime41.BlendMode.Screen => BlendMode.Screen, + BlendMode.Normal => BlendModeSFML.Normal, + BlendMode.Additive => BlendModeSFML.Additive, + BlendMode.Multiply => BlendModeSFML.Multiply, + BlendMode.Screen => BlendModeSFML.Screen, _ => throw new NotImplementedException($"{spineBlendMode}"), }; } @@ -286,7 +286,7 @@ namespace SpineViewer.Spine.Implementations.Spine if (vertexArray.VertexCount > 0) { // XXX: 实测不用设置 sampler2D 的值也正确 - if (UsePremultipliedAlpha && (states.BlendMode == BlendMode.Normal || states.BlendMode == BlendMode.Additive)) + if (UsePremultipliedAlpha && (states.BlendMode == BlendModeSFML.Normal || states.BlendMode == BlendModeSFML.Additive)) states.Shader = FragmentShader; else states.Shader = null; @@ -331,7 +331,7 @@ namespace SpineViewer.Spine.Implementations.Spine clipping.ClipEnd(slot); } - if (UsePremultipliedAlpha && (states.BlendMode == BlendMode.Normal || states.BlendMode == BlendMode.Additive)) + if (UsePremultipliedAlpha && (states.BlendMode == BlendModeSFML.Normal || states.BlendMode == BlendModeSFML.Additive)) states.Shader = FragmentShader; else states.Shader = null; diff --git a/SpineViewer/Spine/Implementations/Spine/Spine42.cs b/SpineViewer/Spine/Implementations/Spine/Spine42.cs index 7b6be60..5b0a316 100644 --- a/SpineViewer/Spine/Implementations/Spine/Spine42.cs +++ b/SpineViewer/Spine/Implementations/Spine/Spine42.cs @@ -203,14 +203,14 @@ namespace SpineViewer.Spine.Implementations.Spine skeleton.UpdateWorldTransform(Skeleton.Physics.Update); } - private SFML.Graphics.BlendMode GetSFMLBlendMode(SpineRuntime42.BlendMode spineBlendMode) + private SFML.Graphics.BlendMode GetSFMLBlendMode(BlendMode spineBlendMode) { return spineBlendMode switch { - SpineRuntime42.BlendMode.Normal => BlendMode.Normal, - SpineRuntime42.BlendMode.Additive => BlendMode.Additive, - SpineRuntime42.BlendMode.Multiply => BlendMode.Multiply, - SpineRuntime42.BlendMode.Screen => BlendMode.Screen, + BlendMode.Normal => BlendModeSFML.Normal, + BlendMode.Additive => BlendModeSFML.Additive, + BlendMode.Multiply => BlendModeSFML.Multiply, + BlendMode.Screen => BlendModeSFML.Screen, _ => throw new NotImplementedException($"{spineBlendMode}"), }; } @@ -286,7 +286,7 @@ namespace SpineViewer.Spine.Implementations.Spine if (vertexArray.VertexCount > 0) { // XXX: 实测不用设置 sampler2D 的值也正确 - if (UsePremultipliedAlpha && (states.BlendMode == BlendMode.Normal || states.BlendMode == BlendMode.Additive)) + if (UsePremultipliedAlpha && (states.BlendMode == BlendModeSFML.Normal || states.BlendMode == BlendModeSFML.Additive)) states.Shader = FragmentShader; else states.Shader = null; @@ -331,7 +331,7 @@ namespace SpineViewer.Spine.Implementations.Spine clipping.ClipEnd(slot); } - if (UsePremultipliedAlpha && (states.BlendMode == BlendMode.Normal || states.BlendMode == BlendMode.Additive)) + if (UsePremultipliedAlpha && (states.BlendMode == BlendModeSFML.Normal || states.BlendMode == BlendModeSFML.Additive)) states.Shader = FragmentShader; else states.Shader = null;