Improve sequence rendering accuracy

OpenKH · Jun 2, 2020 · 79a4998 · 79a4998
1 parent 17da8a7
commit 79a4998
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/OpenKh.Engine/Renders/ISpriteDrawing.cs b/OpenKh.Engine/Renders/ISpriteDrawing.cs
@@ -3,6 +3,13 @@
 
 namespace OpenKh.Engine.Renders
 {
+    public enum BlendMode
+    {
+        Default,
+        Add,
+        Subtract,
+    }
+
     public struct ColorF
     {
         public static readonly ColorF Black = new ColorF(0.0f, 0.0f, 0.0f, 1.0f);
@@ -77,6 +84,7 @@ public class SpriteDrawingContext
         public ColorF Color3 { get; set; }
 
         public ISpriteTexture SpriteTexture { get; set; }
+        public BlendMode BlendMode { get; set; }
     }
 
     public static class SpriteDrawingContextExtensions

diff --git a/OpenKh.Engine/Renders/SequenceRenderer.cs b/OpenKh.Engine/Renders/SequenceRenderer.cs
@@ -14,7 +14,7 @@ private class Context
             public float ScaleX { get; set; }
             public float ScaleY { get; set; }
             public ColorF Color { get; set; }
-            public int ColorBlendType { get; set; }
+            public int ColorBlendMode { get; set; }
             public float Left { get; set; }
             public float Top { get; set; }
             public float Right { get; set; }
@@ -28,7 +28,7 @@ private class Context
                 ScaleX = ScaleX,
                 ScaleY = ScaleY,
                 Color = Color,
-                ColorBlendType = ColorBlendType,
+                ColorBlendMode = ColorBlendMode,
                 Left = Left,
                 Top = Top,
                 Right = Right,
@@ -112,7 +112,7 @@ private void DrawAnimation(Context contextParent, Sequence.Animation animation)
 
             context.PositionX += Lerp(t, animation.Xa0, animation.Xa1);
             context.PositionY += Lerp(t, animation.Ya0, animation.Ya1);
-            context.ColorBlendType = animation.ColorBlend;
+            context.ColorBlendMode = animation.ColorBlend;
 
             if ((animation.Flags & ScalingFlag) == 0)
             {
@@ -188,6 +188,7 @@ private void DrawFrame(Context context, Sequence.Frame frame)
             drawContext.Color2 = ConvertColor(frame.ColorRight);
             drawContext.Color3 = ConvertColor(frame.ColorBottom);
             drawContext.ColorMultiply(context.Color);
+            drawContext.BlendMode = (BlendMode)context.ColorBlendMode;
 
             drawing.AppendSprite(drawContext);
         }