Fixed clang check.

The [[ syntax requires bash, not merely sh. This patch fixes this by simply running the script and letting it use the binary declared inside.

Diffs=
c5cde614b Fixed clang check. (#6125)

Co-authored-by: Dragoș Tiselice <[email protected]>

.rive_head

@@ -1 +1 @@
-3b32d24314be7d877a11b8069622d6d6115383b7
+c5cde614bdb0de792c0bb074185f6ff51b1ff954

include/rive/animation/nested_input.hpp

@@ -9,11 +9,13 @@ class NestedInput : public NestedInputBase
 {
 public:
 protected:
-    SMIInput* input() {
+    SMIInput* input()
+    {
         auto parent = this->parent();
-        if (parent != nullptr && parent->is<NestedStateMachine>()) 
+        if (parent != nullptr && parent->is<NestedStateMachine>())
         {
-            StateMachineInstance* smInstance = parent->as<NestedStateMachine>()->stateMachineInstance();
+            StateMachineInstance* smInstance =
+                parent->as<NestedStateMachine>()->stateMachineInstance();
             auto inputInstance = smInstance->input(this->inputId());
             return inputInstance;
         }

include/rive/animation/state_machine_instance.hpp

@@ -100,7 +100,10 @@ class StateMachineInstance : public Scene, public KeyedCallbackReporter
     /// the backing artboard (explicitly not allowed on Scenes).
     Artboard* artboard() { return m_artboardInstance; }
 
-    void setParentStateMachineInstance(StateMachineInstance* instance) { m_parentStateMachineInstance = instance; }
+    void setParentStateMachineInstance(StateMachineInstance* instance)
+    {
+        m_parentStateMachineInstance = instance;
+    }
     StateMachineInstance* parentStateMachineInstance() { return m_parentStateMachineInstance; }
 
     void setParentNestedArtboard(NestedArtboard* artboard) { m_parentNestedArtboard = artboard; }

include/rive/assets/file_asset_referencer.hpp

@@ -9,10 +9,10 @@ namespace rive
 class FileAsset;
 class FileAssetReferencer
 {
-protected: 
+protected:
     FileAsset* m_fileAsset = nullptr;
-public:
 
+public:
     virtual ~FileAssetReferencer() = 0;
     virtual void setAsset(FileAsset* asset);
     virtual uint32_t assetId() = 0;

include/rive/file_asset_loader.hpp

@@ -16,7 +16,7 @@ class FileAssetLoader
     /// Load the contents of the given asset
     ///
     /// @param asset describes the asset that Rive is looking for the
-    /// contents of. 
+    /// contents of.
     /// @param inBandBytes is a pointer to the bytes in question
     /// @returns bool indicating if we are loading or have loaded the contents
 

include/rive/shapes/shape_paint_container.hpp

@@ -39,9 +39,9 @@ class ShapePaintContainer
 
     void propagateOpacity(float opacity);
 
-    #ifdef TESTING
+#ifdef TESTING
     const std::vector<ShapePaint*>& shapePaints() const { return m_ShapePaints; }
-    #endif
+#endif
 };
 } // namespace rive
 

src/animation/listener_bool_change.cpp

@@ -17,15 +17,16 @@ bool ListenerBoolChange::validateInputType(const StateMachineInput* input) const
 
 void ListenerBoolChange::perform(StateMachineInstance* stateMachineInstance, Vec2D position) const
 {
-    if (nestedInputId() != Core::emptyId) 
+    if (nestedInputId() != Core::emptyId)
     {
         auto nestedInputInstance = stateMachineInstance->artboard()->resolve(nestedInputId());
-        if (nestedInputInstance == nullptr) 
+        if (nestedInputInstance == nullptr)
         {
             return;
         }
         auto nestedBoolInput = static_cast<NestedBool*>(nestedInputInstance);
-        if (nestedBoolInput != nullptr) {
+        if (nestedBoolInput != nullptr)
+        {
             switch (value())
             {
                 case 0:
@@ -39,15 +40,18 @@ void ListenerBoolChange::perform(StateMachineInstance* stateMachineInstance, Vec
                     break;
             }
         }
-    } else {
+    }
+    else
+    {
         auto inputInstance = stateMachineInstance->input(inputId());
         if (inputInstance == nullptr)
         {
             return;
         }
         // If it's not null, it must be our correct type (why we validate at load time).
         auto boolInput = static_cast<SMIBool*>(inputInstance);
-        if (boolInput != nullptr) {
+        if (boolInput != nullptr)
+        {
             switch (value())
             {
                 case 0:

src/animation/listener_number_change.cpp

@@ -17,26 +17,30 @@ bool ListenerNumberChange::validateInputType(const StateMachineInput* input) con
 
 void ListenerNumberChange::perform(StateMachineInstance* stateMachineInstance, Vec2D position) const
 {
-    if (nestedInputId() != Core::emptyId) 
+    if (nestedInputId() != Core::emptyId)
     {
         auto nestedInputInstance = stateMachineInstance->artboard()->resolve(nestedInputId());
-        if (nestedInputInstance == nullptr) 
+        if (nestedInputInstance == nullptr)
         {
             return;
         }
         auto nestedNumberInput = static_cast<NestedNumber*>(nestedInputInstance);
-        if (nestedNumberInput != nullptr) {
+        if (nestedNumberInput != nullptr)
+        {
             nestedNumberInput->nestedValue(value());
         }
-    } else {
+    }
+    else
+    {
         auto inputInstance = stateMachineInstance->input(inputId());
         if (inputInstance == nullptr)
         {
             return;
         }
         // If it's not null, it must be our correct type (why we validate at load time).
         auto numberInput = static_cast<SMINumber*>(inputInstance);
-        if (numberInput != nullptr) {
+        if (numberInput != nullptr)
+        {
             numberInput->value(value());
         }
     }

src/animation/listener_trigger_change.cpp

@@ -19,26 +19,30 @@ bool ListenerTriggerChange::validateInputType(const StateMachineInput* input) co
 void ListenerTriggerChange::perform(StateMachineInstance* stateMachineInstance,
                                     Vec2D position) const
 {
-    if (nestedInputId() != Core::emptyId) 
+    if (nestedInputId() != Core::emptyId)
     {
         auto nestedInputInstance = stateMachineInstance->artboard()->resolve(nestedInputId());
-        if (nestedInputInstance == nullptr) 
+        if (nestedInputInstance == nullptr)
         {
             return;
         }
         auto nestedTriggerInput = static_cast<NestedTrigger*>(nestedInputInstance);
-        if (nestedTriggerInput != nullptr) {
+        if (nestedTriggerInput != nullptr)
+        {
             nestedTriggerInput->fire(CallbackData(stateMachineInstance, 0));
         }
-    } else {
+    }
+    else
+    {
         auto inputInstance = stateMachineInstance->input(inputId());
         if (inputInstance == nullptr)
         {
             return;
         }
         // If it's not null, it must be our correct type (why we validate at load time).
         auto triggerInput = static_cast<SMITrigger*>(inputInstance);
-        if (triggerInput != nullptr) {
+        if (triggerInput != nullptr)
+        {
             triggerInput->fire();
         }
     }

src/animation/nested_bool.cpp

@@ -6,12 +6,14 @@
 using namespace rive;
 class StateMachineInstance;
 
-void NestedBool::nestedValueChanged() {
+void NestedBool::nestedValueChanged()
+{
     auto inputInstance = input();
-    if (inputInstance != nullptr) 
+    if (inputInstance != nullptr)
     {
         auto boolInput = static_cast<SMIBool*>(inputInstance);
-        if (boolInput != nullptr) {
+        if (boolInput != nullptr)
+        {
             boolInput->value(nestedValue());
         }
     }

src/animation/nested_number.cpp

@@ -6,12 +6,14 @@
 using namespace rive;
 class StateMachineInstance;
 
-void NestedNumber::nestedValueChanged() {
+void NestedNumber::nestedValueChanged()
+{
     auto inputInstance = input();
-    if (inputInstance != nullptr) 
+    if (inputInstance != nullptr)
     {
         auto numInput = static_cast<SMINumber*>(inputInstance);
-        if (numInput != nullptr) {
+        if (numInput != nullptr)
+        {
             numInput->value(nestedValue());
         }
     }

src/animation/nested_trigger.cpp

@@ -6,14 +6,15 @@
 using namespace rive;
 class StateMachineInstance;
 
-void NestedTrigger::fire(const CallbackData& value) {
+void NestedTrigger::fire(const CallbackData& value)
+{
     auto inputInstance = input();
-    if (inputInstance != nullptr) 
+    if (inputInstance != nullptr)
     {
         auto numInput = static_cast<SMITrigger*>(inputInstance);
-        if (numInput != nullptr) {
+        if (numInput != nullptr)
+        {
             numInput->fire();
         }
     }
-
 }

src/assets/font_asset.cpp

@@ -13,14 +13,15 @@ bool FontAsset::decode(Span<const uint8_t> data, Factory* factory)
 }
 std::string FontAsset::fileExtension() const { return "ttf"; }
 
-void FontAsset::font(rcp<Font> font) { 
-    m_font = std::move(font); 
+void FontAsset::font(rcp<Font> font)
+{
+    m_font = std::move(font);
 
-    // We could try to tie this to some generic FileAssetReferencer callback 
-    // but for that we'd need this to be behind a more generic setter like 
+    // We could try to tie this to some generic FileAssetReferencer callback
+    // but for that we'd need this to be behind a more generic setter like
     // ::asset(rcp<Asset> asset)
-    for (FileAssetReferencer* fileAssetReferencer: fileAssetReferencers()){
+    for (FileAssetReferencer* fileAssetReferencer : fileAssetReferencers())
+    {
         static_cast<TextStyle*>(fileAssetReferencer)->addDirt(ComponentDirt::TextShape);
     }
-
 }

src/importers/file_asset_importer.cpp

@@ -13,7 +13,7 @@ FileAssetImporter::FileAssetImporter(FileAsset* fileAsset,
     m_FileAsset(fileAsset), m_FileAssetLoader(assetLoader), m_Factory(factory)
 {}
 
-// if file asset contents are found when importing a rive file, store those for when we resolve 
+// if file asset contents are found when importing a rive file, store those for when we resolve
 // the importer later
 void FileAssetImporter::onFileAssetContents(std::unique_ptr<FileAssetContents> contents)
 {
@@ -24,23 +24,25 @@ void FileAssetImporter::onFileAssetContents(std::unique_ptr<FileAssetContents> c
 
 StatusCode FileAssetImporter::resolve()
 {
-    
+
     Span<const uint8_t> bytes;
     if (m_Content != nullptr)
     {
         bytes = m_Content->bytes();
     }
 
-    // If we have a file asset loader, lets give it the opportunity to claim responsibility for loading the asset
+    // If we have a file asset loader, lets give it the opportunity to claim responsibility for
+    // loading the asset
     if (m_FileAssetLoader != nullptr && m_FileAssetLoader->loadContents(*m_FileAsset, bytes))
     {
         return StatusCode::Ok;
     }
     // If we do not, but we have found in band contents, load those
-    else if (bytes.size() > 0){
+    else if (bytes.size() > 0)
+    {
         m_FileAsset->decode(bytes, m_Factory);
     }
-    
+
     // Note that it's ok for an asset to not resolve (or to resolve async).
     return StatusCode::Ok;
 }

src/shapes/shape.cpp

@@ -21,9 +21,8 @@ void Shape::addPath(Path* path)
 
 bool Shape::canDeferPathUpdate()
 {
-    return renderOpacity() == 0
-        && (pathSpace() & PathSpace::Clipping) != PathSpace::Clipping
-        && (pathSpace() & PathSpace::FollowPath) != PathSpace::FollowPath;
+    return renderOpacity() == 0 && (pathSpace() & PathSpace::Clipping) != PathSpace::Clipping &&
+           (pathSpace() & PathSpace::FollowPath) != PathSpace::FollowPath;
 }
 
 void Shape::update(ComponentDirt value)

test/follow_path_constraint_test.cpp

@@ -27,7 +27,6 @@ TEST_CASE("follow path constraint updates world transform", "[file]")
     REQUIRE(targetComponents.y() == rectComponents.y());
 }
 
-
 TEST_CASE("follow path with 0 opacity constraint updates world transform", "[file]")
 {
     auto file = ReadRiveFile("../../test/assets/follow_path_with_0_opacity.riv");

test/in_band_asset_load_test.cpp

@@ -17,7 +17,6 @@
 #include <catch.hpp>
 #include <cstdio>
 
-
 class PretendAssetLoader : public rive ::FileAssetLoader
 {
 
@@ -65,7 +64,6 @@ TEST_CASE("Load asset with in-band image", "[asset]")
     REQUIRE(firstAsset->as<rive::ImageAsset>()->decodedByteSize == 308);
 }
 
-
 TEST_CASE("Load asset with in-band image, passing responsibility to loader", "[asset]")
 {
     auto loader = PretendAssetLoader();

test/nested_artboard_opacity_test.cpp

@@ -10,11 +10,12 @@ TEST_CASE("Nested artboard background renders with opacity", "[file]")
 
     auto mainArtboard = file->artboard()->instance();
     REQUIRE(mainArtboard->find("Parent Artboard") != nullptr);
-    auto artboard = mainArtboard->find<rive::Artboard>("Parent Artboard");  
+    auto artboard = mainArtboard->find<rive::Artboard>("Parent Artboard");
     artboard->updateComponents();
     REQUIRE(artboard->is<rive::Artboard>());
     REQUIRE(artboard->find("Nested artboard container") != nullptr);
-    auto nestedArtboardContainer = artboard->find<rive::NestedArtboard>("Nested artboard container");
+    auto nestedArtboardContainer =
+        artboard->find<rive::NestedArtboard>("Nested artboard container");
     REQUIRE(nestedArtboardContainer->artboard() != nullptr);
     auto nestedArtboard = nestedArtboardContainer->artboard();
     nestedArtboard->updateComponents();

viewer/src/skia/skia_host.cpp

@@ -27,9 +27,9 @@ sk_sp<SkSurface> makeSkiaSurface(GrDirectContext* context, int width, int height
 void skiaPresentSurface(sk_sp<SkSurface> surface);
 
 // Experimental flag, until we complete coregraphics_host
-//#define TEST_CG_RENDERER
+// #define TEST_CG_RENDERER
 
-//#define SW_SKIA_MODE
+// #define SW_SKIA_MODE
 
 #ifdef TEST_CG_RENDERER
 #include "cg_factory.hpp"