rngine 0.11.5 → 0.11.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rngine",
-  "version": "0.11.5",
+  "version": "0.11.6",
   "description": "React Native 2D game engine powered by Nitro Modules",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/shared/GameRenderer.cpp

@@ -173,7 +173,7 @@ void GameRenderer::render(const Screen &screen,
   canvas->clipRect(gameBounds);
 
   if (screen.color.has_value()) {
-    canvas->clear(ColorUtils::parseHexColor(screen.color.value()));
+    canvas->clear(ColorUtils::parseString(screen.color.value()));
   }
 
   if (screen.asset.has_value() && screen.asset.value() != 0) {
@@ -201,7 +201,7 @@ void GameRenderer::render(const Screen &screen,
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setStyle(SkPaint::kFill_Style);
-        paint.setColor(ColorUtils::parseHexColor(entity.color.value()));
+        paint.setColor(ColorUtils::parseString(entity.color.value()));
 
         std::visit(
             [&](const auto &shape) {

package/shared/utils/ColorUtils.cpp

@@ -1,33 +1,14 @@
 #include "ColorUtils.hpp"
+#include <react/renderer/css/CSSColor.h>
+#include <react/renderer/css/CSSValueParser.h>
 
 namespace margelo::nitro::rngine::ColorUtils {
-uint32_t parseHexColor(const std::string &color) {
-  const std::string &c = color;
-  if (!c.empty() && c[0] == '#') {
-    std::string hex = c.substr(1);
-
-    if (hex.size() == 3 || hex.size() == 4) {
-      std::string expanded;
-      expanded.reserve(hex.size() * 2);
-      for (char ch : hex) {
-        expanded += ch;
-        expanded += ch;
-      }
-      hex = std::move(expanded);
-    }
-
-    if (hex.size() == 6) {
-      return 0xFF000000 | std::stoul(hex, nullptr, 16);
-    } else if (hex.size() == 8) {
-      uint32_t rgba = std::stoul(hex, nullptr, 16);
-      uint32_t r = (rgba >> 24) & 0xFF;
-      uint32_t g = (rgba >> 16) & 0xFF;
-      uint32_t b = (rgba >> 8) & 0xFF;
-      uint32_t a = rgba & 0xFF;
-      return (a << 24) | (r << 16) | (g << 8) | b;
-    }
+uint32_t parseString(const std::string &s) {
+  auto v = facebook::react::parseCSSProperty<facebook::react::CSSColor>(s);
+  if (auto *c = std::get_if<facebook::react::CSSColor>(&v)) {
+    return (uint32_t(c->a) << 24) | (uint32_t(c->r) << 16) |
+           (uint32_t(c->g) << 8) | c->b; // 0xAARRGGBB
   }
-
   return 0x00000000;
 }
 } // namespace margelo::nitro::rngine::ColorUtils

package/shared/utils/ColorUtils.hpp

@@ -3,5 +3,5 @@
 #include <string>
 
 namespace margelo::nitro::rngine::ColorUtils {
-uint32_t parseHexColor(const std::string &color);
+uint32_t parseString(const std::string &color);
 } // namespace margelo::nitro::rngine::ColorUtils