ANIMATION_RELATIVE

OpenDreamProject · May 27, 2024 · 3d67038 · 3d67038
1 parent e6fb5fa
commit 3d67038
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 3 deletions.
diff --git a/OpenDreamRuntime/Objects/Types/DreamList.cs b/OpenDreamRuntime/Objects/Types/DreamList.cs
@@ -25,7 +25,7 @@ public DreamList(DreamObjectDefinition listDef, int size) : base(listDef) {
     /// <summary>
     /// Create a new DreamList using an existing list of values (does not copy them)
     /// </summary>
-    private DreamList(DreamObjectDefinition listDef, List<DreamValue> values, Dictionary<DreamValue, DreamValue>? associativeValues) : base(listDef) {
+    public DreamList(DreamObjectDefinition listDef, List<DreamValue> values, Dictionary<DreamValue, DreamValue>? associativeValues) : base(listDef) {
         _values = values;
         _associativeValues = associativeValues;
     }

diff --git a/OpenDreamRuntime/Procs/Native/DreamProcNativeRoot.cs b/OpenDreamRuntime/Procs/Native/DreamProcNativeRoot.cs
@@ -197,6 +197,58 @@ public static DreamValue NativeProc_animate(NativeProc.Bundle bundle, DreamObjec
             var invisibility = bundle.GetArgument(24, "invisibility");
             var suffix = bundle.GetArgument(25, "suffix");
 
+            if((flags & AnimationFlags.AnimationRelative) != 0){
+                // This works for maptext_x/y/width/height, pixel_x/y/w/z, luminosity, layer, alpha, transform, and color. For transform and color, the current value is multiplied by the new one. Vars not in this list are simply changed as if this flag is not present.
+                if(!pixelX.IsNull)
+                    pixelX = new(pixelX.UnsafeGetValueAsFloat() + obj.GetVariable("pixel_x").UnsafeGetValueAsFloat());
+                if(!pixelY.IsNull)
+                    pixelY = new(pixelY.UnsafeGetValueAsFloat() + obj.GetVariable("pixel_y").UnsafeGetValueAsFloat());
+                if(!pixelZ.IsNull)
+                    pixelZ = new(pixelZ.UnsafeGetValueAsFloat() + obj.GetVariable("pixel_z").UnsafeGetValueAsFloat());
+                if(!maptextWidth.IsNull)
+                    maptextWidth = new(maptextWidth.UnsafeGetValueAsFloat() + obj.GetVariable("maptext_width").UnsafeGetValueAsFloat());
+                if(!maptextHeight.IsNull)
+                    maptextHeight = new(maptextHeight.UnsafeGetValueAsFloat() + obj.GetVariable("maptext_height").UnsafeGetValueAsFloat());
+                if(!maptextX.IsNull)
+                    maptextX = new(maptextX.UnsafeGetValueAsFloat() + obj.GetVariable("maptext_x").UnsafeGetValueAsFloat());
+                if(!maptextY.IsNull)
+                    maptextY = new(maptextY.UnsafeGetValueAsFloat() + obj.GetVariable("maptext_y").UnsafeGetValueAsFloat());
+                if(!luminosity.IsNull)
+                    luminosity = new(luminosity.UnsafeGetValueAsFloat() + obj.GetVariable("luminosity").UnsafeGetValueAsFloat());
+                if(!layer.IsNull)
+                    layer = new(layer.UnsafeGetValueAsFloat() + obj.GetVariable("layer").UnsafeGetValueAsFloat());
+                if(!alpha.IsNull)
+                    alpha = new(alpha.UnsafeGetValueAsFloat() + obj.GetVariable("alpha").UnsafeGetValueAsFloat());
+                if(!transform.IsNull) {
+                    if(transform.TryGetValueAsDreamObject<DreamObjectMatrix>(out var transformObj) && obj.GetVariable("transform").TryGetValueAsDreamObject<DreamObjectMatrix>(out var objTransform)){
+                        transform = objTransform.OperatorMultiply(transform);
+                    }
+                }
+                if(!color.IsNull) {
+                    ColorMatrix cMatrix;
+                    if(color.TryGetValueAsString(out var colorStr) && Color.TryParse(colorStr, out var colorObj)){
+                        cMatrix = new ColorMatrix(colorObj);
+                    } else if (color.TryGetValueAsDreamList(out var colorList) && DreamProcNativeHelpers.TryParseColorMatrix(colorList, out cMatrix)){
+                        //parsed as colormatrix
+                    } else {
+                        cMatrix = ColorMatrix.Identity; //fallback to identity if invalid
+                    }
+                    ColorMatrix objCMatrix;
+                    DreamValue objColor = obj.GetVariable("color");
+                    if(objColor.TryGetValueAsString(out var objColorStr) && Color.TryParse(objColorStr, out var objColorObj)){
+                        objCMatrix = new ColorMatrix(objColorObj);
+                    } else if (objColor.TryGetValueAsDreamList(out var objColorList) && DreamProcNativeHelpers.TryParseColorMatrix(objColorList, out objCMatrix)){
+                        //parsed as colormatrix
+                    } else {
+                        objCMatrix = ColorMatrix.Identity; //fallback to identity if invalid
+                    }
+                    ColorMatrix.Multiply(ref objCMatrix, ref cMatrix, out var resultMatrix);
+                    color = new DreamValue(new DreamList(bundle.ObjectTree.List.ObjectDefinition, resultMatrix.GetValues().Select(x => new DreamValue(x)).ToList(), null));
+                }
+
+
+            }
+
             bundle.AtomManager.AnimateAppearance(obj, TimeSpan.FromMilliseconds(time * 100), (AnimationEasing)easing, loop, flags, delay, chainAnim,
             appearance => {
                 if (!pixelX.IsNull) {

diff --git a/TestGame/renderer_tests.dm b/TestGame/renderer_tests.dm
@@ -334,8 +334,21 @@
 			animate(transform = matrix(), time = 5, easing=SINE_EASING)
 			animate(transform = matrix()*2, time = 5, easing=CIRCULAR_EASING)
 			animate(transform = matrix(), time = 5, easing=JUMP_EASING)
-		i++
-		if(i>5)
+		if(i==6)
+			usr << "relative color"
+			animate(usr, color="#ff0000", time=5, flags=ANIMATION_RELATIVE)
+			animate(color="#00ff00", time=5, flags=ANIMATION_RELATIVE)
+			animate(color="#0000ff", time=5, flags=ANIMATION_RELATIVE)
+		if(i==7)
+			usr << "relative transform"
+			animate(usr, transform = matrix()*2, time = 5, flags=ANIMATION_RELATIVE)
+			animate(transform = matrix()*0.5, time = 5, flags=ANIMATION_RELATIVE)
+		if(i==8)
+			usr << "more relative tests"
+			animate(usr, alpha=-125, pixel_x=16, time = 5, flags=ANIMATION_RELATIVE)
+			animate(alpha=125, pixel_x=-16, time = 5, flags=ANIMATION_RELATIVE)
+		i++;
+		if(i>8)
 			i = 0
 /obj/plaque/animation_test 
 	data = "<h3>Animation Test</h3><p>Click the button to apply a series of animations to your mob</p>"