Cryptomatte: Data structure in compositor node

This changes the way how the mattes are stored in the compositor node. This used to
be a single string what was decoded/encoded when needed. The new data structure
stores all entries in `CryptomatteEntry` and is converted to the old `matte_id`
property on the fly.

This is done for some future changes in the workflow where a more structured
approach leads to less confusing and easier to read code.

1 files changed, 8 insertions, 45 deletions

diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cpp b/source/blender/compositor/nodes/COM_CryptomatteNode.cpp
index 8cc6b933759..7ca4e1f76fc 100644
--- a/source/blender/compositor/nodes/COM_CryptomatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cpp
@@ -17,12 +17,15 @@
  */
 
 #include "COM_CryptomatteNode.h"
-#include "BLI_assert.h"
-#include "BLI_hash_mm3.h"
-#include "BLI_string.h"
 #include "COM_ConvertOperation.h"
 #include "COM_CryptomatteOperation.h"
 #include "COM_SetAlphaOperation.h"
+
+#include "BLI_assert.h"
+#include "BLI_hash_mm3.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"
+
 #include <iterator>
 
 CryptomatteNode::CryptomatteNode(bNode *editorNode) : Node(editorNode)
@@ -30,24 +33,6 @@ CryptomatteNode::CryptomatteNode(bNode *editorNode) : Node(editorNode)
   /* pass */
 }
 
-/* This is taken from the Cryptomatte specification 1.0. */
-static inline float hash_to_float(uint32_t hash)
-{
-  uint32_t mantissa = hash & ((1 << 23) - 1);
-  uint32_t exponent = (hash >> 23) & ((1 << 8) - 1);
-  exponent = max(exponent, (uint32_t)1);
-  exponent = min(exponent, (uint32_t)254);
-  exponent = exponent << 23;
-  uint32_t sign = (hash >> 31);
-  sign = sign << 31;
-  uint32_t float_bits = sign | exponent | mantissa;
-  float f;
-  /* Bit casting relies on equal size for both types. */
-  BLI_STATIC_ASSERT(sizeof(float) == sizeof(uint32_t), "float and uint32_t are not the same size")
-  ::memcpy(&f, &float_bits, sizeof(float));
-  return f;
-}
-
 void CryptomatteNode::convertToOperations(NodeConverter &converter,
                                           const CompositorContext & /*context*/) const
 {
@@ -61,30 +46,8 @@ void CryptomatteNode::convertToOperations(NodeConverter &converter,
 
   CryptomatteOperation *operation = new CryptomatteOperation(getNumberOfInputSockets() - 1);
   if (cryptoMatteSettings) {
-    if (cryptoMatteSettings->matte_id) {
-      /* Split the string by commas, ignoring white space. */
-      std::string input = cryptoMatteSettings->matte_id;
-      std::istringstream ss(input);
-      while (ss.good()) {
-        std::string token;
-        getline(ss, token, ',');
-        /* Ignore empty tokens. */
-        if (token.length() > 0) {
-          size_t first = token.find_first_not_of(' ');
-          size_t last = token.find_last_not_of(' ');
-          if (first == std::string::npos || last == std::string::npos) {
-            break;
-          }
-          token = token.substr(first, (last - first + 1));
-          if (*token.begin() == '<' && *(--token.end()) == '>') {
-            operation->addObjectIndex(atof(token.substr(1, token.length() - 2).c_str()));
-          }
-          else {
-            uint32_t hash = BLI_hash_mm3((const unsigned char *)token.c_str(), token.length(), 0);
-            operation->addObjectIndex(hash_to_float(hash));
-          }
-        }
-      }
+    LISTBASE_FOREACH (CryptomatteEntry *, cryptomatte_entry, &cryptoMatteSettings->entries) {
+      operation->addObjectIndex(cryptomatte_entry->encoded_hash);
     }
   }