formatting cpp code

margelo · Oct 15, 2024 · 4c7f90f · 4c7f90f
1 parent 985499d
commit 4c7f90f
Show file tree

Hide file tree

Showing 26 changed files with 81 additions and 86 deletions.
diff --git a/package/cpp/RNFChoreographer.cpp b/package/cpp/RNFChoreographer.cpp
@@ -2,9 +2,9 @@
 // Created by Marc Rousavy on 23.02.24.
 //
 
-#include "RNFLogger.h"
 #include "RNFChoreographer.h"
 #include "RNFListenerManager.h"
+#include "RNFLogger.h"
 
 namespace margelo {
 

diff --git a/package/cpp/RNFChoreographer.h b/package/cpp/RNFChoreographer.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "RNFLogger.h"
 #include "RNFListener.h"
 #include "RNFListenerManager.h"
+#include "RNFLogger.h"
 #include <functional>
 
 namespace margelo {

diff --git a/package/cpp/RNFChoreographerWrapper.cpp b/package/cpp/RNFChoreographerWrapper.cpp
@@ -90,7 +90,7 @@ void ChoreographerWrapper::release() {
 }
 
 // TODO: nitro is this still needed? I don't think so
-//void ChoreographerWrapper::onRuntimeDestroyed(jsi::Runtime*) {
+// void ChoreographerWrapper::onRuntimeDestroyed(jsi::Runtime*) {
 //  std::unique_lock lock(_mutex);
 //  Logger::log(TAG, "Runtime destroyed...");
 //  stopAndRemoveListeners();

diff --git a/package/cpp/RNFFilamentBuffer.h b/package/cpp/RNFFilamentBuffer.h
@@ -9,7 +9,7 @@ class FilamentBuffer : public PointerHolder<ManagedBuffer> {
 public:
   explicit FilamentBuffer(std::shared_ptr<ManagedBuffer> buffer) : PointerHolder("FilamentBuffer", buffer) {}
   void loadHybridMethods() override {
-      PointerHolder::loadHybridMethods();
+    PointerHolder::loadHybridMethods();
   }
 
   std::shared_ptr<ManagedBuffer> getBuffer() {

diff --git a/package/cpp/RNFFilamentProxy.cpp b/package/cpp/RNFFilamentProxy.cpp
@@ -29,9 +29,9 @@ void FilamentProxy::loadHybridMethods() {
     proto.registerHybridMethod("createRecorder", &FilamentProxy::createRecorder);
     proto.registerRawHybridMethod("getCurrentDispatcher", 0, &FilamentProxy::getCurrentDispatcher);
     proto.registerHybridGetter("hasWorklets", &FilamentProxy::getHasWorklets);
-  #if HAS_WORKLETS
+#if HAS_WORKLETS
     proto.registerHybridMethod("createWorkletContext", &FilamentProxy::createWorkletContext);
-  #endif
+#endif
   });
 }
 

diff --git a/package/cpp/RNFFilamentProxy.h b/package/cpp/RNFFilamentProxy.h
@@ -5,8 +5,8 @@
 #pragma once
 
 #if __has_include(<NitroModules/HybridObject.hpp>)
-#include <NitroModules/HybridObject.hpp>
 #include <NitroModules/Dispatcher.hpp>
+#include <NitroModules/HybridObject.hpp>
 #else
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif

diff --git a/package/cpp/RNFFilamentRecorder.cpp b/package/cpp/RNFFilamentRecorder.cpp
@@ -10,7 +10,8 @@ namespace margelo {
 
 using namespace facebook;
 
-FilamentRecorder::FilamentRecorder(std::shared_ptr<nitro::Dispatcher> renderThreadDispatcher, int width, int height, int fps, double bitRate)
+FilamentRecorder::FilamentRecorder(std::shared_ptr<nitro::Dispatcher> renderThreadDispatcher, int width, int height, int fps,
+                                   double bitRate)
     : HybridObject("FilamentRecorder"), _renderThreadDispatcher(renderThreadDispatcher), _width(width), _height(height), _fps(fps),
       _bitRate(bitRate), _listenerManager(ListenerManager<ReadyForMoreDataCallback>::create()) {
   Logger::log(TAG, "Creating %zu x %zu @ %zu FPS (%f bps) FilamentRecorder...", width, height, fps, bitRate);
@@ -22,19 +23,19 @@ FilamentRecorder::~FilamentRecorder() {
 
 void FilamentRecorder::loadHybridMethods() {
   HybridObject::loadHybridMethods();
-    registerHybrids(this, [](nitro::Prototype& proto) {
-        proto.registerHybridGetter("width", &FilamentRecorder::getWidth);
-        proto.registerHybridGetter("height", &FilamentRecorder::getHeight);
-        proto.registerHybridGetter("fps", &FilamentRecorder::getFps);
-        proto.registerHybridGetter("bitRate", &FilamentRecorder::getBitRate);
-        proto.registerHybridGetter("outputFile", &FilamentRecorder::getOutputFile);
-        proto.registerHybridGetter("isRecording", &FilamentRecorder::getIsRecording);
-        proto.registerHybridMethod("startRecording", &FilamentRecorder::startRecording);
-        proto.registerHybridMethod("stopRecording", &FilamentRecorder::stopRecording);
-        proto.registerHybridMethod("renderFrame", &FilamentRecorder::renderFrame);
-//        TODO: nitro
-//        proto.registerHybridMethod("addOnReadyForMoreDataListener", &FilamentRecorder::addOnReadyForMoreDataListener);
-    });
+  registerHybrids(this, [](nitro::Prototype& proto) {
+    proto.registerHybridGetter("width", &FilamentRecorder::getWidth);
+    proto.registerHybridGetter("height", &FilamentRecorder::getHeight);
+    proto.registerHybridGetter("fps", &FilamentRecorder::getFps);
+    proto.registerHybridGetter("bitRate", &FilamentRecorder::getBitRate);
+    proto.registerHybridGetter("outputFile", &FilamentRecorder::getOutputFile);
+    proto.registerHybridGetter("isRecording", &FilamentRecorder::getIsRecording);
+    proto.registerHybridMethod("startRecording", &FilamentRecorder::startRecording);
+    proto.registerHybridMethod("stopRecording", &FilamentRecorder::stopRecording);
+    proto.registerHybridMethod("renderFrame", &FilamentRecorder::renderFrame);
+    //        TODO: nitro
+    //        proto.registerHybridMethod("addOnReadyForMoreDataListener", &FilamentRecorder::addOnReadyForMoreDataListener);
+  });
 }
 
 std::shared_ptr<Listener> FilamentRecorder::addOnReadyForMoreDataListener(const ReadyForMoreDataCallback& callback) {

diff --git a/package/cpp/RNFFilamentRecorder.h b/package/cpp/RNFFilamentRecorder.h
@@ -12,8 +12,8 @@
 #include "RNFListener.h"
 #include "RNFListenerManager.h"
 #if __has_include(<NitroModules/HybridObject.hpp>)
-#include <NitroModules/HybridObject.hpp>
 #include <NitroModules/Dispatcher.hpp>
+#include <NitroModules/HybridObject.hpp>
 #else
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif

diff --git a/package/cpp/RNFListener.cpp b/package/cpp/RNFListener.cpp
@@ -18,9 +18,7 @@ Listener::~Listener() {
 
 void Listener::loadHybridMethods() {
   HybridObject::loadHybridMethods();
-    registerHybrids(this, [](nitro::Prototype& proto) {
-        proto.registerHybridMethod("remove", &Listener::remove);
-    });
+  registerHybrids(this, [](nitro::Prototype& proto) { proto.registerHybridMethod("remove", &Listener::remove); });
 }
 
 void Listener::remove() {

diff --git a/package/cpp/RNFSurfaceProvider.h b/package/cpp/RNFSurfaceProvider.h
@@ -5,8 +5,8 @@
 #pragma once
 
 #if __has_include(<NitroModules/HybridObject.hpp>)
-#include <NitroModules/HybridObject.hpp>
 #include <NitroModules/Dispatcher.hpp>
+#include <NitroModules/HybridObject.hpp>
 #else
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif

diff --git a/package/cpp/bullet/RNFBulletWrapper.cpp b/package/cpp/bullet/RNFBulletWrapper.cpp
@@ -9,15 +9,15 @@ namespace margelo {
 void BulletWrapper::loadHybridMethods() {
   HybridObject::loadHybridMethods();
   registerHybrids(this, [](nitro::Prototype& proto) {
-      proto.registerHybridMethod("createDiscreteDynamicWorld", &BulletWrapper::createDiscreteDynamicWorld);
-      proto.registerHybridMethod("createRigidBody", &BulletWrapper::createRigidBody);
-      proto.registerHybridMethod("createBoxShape", &BulletWrapper::createBoxShape);
-      proto.registerHybridMethod("createCylinderShape", &BulletWrapper::createCylinderShape);
-      proto.registerHybridMethod("createCylinderShapeX", &BulletWrapper::createCylinderShapeX);
-      proto.registerHybridMethod("createCylinderShapeZ", &BulletWrapper::createCylinderShapeZ);
-      proto.registerHybridMethod("createStaticPlaneShape", &BulletWrapper::createStaticPlaneShape);
-      proto.registerHybridMethod("createRigidBodyFromTransform", &BulletWrapper::createRigidBodyFromTransform);
-      proto.registerHybridMethod("createSphereShape", &BulletWrapper::createSphereShape);
+    proto.registerHybridMethod("createDiscreteDynamicWorld", &BulletWrapper::createDiscreteDynamicWorld);
+    proto.registerHybridMethod("createRigidBody", &BulletWrapper::createRigidBody);
+    proto.registerHybridMethod("createBoxShape", &BulletWrapper::createBoxShape);
+    proto.registerHybridMethod("createCylinderShape", &BulletWrapper::createCylinderShape);
+    proto.registerHybridMethod("createCylinderShapeX", &BulletWrapper::createCylinderShapeX);
+    proto.registerHybridMethod("createCylinderShapeZ", &BulletWrapper::createCylinderShapeZ);
+    proto.registerHybridMethod("createStaticPlaneShape", &BulletWrapper::createStaticPlaneShape);
+    proto.registerHybridMethod("createRigidBodyFromTransform", &BulletWrapper::createRigidBodyFromTransform);
+    proto.registerHybridMethod("createSphereShape", &BulletWrapper::createSphereShape);
   });
 }
 
@@ -37,7 +37,8 @@ std::shared_ptr<RigidBodyWrapper> BulletWrapper::createRigidBody(double mass, do
   return RigidBodyWrapper::create(mass, x, y, z, shapePtr, id, collisionCallback);
 }
 
-std::shared_ptr<RigidBodyWrapper> BulletWrapper::createRigidBodyFromTransform(double mass, const std::shared_ptr<TMat44Wrapper>& entityTransform,
+std::shared_ptr<RigidBodyWrapper> BulletWrapper::createRigidBodyFromTransform(double mass,
+                                                                              const std::shared_ptr<TMat44Wrapper>& entityTransform,
                                                                               const std::shared_ptr<ShapeWrapper>& shape, std::string id,
                                                                               const std::optional<CollisionCallback>& collisionCallback) {
   const auto& shapePtr = shape->getShape();

diff --git a/package/cpp/core/RNFEngineImpl.h b/package/cpp/core/RNFEngineImpl.h
@@ -68,8 +68,7 @@ class EngineImpl : public std::enable_shared_from_this<EngineImpl> {
   std::shared_ptr<NameComponentManagerWrapper> createNameComponentManager();
   std::shared_ptr<MaterialWrapper> createMaterial(std::shared_ptr<FilamentBuffer> materialBuffer);
   void createAndSetSkybox(std::string hexColor, std::optional<bool> showSun, std::optional<float> envIntensity);
-  void createAndSetSkybox(std::shared_ptr<FilamentBuffer> textureBuffer, std::optional<bool> showSun,
-                          std::optional<float> envIntensity);
+  void createAndSetSkybox(std::shared_ptr<FilamentBuffer> textureBuffer, std::optional<bool> showSun, std::optional<float> envIntensity);
   void clearSkybox();
   void setAutomaticInstancingEnabled(bool enabled);
 

diff --git a/package/cpp/core/RNFLightManagerWrapper.cpp b/package/cpp/core/RNFLightManagerWrapper.cpp
@@ -13,7 +13,7 @@
 namespace margelo {
 
 void LightManagerWrapper::loadHybridMethods() {
-    PointerHolder::loadHybridMethods();
+  PointerHolder::loadHybridMethods();
   registerHybrids(this, [](nitro::Prototype& proto) {
     proto.registerHybridMethod("createLightEntity", &LightManagerWrapper::createLightEntity);
     proto.registerHybridMethod("destroy", &LightManagerWrapper::destroy);

diff --git a/package/cpp/core/RNFMaterialWrapper.cpp b/package/cpp/core/RNFMaterialWrapper.cpp
@@ -9,7 +9,7 @@
 
 namespace margelo {
 void MaterialWrapper::loadHybridMethods() {
-    PointerHolder::loadHybridMethods();
+  PointerHolder::loadHybridMethods();
   registerHybrids(this, [](nitro::Prototype& proto) {
     proto.registerHybridMethod("createInstance", &MaterialWrapper::createInstance);
     proto.registerHybridMethod("setDefaultFloatParameter", &MaterialWrapper::setDefaultFloatParameter);

diff --git a/package/cpp/core/RNFNameComponentManagerWrapper.cpp b/package/cpp/core/RNFNameComponentManagerWrapper.cpp
@@ -5,32 +5,30 @@
 
 namespace margelo {
 
-    void NameComponentManagerWrapper::loadHybridMethods() {
-        PointerHolder::loadHybridMethods();
-        registerHybrids(this, [](nitro::Prototype& proto) {
-            proto.registerHybridMethod("getEntityName", &NameComponentManagerWrapper::getEntityName);
-        });
-    }
+void NameComponentManagerWrapper::loadHybridMethods() {
+  PointerHolder::loadHybridMethods();
+  registerHybrids(
+      this, [](nitro::Prototype& proto) { proto.registerHybridMethod("getEntityName", &NameComponentManagerWrapper::getEntityName); });
+}
 
-    // TODO: This code is similar to EntityNameMap AnimatorWrapper::createEntityNameMap, consider refactoring
-    std::optional<std::string>
-    NameComponentManagerWrapper::getEntityName(std::shared_ptr<EntityWrapper> entityWrapper) {
-        if (!entityWrapper) {
-            throw std::invalid_argument("EntityWrapper is null");
-        }
+// TODO: This code is similar to EntityNameMap AnimatorWrapper::createEntityNameMap, consider refactoring
+std::optional<std::string> NameComponentManagerWrapper::getEntityName(std::shared_ptr<EntityWrapper> entityWrapper) {
+  if (!entityWrapper) {
+    throw std::invalid_argument("EntityWrapper is null");
+  }
 
-        Entity entity = entityWrapper->getEntity();
-        bool hasEntity = pointee()->hasComponent(entity);
-        if (!hasEntity) {
-            Logger::log(TAG, "Entity wasn't found in NameComponentManager");
-            return std::nullopt;
-        }
+  Entity entity = entityWrapper->getEntity();
+  bool hasEntity = pointee()->hasComponent(entity);
+  if (!hasEntity) {
+    Logger::log(TAG, "Entity wasn't found in NameComponentManager");
+    return std::nullopt;
+  }
 
-        NameComponentManager::Instance instance = pointee()->getInstance(entity);
-        if (!instance || !instance.isValid()) {
-            Logger::log(TAG, "Instance wasn't found in NameComponentManager");
-            return std::nullopt;
-        }
-        return pointee()->getName(instance);
-    }
+  NameComponentManager::Instance instance = pointee()->getInstance(entity);
+  if (!instance || !instance.isValid()) {
+    Logger::log(TAG, "Instance wasn't found in NameComponentManager");
+    return std::nullopt;
+  }
+  return pointee()->getName(instance);
 }
+} // namespace margelo
diff --git a/package/cpp/core/RNFNameComponentManagerWrapper.h b/package/cpp/core/RNFNameComponentManagerWrapper.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "jsi/RNFPointerHolder.h"
 #include "core/utils/RNFEntityWrapper.h"
+#include "jsi/RNFPointerHolder.h"
 #include <utils/NameComponentManager.h>
 
 namespace margelo {
@@ -27,7 +27,7 @@ class NameComponentManagerWrapper : public PointerHolder<NameComponentManager> {
   static auto constexpr TAG = "NameComponentManagerWrapper";
 
 private: // Exposed JS method
-    std::optional<std::string> getEntityName(std::shared_ptr<EntityWrapper> entityWrapper);
+  std::optional<std::string> getEntityName(std::shared_ptr<EntityWrapper> entityWrapper);
 };
 
 } // namespace margelo
diff --git a/package/cpp/core/RNFRenderableManagerWrapper.cpp b/package/cpp/core/RNFRenderableManagerWrapper.cpp
@@ -10,7 +10,7 @@
 
 namespace margelo {
 void RenderableManagerWrapper::loadHybridMethods() {
-    PointerHolder::loadHybridMethods();
+  PointerHolder::loadHybridMethods();
   registerHybrids(this, [](nitro::Prototype& proto) {
     proto.registerHybridMethod("getPrimitiveCount", &RenderableManagerWrapper::getPrimitiveCount);
     proto.registerHybridMethod("getMaterialInstanceAt", &RenderableManagerWrapper::getMaterialInstanceAt);

diff --git a/package/cpp/core/RNFSceneWrapper.cpp b/package/cpp/core/RNFSceneWrapper.cpp
@@ -5,7 +5,7 @@
 namespace margelo {
 
 void margelo::SceneWrapper::loadHybridMethods() {
-    PointerHolder::loadHybridMethods();
+  PointerHolder::loadHybridMethods();
   registerHybrids(this, [](nitro::Prototype& proto) {
     proto.registerHybridMethod("addEntity", &SceneWrapper::addEntity);
     proto.registerHybridMethod("addEntities", &SceneWrapper::addEntities);

diff --git a/package/cpp/core/RNFSwapChainWrapper.h b/package/cpp/core/RNFSwapChainWrapper.h
@@ -12,7 +12,7 @@ class SwapChainWrapper : public PointerHolder<SwapChain> {
   explicit SwapChainWrapper(std::shared_ptr<SwapChain> swapChain) : PointerHolder("SwapChainWrapper", swapChain) {}
 
   void loadHybridMethods() override {
-      PointerHolder::loadHybridMethods();
+    PointerHolder::loadHybridMethods();
   }
 
   std::shared_ptr<SwapChain> getSwapChain() {

diff --git a/package/cpp/core/RNFTransformManagerWrapper.cpp b/package/cpp/core/RNFTransformManagerWrapper.cpp
@@ -7,7 +7,7 @@
 namespace margelo {
 
 void TransformManagerWrapper::loadHybridMethods() {
-    PointerHolder::loadHybridMethods();
+  PointerHolder::loadHybridMethods();
   registerHybrids(this, [](nitro::Prototype& proto) {
     proto.registerHybridMethod("getTransform", &TransformManagerWrapper::getTransform);
     proto.registerHybridMethod("getWorldTransform", &TransformManagerWrapper::getWorldTransform);

diff --git a/package/cpp/core/RNFViewWrapper.cpp b/package/cpp/core/RNFViewWrapper.cpp
@@ -3,7 +3,7 @@
 namespace margelo {
 
 void ViewWrapper::loadHybridMethods() {
-    PointerHolder::loadHybridMethods();
+  PointerHolder::loadHybridMethods();
   registerHybrids(this, [](nitro::Prototype& proto) {
     proto.registerHybridMethod("getAspectRatio", &ViewWrapper::getAspectRatio);
     proto.registerHybridMethod("createAmbientOcclusionOptions", &ViewWrapper::createAmbientOcclusionOptions);

diff --git a/package/cpp/core/utils/RNFEntityWrapper.cpp b/package/cpp/core/utils/RNFEntityWrapper.cpp
@@ -2,9 +2,7 @@
 
 void margelo::EntityWrapper::loadHybridMethods() {
   HybridObject::loadHybridMethods();
-  registerHybrids(this, [](nitro::Prototype& proto) {
-    proto.registerHybridGetter("id", &EntityWrapper::getId);
-  });
+  registerHybrids(this, [](nitro::Prototype& proto) { proto.registerHybridGetter("id", &EntityWrapper::getId); });
 }
 
 int margelo::EntityWrapper::getId() {

diff --git a/package/cpp/core/utils/RNFManipulatorWrapper.cpp b/package/cpp/core/utils/RNFManipulatorWrapper.cpp
@@ -2,7 +2,7 @@
 
 namespace margelo {
 void ManipulatorWrapper::loadHybridMethods() {
-    PointerHolder::loadHybridMethods();
+  PointerHolder::loadHybridMethods();
   registerHybrids(this, [](nitro::Prototype& proto) {
     proto.registerHybridMethod("grabBegin", &ManipulatorWrapper::grabBegin);
     proto.registerHybridMethod("grabUpdate", &ManipulatorWrapper::grabUpdate);

diff --git a/package/cpp/jsi/RNFPointerHolder.h b/package/cpp/jsi/RNFPointerHolder.h
@@ -45,14 +45,14 @@ template <typename T> class PointerHolder : public nitro::HybridObject {
       Logger::log(TAG, "Automatically releasing %s... (~PointerHolder())", _name.c_str());
     }
   }
-    
-    void loadHybridMethods() override {
-        HybridObject::loadHybridMethods();
-        registerHybrids(this, [](nitro::Prototype& proto) {
-            proto.registerHybridMethod("release", &PointerHolder<T>::release);
-            proto.registerHybridGetter("isValid", &PointerHolder<T>::getIsValid);
-        });
-    }
+
+  void loadHybridMethods() override {
+    HybridObject::loadHybridMethods();
+    registerHybrids(this, [](nitro::Prototype& proto) {
+      proto.registerHybridMethod("release", &PointerHolder<T>::release);
+      proto.registerHybridGetter("isValid", &PointerHolder<T>::getIsValid);
+    });
+  }
 
 protected:
   /**

diff --git a/package/ios/src/RNFAppleFilamentRecorder.mm b/package/ios/src/RNFAppleFilamentRecorder.mm
@@ -5,8 +5,8 @@
 //  Created by Marc Rousavy on 02.05.24.
 //
 
-#include "RNFLogger.h"
 #include "RNFAppleFilamentRecorder.h"
+#include "RNFLogger.h"
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreVideo/CoreVideo.h>
 #include <VideoToolbox/VTCompressionProperties.h>

diff --git a/package/ios/src/RNFFilamentInstaller.mm b/package/ios/src/RNFFilamentInstaller.mm
@@ -49,7 +49,7 @@ + (BOOL)installToBridge:(jsi::Runtime*)runtime
 #else
   auto filamentProxy = std::make_shared<margelo::AppleFilamentProxy>(runtime, jsDispatcher);
 #endif
-    runtime->global().setProperty(*runtime, "FilamentProxy", filamentProxy->toObject(*runtime));
+  runtime->global().setProperty(*runtime, "FilamentProxy", filamentProxy->toObject(*runtime));
 
   return YES;
 }