Merge pull request #1 from tomekzaw/circle-shape

Add circle shape

Author: hannojg

cpp/JSIBox2dApi.h

@@ -10,6 +10,7 @@
 #include "JSIBox2dWorld.h"
 #include "JSIBox2dBodyDef.h"
 #include "JSIBox2dPolygonShape.h"
+#include "JSIBox2dCircleShape.h"
 #include "JSIBox2dFixtureDef.h"
 
 namespace Box2d {
@@ -22,6 +23,7 @@ namespace Box2d {
             installFunction("b2World", JSIBox2dWorld::createCtor());
             installFunction("b2BodyDef", JSIBox2dBodyDef::createCtor());
             installFunction("b2PolygonShape", JSIBox2dPolygonShape::createCtor());
+            installFunction("b2CircleShape", JSIBox2dCircleShape::createCtor());
             installFunction("b2FixtureDef", JSIBox2dFixtureDef::createCtor());
         }
     };

cpp/JSIBox2dCircleShape.h

@@ -0,0 +1,53 @@
+//
+// Created by Tomek Zawadzki on 26.02.23.
+//
+
+#pragma once
+
+#include "box2d/b2_circle_shape.h"
+
+namespace Box2d {
+    using namespace facebook;
+
+    class JSIBox2dCircleShape : public JsiWrappingSharedPtrHostObject<b2CircleShape> {
+    public:
+
+        JSI_HOST_FUNCTION(SetRadius) {
+            getObject()->m_radius = arguments[0].asNumber();
+            return jsi::Value::undefined();
+        }
+
+        JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JSIBox2dCircleShape, SetRadius))
+
+        /**
+         * Constructor
+         */
+        JSIBox2dCircleShape(const b2CircleShape &shape)
+                : JsiWrappingSharedPtrHostObject<b2CircleShape>(
+                std::make_shared<b2CircleShape>(std::move(shape))) {}
+
+        /**
+        * Returns the underlying object from a host object of this type
+        */
+        static std::shared_ptr<b2CircleShape> fromValue(jsi::Runtime &runtime,
+                                                         const jsi::Value &obj) {
+            return obj.asObject(runtime)
+                    .asHostObject<JSIBox2dCircleShape>(runtime)
+                    ->getObject();
+        }
+
+        static const jsi::HostFunctionType
+        createCtor() {
+            return JSI_HOST_FUNCTION_LAMBDA {
+                b2CircleShape shape;
+
+                return jsi::Object::createFromHostObject(
+                        runtime,
+                        std::make_shared<JSIBox2dCircleShape>(
+                                std::move(shape)
+                        )
+                );
+            };
+        };
+    };
+}

cpp/utils.h

@@ -7,6 +7,7 @@
 #include "box2d/b2_shape.h"
 #include "JSIBox2dShape.h"
 #include "JSIBox2dPolygonShape.h"
+#include "JSIBox2dCircleShape.h"
 
 namespace Box2d {
     class Utils {
@@ -17,6 +18,9 @@ namespace Box2d {
                 if (obj.isHostObject<JSIBox2dPolygonShape>(runtime)) {
                     return JSIBox2dPolygonShape::fromValue(runtime, value).get();
                 }
+                if (obj.isHostObject<JSIBox2dCircleShape>(runtime)) {
+                    return JSIBox2dCircleShape::fromValue(runtime, value).get();
+                }
             }
             return nullptr;
         }

src/Box2d.ts

@@ -1,6 +1,7 @@
 import { NativeModules, Platform } from 'react-native';
 import type {
   b2BodyDef,
+  b2CircleShape,
   b2FixtureDef,
   b2PolygonShape,
   b2Vec2,
@@ -18,6 +19,7 @@ declare global {
         b2World: (vec: b2Vec2) => b2World;
         b2BodyDef: () => b2BodyDef;
         b2PolygonShape: () => b2PolygonShape;
+        b2CircleShape: () => b2CircleShape;
         b2FixtureDef: () => b2FixtureDef;
       };
 }

src/types.ts

@@ -35,6 +35,15 @@ export interface b2PolygonShape extends b2Shape {
   SetAsBox(hx: number, hy: number): void;
 }
 
+export interface b2CircleShape extends b2Shape {
+  /**
+   * Set the radius of the circle.
+   * @param r Radius of the circle.
+   * @return Circle shape.
+   **/
+  SetRadius(r: number): void;
+}
+
 export interface b2FixtureDef {
   /**
    * The density, usually in kg/m^2.