rngine 0.6.0 → 0.7.0

package/README.md

@@ -21,28 +21,33 @@ configure({
   entities: [
     {
       id: 'player',
-      px: 400,
-      py: 400,
-      width: 40,
-      height: 40,
-      color: '#00ff00',
+      px: 420,
+      py: 420,
+      color: '#0f0',
+      shape: {
+        radius: 20,
+      },
     },
     {
       id: 'enemy_1',
-      px: 100,
-      py: 100,
-      width: 40,
-      height: 40,
-      color: '#ff0000',
+      px: 120,
+      py: 120,
+      color: '#f00',
+      shape: {
+        width: 40,
+        height: 40,
+      },
       vx: 1000,
     },
     {
       id: 'enemy_2',
-      px: 200,
-      py: 200,
-      width: 40,
-      height: 40,
-      color: '#ff0000',
+      px: 220,
+      py: 220,
+      color: '#f00',
+      shape: {
+        width: 40,
+        height: 40,
+      },
       vx: -1000,
     },
   ],
@@ -53,7 +58,10 @@ configure({
       onTick: (enemies) => {
         enemies.forEach((enemy) => {
           // reverse direction when reaching screen edges
-          if (enemy.px <= 0 || enemy.px + enemy.width >= 800) {
+          if (
+            enemy.px - enemy.width / 2 <= 0 ||
+            enemy.px + enemy.width / 2 >= 800
+          ) {
             update({ id: enemy.id, vx: -enemy.vx });
           }
         });
@@ -70,7 +78,7 @@ export default function App() {
 
 ## Concepts
 
-**Entities** are the objects in your game world. Each entity has a position, size, color, and velocity. See [`Entity`](./src/nativeTypes.ts).
+**Entities** are the objects in your game world. Each entity has a position, shape, color, and velocity. See [`Entity`](./src/nativeTypes.ts).
 
 **Systems** define your game logic. Each system optionally declares which entities it cares about via `entities`, which collision pairs to watch via `collisions`, or both. Systems run every tick receiving the resolved entities and any active collisions. See [`System`](./src/types.ts).
 

package/android/CMakeLists.txt

@@ -13,6 +13,7 @@ add_library(
         src/main/cpp/GameLoopJNI.cpp
         ../shared/GameLoop.cpp
         ../shared/GameMethods.cpp
+        ../shared/CollisionUtils.cpp
 )
 
 # Add Nitrogen specs :)

package/android/src/main/cpp/GameLoopJNI.cpp

@@ -3,6 +3,7 @@
 #include <cstdint>
 #include <jni.h>
 #include <mutex>
+#include <variant>
 
 extern "C" {
 JNIEXPORT jbyteArray JNICALL
@@ -46,14 +47,37 @@ Java_com_margelo_nitro_rngine_GameView_getSnapshot(JNIEnv *env, jobject) {
   }
 
   for (const auto &[_, entitySnapshot] : entitiesSnapshot) {
-    const auto entitySnapshotLeft =
-        static_cast<float>(entitySnapshot.px - (entitySnapshot.width / 2));
-    const auto entitySnapshotRight =
-        static_cast<float>(entitySnapshot.px + (entitySnapshot.width / 2));
-    const auto entitySnapshotTop =
-        static_cast<float>(entitySnapshot.py - (entitySnapshot.height / 2));
-    const auto entitySnapshotBottom =
-        static_cast<float>(entitySnapshot.py + (entitySnapshot.height / 2));
+    uint8_t shapeType{0};
+    float entitySnapshotLeft{0}, entitySnapshotRight{0}, entitySnapshotTop{0},
+        entitySnapshotBottom{0}, circleRadius{0};
+
+    std::visit(
+        [&](const auto &shape) {
+          using T = std::decay_t<decltype(shape)>;
+          if constexpr (std::is_same_v<T, margelo::nitro::rngine::Rect>) {
+            shapeType = 0;
+            entitySnapshotLeft =
+                static_cast<float>(entitySnapshot.px - shape.width / 2.0);
+            entitySnapshotRight =
+                static_cast<float>(entitySnapshot.px + shape.width / 2.0);
+            entitySnapshotTop =
+                static_cast<float>(entitySnapshot.py - shape.height / 2.0);
+            entitySnapshotBottom =
+                static_cast<float>(entitySnapshot.py + shape.height / 2.0);
+          } else {
+            shapeType = 1;
+            circleRadius = static_cast<float>(shape.radius);
+            entitySnapshotLeft =
+                static_cast<float>(entitySnapshot.px - shape.radius);
+            entitySnapshotRight =
+                static_cast<float>(entitySnapshot.px + shape.radius);
+            entitySnapshotTop =
+                static_cast<float>(entitySnapshot.py - shape.radius);
+            entitySnapshotBottom =
+                static_cast<float>(entitySnapshot.py + shape.radius);
+          }
+        },
+        entitySnapshot.shape);
 
     if (entitySnapshotRight < 0 || entitySnapshotLeft > screenSnapshot.width ||
         entitySnapshotBottom < 0 || entitySnapshotTop > screenSnapshot.height) {
@@ -65,10 +89,19 @@ Java_com_margelo_nitro_rngine_GameView_getSnapshot(JNIEnv *env, jobject) {
     const auto entitySnapshotAsset =
         static_cast<int32_t>(entitySnapshot.asset.value_or(0));
 
-    writeFloat(entitySnapshotLeft);
-    writeFloat(entitySnapshotRight);
-    writeFloat(entitySnapshotTop);
-    writeFloat(entitySnapshotBottom);
+    buffer.push_back(shapeType);
+
+    if (shapeType == 0) {
+      writeFloat(entitySnapshotLeft);
+      writeFloat(entitySnapshotRight);
+      writeFloat(entitySnapshotTop);
+      writeFloat(entitySnapshotBottom);
+    } else {
+      writeFloat(static_cast<float>(entitySnapshot.px));
+      writeFloat(static_cast<float>(entitySnapshot.py));
+      writeFloat(circleRadius);
+    }
+
     writeU32(entitySnapshotColor);
     writeI32(entitySnapshotAsset);
 

package/android/src/main/java/com/margelo/nitro/rngine/GameView.kt

@@ -1,7 +1,7 @@
 package com.margelo.nitro.rngine
 
 import android.content.Context
-import android.graphics.Color
+import android.graphics.Canvas
 import android.graphics.Paint
 import android.util.AttributeSet
 import android.view.SurfaceView
@@ -23,52 +23,93 @@ class GameView(
   var onDetached: () -> Unit = {}
 
   private val paint = Paint().apply {
-    color = Color.TRANSPARENT
     style = Paint.Style.FILL
   }
 
-  private fun drawRenderable(
-    canvas: android.graphics.Canvas,
+  private fun drawAsset(
+    canvas: Canvas,
     left: Float,
     top: Float,
     right: Float,
     bottom: Float,
-    color: Int,
     asset: Int,
     progress: Float?,
-    clampedLeft: Float = left,
-    clampedTop: Float = top,
-    clampedRight: Float = right,
-    clampedBottom: Float = bottom,
   ) {
-    paint.color = color
-    canvas.drawRect(clampedLeft, clampedTop, clampedRight, clampedBottom, paint)
-
-    canvas.withClip(clampedLeft, clampedTop, clampedRight, clampedBottom) {
-      withTranslation(left, top) {
-        when (val resolvedAsset = GameAssets.getAsset(asset)) {
-          is Asset.Svg -> {
-            scale(
-              (right - left) / resolvedAsset.picture.width,
-              (bottom - top) / resolvedAsset.picture.height
-            )
-            drawPicture(resolvedAsset.picture)
-          }
+    canvas.withTranslation(left, top) {
+      when (val resolvedAsset = GameAssets.getAsset(asset)) {
+        is Asset.Svg -> {
+          scale(
+            (right - left) / resolvedAsset.picture.width,
+            (bottom - top) / resolvedAsset.picture.height
+          )
+          drawPicture(resolvedAsset.picture)
+        }
 
-          is Asset.Lottie -> {
-            progress?.let {
-              resolvedAsset.drawable.progress = it
-            }
-            resolvedAsset.drawable.setBounds(0, 0, (right - left).toInt(), (bottom - top).toInt())
-            resolvedAsset.drawable.draw(canvas)
+        is Asset.Lottie -> {
+          progress?.let {
+            resolvedAsset.drawable.progress = it
           }
-
-          null -> {}
+          resolvedAsset.drawable.setBounds(0, 0, (right - left).toInt(), (bottom - top).toInt())
+          resolvedAsset.drawable.draw(canvas)
         }
+
+        null -> {}
       }
     }
   }
 
+  private fun drawRect(
+    canvas: Canvas,
+    left: Float,
+    top: Float,
+    right: Float,
+    bottom: Float,
+    color: Int,
+    asset: Int,
+    progress: Float?,
+  ) {
+    paint.color = color
+    canvas.drawRect(left, top, right, bottom, paint)
+
+    drawAsset(
+      canvas,
+      left,
+      top,
+      right,
+      bottom,
+      asset,
+      progress
+    )
+  }
+
+  private fun drawCircle(
+    canvas: Canvas,
+    cx: Float,
+    cy: Float,
+    radius: Float,
+    color: Int,
+    asset: Int,
+    progress: Float?,
+  ) {
+    val left = cx - radius
+    val top = cy - radius
+    val right = cx + radius
+    val bottom = cy + radius
+
+    paint.color = color
+    canvas.drawCircle(cx, cy, radius, paint)
+
+    drawAsset(
+      canvas,
+      left,
+      top,
+      right,
+      bottom,
+      asset,
+      progress,
+    )
+  }
+
   init {
     addOnAttachStateChangeListener(
       object : OnAttachStateChangeListener {
@@ -91,7 +132,7 @@ class GameView(
     val screenRight = screenLeft + snapshot.screen.width * scale
     val screenBottom = screenTop + snapshot.screen.height * scale
 
-    drawRenderable(
+    drawRect(
       canvas,
       screenLeft,
       screenTop,
@@ -102,31 +143,44 @@ class GameView(
       snapshot.screen.progress,
     )
 
-    snapshot.rects.forEach { rect ->
-      val left = rect.left * scale + screenLeft
-      val top = rect.top * scale + screenTop
-      val right = rect.right * scale + screenLeft
-      val bottom = rect.bottom * scale + screenTop
-
-      val clampedLeft = left.coerceAtLeast(screenLeft)
-      val clampedTop = top.coerceAtLeast(screenTop)
-      val clampedRight = right.coerceAtMost(screenLeft + snapshot.screen.width * scale)
-      val clampedBottom = bottom.coerceAtMost(screenTop + snapshot.screen.height * scale)
-
-      drawRenderable(
-        canvas,
-        left,
-        top,
-        right,
-        bottom,
-        rect.color,
-        rect.asset,
-        rect.progress,
-        clampedLeft,
-        clampedTop,
-        clampedRight,
-        clampedBottom
-      )
+    canvas.withClip(screenLeft, screenTop, screenRight, screenBottom) {
+      snapshot.shapes.forEach { shape ->
+        when (shape) {
+          is Shape.Rect -> {
+            val left = shape.left * scale + screenLeft
+            val top = shape.top * scale + screenTop
+            val right = shape.right * scale + screenLeft
+            val bottom = shape.bottom * scale + screenTop
+
+            drawRect(
+              canvas,
+              left,
+              top,
+              right,
+              bottom,
+              shape.color,
+              shape.asset,
+              shape.progress,
+            )
+          }
+
+          is Shape.Circle -> {
+            val cx = shape.px * scale + screenLeft
+            val cy = shape.py * scale + screenTop
+            val radius = shape.radius * scale
+
+            drawCircle(
+              canvas,
+              cx,
+              cy,
+              radius,
+              shape.color,
+              shape.asset,
+              shape.progress,
+            )
+          }
+        }
+      }
     }
     holder.unlockCanvasAndPost(canvas)
   }

package/android/src/main/java/com/margelo/nitro/rngine/Shape.kt

@@ -0,0 +1,26 @@
+package com.margelo.nitro.rngine
+
+sealed class Shape(
+  val color: Int,
+  val asset: Int,
+  val progress: Float?,
+) {
+  class Rect(
+    val left: Float,
+    val right: Float,
+    val top: Float,
+    val bottom: Float,
+    color: Int,
+    asset: Int,
+    progress: Float?,
+  ) : Shape(color, asset, progress)
+
+  class Circle(
+    val px: Float,
+    val py: Float,
+    val radius: Float,
+    color: Int,
+    asset: Int,
+    progress: Float?,
+  ) : Shape(color, asset, progress)
+}

package/android/src/main/java/com/margelo/nitro/rngine/Snapshot.kt

@@ -1,3 +1,3 @@
 package com.margelo.nitro.rngine
 
-data class Snapshot(val screen: Screen, val rects: List<Rect>)
+data class Snapshot(val screen: Screen, val shapes: List<Shape>)

package/android/src/main/java/com/margelo/nitro/rngine/SnapshotSerializer.kt

@@ -1,5 +1,6 @@
 package com.margelo.nitro.rngine
 
+import android.util.Log
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
 
@@ -14,20 +15,39 @@ object SnapshotSerializer {
     val progress = if (asset < 0) buffer.float else null
 
     val screen = Screen(width, height, color, asset, progress)
-    val rects = ArrayList<Rect>()
-
-    while (buffer.remaining() >= 24) {
-      val left = buffer.float
-      val right = buffer.float
-      val top = buffer.float
-      val bottom = buffer.float
-      val color = buffer.int
-      val asset = buffer.int
-      val progress = if (asset < 0) buffer.float else null
-
-      rects.add(Rect(left, right, top, bottom, color, asset, progress))
+    val shapes = ArrayList<Shape>()
+
+    while (buffer.hasRemaining()) {
+      when (val shapeType = buffer.get().toInt()) {
+        0 -> {
+          val left = buffer.float
+          val right = buffer.float
+          val top = buffer.float
+          val bottom = buffer.float
+
+          val color = buffer.int
+          val asset = buffer.int
+          val progress = if (asset < 0) buffer.float else null
+
+          shapes.add(Shape.Rect(left, right, top, bottom, color, asset, progress))
+        }
+
+        1 -> {
+          val px = buffer.float
+          val py = buffer.float
+          val radius = buffer.float
+
+          val color = buffer.int
+          val asset = buffer.int
+          val progress = if (asset < 0) buffer.float else null
+
+          shapes.add(Shape.Circle(px, py, radius, color, asset, progress))
+        }
+
+        else -> Log.e("SnapshotSerializer", "Unknown shapeType: $shapeType")
+      }
     }
 
-    return Snapshot(screen, rects)
+    return Snapshot(screen, shapes)
   }
 }

package/lib/typescript/src/nativeTypes.d.ts

@@ -4,12 +4,20 @@ interface Positioned {
     /** Y position in game units. */
     py: number;
 }
-interface Shaped {
+interface Rect {
     /** Width in game units. */
     width: number;
     /** Height in game units. */
     height: number;
 }
+interface Circle {
+    /** Radius in game units. */
+    radius: number;
+}
+interface Shaped {
+    /** Shape of the entity. */
+    shape: Rect | Circle;
+}
 interface Renderable {
     /** Fill color as a hex string e.g. `'#00ff00'`. */
     color?: string;
@@ -24,7 +32,7 @@ interface Kinematic {
     /** Velocity on the Y axis in game units per second. */
     vy?: number;
 }
-export interface Screen extends Shaped, Renderable {
+export interface Screen extends Rect, Renderable {
 }
 export interface Entity extends Positioned, Shaped, Renderable, Kinematic {
     /** Unique identifier. Use `_` as a separator for group queries e.g. `'enemy_1'`. */

package/lib/typescript/src/nativeTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nativeTypes.d.ts","sourceRoot":"","sources":["../../../src/nativeTypes.ts"],"names":[],"mappings":"AAAA,UAAU,UAAU;IAClB,gCAAgC;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,gCAAgC;IAChC,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,MAAM;IACd,2BAA2B;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,4BAA4B;IAC5B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,UAAU;IAClB,mDAAmD;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uEAAuE;IACvE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8FAA8F;IAC9F,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,SAAS;IACjB,uDAAuD;IACvD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,uDAAuD;IACvD,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,MAAO,SAAQ,MAAM,EAAE,UAAU;CAAG;AAErD,MAAM,WAAW,MAAO,SAAQ,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS;IACvE,oFAAoF;IACpF,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,YAAa,SAAQ,OAAO,CAC3C,UAAU,GAAG,MAAM,GAAG,UAAU,GAAG,SAAS,CAC7C;IACC,6DAA6D;IAC7D,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,aAAa;IAC5B,wDAAwD;IACxD,CAAC,EAAE,MAAM,CAAC;IACV,yDAAyD;IACzD,CAAC,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,SAAS;IACxB,wDAAwD;IACxD,CAAC,EAAE,MAAM,CAAC;IACV,yDAAyD;IACzD,CAAC,EAAE,MAAM,CAAC;IACV,0CAA0C;IAC1C,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,MAAM;IACrB,wDAAwD;IACxD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,+CAA+C;IAC/C,UAAU,CAAC,EAAE,aAAa,EAAE,CAAC;IAC7B,mEAAmE;IACnE,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,MAAM,CAAC;CACjE"}
+{"version":3,"file":"nativeTypes.d.ts","sourceRoot":"","sources":["../../../src/nativeTypes.ts"],"names":[],"mappings":"AAAA,UAAU,UAAU;IAClB,gCAAgC;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,gCAAgC;IAChC,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,IAAI;IACZ,2BAA2B;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,4BAA4B;IAC5B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,MAAM;IACd,4BAA4B;IAC5B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,MAAM;IACd,2BAA2B;IAC3B,KAAK,EAAE,IAAI,GAAG,MAAM,CAAC;CACtB;AAED,UAAU,UAAU;IAClB,mDAAmD;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uEAAuE;IACvE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8FAA8F;IAC9F,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,SAAS;IACjB,uDAAuD;IACvD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,uDAAuD;IACvD,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,MAAO,SAAQ,IAAI,EAAE,UAAU;CAAG;AAEnD,MAAM,WAAW,MAAO,SAAQ,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS;IACvE,oFAAoF;IACpF,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,YAAa,SAAQ,OAAO,CAC3C,UAAU,GAAG,MAAM,GAAG,UAAU,GAAG,SAAS,CAC7C;IACC,6DAA6D;IAC7D,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,aAAa;IAC5B,wDAAwD;IACxD,CAAC,EAAE,MAAM,CAAC;IACV,yDAAyD;IACzD,CAAC,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,SAAS;IACxB,wDAAwD;IACxD,CAAC,EAAE,MAAM,CAAC;IACV,yDAAyD;IACzD,CAAC,EAAE,MAAM,CAAC;IACV,0CAA0C;IAC1C,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,MAAM;IACrB,wDAAwD;IACxD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,+CAA+C;IAC/C,UAAU,CAAC,EAAE,aAAa,EAAE,CAAC;IAC7B,mEAAmE;IACnE,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,MAAM,CAAC;CACjE"}

package/nitrogen/generated/shared/c++/Circle.hpp

@@ -0,0 +1,83 @@
+///
+/// Circle.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#if __has_include(<NitroModules/JSIConverter.hpp>)
+#include <NitroModules/JSIConverter.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/NitroDefines.hpp>)
+#include <NitroModules/NitroDefines.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/JSIHelpers.hpp>)
+#include <NitroModules/JSIHelpers.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
+
+
+
+
+namespace margelo::nitro::rngine {
+
+  /**
+   * A struct which can be represented as a JavaScript object (Circle).
+   */
+  struct Circle final {
+  public:
+    double radius     SWIFT_PRIVATE;
+
+  public:
+    Circle() = default;
+    explicit Circle(double radius): radius(radius) {}
+
+  public:
+    friend bool operator==(const Circle& lhs, const Circle& rhs) = default;
+  };
+
+} // namespace margelo::nitro::rngine
+
+namespace margelo::nitro {
+
+  // C++ Circle <> JS Circle (object)
+  template <>
+  struct JSIConverter<margelo::nitro::rngine::Circle> final {
+    static inline margelo::nitro::rngine::Circle fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+      jsi::Object obj = arg.asObject(runtime);
+      return margelo::nitro::rngine::Circle(
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "radius")))
+      );
+    }
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngine::Circle& arg) {
+      jsi::Object obj(runtime);
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "radius"), JSIConverter<double>::toJSI(runtime, arg.radius));
+      return obj;
+    }
+    static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
+      if (!value.isObject()) {
+        return false;
+      }
+      jsi::Object obj = value.getObject(runtime);
+      if (!nitro::isPlainObject(runtime, obj)) {
+        return false;
+      }
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "radius")))) return false;
+      return true;
+    }
+  };
+
+} // namespace margelo::nitro

package/nitrogen/generated/shared/c++/Entity.hpp

@@ -28,9 +28,15 @@
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
 
-
+// Forward declaration of `Rect` to properly resolve imports.
+namespace margelo::nitro::rngine { struct Rect; }
+// Forward declaration of `Circle` to properly resolve imports.
+namespace margelo::nitro::rngine { struct Circle; }
 
 #include <string>
+#include "Rect.hpp"
+#include "Circle.hpp"
+#include <variant>
 #include <optional>
 
 namespace margelo::nitro::rngine {
@@ -43,8 +49,7 @@ namespace margelo::nitro::rngine {
     std::string id     SWIFT_PRIVATE;
     double px     SWIFT_PRIVATE;
     double py     SWIFT_PRIVATE;
-    double width     SWIFT_PRIVATE;
-    double height     SWIFT_PRIVATE;
+    std::variant<Rect, Circle> shape     SWIFT_PRIVATE;
     std::optional<std::string> color     SWIFT_PRIVATE;
     std::optional<double> asset     SWIFT_PRIVATE;
     std::optional<double> progress     SWIFT_PRIVATE;
@@ -53,7 +58,7 @@ namespace margelo::nitro::rngine {
 
   public:
     Entity() = default;
-    explicit Entity(std::string id, double px, double py, double width, double height, std::optional<std::string> color, std::optional<double> asset, std::optional<double> progress, std::optional<double> vx, std::optional<double> vy): id(id), px(px), py(py), width(width), height(height), color(color), asset(asset), progress(progress), vx(vx), vy(vy) {}
+    explicit Entity(std::string id, double px, double py, std::variant<Rect, Circle> shape, std::optional<std::string> color, std::optional<double> asset, std::optional<double> progress, std::optional<double> vx, std::optional<double> vy): id(id), px(px), py(py), shape(shape), color(color), asset(asset), progress(progress), vx(vx), vy(vy) {}
 
   public:
     friend bool operator==(const Entity& lhs, const Entity& rhs) = default;
@@ -72,8 +77,7 @@ namespace margelo::nitro {
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "id"))),
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "px"))),
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "py"))),
-        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "width"))),
-        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "height"))),
+        JSIConverter<std::variant<margelo::nitro::rngine::Rect, margelo::nitro::rngine::Circle>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "shape"))),
         JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "color"))),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "asset"))),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "progress"))),
@@ -86,8 +90,7 @@ namespace margelo::nitro {
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "id"), JSIConverter<std::string>::toJSI(runtime, arg.id));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "px"), JSIConverter<double>::toJSI(runtime, arg.px));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "py"), JSIConverter<double>::toJSI(runtime, arg.py));
-      obj.setProperty(runtime, PropNameIDCache::get(runtime, "width"), JSIConverter<double>::toJSI(runtime, arg.width));
-      obj.setProperty(runtime, PropNameIDCache::get(runtime, "height"), JSIConverter<double>::toJSI(runtime, arg.height));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "shape"), JSIConverter<std::variant<margelo::nitro::rngine::Rect, margelo::nitro::rngine::Circle>>::toJSI(runtime, arg.shape));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "color"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.color));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "asset"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.asset));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "progress"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.progress));
@@ -106,8 +109,7 @@ namespace margelo::nitro {
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "id")))) return false;
       if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "px")))) return false;
       if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "py")))) return false;
-      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "width")))) return false;
-      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "height")))) return false;
+      if (!JSIConverter<std::variant<margelo::nitro::rngine::Rect, margelo::nitro::rngine::Circle>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "shape")))) return false;
       if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "color")))) return false;
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "asset")))) return false;
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "progress")))) return false;

package/nitrogen/generated/shared/c++/EntityUpdate.hpp

@@ -28,10 +28,16 @@
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
 
-
+// Forward declaration of `Rect` to properly resolve imports.
+namespace margelo::nitro::rngine { struct Rect; }
+// Forward declaration of `Circle` to properly resolve imports.
+namespace margelo::nitro::rngine { struct Circle; }
 
 #include <string>
 #include <optional>
+#include "Rect.hpp"
+#include "Circle.hpp"
+#include <variant>
 
 namespace margelo::nitro::rngine {
 
@@ -43,8 +49,7 @@ namespace margelo::nitro::rngine {
     std::string id     SWIFT_PRIVATE;
     std::optional<double> px     SWIFT_PRIVATE;
     std::optional<double> py     SWIFT_PRIVATE;
-    std::optional<double> width     SWIFT_PRIVATE;
-    std::optional<double> height     SWIFT_PRIVATE;
+    std::optional<std::variant<Rect, Circle>> shape     SWIFT_PRIVATE;
     std::optional<std::string> color     SWIFT_PRIVATE;
     std::optional<double> asset     SWIFT_PRIVATE;
     std::optional<double> progress     SWIFT_PRIVATE;
@@ -53,7 +58,7 @@ namespace margelo::nitro::rngine {
 
   public:
     EntityUpdate() = default;
-    explicit EntityUpdate(std::string id, std::optional<double> px, std::optional<double> py, std::optional<double> width, std::optional<double> height, std::optional<std::string> color, std::optional<double> asset, std::optional<double> progress, std::optional<double> vx, std::optional<double> vy): id(id), px(px), py(py), width(width), height(height), color(color), asset(asset), progress(progress), vx(vx), vy(vy) {}
+    explicit EntityUpdate(std::string id, std::optional<double> px, std::optional<double> py, std::optional<std::variant<Rect, Circle>> shape, std::optional<std::string> color, std::optional<double> asset, std::optional<double> progress, std::optional<double> vx, std::optional<double> vy): id(id), px(px), py(py), shape(shape), color(color), asset(asset), progress(progress), vx(vx), vy(vy) {}
 
   public:
     friend bool operator==(const EntityUpdate& lhs, const EntityUpdate& rhs) = default;
@@ -72,8 +77,7 @@ namespace margelo::nitro {
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "id"))),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "px"))),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "py"))),
-        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "width"))),
-        JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "height"))),
+        JSIConverter<std::optional<std::variant<margelo::nitro::rngine::Rect, margelo::nitro::rngine::Circle>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "shape"))),
         JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "color"))),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "asset"))),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "progress"))),
@@ -86,8 +90,7 @@ namespace margelo::nitro {
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "id"), JSIConverter<std::string>::toJSI(runtime, arg.id));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "px"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.px));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "py"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.py));
-      obj.setProperty(runtime, PropNameIDCache::get(runtime, "width"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.width));
-      obj.setProperty(runtime, PropNameIDCache::get(runtime, "height"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.height));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "shape"), JSIConverter<std::optional<std::variant<margelo::nitro::rngine::Rect, margelo::nitro::rngine::Circle>>>::toJSI(runtime, arg.shape));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "color"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.color));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "asset"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.asset));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "progress"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.progress));
@@ -106,8 +109,7 @@ namespace margelo::nitro {
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "id")))) return false;
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "px")))) return false;
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "py")))) return false;
-      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "width")))) return false;
-      if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "height")))) return false;
+      if (!JSIConverter<std::optional<std::variant<margelo::nitro::rngine::Rect, margelo::nitro::rngine::Circle>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "shape")))) return false;
       if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "color")))) return false;
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "asset")))) return false;
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "progress")))) return false;

package/nitrogen/generated/shared/c++/Rect.hpp

@@ -0,0 +1,87 @@
+///
+/// Rect.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#if __has_include(<NitroModules/JSIConverter.hpp>)
+#include <NitroModules/JSIConverter.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/NitroDefines.hpp>)
+#include <NitroModules/NitroDefines.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/JSIHelpers.hpp>)
+#include <NitroModules/JSIHelpers.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
+
+
+
+
+namespace margelo::nitro::rngine {
+
+  /**
+   * A struct which can be represented as a JavaScript object (Rect).
+   */
+  struct Rect final {
+  public:
+    double width     SWIFT_PRIVATE;
+    double height     SWIFT_PRIVATE;
+
+  public:
+    Rect() = default;
+    explicit Rect(double width, double height): width(width), height(height) {}
+
+  public:
+    friend bool operator==(const Rect& lhs, const Rect& rhs) = default;
+  };
+
+} // namespace margelo::nitro::rngine
+
+namespace margelo::nitro {
+
+  // C++ Rect <> JS Rect (object)
+  template <>
+  struct JSIConverter<margelo::nitro::rngine::Rect> final {
+    static inline margelo::nitro::rngine::Rect fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+      jsi::Object obj = arg.asObject(runtime);
+      return margelo::nitro::rngine::Rect(
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "width"))),
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "height")))
+      );
+    }
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngine::Rect& arg) {
+      jsi::Object obj(runtime);
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "width"), JSIConverter<double>::toJSI(runtime, arg.width));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "height"), JSIConverter<double>::toJSI(runtime, arg.height));
+      return obj;
+    }
+    static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
+      if (!value.isObject()) {
+        return false;
+      }
+      jsi::Object obj = value.getObject(runtime);
+      if (!nitro::isPlainObject(runtime, obj)) {
+        return false;
+      }
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "width")))) return false;
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "height")))) return false;
+      return true;
+    }
+  };
+
+} // namespace margelo::nitro

package/package.json

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

package/shared/CollisionUtils.cpp

@@ -0,0 +1,67 @@
+#include "CollisionUtils.hpp"
+
+namespace margelo::nitro::rngine::CollisionUtils {
+std::optional<double> overlap(const Rect &a, double ax, double ay,
+                              const Rect &b, double bx, double by) {
+
+  double aLeft = ax - a.width / 2.0, aRight = ax + a.width / 2.0;
+  double aTop = ay - a.height / 2.0, aBottom = ay + a.height / 2.0;
+  double bLeft = bx - b.width / 2.0, bRight = bx + b.width / 2.0;
+  double bTop = by - b.height / 2.0, bBottom = by + b.height / 2.0;
+
+  double overlapX = std::min(aRight, bRight) - std::max(aLeft, bLeft);
+  double overlapY = std::min(aBottom, bBottom) - std::max(aTop, bTop);
+
+  if (overlapX > 0 && overlapY > 0)
+    return std::min(overlapX, overlapY);
+  return std::nullopt;
+}
+
+std::optional<double> overlap(const Circle &a, double ax, double ay,
+                              const Circle &b, double bx, double by) {
+  double dx = bx - ax, dy = by - ay;
+  double dist = std::sqrt(dx * dx + dy * dy);
+  double depth = (a.radius + b.radius) - dist;
+
+  if (depth > 0)
+    return depth;
+  return std::nullopt;
+}
+
+std::optional<double> overlap(const Rect &a, double ax, double ay,
+                              const Circle &b, double bx, double by) {
+  double left = ax - a.width / 2.0, right = ax + a.width / 2.0;
+  double top = ay - a.height / 2.0, bottom = ay + a.height / 2.0;
+
+  double closestX = std::clamp(bx, left, right);
+  double closestY = std::clamp(by, top, bottom);
+
+  double dx = bx - closestX, dy = by - closestY;
+  double distSq = dx * dx + dy * dy;
+
+  if (distSq >= b.radius * b.radius)
+    return std::nullopt;
+
+  double dist = std::sqrt(distSq);
+  return b.radius - dist;
+}
+
+std::optional<double> overlap(const Circle &a, double ax, double ay,
+                              const Rect &b, double bx, double by) {
+  return overlap(b, bx, by, a, ax, ay);
+}
+
+std::optional<double> shapeOverlap(const Entity &entityA,
+                                   const Entity &entityB) {
+  return std::visit(
+      [&](const auto &shapeA) -> std::optional<double> {
+        return std::visit(
+            [&](const auto &shapeB) -> std::optional<double> {
+              return overlap(shapeA, entityA.px, entityA.py, shapeB, entityB.px,
+                             entityB.py);
+            },
+            entityB.shape);
+      },
+      entityA.shape);
+}
+} // namespace margelo::nitro::rngine::CollisionUtils

package/shared/CollisionUtils.hpp

@@ -0,0 +1,19 @@
+#pragma once
+
+#include "Circle.hpp"
+#include "Entity.hpp"
+#include "Rect.hpp"
+#include <optional>
+
+namespace margelo::nitro::rngine::CollisionUtils {
+std::optional<double> overlap(const Rect &a, double ax, double ay,
+                              const Rect &b, double bx, double by);
+std::optional<double> overlap(const Circle &a, double ax, double ay,
+                              const Circle &b, double bx, double by);
+std::optional<double> overlap(const Rect &a, double ax, double ay,
+                              const Circle &b, double bx, double by);
+std::optional<double> overlap(const Circle &a, double ax, double ay,
+                              const Rect &b, double bx, double by);
+std::optional<double> shapeOverlap(const Entity &entityA,
+                                   const Entity &entityB);
+} // namespace margelo::nitro::rngine::CollisionUtils

package/shared/GameLoop.cpp

@@ -1,5 +1,6 @@
 #include "GameLoop.hpp"
 #include "Collision.hpp"
+#include "CollisionUtils.hpp"
 #include "Entity.hpp"
 #include <android/log.h>
 #include <chrono>
@@ -113,8 +114,8 @@ void GameLoop::runSystems() {
         auto resolvedEntitiesInternalA = resolveEntitiesInternal(a);
         auto resolvedEntitiesInternalB = resolveEntitiesInternal(b);
 
-        for (auto *entityA : resolvedEntitiesInternalA) {
-          for (auto *entityB : resolvedEntitiesInternalB) {
+        for (const auto &entityA : resolvedEntitiesInternalA) {
+          for (const auto &entityB : resolvedEntitiesInternalB) {
             if (entityA == entityB)
               continue;
 
@@ -125,22 +126,9 @@ void GameLoop::runSystems() {
 
             uniqueEntityIdPairs.insert(uniqueEntityIdPairKey);
 
-            double aLeft = entityA->px - entityA->width / 2.0;
-            double aRight = entityA->px + entityA->width / 2.0;
-            double aTop = entityA->py - entityA->height / 2.0;
-            double aBottom = entityA->py + entityA->height / 2.0;
-
-            double bLeft = entityB->px - entityB->width / 2.0;
-            double bRight = entityB->px + entityB->width / 2.0;
-            double bTop = entityB->py - entityB->height / 2.0;
-            double bBottom = entityB->py + entityB->height / 2.0;
-
-            double overlapX = std::min(aRight, bRight) - std::max(aLeft, bLeft);
-            double overlapY = std::min(aBottom, bBottom) - std::max(aTop, bTop);
-
-            if (overlapX > 0 && overlapY > 0) {
-              collisions.push_back(Collision(entityA->id, entityB->id,
-                                             std::min(overlapX, overlapY)));
+            if (auto ov = CollisionUtils::shapeOverlap(*entityA, *entityB)) {
+              collisions.push_back(
+                  Collision(entityA->id, entityB->id, ov.value()));
             }
           }
         }

package/shared/GameMethods.cpp

@@ -127,11 +127,8 @@ void GameMethods::update(const std::vector<EntityUpdate> &updates) {
       if (update.py.has_value()) {
         entity->py = update.py.value();
       }
-      if (update.width.has_value()) {
-        entity->width = update.width.value();
-      }
-      if (update.height.has_value()) {
-        entity->height = update.height.value();
+      if (update.shape.has_value()) {
+        entity->shape = update.shape.value();
       }
       if (update.asset.has_value()) {
         entity->asset = update.asset.value();

package/src/nativeTypes.ts

@@ -5,13 +5,23 @@ interface Positioned {
   py: number;
 }
 
-interface Shaped {
+interface Rect {
   /** Width in game units. */
   width: number;
   /** Height in game units. */
   height: number;
 }
 
+interface Circle {
+  /** Radius in game units. */
+  radius: number;
+}
+
+interface Shaped {
+  /** Shape of the entity. */
+  shape: Rect | Circle;
+}
+
 interface Renderable {
   /** Fill color as a hex string e.g. `'#00ff00'`. */
   color?: string;
@@ -28,7 +38,7 @@ interface Kinematic {
   vy?: number;
 }
 
-export interface Screen extends Shaped, Renderable {}
+export interface Screen extends Rect, Renderable {}
 
 export interface Entity extends Positioned, Shaped, Renderable, Kinematic {
   /** Unique identifier. Use `_` as a separator for group queries e.g. `'enemy_1'`. */

package/android/src/main/java/com/margelo/nitro/rngine/Rect.kt

@@ -1,11 +0,0 @@
-package com.margelo.nitro.rngine
-
-data class Rect(
-  val left: Float,
-  val right: Float,
-  val top: Float,
-  val bottom: Float,
-  val color: Int,
-  val asset: Int,
-  val progress: Float?,
-)