ATITD-Tools/Desert-Paint-Codex Changeset

Changeset - dd8780bb11c5

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Jason Maltzen - 3 years ago 2021-09-08 13:03:28
jason@hiddenachievement.com

Correct an error when computing the clipped value on white shifts. It was incorrectly detecting a white shift on single-color clips, resulting in a bad reaction computation. Also don't display the wrong 'observed' color after clearing a reaction.

1 file changed with 7 insertions and 6 deletions:

Models/ReactionTest.cs

0 comments (0 inline, 0 general)

Models/ReactionTest.cs

➞

Show inline comments

@@ ... / @@ -214,28 +214,28 @@ namespace DesertPaintCodex.Models @@
                         bool extrapolated = false;
                         // SPECIAL CASE:
                         // Check to see if we've got a white-shift reaction that's partially clipped, where we can
                         // still extrapolate the reaction, based on the available information.
                         if (!testing3Way && (reaction != null))
+                        {
                             PaintColor baseColor = _recipe.BaseColor;
                             if ((reaction.Red < baseColor.Red) &&
                                 (reaction.Green < baseColor.Green) &&
                                 (reaction.Blue < baseColor.Blue))
                             if ((reaction.Red < 0) &&
                                 (reaction.Green < 0) &&
                                 (reaction.Blue < 0))
+                            {
                                 // White-shift down clip.
                                 extrapolated                    = ExtrapolateWhiteFromOneChannel(_observedColor.Red,   0, reaction.Red);
                                 if (!extrapolated) extrapolated = ExtrapolateWhiteFromOneChannel(_observedColor.Green, 0, reaction.Green);
                                 if (!extrapolated)                ExtrapolateWhiteFromOneChannel(_observedColor.Blue,  0, reaction.Blue);
+                            }
                             else if ((reaction.Red > baseColor.Red) &&
                                 (reaction.Green > baseColor.Green) &&
                                 (reaction.Blue > baseColor.Blue))
                             else if ((reaction.Red > 0) &&
                                 (reaction.Green > 0) &&
                                 (reaction.Blue > 0))
+                            {
                                 // White-shift up clip.
                                 extrapolated                    = ExtrapolateWhiteFromOneChannel(_observedColor.Red,   255, reaction.Red);
                                 if (!extrapolated) extrapolated = ExtrapolateWhiteFromOneChannel(_observedColor.Green, 255, reaction.Green);
                                 if (!extrapolated)                ExtrapolateWhiteFromOneChannel(_observedColor.Blue,  255, reaction.Blue);
+                            }
+                        }
@@ ... / @@ -295,16 +295,17 @@ namespace DesertPaintCodex.Models @@
             BufferReagentFirst = null;
             BufferReagentLast = null;
             Reaction = null;
             BadReaction = null;
             Clipped = ClipType.None;
             State = TestState.Untested;
             ObservedColor = null; // Clear it out
             UpdateRecipe();
+        }
         public void SaveReaction()
+        {
             PlayerProfile? profile = ProfileManager.CurrentProfile;
             if (profile == null) return;

0 comments (0 inline, 0 general)