clang-format tweaks * Always align function arguments at the opening paren if they have to break (never just indented 4 spaces) * Only break after a function's return type if there's no other way to make it fit in 100 columns * Allow one-liner case labels in a switch statement * Delete packages/coop/.clang-format * Reformat the world Diffs= 7d242ebc8 clang-format tweaks
diff --git a/.rive_head b/.rive_head index 84fc2dd..8fb765a 100644 --- a/.rive_head +++ b/.rive_head
@@ -1 +1 @@ -d8fcaec0186f40bd93b19dbc310915d0c616fc23 +7d242ebc81cbf53d679fae1a71d73600d2ff256e
diff --git a/dev/test/include/catch.hpp b/dev/test/include/catch.hpp index 82a2129..09259c7 100644 --- a/dev/test/include/catch.hpp +++ b/dev/test/include/catch.hpp
@@ -1,3 +1,4 @@ +// clang-format off /* * Catch v2.13.7 * Generated: 2021-07-28 20:29:27.753164
diff --git a/include/rive/animation/keyframe.hpp b/include/rive/animation/keyframe.hpp index 6fda087..9174d42 100644 --- a/include/rive/animation/keyframe.hpp +++ b/include/rive/animation/keyframe.hpp
@@ -17,8 +17,11 @@ StatusCode onAddedDirty(CoreContext* context) override; virtual void apply(Core* object, int propertyKey, float mix) = 0; - virtual void applyInterpolation( - Core* object, int propertyKey, float seconds, const KeyFrame* nextFrame, float mix) = 0; + virtual void applyInterpolation(Core* object, + int propertyKey, + float seconds, + const KeyFrame* nextFrame, + float mix) = 0; StatusCode import(ImportStack& importStack) override; };
diff --git a/include/rive/animation/state_transition.hpp b/include/rive/animation/state_transition.hpp index 57c82f5..7c6e45a 100644 --- a/include/rive/animation/state_transition.hpp +++ b/include/rive/animation/state_transition.hpp
@@ -46,8 +46,9 @@ /// Returns AllowTransition::yes when this transition can be taken from /// stateFrom with the given inputs. - AllowTransition - allowed(StateInstance* stateFrom, Span<SMIInput*> inputs, bool ignoreTriggers) const; + AllowTransition allowed(StateInstance* stateFrom, + Span<SMIInput*> inputs, + bool ignoreTriggers) const; /// Whether the animation is held at exit or if it keeps advancing /// during mixing.
diff --git a/include/rive/factory.hpp b/include/rive/factory.hpp index 4283fe8..b1fdcce 100644 --- a/include/rive/factory.hpp +++ b/include/rive/factory.hpp
@@ -43,8 +43,9 @@ size_t count) = 0; // Returns a full-formed RenderPath -- can be treated as immutable - virtual std::unique_ptr<RenderPath> - makeRenderPath(Span<const Vec2D> points, Span<const PathVerb> verbs, FillRule) = 0; + virtual std::unique_ptr<RenderPath> makeRenderPath(Span<const Vec2D> points, + Span<const PathVerb> verbs, + FillRule) = 0; virtual std::unique_ptr<RenderPath> makeEmptyRenderPath() = 0;
diff --git a/include/rive/generated/animation/animation_base.hpp b/include/rive/generated/animation/animation_base.hpp index 21013c8..3666dda 100644 --- a/include/rive/generated/animation/animation_base.hpp +++ b/include/rive/generated/animation/animation_base.hpp
@@ -15,10 +15,8 @@ /// at runtime. bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { - case AnimationBase::typeKey: - return true; - default: - return false; + case AnimationBase::typeKey: return true; + default: return false; } } @@ -44,9 +42,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case namePropertyKey: - m_Name = CoreStringType::deserialize(reader); - return true; + case namePropertyKey: m_Name = CoreStringType::deserialize(reader); return true; } return false; }
diff --git a/include/rive/generated/animation/animation_state_base.hpp b/include/rive/generated/animation/animation_state_base.hpp index 7f61569..b0ebcc1 100644 --- a/include/rive/generated/animation/animation_state_base.hpp +++ b/include/rive/generated/animation/animation_state_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case AnimationStateBase::typeKey: case LayerStateBase::typeKey: - case StateMachineLayerComponentBase::typeKey: - return true; - default: - return false; + case StateMachineLayerComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/any_state_base.hpp b/include/rive/generated/animation/any_state_base.hpp index 39598cd..618049e 100644 --- a/include/rive/generated/animation/any_state_base.hpp +++ b/include/rive/generated/animation/any_state_base.hpp
@@ -15,10 +15,8 @@ switch (typeKey) { case AnyStateBase::typeKey: case LayerStateBase::typeKey: - case StateMachineLayerComponentBase::typeKey: - return true; - default: - return false; + case StateMachineLayerComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/blend_animation_1d_base.hpp b/include/rive/generated/animation/blend_animation_1d_base.hpp index ac6c4cf..4d9869b 100644 --- a/include/rive/generated/animation/blend_animation_1d_base.hpp +++ b/include/rive/generated/animation/blend_animation_1d_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case BlendAnimation1DBase::typeKey: - case BlendAnimationBase::typeKey: - return true; - default: - return false; + case BlendAnimationBase::typeKey: return true; + default: return false; } } @@ -47,9 +45,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case valuePropertyKey: - m_Value = CoreDoubleType::deserialize(reader); - return true; + case valuePropertyKey: m_Value = CoreDoubleType::deserialize(reader); return true; } return BlendAnimation::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/animation/blend_animation_base.hpp b/include/rive/generated/animation/blend_animation_base.hpp index 210bf21..9d178bf 100644 --- a/include/rive/generated/animation/blend_animation_base.hpp +++ b/include/rive/generated/animation/blend_animation_base.hpp
@@ -14,10 +14,8 @@ /// at runtime. bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { - case BlendAnimationBase::typeKey: - return true; - default: - return false; + case BlendAnimationBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/blend_animation_direct_base.hpp b/include/rive/generated/animation/blend_animation_direct_base.hpp index 9483c3c..999be19 100644 --- a/include/rive/generated/animation/blend_animation_direct_base.hpp +++ b/include/rive/generated/animation/blend_animation_direct_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case BlendAnimationDirectBase::typeKey: - case BlendAnimationBase::typeKey: - return true; - default: - return false; + case BlendAnimationBase::typeKey: return true; + default: return false; } } @@ -47,9 +45,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case inputIdPropertyKey: - m_InputId = CoreUintType::deserialize(reader); - return true; + case inputIdPropertyKey: m_InputId = CoreUintType::deserialize(reader); return true; } return BlendAnimation::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/animation/blend_state_1d_base.hpp b/include/rive/generated/animation/blend_state_1d_base.hpp index 7159193..a465c14 100644 --- a/include/rive/generated/animation/blend_state_1d_base.hpp +++ b/include/rive/generated/animation/blend_state_1d_base.hpp
@@ -17,10 +17,8 @@ case BlendState1DBase::typeKey: case BlendStateBase::typeKey: case LayerStateBase::typeKey: - case StateMachineLayerComponentBase::typeKey: - return true; - default: - return false; + case StateMachineLayerComponentBase::typeKey: return true; + default: return false; } } @@ -49,9 +47,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case inputIdPropertyKey: - m_InputId = CoreUintType::deserialize(reader); - return true; + case inputIdPropertyKey: m_InputId = CoreUintType::deserialize(reader); return true; } return BlendState::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/animation/blend_state_base.hpp b/include/rive/generated/animation/blend_state_base.hpp index 097f018..1b6338b 100644 --- a/include/rive/generated/animation/blend_state_base.hpp +++ b/include/rive/generated/animation/blend_state_base.hpp
@@ -15,10 +15,8 @@ switch (typeKey) { case BlendStateBase::typeKey: case LayerStateBase::typeKey: - case StateMachineLayerComponentBase::typeKey: - return true; - default: - return false; + case StateMachineLayerComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/blend_state_direct_base.hpp b/include/rive/generated/animation/blend_state_direct_base.hpp index 4cae7aa..b46b84b 100644 --- a/include/rive/generated/animation/blend_state_direct_base.hpp +++ b/include/rive/generated/animation/blend_state_direct_base.hpp
@@ -16,10 +16,8 @@ case BlendStateDirectBase::typeKey: case BlendStateBase::typeKey: case LayerStateBase::typeKey: - case StateMachineLayerComponentBase::typeKey: - return true; - default: - return false; + case StateMachineLayerComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/blend_state_transition_base.hpp b/include/rive/generated/animation/blend_state_transition_base.hpp index bdb9759..b58bd2c 100644 --- a/include/rive/generated/animation/blend_state_transition_base.hpp +++ b/include/rive/generated/animation/blend_state_transition_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case BlendStateTransitionBase::typeKey: case StateTransitionBase::typeKey: - case StateMachineLayerComponentBase::typeKey: - return true; - default: - return false; + case StateMachineLayerComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/cubic_interpolator_base.hpp b/include/rive/generated/animation/cubic_interpolator_base.hpp index 37f038d..a342d5d 100644 --- a/include/rive/generated/animation/cubic_interpolator_base.hpp +++ b/include/rive/generated/animation/cubic_interpolator_base.hpp
@@ -14,10 +14,8 @@ /// at runtime. bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { - case CubicInterpolatorBase::typeKey: - return true; - default: - return false; + case CubicInterpolatorBase::typeKey: return true; + default: return false; } } @@ -81,18 +79,10 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case x1PropertyKey: - m_X1 = CoreDoubleType::deserialize(reader); - return true; - case y1PropertyKey: - m_Y1 = CoreDoubleType::deserialize(reader); - return true; - case x2PropertyKey: - m_X2 = CoreDoubleType::deserialize(reader); - return true; - case y2PropertyKey: - m_Y2 = CoreDoubleType::deserialize(reader); - return true; + case x1PropertyKey: m_X1 = CoreDoubleType::deserialize(reader); return true; + case y1PropertyKey: m_Y1 = CoreDoubleType::deserialize(reader); return true; + case x2PropertyKey: m_X2 = CoreDoubleType::deserialize(reader); return true; + case y2PropertyKey: m_Y2 = CoreDoubleType::deserialize(reader); return true; } return false; }
diff --git a/include/rive/generated/animation/entry_state_base.hpp b/include/rive/generated/animation/entry_state_base.hpp index 421d44f..52e9c09 100644 --- a/include/rive/generated/animation/entry_state_base.hpp +++ b/include/rive/generated/animation/entry_state_base.hpp
@@ -15,10 +15,8 @@ switch (typeKey) { case EntryStateBase::typeKey: case LayerStateBase::typeKey: - case StateMachineLayerComponentBase::typeKey: - return true; - default: - return false; + case StateMachineLayerComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/exit_state_base.hpp b/include/rive/generated/animation/exit_state_base.hpp index 6479de5..e1daec8 100644 --- a/include/rive/generated/animation/exit_state_base.hpp +++ b/include/rive/generated/animation/exit_state_base.hpp
@@ -15,10 +15,8 @@ switch (typeKey) { case ExitStateBase::typeKey: case LayerStateBase::typeKey: - case StateMachineLayerComponentBase::typeKey: - return true; - default: - return false; + case StateMachineLayerComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/keyed_object_base.hpp b/include/rive/generated/animation/keyed_object_base.hpp index b86275d..43413d5 100644 --- a/include/rive/generated/animation/keyed_object_base.hpp +++ b/include/rive/generated/animation/keyed_object_base.hpp
@@ -14,10 +14,8 @@ /// at runtime. bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { - case KeyedObjectBase::typeKey: - return true; - default: - return false; + case KeyedObjectBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/keyed_property_base.hpp b/include/rive/generated/animation/keyed_property_base.hpp index 3828243..c6ed8e4 100644 --- a/include/rive/generated/animation/keyed_property_base.hpp +++ b/include/rive/generated/animation/keyed_property_base.hpp
@@ -14,10 +14,8 @@ /// at runtime. bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { - case KeyedPropertyBase::typeKey: - return true; - default: - return false; + case KeyedPropertyBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/keyframe_base.hpp b/include/rive/generated/animation/keyframe_base.hpp index d85b0c6..b7ade40 100644 --- a/include/rive/generated/animation/keyframe_base.hpp +++ b/include/rive/generated/animation/keyframe_base.hpp
@@ -14,10 +14,8 @@ /// at runtime. bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { - case KeyFrameBase::typeKey: - return true; - default: - return false; + case KeyFrameBase::typeKey: return true; + default: return false; } } @@ -68,9 +66,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case framePropertyKey: - m_Frame = CoreUintType::deserialize(reader); - return true; + case framePropertyKey: m_Frame = CoreUintType::deserialize(reader); return true; case interpolationTypePropertyKey: m_InterpolationType = CoreUintType::deserialize(reader); return true;
diff --git a/include/rive/generated/animation/keyframe_bool_base.hpp b/include/rive/generated/animation/keyframe_bool_base.hpp index 32a8452..938452d 100644 --- a/include/rive/generated/animation/keyframe_bool_base.hpp +++ b/include/rive/generated/animation/keyframe_bool_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case KeyFrameBoolBase::typeKey: - case KeyFrameBase::typeKey: - return true; - default: - return false; + case KeyFrameBase::typeKey: return true; + default: return false; } } @@ -47,9 +45,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case valuePropertyKey: - m_Value = CoreBoolType::deserialize(reader); - return true; + case valuePropertyKey: m_Value = CoreBoolType::deserialize(reader); return true; } return KeyFrame::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/animation/keyframe_color_base.hpp b/include/rive/generated/animation/keyframe_color_base.hpp index ccf3b91..c56f226 100644 --- a/include/rive/generated/animation/keyframe_color_base.hpp +++ b/include/rive/generated/animation/keyframe_color_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case KeyFrameColorBase::typeKey: - case KeyFrameBase::typeKey: - return true; - default: - return false; + case KeyFrameBase::typeKey: return true; + default: return false; } } @@ -47,9 +45,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case valuePropertyKey: - m_Value = CoreColorType::deserialize(reader); - return true; + case valuePropertyKey: m_Value = CoreColorType::deserialize(reader); return true; } return KeyFrame::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/animation/keyframe_double_base.hpp b/include/rive/generated/animation/keyframe_double_base.hpp index adc99dd..0d5f808 100644 --- a/include/rive/generated/animation/keyframe_double_base.hpp +++ b/include/rive/generated/animation/keyframe_double_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case KeyFrameDoubleBase::typeKey: - case KeyFrameBase::typeKey: - return true; - default: - return false; + case KeyFrameBase::typeKey: return true; + default: return false; } } @@ -47,9 +45,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case valuePropertyKey: - m_Value = CoreDoubleType::deserialize(reader); - return true; + case valuePropertyKey: m_Value = CoreDoubleType::deserialize(reader); return true; } return KeyFrame::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/animation/keyframe_id_base.hpp b/include/rive/generated/animation/keyframe_id_base.hpp index 4e5022d..6cab3de 100644 --- a/include/rive/generated/animation/keyframe_id_base.hpp +++ b/include/rive/generated/animation/keyframe_id_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case KeyFrameIdBase::typeKey: - case KeyFrameBase::typeKey: - return true; - default: - return false; + case KeyFrameBase::typeKey: return true; + default: return false; } } @@ -47,9 +45,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case valuePropertyKey: - m_Value = CoreUintType::deserialize(reader); - return true; + case valuePropertyKey: m_Value = CoreUintType::deserialize(reader); return true; } return KeyFrame::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/animation/layer_state_base.hpp b/include/rive/generated/animation/layer_state_base.hpp index f0ae72b..bbf8ca0 100644 --- a/include/rive/generated/animation/layer_state_base.hpp +++ b/include/rive/generated/animation/layer_state_base.hpp
@@ -14,10 +14,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case LayerStateBase::typeKey: - case StateMachineLayerComponentBase::typeKey: - return true; - default: - return false; + case StateMachineLayerComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/linear_animation_base.hpp b/include/rive/generated/animation/linear_animation_base.hpp index 4df9e6a..43b97ed 100644 --- a/include/rive/generated/animation/linear_animation_base.hpp +++ b/include/rive/generated/animation/linear_animation_base.hpp
@@ -17,10 +17,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case LinearAnimationBase::typeKey: - case AnimationBase::typeKey: - return true; - default: - return false; + case AnimationBase::typeKey: return true; + default: return false; } } @@ -121,24 +119,18 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case fpsPropertyKey: - m_Fps = CoreUintType::deserialize(reader); - return true; + case fpsPropertyKey: m_Fps = CoreUintType::deserialize(reader); return true; case durationPropertyKey: m_Duration = CoreUintType::deserialize(reader); return true; - case speedPropertyKey: - m_Speed = CoreDoubleType::deserialize(reader); - return true; + case speedPropertyKey: m_Speed = CoreDoubleType::deserialize(reader); return true; case loopValuePropertyKey: m_LoopValue = CoreUintType::deserialize(reader); return true; case workStartPropertyKey: m_WorkStart = CoreUintType::deserialize(reader); return true; - case workEndPropertyKey: - m_WorkEnd = CoreUintType::deserialize(reader); - return true; + case workEndPropertyKey: m_WorkEnd = CoreUintType::deserialize(reader); return true; case enableWorkAreaPropertyKey: m_EnableWorkArea = CoreBoolType::deserialize(reader); return true;
diff --git a/include/rive/generated/animation/listener_action_base.hpp b/include/rive/generated/animation/listener_action_base.hpp index e73cb1c..bdb827f 100644 --- a/include/rive/generated/animation/listener_action_base.hpp +++ b/include/rive/generated/animation/listener_action_base.hpp
@@ -13,10 +13,8 @@ /// at runtime. bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { - case ListenerActionBase::typeKey: - return true; - default: - return false; + case ListenerActionBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/listener_align_target_base.hpp b/include/rive/generated/animation/listener_align_target_base.hpp index d7e8c86..5bce56f 100644 --- a/include/rive/generated/animation/listener_align_target_base.hpp +++ b/include/rive/generated/animation/listener_align_target_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case ListenerAlignTargetBase::typeKey: - case ListenerActionBase::typeKey: - return true; - default: - return false; + case ListenerActionBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/listener_bool_change_base.hpp b/include/rive/generated/animation/listener_bool_change_base.hpp index c7d87c8..f48a767 100644 --- a/include/rive/generated/animation/listener_bool_change_base.hpp +++ b/include/rive/generated/animation/listener_bool_change_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case ListenerBoolChangeBase::typeKey: case ListenerInputChangeBase::typeKey: - case ListenerActionBase::typeKey: - return true; - default: - return false; + case ListenerActionBase::typeKey: return true; + default: return false; } } @@ -48,9 +46,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case valuePropertyKey: - m_Value = CoreUintType::deserialize(reader); - return true; + case valuePropertyKey: m_Value = CoreUintType::deserialize(reader); return true; } return ListenerInputChange::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/animation/listener_input_change_base.hpp b/include/rive/generated/animation/listener_input_change_base.hpp index ef82552..36e9cad 100644 --- a/include/rive/generated/animation/listener_input_change_base.hpp +++ b/include/rive/generated/animation/listener_input_change_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case ListenerInputChangeBase::typeKey: - case ListenerActionBase::typeKey: - return true; - default: - return false; + case ListenerActionBase::typeKey: return true; + default: return false; } } @@ -46,9 +44,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case inputIdPropertyKey: - m_InputId = CoreUintType::deserialize(reader); - return true; + case inputIdPropertyKey: m_InputId = CoreUintType::deserialize(reader); return true; } return ListenerAction::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/animation/listener_number_change_base.hpp b/include/rive/generated/animation/listener_number_change_base.hpp index 8106d29..79c6b0a 100644 --- a/include/rive/generated/animation/listener_number_change_base.hpp +++ b/include/rive/generated/animation/listener_number_change_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case ListenerNumberChangeBase::typeKey: case ListenerInputChangeBase::typeKey: - case ListenerActionBase::typeKey: - return true; - default: - return false; + case ListenerActionBase::typeKey: return true; + default: return false; } } @@ -48,9 +46,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case valuePropertyKey: - m_Value = CoreDoubleType::deserialize(reader); - return true; + case valuePropertyKey: m_Value = CoreDoubleType::deserialize(reader); return true; } return ListenerInputChange::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/animation/listener_trigger_change_base.hpp b/include/rive/generated/animation/listener_trigger_change_base.hpp index 7e82832..766a73d 100644 --- a/include/rive/generated/animation/listener_trigger_change_base.hpp +++ b/include/rive/generated/animation/listener_trigger_change_base.hpp
@@ -15,10 +15,8 @@ switch (typeKey) { case ListenerTriggerChangeBase::typeKey: case ListenerInputChangeBase::typeKey: - case ListenerActionBase::typeKey: - return true; - default: - return false; + case ListenerActionBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/nested_bool_base.hpp b/include/rive/generated/animation/nested_bool_base.hpp index 781fcfc..0c38dc5 100644 --- a/include/rive/generated/animation/nested_bool_base.hpp +++ b/include/rive/generated/animation/nested_bool_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case NestedBoolBase::typeKey: case NestedInputBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/nested_input_base.hpp b/include/rive/generated/animation/nested_input_base.hpp index df1fa05..34e9a68 100644 --- a/include/rive/generated/animation/nested_input_base.hpp +++ b/include/rive/generated/animation/nested_input_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case NestedInputBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -46,9 +44,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case inputIdPropertyKey: - m_InputId = CoreUintType::deserialize(reader); - return true; + case inputIdPropertyKey: m_InputId = CoreUintType::deserialize(reader); return true; } return Component::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/animation/nested_linear_animation_base.hpp b/include/rive/generated/animation/nested_linear_animation_base.hpp index a749818..aeca95a 100644 --- a/include/rive/generated/animation/nested_linear_animation_base.hpp +++ b/include/rive/generated/animation/nested_linear_animation_base.hpp
@@ -17,10 +17,8 @@ case NestedLinearAnimationBase::typeKey: case NestedAnimationBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -48,9 +46,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case mixPropertyKey: - m_Mix = CoreDoubleType::deserialize(reader); - return true; + case mixPropertyKey: m_Mix = CoreDoubleType::deserialize(reader); return true; } return NestedAnimation::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/animation/nested_number_base.hpp b/include/rive/generated/animation/nested_number_base.hpp index 3847b20..e2cc9f8 100644 --- a/include/rive/generated/animation/nested_number_base.hpp +++ b/include/rive/generated/animation/nested_number_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case NestedNumberBase::typeKey: case NestedInputBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/nested_remap_animation_base.hpp b/include/rive/generated/animation/nested_remap_animation_base.hpp index a743a90..345dd25 100644 --- a/include/rive/generated/animation/nested_remap_animation_base.hpp +++ b/include/rive/generated/animation/nested_remap_animation_base.hpp
@@ -18,10 +18,8 @@ case NestedLinearAnimationBase::typeKey: case NestedAnimationBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -50,9 +48,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case timePropertyKey: - m_Time = CoreDoubleType::deserialize(reader); - return true; + case timePropertyKey: m_Time = CoreDoubleType::deserialize(reader); return true; } return NestedLinearAnimation::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/animation/nested_simple_animation_base.hpp b/include/rive/generated/animation/nested_simple_animation_base.hpp index d51e941..a233b77 100644 --- a/include/rive/generated/animation/nested_simple_animation_base.hpp +++ b/include/rive/generated/animation/nested_simple_animation_base.hpp
@@ -19,10 +19,8 @@ case NestedLinearAnimationBase::typeKey: case NestedAnimationBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -63,9 +61,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case speedPropertyKey: - m_Speed = CoreDoubleType::deserialize(reader); - return true; + case speedPropertyKey: m_Speed = CoreDoubleType::deserialize(reader); return true; case isPlayingPropertyKey: m_IsPlaying = CoreBoolType::deserialize(reader); return true;
diff --git a/include/rive/generated/animation/nested_state_machine_base.hpp b/include/rive/generated/animation/nested_state_machine_base.hpp index 407de9d..5609866 100644 --- a/include/rive/generated/animation/nested_state_machine_base.hpp +++ b/include/rive/generated/animation/nested_state_machine_base.hpp
@@ -16,10 +16,8 @@ case NestedStateMachineBase::typeKey: case NestedAnimationBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/nested_trigger_base.hpp b/include/rive/generated/animation/nested_trigger_base.hpp index 61a9c32..26a254f 100644 --- a/include/rive/generated/animation/nested_trigger_base.hpp +++ b/include/rive/generated/animation/nested_trigger_base.hpp
@@ -15,10 +15,8 @@ switch (typeKey) { case NestedTriggerBase::typeKey: case NestedInputBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/state_machine_base.hpp b/include/rive/generated/animation/state_machine_base.hpp index 7f96fe3..88a0018 100644 --- a/include/rive/generated/animation/state_machine_base.hpp +++ b/include/rive/generated/animation/state_machine_base.hpp
@@ -14,10 +14,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case StateMachineBase::typeKey: - case AnimationBase::typeKey: - return true; - default: - return false; + case AnimationBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/state_machine_bool_base.hpp b/include/rive/generated/animation/state_machine_bool_base.hpp index f9cec48..56ac35e 100644 --- a/include/rive/generated/animation/state_machine_bool_base.hpp +++ b/include/rive/generated/animation/state_machine_bool_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case StateMachineBoolBase::typeKey: case StateMachineInputBase::typeKey: - case StateMachineComponentBase::typeKey: - return true; - default: - return false; + case StateMachineComponentBase::typeKey: return true; + default: return false; } } @@ -48,9 +46,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case valuePropertyKey: - m_Value = CoreBoolType::deserialize(reader); - return true; + case valuePropertyKey: m_Value = CoreBoolType::deserialize(reader); return true; } return StateMachineInput::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/animation/state_machine_component_base.hpp b/include/rive/generated/animation/state_machine_component_base.hpp index 1d5ffe5..b286535 100644 --- a/include/rive/generated/animation/state_machine_component_base.hpp +++ b/include/rive/generated/animation/state_machine_component_base.hpp
@@ -15,10 +15,8 @@ /// at runtime. bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { - case StateMachineComponentBase::typeKey: - return true; - default: - return false; + case StateMachineComponentBase::typeKey: return true; + default: return false; } } @@ -43,9 +41,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case namePropertyKey: - m_Name = CoreStringType::deserialize(reader); - return true; + case namePropertyKey: m_Name = CoreStringType::deserialize(reader); return true; } return false; }
diff --git a/include/rive/generated/animation/state_machine_input_base.hpp b/include/rive/generated/animation/state_machine_input_base.hpp index 890063c..900d844 100644 --- a/include/rive/generated/animation/state_machine_input_base.hpp +++ b/include/rive/generated/animation/state_machine_input_base.hpp
@@ -14,10 +14,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case StateMachineInputBase::typeKey: - case StateMachineComponentBase::typeKey: - return true; - default: - return false; + case StateMachineComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/state_machine_layer_base.hpp b/include/rive/generated/animation/state_machine_layer_base.hpp index 157014c..520e19c 100644 --- a/include/rive/generated/animation/state_machine_layer_base.hpp +++ b/include/rive/generated/animation/state_machine_layer_base.hpp
@@ -14,10 +14,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case StateMachineLayerBase::typeKey: - case StateMachineComponentBase::typeKey: - return true; - default: - return false; + case StateMachineComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/state_machine_layer_component_base.hpp b/include/rive/generated/animation/state_machine_layer_component_base.hpp index 06d2d83..5964439 100644 --- a/include/rive/generated/animation/state_machine_layer_component_base.hpp +++ b/include/rive/generated/animation/state_machine_layer_component_base.hpp
@@ -13,10 +13,8 @@ /// at runtime. bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { - case StateMachineLayerComponentBase::typeKey: - return true; - default: - return false; + case StateMachineLayerComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/state_machine_listener_base.hpp b/include/rive/generated/animation/state_machine_listener_base.hpp index 6811b29..689a2c0 100644 --- a/include/rive/generated/animation/state_machine_listener_base.hpp +++ b/include/rive/generated/animation/state_machine_listener_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case StateMachineListenerBase::typeKey: - case StateMachineComponentBase::typeKey: - return true; - default: - return false; + case StateMachineComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/state_machine_number_base.hpp b/include/rive/generated/animation/state_machine_number_base.hpp index a97c85d..67a0d8c 100644 --- a/include/rive/generated/animation/state_machine_number_base.hpp +++ b/include/rive/generated/animation/state_machine_number_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case StateMachineNumberBase::typeKey: case StateMachineInputBase::typeKey: - case StateMachineComponentBase::typeKey: - return true; - default: - return false; + case StateMachineComponentBase::typeKey: return true; + default: return false; } } @@ -48,9 +46,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case valuePropertyKey: - m_Value = CoreDoubleType::deserialize(reader); - return true; + case valuePropertyKey: m_Value = CoreDoubleType::deserialize(reader); return true; } return StateMachineInput::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/animation/state_machine_trigger_base.hpp b/include/rive/generated/animation/state_machine_trigger_base.hpp index 07490cf..0418cfc 100644 --- a/include/rive/generated/animation/state_machine_trigger_base.hpp +++ b/include/rive/generated/animation/state_machine_trigger_base.hpp
@@ -15,10 +15,8 @@ switch (typeKey) { case StateMachineTriggerBase::typeKey: case StateMachineInputBase::typeKey: - case StateMachineComponentBase::typeKey: - return true; - default: - return false; + case StateMachineComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/state_transition_base.hpp b/include/rive/generated/animation/state_transition_base.hpp index 8ca700a..a041740 100644 --- a/include/rive/generated/animation/state_transition_base.hpp +++ b/include/rive/generated/animation/state_transition_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case StateTransitionBase::typeKey: - case StateMachineLayerComponentBase::typeKey: - return true; - default: - return false; + case StateMachineLayerComponentBase::typeKey: return true; + default: return false; } } @@ -86,9 +84,7 @@ case stateToIdPropertyKey: m_StateToId = CoreUintType::deserialize(reader); return true; - case flagsPropertyKey: - m_Flags = CoreUintType::deserialize(reader); - return true; + case flagsPropertyKey: m_Flags = CoreUintType::deserialize(reader); return true; case durationPropertyKey: m_Duration = CoreUintType::deserialize(reader); return true;
diff --git a/include/rive/generated/animation/transition_bool_condition_base.hpp b/include/rive/generated/animation/transition_bool_condition_base.hpp index ffbdd47..fcbec59 100644 --- a/include/rive/generated/animation/transition_bool_condition_base.hpp +++ b/include/rive/generated/animation/transition_bool_condition_base.hpp
@@ -15,10 +15,8 @@ switch (typeKey) { case TransitionBoolConditionBase::typeKey: case TransitionValueConditionBase::typeKey: - case TransitionConditionBase::typeKey: - return true; - default: - return false; + case TransitionConditionBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/transition_condition_base.hpp b/include/rive/generated/animation/transition_condition_base.hpp index dfe0b4b..0eed41b 100644 --- a/include/rive/generated/animation/transition_condition_base.hpp +++ b/include/rive/generated/animation/transition_condition_base.hpp
@@ -14,10 +14,8 @@ /// at runtime. bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { - case TransitionConditionBase::typeKey: - return true; - default: - return false; + case TransitionConditionBase::typeKey: return true; + default: return false; } } @@ -42,9 +40,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case inputIdPropertyKey: - m_InputId = CoreUintType::deserialize(reader); - return true; + case inputIdPropertyKey: m_InputId = CoreUintType::deserialize(reader); return true; } return false; }
diff --git a/include/rive/generated/animation/transition_number_condition_base.hpp b/include/rive/generated/animation/transition_number_condition_base.hpp index 60adb86..1b91cec 100644 --- a/include/rive/generated/animation/transition_number_condition_base.hpp +++ b/include/rive/generated/animation/transition_number_condition_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case TransitionNumberConditionBase::typeKey: case TransitionValueConditionBase::typeKey: - case TransitionConditionBase::typeKey: - return true; - default: - return false; + case TransitionConditionBase::typeKey: return true; + default: return false; } } @@ -48,9 +46,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case valuePropertyKey: - m_Value = CoreDoubleType::deserialize(reader); - return true; + case valuePropertyKey: m_Value = CoreDoubleType::deserialize(reader); return true; } return TransitionValueCondition::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/animation/transition_trigger_condition_base.hpp b/include/rive/generated/animation/transition_trigger_condition_base.hpp index 7a41986..08d3f49 100644 --- a/include/rive/generated/animation/transition_trigger_condition_base.hpp +++ b/include/rive/generated/animation/transition_trigger_condition_base.hpp
@@ -14,10 +14,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case TransitionTriggerConditionBase::typeKey: - case TransitionConditionBase::typeKey: - return true; - default: - return false; + case TransitionConditionBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/animation/transition_value_condition_base.hpp b/include/rive/generated/animation/transition_value_condition_base.hpp index 39472a6..0967b10 100644 --- a/include/rive/generated/animation/transition_value_condition_base.hpp +++ b/include/rive/generated/animation/transition_value_condition_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case TransitionValueConditionBase::typeKey: - case TransitionConditionBase::typeKey: - return true; - default: - return false; + case TransitionConditionBase::typeKey: return true; + default: return false; } } @@ -46,9 +44,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case opValuePropertyKey: - m_OpValue = CoreUintType::deserialize(reader); - return true; + case opValuePropertyKey: m_OpValue = CoreUintType::deserialize(reader); return true; } return TransitionCondition::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/artboard_base.hpp b/include/rive/generated/artboard_base.hpp index f548975..7b85e6d 100644 --- a/include/rive/generated/artboard_base.hpp +++ b/include/rive/generated/artboard_base.hpp
@@ -19,10 +19,8 @@ case ArtboardBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -135,21 +133,11 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case clipPropertyKey: - m_Clip = CoreBoolType::deserialize(reader); - return true; - case widthPropertyKey: - m_Width = CoreDoubleType::deserialize(reader); - return true; - case heightPropertyKey: - m_Height = CoreDoubleType::deserialize(reader); - return true; - case xPropertyKey: - m_X = CoreDoubleType::deserialize(reader); - return true; - case yPropertyKey: - m_Y = CoreDoubleType::deserialize(reader); - return true; + case clipPropertyKey: m_Clip = CoreBoolType::deserialize(reader); return true; + case widthPropertyKey: m_Width = CoreDoubleType::deserialize(reader); return true; + case heightPropertyKey: m_Height = CoreDoubleType::deserialize(reader); return true; + case xPropertyKey: m_X = CoreDoubleType::deserialize(reader); return true; + case yPropertyKey: m_Y = CoreDoubleType::deserialize(reader); return true; case originXPropertyKey: m_OriginX = CoreDoubleType::deserialize(reader); return true;
diff --git a/include/rive/generated/assets/asset_base.hpp b/include/rive/generated/assets/asset_base.hpp index 82c72b7..dae032e 100644 --- a/include/rive/generated/assets/asset_base.hpp +++ b/include/rive/generated/assets/asset_base.hpp
@@ -15,10 +15,8 @@ /// at runtime. bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { - case AssetBase::typeKey: - return true; - default: - return false; + case AssetBase::typeKey: return true; + default: return false; } } @@ -43,9 +41,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case namePropertyKey: - m_Name = CoreStringType::deserialize(reader); - return true; + case namePropertyKey: m_Name = CoreStringType::deserialize(reader); return true; } return false; }
diff --git a/include/rive/generated/assets/drawable_asset_base.hpp b/include/rive/generated/assets/drawable_asset_base.hpp index a473a30..8f19f4c 100644 --- a/include/rive/generated/assets/drawable_asset_base.hpp +++ b/include/rive/generated/assets/drawable_asset_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case DrawableAssetBase::typeKey: case FileAssetBase::typeKey: - case AssetBase::typeKey: - return true; - default: - return false; + case AssetBase::typeKey: return true; + default: return false; } } @@ -59,12 +57,8 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case heightPropertyKey: - m_Height = CoreDoubleType::deserialize(reader); - return true; - case widthPropertyKey: - m_Width = CoreDoubleType::deserialize(reader); - return true; + case heightPropertyKey: m_Height = CoreDoubleType::deserialize(reader); return true; + case widthPropertyKey: m_Width = CoreDoubleType::deserialize(reader); return true; } return FileAsset::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/assets/file_asset_base.hpp b/include/rive/generated/assets/file_asset_base.hpp index 07b0477..c9130f5 100644 --- a/include/rive/generated/assets/file_asset_base.hpp +++ b/include/rive/generated/assets/file_asset_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case FileAssetBase::typeKey: - case AssetBase::typeKey: - return true; - default: - return false; + case AssetBase::typeKey: return true; + default: return false; } } @@ -46,9 +44,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case assetIdPropertyKey: - m_AssetId = CoreUintType::deserialize(reader); - return true; + case assetIdPropertyKey: m_AssetId = CoreUintType::deserialize(reader); return true; } return Asset::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/assets/file_asset_contents_base.hpp b/include/rive/generated/assets/file_asset_contents_base.hpp index c1cf02b..136b199 100644 --- a/include/rive/generated/assets/file_asset_contents_base.hpp +++ b/include/rive/generated/assets/file_asset_contents_base.hpp
@@ -15,10 +15,8 @@ /// at runtime. bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { - case FileAssetContentsBase::typeKey: - return true; - default: - return false; + case FileAssetContentsBase::typeKey: return true; + default: return false; } } @@ -35,9 +33,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case bytesPropertyKey: - decodeBytes(CoreBytesType::deserialize(reader)); - return true; + case bytesPropertyKey: decodeBytes(CoreBytesType::deserialize(reader)); return true; } return false; }
diff --git a/include/rive/generated/assets/folder_base.hpp b/include/rive/generated/assets/folder_base.hpp index 67f0534..ed174c8 100644 --- a/include/rive/generated/assets/folder_base.hpp +++ b/include/rive/generated/assets/folder_base.hpp
@@ -14,10 +14,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case FolderBase::typeKey: - case AssetBase::typeKey: - return true; - default: - return false; + case AssetBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/assets/image_asset_base.hpp b/include/rive/generated/assets/image_asset_base.hpp index ea46f4a..942b036 100644 --- a/include/rive/generated/assets/image_asset_base.hpp +++ b/include/rive/generated/assets/image_asset_base.hpp
@@ -16,10 +16,8 @@ case ImageAssetBase::typeKey: case DrawableAssetBase::typeKey: case FileAssetBase::typeKey: - case AssetBase::typeKey: - return true; - default: - return false; + case AssetBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/backboard_base.hpp b/include/rive/generated/backboard_base.hpp index ebc6360..c349b6b 100644 --- a/include/rive/generated/backboard_base.hpp +++ b/include/rive/generated/backboard_base.hpp
@@ -13,10 +13,8 @@ /// at runtime. bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { - case BackboardBase::typeKey: - return true; - default: - return false; + case BackboardBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/bones/bone_base.hpp b/include/rive/generated/bones/bone_base.hpp index d1a53c9..e770fc2 100644 --- a/include/rive/generated/bones/bone_base.hpp +++ b/include/rive/generated/bones/bone_base.hpp
@@ -19,10 +19,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -51,9 +49,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case lengthPropertyKey: - m_Length = CoreDoubleType::deserialize(reader); - return true; + case lengthPropertyKey: m_Length = CoreDoubleType::deserialize(reader); return true; } return SkeletalComponent::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/bones/cubic_weight_base.hpp b/include/rive/generated/bones/cubic_weight_base.hpp index e33b2a1..194e111 100644 --- a/include/rive/generated/bones/cubic_weight_base.hpp +++ b/include/rive/generated/bones/cubic_weight_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case CubicWeightBase::typeKey: case WeightBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/bones/root_bone_base.hpp b/include/rive/generated/bones/root_bone_base.hpp index df937ef..cd262ff 100644 --- a/include/rive/generated/bones/root_bone_base.hpp +++ b/include/rive/generated/bones/root_bone_base.hpp
@@ -20,10 +20,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -64,12 +62,8 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case xPropertyKey: - m_X = CoreDoubleType::deserialize(reader); - return true; - case yPropertyKey: - m_Y = CoreDoubleType::deserialize(reader); - return true; + case xPropertyKey: m_X = CoreDoubleType::deserialize(reader); return true; + case yPropertyKey: m_Y = CoreDoubleType::deserialize(reader); return true; } return Bone::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/bones/skeletal_component_base.hpp b/include/rive/generated/bones/skeletal_component_base.hpp index 60a2d51..05ec32f 100644 --- a/include/rive/generated/bones/skeletal_component_base.hpp +++ b/include/rive/generated/bones/skeletal_component_base.hpp
@@ -17,10 +17,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/bones/skin_base.hpp b/include/rive/generated/bones/skin_base.hpp index 62b5eff..ce0b1f8 100644 --- a/include/rive/generated/bones/skin_base.hpp +++ b/include/rive/generated/bones/skin_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case SkinBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -108,24 +106,12 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case xxPropertyKey: - m_Xx = CoreDoubleType::deserialize(reader); - return true; - case yxPropertyKey: - m_Yx = CoreDoubleType::deserialize(reader); - return true; - case xyPropertyKey: - m_Xy = CoreDoubleType::deserialize(reader); - return true; - case yyPropertyKey: - m_Yy = CoreDoubleType::deserialize(reader); - return true; - case txPropertyKey: - m_Tx = CoreDoubleType::deserialize(reader); - return true; - case tyPropertyKey: - m_Ty = CoreDoubleType::deserialize(reader); - return true; + case xxPropertyKey: m_Xx = CoreDoubleType::deserialize(reader); return true; + case yxPropertyKey: m_Yx = CoreDoubleType::deserialize(reader); return true; + case xyPropertyKey: m_Xy = CoreDoubleType::deserialize(reader); return true; + case yyPropertyKey: m_Yy = CoreDoubleType::deserialize(reader); return true; + case txPropertyKey: m_Tx = CoreDoubleType::deserialize(reader); return true; + case tyPropertyKey: m_Ty = CoreDoubleType::deserialize(reader); return true; } return ContainerComponent::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/bones/tendon_base.hpp b/include/rive/generated/bones/tendon_base.hpp index 4d22702..bcb4136 100644 --- a/include/rive/generated/bones/tendon_base.hpp +++ b/include/rive/generated/bones/tendon_base.hpp
@@ -16,10 +16,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case TendonBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -120,27 +118,13 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case boneIdPropertyKey: - m_BoneId = CoreUintType::deserialize(reader); - return true; - case xxPropertyKey: - m_Xx = CoreDoubleType::deserialize(reader); - return true; - case yxPropertyKey: - m_Yx = CoreDoubleType::deserialize(reader); - return true; - case xyPropertyKey: - m_Xy = CoreDoubleType::deserialize(reader); - return true; - case yyPropertyKey: - m_Yy = CoreDoubleType::deserialize(reader); - return true; - case txPropertyKey: - m_Tx = CoreDoubleType::deserialize(reader); - return true; - case tyPropertyKey: - m_Ty = CoreDoubleType::deserialize(reader); - return true; + case boneIdPropertyKey: m_BoneId = CoreUintType::deserialize(reader); return true; + case xxPropertyKey: m_Xx = CoreDoubleType::deserialize(reader); return true; + case yxPropertyKey: m_Yx = CoreDoubleType::deserialize(reader); return true; + case xyPropertyKey: m_Xy = CoreDoubleType::deserialize(reader); return true; + case yyPropertyKey: m_Yy = CoreDoubleType::deserialize(reader); return true; + case txPropertyKey: m_Tx = CoreDoubleType::deserialize(reader); return true; + case tyPropertyKey: m_Ty = CoreDoubleType::deserialize(reader); return true; } return Component::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/bones/weight_base.hpp b/include/rive/generated/bones/weight_base.hpp index d7d665a..0c4c707 100644 --- a/include/rive/generated/bones/weight_base.hpp +++ b/include/rive/generated/bones/weight_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case WeightBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -59,12 +57,8 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case valuesPropertyKey: - m_Values = CoreUintType::deserialize(reader); - return true; - case indicesPropertyKey: - m_Indices = CoreUintType::deserialize(reader); - return true; + case valuesPropertyKey: m_Values = CoreUintType::deserialize(reader); return true; + case indicesPropertyKey: m_Indices = CoreUintType::deserialize(reader); return true; } return Component::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/component_base.hpp b/include/rive/generated/component_base.hpp index 2e9aafd..840fada 100644 --- a/include/rive/generated/component_base.hpp +++ b/include/rive/generated/component_base.hpp
@@ -16,10 +16,8 @@ /// at runtime. bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -58,9 +56,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case namePropertyKey: - m_Name = CoreStringType::deserialize(reader); - return true; + case namePropertyKey: m_Name = CoreStringType::deserialize(reader); return true; case parentIdPropertyKey: m_ParentId = CoreUintType::deserialize(reader); return true;
diff --git a/include/rive/generated/constraints/constraint_base.hpp b/include/rive/generated/constraints/constraint_base.hpp index 8f558b1..e7a6ed9 100644 --- a/include/rive/generated/constraints/constraint_base.hpp +++ b/include/rive/generated/constraints/constraint_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case ConstraintBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/constraints/distance_constraint_base.hpp b/include/rive/generated/constraints/distance_constraint_base.hpp index 21ba252..e7d6965 100644 --- a/include/rive/generated/constraints/distance_constraint_base.hpp +++ b/include/rive/generated/constraints/distance_constraint_base.hpp
@@ -18,10 +18,8 @@ case DistanceConstraintBase::typeKey: case TargetedConstraintBase::typeKey: case ConstraintBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/constraints/ik_constraint_base.hpp b/include/rive/generated/constraints/ik_constraint_base.hpp index ead07f8..428aff7 100644 --- a/include/rive/generated/constraints/ik_constraint_base.hpp +++ b/include/rive/generated/constraints/ik_constraint_base.hpp
@@ -18,10 +18,8 @@ case IKConstraintBase::typeKey: case TargetedConstraintBase::typeKey: case ConstraintBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/constraints/rotation_constraint_base.hpp b/include/rive/generated/constraints/rotation_constraint_base.hpp index 29c35b9..80a5d56 100644 --- a/include/rive/generated/constraints/rotation_constraint_base.hpp +++ b/include/rive/generated/constraints/rotation_constraint_base.hpp
@@ -18,10 +18,8 @@ case TransformSpaceConstraintBase::typeKey: case TargetedConstraintBase::typeKey: case ConstraintBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/constraints/scale_constraint_base.hpp b/include/rive/generated/constraints/scale_constraint_base.hpp index a3c69d7..d84f379 100644 --- a/include/rive/generated/constraints/scale_constraint_base.hpp +++ b/include/rive/generated/constraints/scale_constraint_base.hpp
@@ -19,10 +19,8 @@ case TransformSpaceConstraintBase::typeKey: case TargetedConstraintBase::typeKey: case ConstraintBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/constraints/targeted_constraint_base.hpp b/include/rive/generated/constraints/targeted_constraint_base.hpp index 34d27b7..6378d4d 100644 --- a/include/rive/generated/constraints/targeted_constraint_base.hpp +++ b/include/rive/generated/constraints/targeted_constraint_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case TargetedConstraintBase::typeKey: case ConstraintBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/constraints/transform_component_constraint_base.hpp b/include/rive/generated/constraints/transform_component_constraint_base.hpp index 680ffa4..95c1142 100644 --- a/include/rive/generated/constraints/transform_component_constraint_base.hpp +++ b/include/rive/generated/constraints/transform_component_constraint_base.hpp
@@ -20,10 +20,8 @@ case TransformSpaceConstraintBase::typeKey: case TargetedConstraintBase::typeKey: case ConstraintBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -147,18 +145,12 @@ case maxValuePropertyKey: m_MaxValue = CoreDoubleType::deserialize(reader); return true; - case offsetPropertyKey: - m_Offset = CoreBoolType::deserialize(reader); - return true; + case offsetPropertyKey: m_Offset = CoreBoolType::deserialize(reader); return true; case doesCopyPropertyKey: m_DoesCopy = CoreBoolType::deserialize(reader); return true; - case minPropertyKey: - m_Min = CoreBoolType::deserialize(reader); - return true; - case maxPropertyKey: - m_Max = CoreBoolType::deserialize(reader); - return true; + case minPropertyKey: m_Min = CoreBoolType::deserialize(reader); return true; + case maxPropertyKey: m_Max = CoreBoolType::deserialize(reader); return true; } return TransformSpaceConstraint::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/constraints/transform_component_constraint_y_base.hpp b/include/rive/generated/constraints/transform_component_constraint_y_base.hpp index 81e4287..7e1ac60 100644 --- a/include/rive/generated/constraints/transform_component_constraint_y_base.hpp +++ b/include/rive/generated/constraints/transform_component_constraint_y_base.hpp
@@ -20,10 +20,8 @@ case TransformSpaceConstraintBase::typeKey: case TargetedConstraintBase::typeKey: case ConstraintBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -123,12 +121,8 @@ case doesCopyYPropertyKey: m_DoesCopyY = CoreBoolType::deserialize(reader); return true; - case minYPropertyKey: - m_MinY = CoreBoolType::deserialize(reader); - return true; - case maxYPropertyKey: - m_MaxY = CoreBoolType::deserialize(reader); - return true; + case minYPropertyKey: m_MinY = CoreBoolType::deserialize(reader); return true; + case maxYPropertyKey: m_MaxY = CoreBoolType::deserialize(reader); return true; } return TransformComponentConstraint::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/constraints/transform_constraint_base.hpp b/include/rive/generated/constraints/transform_constraint_base.hpp index c36b754..353889b 100644 --- a/include/rive/generated/constraints/transform_constraint_base.hpp +++ b/include/rive/generated/constraints/transform_constraint_base.hpp
@@ -17,10 +17,8 @@ case TransformSpaceConstraintBase::typeKey: case TargetedConstraintBase::typeKey: case ConstraintBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/constraints/transform_space_constraint_base.hpp b/include/rive/generated/constraints/transform_space_constraint_base.hpp index 6d2e22b..b65dc7e 100644 --- a/include/rive/generated/constraints/transform_space_constraint_base.hpp +++ b/include/rive/generated/constraints/transform_space_constraint_base.hpp
@@ -17,10 +17,8 @@ case TransformSpaceConstraintBase::typeKey: case TargetedConstraintBase::typeKey: case ConstraintBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/constraints/translation_constraint_base.hpp b/include/rive/generated/constraints/translation_constraint_base.hpp index ccf75f2..f0ab7a3 100644 --- a/include/rive/generated/constraints/translation_constraint_base.hpp +++ b/include/rive/generated/constraints/translation_constraint_base.hpp
@@ -19,10 +19,8 @@ case TransformSpaceConstraintBase::typeKey: case TargetedConstraintBase::typeKey: case ConstraintBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/container_component_base.hpp b/include/rive/generated/container_component_base.hpp index 619a63f..26bcd6a 100644 --- a/include/rive/generated/container_component_base.hpp +++ b/include/rive/generated/container_component_base.hpp
@@ -14,10 +14,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/core_registry.hpp b/include/rive/generated/core_registry.hpp index ad48ce9..4b8db4d 100644 --- a/include/rive/generated/core_registry.hpp +++ b/include/rive/generated/core_registry.hpp
@@ -121,170 +121,89 @@ public: static Core* makeCoreInstance(int typeKey) { switch (typeKey) { - case DrawTargetBase::typeKey: - return new DrawTarget(); - case DistanceConstraintBase::typeKey: - return new DistanceConstraint(); - case IKConstraintBase::typeKey: - return new IKConstraint(); - case TranslationConstraintBase::typeKey: - return new TranslationConstraint(); - case TransformConstraintBase::typeKey: - return new TransformConstraint(); - case ScaleConstraintBase::typeKey: - return new ScaleConstraint(); - case RotationConstraintBase::typeKey: - return new RotationConstraint(); - case NodeBase::typeKey: - return new Node(); - case NestedArtboardBase::typeKey: - return new NestedArtboard(); - case NestedSimpleAnimationBase::typeKey: - return new NestedSimpleAnimation(); - case AnimationStateBase::typeKey: - return new AnimationState(); - case NestedTriggerBase::typeKey: - return new NestedTrigger(); - case KeyedObjectBase::typeKey: - return new KeyedObject(); - case BlendAnimationDirectBase::typeKey: - return new BlendAnimationDirect(); - case StateMachineNumberBase::typeKey: - return new StateMachineNumber(); + case DrawTargetBase::typeKey: return new DrawTarget(); + case DistanceConstraintBase::typeKey: return new DistanceConstraint(); + case IKConstraintBase::typeKey: return new IKConstraint(); + case TranslationConstraintBase::typeKey: return new TranslationConstraint(); + case TransformConstraintBase::typeKey: return new TransformConstraint(); + case ScaleConstraintBase::typeKey: return new ScaleConstraint(); + case RotationConstraintBase::typeKey: return new RotationConstraint(); + case NodeBase::typeKey: return new Node(); + case NestedArtboardBase::typeKey: return new NestedArtboard(); + case NestedSimpleAnimationBase::typeKey: return new NestedSimpleAnimation(); + case AnimationStateBase::typeKey: return new AnimationState(); + case NestedTriggerBase::typeKey: return new NestedTrigger(); + case KeyedObjectBase::typeKey: return new KeyedObject(); + case BlendAnimationDirectBase::typeKey: return new BlendAnimationDirect(); + case StateMachineNumberBase::typeKey: return new StateMachineNumber(); case TransitionTriggerConditionBase::typeKey: return new TransitionTriggerCondition(); - case KeyedPropertyBase::typeKey: - return new KeyedProperty(); - case StateMachineListenerBase::typeKey: - return new StateMachineListener(); - case KeyFrameIdBase::typeKey: - return new KeyFrameId(); - case KeyFrameBoolBase::typeKey: - return new KeyFrameBool(); - case ListenerBoolChangeBase::typeKey: - return new ListenerBoolChange(); - case ListenerAlignTargetBase::typeKey: - return new ListenerAlignTarget(); - case TransitionNumberConditionBase::typeKey: - return new TransitionNumberCondition(); - case AnyStateBase::typeKey: - return new AnyState(); - case StateMachineLayerBase::typeKey: - return new StateMachineLayer(); - case AnimationBase::typeKey: - return new Animation(); - case ListenerNumberChangeBase::typeKey: - return new ListenerNumberChange(); - case CubicInterpolatorBase::typeKey: - return new CubicInterpolator(); - case StateTransitionBase::typeKey: - return new StateTransition(); - case NestedBoolBase::typeKey: - return new NestedBool(); - case KeyFrameDoubleBase::typeKey: - return new KeyFrameDouble(); - case KeyFrameColorBase::typeKey: - return new KeyFrameColor(); - case StateMachineBase::typeKey: - return new StateMachine(); - case EntryStateBase::typeKey: - return new EntryState(); - case LinearAnimationBase::typeKey: - return new LinearAnimation(); - case StateMachineTriggerBase::typeKey: - return new StateMachineTrigger(); - case ListenerTriggerChangeBase::typeKey: - return new ListenerTriggerChange(); - case BlendStateDirectBase::typeKey: - return new BlendStateDirect(); - case NestedStateMachineBase::typeKey: - return new NestedStateMachine(); - case ExitStateBase::typeKey: - return new ExitState(); - case NestedNumberBase::typeKey: - return new NestedNumber(); - case BlendState1DBase::typeKey: - return new BlendState1D(); - case NestedRemapAnimationBase::typeKey: - return new NestedRemapAnimation(); - case TransitionBoolConditionBase::typeKey: - return new TransitionBoolCondition(); - case BlendStateTransitionBase::typeKey: - return new BlendStateTransition(); - case StateMachineBoolBase::typeKey: - return new StateMachineBool(); - case BlendAnimation1DBase::typeKey: - return new BlendAnimation1D(); - case LinearGradientBase::typeKey: - return new LinearGradient(); - case RadialGradientBase::typeKey: - return new RadialGradient(); - case StrokeBase::typeKey: - return new Stroke(); - case SolidColorBase::typeKey: - return new SolidColor(); - case GradientStopBase::typeKey: - return new GradientStop(); - case TrimPathBase::typeKey: - return new TrimPath(); - case FillBase::typeKey: - return new Fill(); - case MeshVertexBase::typeKey: - return new MeshVertex(); - case ShapeBase::typeKey: - return new Shape(); - case StraightVertexBase::typeKey: - return new StraightVertex(); - case CubicAsymmetricVertexBase::typeKey: - return new CubicAsymmetricVertex(); - case MeshBase::typeKey: - return new Mesh(); - case PointsPathBase::typeKey: - return new PointsPath(); - case ContourMeshVertexBase::typeKey: - return new ContourMeshVertex(); - case RectangleBase::typeKey: - return new Rectangle(); - case CubicMirroredVertexBase::typeKey: - return new CubicMirroredVertex(); - case TriangleBase::typeKey: - return new Triangle(); - case EllipseBase::typeKey: - return new Ellipse(); - case ClippingShapeBase::typeKey: - return new ClippingShape(); - case PolygonBase::typeKey: - return new Polygon(); - case StarBase::typeKey: - return new Star(); - case ImageBase::typeKey: - return new Image(); - case CubicDetachedVertexBase::typeKey: - return new CubicDetachedVertex(); - case DrawRulesBase::typeKey: - return new DrawRules(); - case ArtboardBase::typeKey: - return new Artboard(); - case BackboardBase::typeKey: - return new Backboard(); - case WeightBase::typeKey: - return new Weight(); - case BoneBase::typeKey: - return new Bone(); - case RootBoneBase::typeKey: - return new RootBone(); - case SkinBase::typeKey: - return new Skin(); - case TendonBase::typeKey: - return new Tendon(); - case CubicWeightBase::typeKey: - return new CubicWeight(); - case FolderBase::typeKey: - return new Folder(); - case ImageAssetBase::typeKey: - return new ImageAsset(); - case FileAssetContentsBase::typeKey: - return new FileAssetContents(); + case KeyedPropertyBase::typeKey: return new KeyedProperty(); + case StateMachineListenerBase::typeKey: return new StateMachineListener(); + case KeyFrameIdBase::typeKey: return new KeyFrameId(); + case KeyFrameBoolBase::typeKey: return new KeyFrameBool(); + case ListenerBoolChangeBase::typeKey: return new ListenerBoolChange(); + case ListenerAlignTargetBase::typeKey: return new ListenerAlignTarget(); + case TransitionNumberConditionBase::typeKey: return new TransitionNumberCondition(); + case AnyStateBase::typeKey: return new AnyState(); + case StateMachineLayerBase::typeKey: return new StateMachineLayer(); + case AnimationBase::typeKey: return new Animation(); + case ListenerNumberChangeBase::typeKey: return new ListenerNumberChange(); + case CubicInterpolatorBase::typeKey: return new CubicInterpolator(); + case StateTransitionBase::typeKey: return new StateTransition(); + case NestedBoolBase::typeKey: return new NestedBool(); + case KeyFrameDoubleBase::typeKey: return new KeyFrameDouble(); + case KeyFrameColorBase::typeKey: return new KeyFrameColor(); + case StateMachineBase::typeKey: return new StateMachine(); + case EntryStateBase::typeKey: return new EntryState(); + case LinearAnimationBase::typeKey: return new LinearAnimation(); + case StateMachineTriggerBase::typeKey: return new StateMachineTrigger(); + case ListenerTriggerChangeBase::typeKey: return new ListenerTriggerChange(); + case BlendStateDirectBase::typeKey: return new BlendStateDirect(); + case NestedStateMachineBase::typeKey: return new NestedStateMachine(); + case ExitStateBase::typeKey: return new ExitState(); + case NestedNumberBase::typeKey: return new NestedNumber(); + case BlendState1DBase::typeKey: return new BlendState1D(); + case NestedRemapAnimationBase::typeKey: return new NestedRemapAnimation(); + case TransitionBoolConditionBase::typeKey: return new TransitionBoolCondition(); + case BlendStateTransitionBase::typeKey: return new BlendStateTransition(); + case StateMachineBoolBase::typeKey: return new StateMachineBool(); + case BlendAnimation1DBase::typeKey: return new BlendAnimation1D(); + case LinearGradientBase::typeKey: return new LinearGradient(); + case RadialGradientBase::typeKey: return new RadialGradient(); + case StrokeBase::typeKey: return new Stroke(); + case SolidColorBase::typeKey: return new SolidColor(); + case GradientStopBase::typeKey: return new GradientStop(); + case TrimPathBase::typeKey: return new TrimPath(); + case FillBase::typeKey: return new Fill(); + case MeshVertexBase::typeKey: return new MeshVertex(); + case ShapeBase::typeKey: return new Shape(); + case StraightVertexBase::typeKey: return new StraightVertex(); + case CubicAsymmetricVertexBase::typeKey: return new CubicAsymmetricVertex(); + case MeshBase::typeKey: return new Mesh(); + case PointsPathBase::typeKey: return new PointsPath(); + case ContourMeshVertexBase::typeKey: return new ContourMeshVertex(); + case RectangleBase::typeKey: return new Rectangle(); + case CubicMirroredVertexBase::typeKey: return new CubicMirroredVertex(); + case TriangleBase::typeKey: return new Triangle(); + case EllipseBase::typeKey: return new Ellipse(); + case ClippingShapeBase::typeKey: return new ClippingShape(); + case PolygonBase::typeKey: return new Polygon(); + case StarBase::typeKey: return new Star(); + case ImageBase::typeKey: return new Image(); + case CubicDetachedVertexBase::typeKey: return new CubicDetachedVertex(); + case DrawRulesBase::typeKey: return new DrawRules(); + case ArtboardBase::typeKey: return new Artboard(); + case BackboardBase::typeKey: return new Backboard(); + case WeightBase::typeKey: return new Weight(); + case BoneBase::typeKey: return new Bone(); + case RootBoneBase::typeKey: return new RootBone(); + case SkinBase::typeKey: return new Skin(); + case TendonBase::typeKey: return new Tendon(); + case CubicWeightBase::typeKey: return new CubicWeight(); + case FolderBase::typeKey: return new Folder(); + case ImageAssetBase::typeKey: return new ImageAsset(); + case FileAssetContentsBase::typeKey: return new FileAssetContents(); } return nullptr; } @@ -299,9 +218,7 @@ case AnimationBase::namePropertyKey: object->as<AnimationBase>()->name(value); break; - case AssetBase::namePropertyKey: - object->as<AssetBase>()->name(value); - break; + case AssetBase::namePropertyKey: object->as<AssetBase>()->name(value); break; } } static void setUint(Core* object, int propertyKey, uint32_t value) { @@ -429,18 +346,12 @@ case BlendStateTransitionBase::exitBlendAnimationIdPropertyKey: object->as<BlendStateTransitionBase>()->exitBlendAnimationId(value); break; - case StrokeBase::capPropertyKey: - object->as<StrokeBase>()->cap(value); - break; - case StrokeBase::joinPropertyKey: - object->as<StrokeBase>()->join(value); - break; + case StrokeBase::capPropertyKey: object->as<StrokeBase>()->cap(value); break; + case StrokeBase::joinPropertyKey: object->as<StrokeBase>()->join(value); break; case TrimPathBase::modeValuePropertyKey: object->as<TrimPathBase>()->modeValue(value); break; - case FillBase::fillRulePropertyKey: - object->as<FillBase>()->fillRule(value); - break; + case FillBase::fillRulePropertyKey: object->as<FillBase>()->fillRule(value); break; case PathBase::pathFlagsPropertyKey: object->as<PathBase>()->pathFlags(value); break; @@ -453,24 +364,18 @@ case PolygonBase::pointsPropertyKey: object->as<PolygonBase>()->points(value); break; - case ImageBase::assetIdPropertyKey: - object->as<ImageBase>()->assetId(value); - break; + case ImageBase::assetIdPropertyKey: object->as<ImageBase>()->assetId(value); break; case DrawRulesBase::drawTargetIdPropertyKey: object->as<DrawRulesBase>()->drawTargetId(value); break; case ArtboardBase::defaultStateMachineIdPropertyKey: object->as<ArtboardBase>()->defaultStateMachineId(value); break; - case WeightBase::valuesPropertyKey: - object->as<WeightBase>()->values(value); - break; + case WeightBase::valuesPropertyKey: object->as<WeightBase>()->values(value); break; case WeightBase::indicesPropertyKey: object->as<WeightBase>()->indices(value); break; - case TendonBase::boneIdPropertyKey: - object->as<TendonBase>()->boneId(value); - break; + case TendonBase::boneIdPropertyKey: object->as<TendonBase>()->boneId(value); break; case CubicWeightBase::inValuesPropertyKey: object->as<CubicWeightBase>()->inValues(value); break; @@ -526,12 +431,8 @@ case TransformComponentBase::scaleYPropertyKey: object->as<TransformComponentBase>()->scaleY(value); break; - case NodeBase::xPropertyKey: - object->as<NodeBase>()->x(value); - break; - case NodeBase::yPropertyKey: - object->as<NodeBase>()->y(value); - break; + case NodeBase::xPropertyKey: object->as<NodeBase>()->x(value); break; + case NodeBase::yPropertyKey: object->as<NodeBase>()->y(value); break; case NestedLinearAnimationBase::mixPropertyKey: object->as<NestedLinearAnimationBase>()->mix(value); break; @@ -598,24 +499,14 @@ case TrimPathBase::startPropertyKey: object->as<TrimPathBase>()->start(value); break; - case TrimPathBase::endPropertyKey: - object->as<TrimPathBase>()->end(value); - break; + case TrimPathBase::endPropertyKey: object->as<TrimPathBase>()->end(value); break; case TrimPathBase::offsetPropertyKey: object->as<TrimPathBase>()->offset(value); break; - case VertexBase::xPropertyKey: - object->as<VertexBase>()->x(value); - break; - case VertexBase::yPropertyKey: - object->as<VertexBase>()->y(value); - break; - case MeshVertexBase::uPropertyKey: - object->as<MeshVertexBase>()->u(value); - break; - case MeshVertexBase::vPropertyKey: - object->as<MeshVertexBase>()->v(value); - break; + case VertexBase::xPropertyKey: object->as<VertexBase>()->x(value); break; + case VertexBase::yPropertyKey: object->as<VertexBase>()->y(value); break; + case MeshVertexBase::uPropertyKey: object->as<MeshVertexBase>()->u(value); break; + case MeshVertexBase::vPropertyKey: object->as<MeshVertexBase>()->v(value); break; case StraightVertexBase::radiusPropertyKey: object->as<StraightVertexBase>()->radius(value); break; @@ -682,63 +573,29 @@ case ArtboardBase::heightPropertyKey: object->as<ArtboardBase>()->height(value); break; - case ArtboardBase::xPropertyKey: - object->as<ArtboardBase>()->x(value); - break; - case ArtboardBase::yPropertyKey: - object->as<ArtboardBase>()->y(value); - break; + case ArtboardBase::xPropertyKey: object->as<ArtboardBase>()->x(value); break; + case ArtboardBase::yPropertyKey: object->as<ArtboardBase>()->y(value); break; case ArtboardBase::originXPropertyKey: object->as<ArtboardBase>()->originX(value); break; case ArtboardBase::originYPropertyKey: object->as<ArtboardBase>()->originY(value); break; - case BoneBase::lengthPropertyKey: - object->as<BoneBase>()->length(value); - break; - case RootBoneBase::xPropertyKey: - object->as<RootBoneBase>()->x(value); - break; - case RootBoneBase::yPropertyKey: - object->as<RootBoneBase>()->y(value); - break; - case SkinBase::xxPropertyKey: - object->as<SkinBase>()->xx(value); - break; - case SkinBase::yxPropertyKey: - object->as<SkinBase>()->yx(value); - break; - case SkinBase::xyPropertyKey: - object->as<SkinBase>()->xy(value); - break; - case SkinBase::yyPropertyKey: - object->as<SkinBase>()->yy(value); - break; - case SkinBase::txPropertyKey: - object->as<SkinBase>()->tx(value); - break; - case SkinBase::tyPropertyKey: - object->as<SkinBase>()->ty(value); - break; - case TendonBase::xxPropertyKey: - object->as<TendonBase>()->xx(value); - break; - case TendonBase::yxPropertyKey: - object->as<TendonBase>()->yx(value); - break; - case TendonBase::xyPropertyKey: - object->as<TendonBase>()->xy(value); - break; - case TendonBase::yyPropertyKey: - object->as<TendonBase>()->yy(value); - break; - case TendonBase::txPropertyKey: - object->as<TendonBase>()->tx(value); - break; - case TendonBase::tyPropertyKey: - object->as<TendonBase>()->ty(value); - break; + case BoneBase::lengthPropertyKey: object->as<BoneBase>()->length(value); break; + case RootBoneBase::xPropertyKey: object->as<RootBoneBase>()->x(value); break; + case RootBoneBase::yPropertyKey: object->as<RootBoneBase>()->y(value); break; + case SkinBase::xxPropertyKey: object->as<SkinBase>()->xx(value); break; + case SkinBase::yxPropertyKey: object->as<SkinBase>()->yx(value); break; + case SkinBase::xyPropertyKey: object->as<SkinBase>()->xy(value); break; + case SkinBase::yyPropertyKey: object->as<SkinBase>()->yy(value); break; + case SkinBase::txPropertyKey: object->as<SkinBase>()->tx(value); break; + case SkinBase::tyPropertyKey: object->as<SkinBase>()->ty(value); break; + case TendonBase::xxPropertyKey: object->as<TendonBase>()->xx(value); break; + case TendonBase::yxPropertyKey: object->as<TendonBase>()->yx(value); break; + case TendonBase::xyPropertyKey: object->as<TendonBase>()->xy(value); break; + case TendonBase::yyPropertyKey: object->as<TendonBase>()->yy(value); break; + case TendonBase::txPropertyKey: object->as<TendonBase>()->tx(value); break; + case TendonBase::tyPropertyKey: object->as<TendonBase>()->ty(value); break; case DrawableAssetBase::heightPropertyKey: object->as<DrawableAssetBase>()->height(value); break; @@ -803,9 +660,7 @@ case ClippingShapeBase::isVisiblePropertyKey: object->as<ClippingShapeBase>()->isVisible(value); break; - case ArtboardBase::clipPropertyKey: - object->as<ArtboardBase>()->clip(value); - break; + case ArtboardBase::clipPropertyKey: object->as<ArtboardBase>()->clip(value); break; } } static void setColor(Core* object, int propertyKey, int value) { @@ -823,14 +678,11 @@ } static std::string getString(Core* object, int propertyKey) { switch (propertyKey) { - case ComponentBase::namePropertyKey: - return object->as<ComponentBase>()->name(); + case ComponentBase::namePropertyKey: return object->as<ComponentBase>()->name(); case StateMachineComponentBase::namePropertyKey: return object->as<StateMachineComponentBase>()->name(); - case AnimationBase::namePropertyKey: - return object->as<AnimationBase>()->name(); - case AssetBase::namePropertyKey: - return object->as<AssetBase>()->name(); + case AnimationBase::namePropertyKey: return object->as<AnimationBase>()->name(); + case AssetBase::namePropertyKey: return object->as<AssetBase>()->name(); } return ""; } @@ -882,14 +734,12 @@ return object->as<StateMachineListenerBase>()->targetId(); case StateMachineListenerBase::listenerTypeValuePropertyKey: return object->as<StateMachineListenerBase>()->listenerTypeValue(); - case KeyFrameBase::framePropertyKey: - return object->as<KeyFrameBase>()->frame(); + case KeyFrameBase::framePropertyKey: return object->as<KeyFrameBase>()->frame(); case KeyFrameBase::interpolationTypePropertyKey: return object->as<KeyFrameBase>()->interpolationType(); case KeyFrameBase::interpolatorIdPropertyKey: return object->as<KeyFrameBase>()->interpolatorId(); - case KeyFrameIdBase::valuePropertyKey: - return object->as<KeyFrameIdBase>()->value(); + case KeyFrameIdBase::valuePropertyKey: return object->as<KeyFrameIdBase>()->value(); case ListenerBoolChangeBase::valuePropertyKey: return object->as<ListenerBoolChangeBase>()->value(); case ListenerAlignTargetBase::targetIdPropertyKey: @@ -918,34 +768,25 @@ return object->as<BlendState1DBase>()->inputId(); case BlendStateTransitionBase::exitBlendAnimationIdPropertyKey: return object->as<BlendStateTransitionBase>()->exitBlendAnimationId(); - case StrokeBase::capPropertyKey: - return object->as<StrokeBase>()->cap(); - case StrokeBase::joinPropertyKey: - return object->as<StrokeBase>()->join(); + case StrokeBase::capPropertyKey: return object->as<StrokeBase>()->cap(); + case StrokeBase::joinPropertyKey: return object->as<StrokeBase>()->join(); case TrimPathBase::modeValuePropertyKey: return object->as<TrimPathBase>()->modeValue(); - case FillBase::fillRulePropertyKey: - return object->as<FillBase>()->fillRule(); - case PathBase::pathFlagsPropertyKey: - return object->as<PathBase>()->pathFlags(); + case FillBase::fillRulePropertyKey: return object->as<FillBase>()->fillRule(); + case PathBase::pathFlagsPropertyKey: return object->as<PathBase>()->pathFlags(); case ClippingShapeBase::sourceIdPropertyKey: return object->as<ClippingShapeBase>()->sourceId(); case ClippingShapeBase::fillRulePropertyKey: return object->as<ClippingShapeBase>()->fillRule(); - case PolygonBase::pointsPropertyKey: - return object->as<PolygonBase>()->points(); - case ImageBase::assetIdPropertyKey: - return object->as<ImageBase>()->assetId(); + case PolygonBase::pointsPropertyKey: return object->as<PolygonBase>()->points(); + case ImageBase::assetIdPropertyKey: return object->as<ImageBase>()->assetId(); case DrawRulesBase::drawTargetIdPropertyKey: return object->as<DrawRulesBase>()->drawTargetId(); case ArtboardBase::defaultStateMachineIdPropertyKey: return object->as<ArtboardBase>()->defaultStateMachineId(); - case WeightBase::valuesPropertyKey: - return object->as<WeightBase>()->values(); - case WeightBase::indicesPropertyKey: - return object->as<WeightBase>()->indices(); - case TendonBase::boneIdPropertyKey: - return object->as<TendonBase>()->boneId(); + case WeightBase::valuesPropertyKey: return object->as<WeightBase>()->values(); + case WeightBase::indicesPropertyKey: return object->as<WeightBase>()->indices(); + case TendonBase::boneIdPropertyKey: return object->as<TendonBase>()->boneId(); case CubicWeightBase::inValuesPropertyKey: return object->as<CubicWeightBase>()->inValues(); case CubicWeightBase::inIndicesPropertyKey: @@ -985,10 +826,8 @@ return object->as<TransformComponentBase>()->scaleX(); case TransformComponentBase::scaleYPropertyKey: return object->as<TransformComponentBase>()->scaleY(); - case NodeBase::xPropertyKey: - return object->as<NodeBase>()->x(); - case NodeBase::yPropertyKey: - return object->as<NodeBase>()->y(); + case NodeBase::xPropertyKey: return object->as<NodeBase>()->x(); + case NodeBase::yPropertyKey: return object->as<NodeBase>()->y(); case NestedLinearAnimationBase::mixPropertyKey: return object->as<NestedLinearAnimationBase>()->mix(); case NestedSimpleAnimationBase::speedPropertyKey: @@ -1027,24 +866,16 @@ return object->as<LinearGradientBase>()->endY(); case LinearGradientBase::opacityPropertyKey: return object->as<LinearGradientBase>()->opacity(); - case StrokeBase::thicknessPropertyKey: - return object->as<StrokeBase>()->thickness(); + case StrokeBase::thicknessPropertyKey: return object->as<StrokeBase>()->thickness(); case GradientStopBase::positionPropertyKey: return object->as<GradientStopBase>()->position(); - case TrimPathBase::startPropertyKey: - return object->as<TrimPathBase>()->start(); - case TrimPathBase::endPropertyKey: - return object->as<TrimPathBase>()->end(); - case TrimPathBase::offsetPropertyKey: - return object->as<TrimPathBase>()->offset(); - case VertexBase::xPropertyKey: - return object->as<VertexBase>()->x(); - case VertexBase::yPropertyKey: - return object->as<VertexBase>()->y(); - case MeshVertexBase::uPropertyKey: - return object->as<MeshVertexBase>()->u(); - case MeshVertexBase::vPropertyKey: - return object->as<MeshVertexBase>()->v(); + case TrimPathBase::startPropertyKey: return object->as<TrimPathBase>()->start(); + case TrimPathBase::endPropertyKey: return object->as<TrimPathBase>()->end(); + case TrimPathBase::offsetPropertyKey: return object->as<TrimPathBase>()->offset(); + case VertexBase::xPropertyKey: return object->as<VertexBase>()->x(); + case VertexBase::yPropertyKey: return object->as<VertexBase>()->y(); + case MeshVertexBase::uPropertyKey: return object->as<MeshVertexBase>()->u(); + case MeshVertexBase::vPropertyKey: return object->as<MeshVertexBase>()->v(); case StraightVertexBase::radiusPropertyKey: return object->as<StraightVertexBase>()->radius(); case CubicAsymmetricVertexBase::rotationPropertyKey: @@ -1075,8 +906,7 @@ return object->as<CubicMirroredVertexBase>()->distance(); case PolygonBase::cornerRadiusPropertyKey: return object->as<PolygonBase>()->cornerRadius(); - case StarBase::innerRadiusPropertyKey: - return object->as<StarBase>()->innerRadius(); + case StarBase::innerRadiusPropertyKey: return object->as<StarBase>()->innerRadius(); case CubicDetachedVertexBase::inRotationPropertyKey: return object->as<CubicDetachedVertexBase>()->inRotation(); case CubicDetachedVertexBase::inDistancePropertyKey: @@ -1085,48 +915,27 @@ return object->as<CubicDetachedVertexBase>()->outRotation(); case CubicDetachedVertexBase::outDistancePropertyKey: return object->as<CubicDetachedVertexBase>()->outDistance(); - case ArtboardBase::widthPropertyKey: - return object->as<ArtboardBase>()->width(); - case ArtboardBase::heightPropertyKey: - return object->as<ArtboardBase>()->height(); - case ArtboardBase::xPropertyKey: - return object->as<ArtboardBase>()->x(); - case ArtboardBase::yPropertyKey: - return object->as<ArtboardBase>()->y(); - case ArtboardBase::originXPropertyKey: - return object->as<ArtboardBase>()->originX(); - case ArtboardBase::originYPropertyKey: - return object->as<ArtboardBase>()->originY(); - case BoneBase::lengthPropertyKey: - return object->as<BoneBase>()->length(); - case RootBoneBase::xPropertyKey: - return object->as<RootBoneBase>()->x(); - case RootBoneBase::yPropertyKey: - return object->as<RootBoneBase>()->y(); - case SkinBase::xxPropertyKey: - return object->as<SkinBase>()->xx(); - case SkinBase::yxPropertyKey: - return object->as<SkinBase>()->yx(); - case SkinBase::xyPropertyKey: - return object->as<SkinBase>()->xy(); - case SkinBase::yyPropertyKey: - return object->as<SkinBase>()->yy(); - case SkinBase::txPropertyKey: - return object->as<SkinBase>()->tx(); - case SkinBase::tyPropertyKey: - return object->as<SkinBase>()->ty(); - case TendonBase::xxPropertyKey: - return object->as<TendonBase>()->xx(); - case TendonBase::yxPropertyKey: - return object->as<TendonBase>()->yx(); - case TendonBase::xyPropertyKey: - return object->as<TendonBase>()->xy(); - case TendonBase::yyPropertyKey: - return object->as<TendonBase>()->yy(); - case TendonBase::txPropertyKey: - return object->as<TendonBase>()->tx(); - case TendonBase::tyPropertyKey: - return object->as<TendonBase>()->ty(); + case ArtboardBase::widthPropertyKey: return object->as<ArtboardBase>()->width(); + case ArtboardBase::heightPropertyKey: return object->as<ArtboardBase>()->height(); + case ArtboardBase::xPropertyKey: return object->as<ArtboardBase>()->x(); + case ArtboardBase::yPropertyKey: return object->as<ArtboardBase>()->y(); + case ArtboardBase::originXPropertyKey: return object->as<ArtboardBase>()->originX(); + case ArtboardBase::originYPropertyKey: return object->as<ArtboardBase>()->originY(); + case BoneBase::lengthPropertyKey: return object->as<BoneBase>()->length(); + case RootBoneBase::xPropertyKey: return object->as<RootBoneBase>()->x(); + case RootBoneBase::yPropertyKey: return object->as<RootBoneBase>()->y(); + case SkinBase::xxPropertyKey: return object->as<SkinBase>()->xx(); + case SkinBase::yxPropertyKey: return object->as<SkinBase>()->yx(); + case SkinBase::xyPropertyKey: return object->as<SkinBase>()->xy(); + case SkinBase::yyPropertyKey: return object->as<SkinBase>()->yy(); + case SkinBase::txPropertyKey: return object->as<SkinBase>()->tx(); + case SkinBase::tyPropertyKey: return object->as<SkinBase>()->ty(); + case TendonBase::xxPropertyKey: return object->as<TendonBase>()->xx(); + case TendonBase::yxPropertyKey: return object->as<TendonBase>()->yx(); + case TendonBase::xyPropertyKey: return object->as<TendonBase>()->xy(); + case TendonBase::yyPropertyKey: return object->as<TendonBase>()->yy(); + case TendonBase::txPropertyKey: return object->as<TendonBase>()->tx(); + case TendonBase::tyPropertyKey: return object->as<TendonBase>()->ty(); case DrawableAssetBase::heightPropertyKey: return object->as<DrawableAssetBase>()->height(); case DrawableAssetBase::widthPropertyKey: @@ -1172,8 +981,7 @@ return object->as<RectangleBase>()->linkCornerRadius(); case ClippingShapeBase::isVisiblePropertyKey: return object->as<ClippingShapeBase>()->isVisible(); - case ArtboardBase::clipPropertyKey: - return object->as<ArtboardBase>()->clip(); + case ArtboardBase::clipPropertyKey: return object->as<ArtboardBase>()->clip(); } return false; } @@ -1193,8 +1001,7 @@ case ComponentBase::namePropertyKey: case StateMachineComponentBase::namePropertyKey: case AnimationBase::namePropertyKey: - case AssetBase::namePropertyKey: - return CoreStringType::id; + case AssetBase::namePropertyKey: return CoreStringType::id; case ComponentBase::parentIdPropertyKey: case DrawTargetBase::drawableIdPropertyKey: case DrawTargetBase::placementValuePropertyKey: @@ -1254,8 +1061,7 @@ case CubicWeightBase::inIndicesPropertyKey: case CubicWeightBase::outValuesPropertyKey: case CubicWeightBase::outIndicesPropertyKey: - case FileAssetBase::assetIdPropertyKey: - return CoreUintType::id; + case FileAssetBase::assetIdPropertyKey: return CoreUintType::id; case ConstraintBase::strengthPropertyKey: case DistanceConstraintBase::distancePropertyKey: case TransformComponentConstraintBase::copyFactorPropertyKey: @@ -1340,8 +1146,7 @@ case TendonBase::txPropertyKey: case TendonBase::tyPropertyKey: case DrawableAssetBase::heightPropertyKey: - case DrawableAssetBase::widthPropertyKey: - return CoreDoubleType::id; + case DrawableAssetBase::widthPropertyKey: return CoreDoubleType::id; case TransformComponentConstraintBase::offsetPropertyKey: case TransformComponentConstraintBase::doesCopyPropertyKey: case TransformComponentConstraintBase::minPropertyKey: @@ -1360,17 +1165,13 @@ case PointsPathBase::isClosedPropertyKey: case RectangleBase::linkCornerRadiusPropertyKey: case ClippingShapeBase::isVisiblePropertyKey: - case ArtboardBase::clipPropertyKey: - return CoreBoolType::id; + case ArtboardBase::clipPropertyKey: return CoreBoolType::id; case KeyFrameColorBase::valuePropertyKey: case SolidColorBase::colorValuePropertyKey: - case GradientStopBase::colorValuePropertyKey: - return CoreColorType::id; + case GradientStopBase::colorValuePropertyKey: return CoreColorType::id; case MeshBase::triangleIndexBytesPropertyKey: - case FileAssetContentsBase::bytesPropertyKey: - return CoreBytesType::id; - default: - return -1; + case FileAssetContentsBase::bytesPropertyKey: return CoreBytesType::id; + default: return -1; } } };
diff --git a/include/rive/generated/draw_rules_base.hpp b/include/rive/generated/draw_rules_base.hpp index 5ba2371..7d173cf 100644 --- a/include/rive/generated/draw_rules_base.hpp +++ b/include/rive/generated/draw_rules_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case DrawRulesBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/draw_target_base.hpp b/include/rive/generated/draw_target_base.hpp index 400494d..53d6b3b 100644 --- a/include/rive/generated/draw_target_base.hpp +++ b/include/rive/generated/draw_target_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case DrawTargetBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/drawable_base.hpp b/include/rive/generated/drawable_base.hpp index 45eee97..8bd0b4b 100644 --- a/include/rive/generated/drawable_base.hpp +++ b/include/rive/generated/drawable_base.hpp
@@ -19,10 +19,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/nested_animation_base.hpp b/include/rive/generated/nested_animation_base.hpp index 6d33c29..928a179 100644 --- a/include/rive/generated/nested_animation_base.hpp +++ b/include/rive/generated/nested_animation_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case NestedAnimationBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/nested_artboard_base.hpp b/include/rive/generated/nested_artboard_base.hpp index 2dcd60c..01d439c 100644 --- a/include/rive/generated/nested_artboard_base.hpp +++ b/include/rive/generated/nested_artboard_base.hpp
@@ -20,10 +20,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/node_base.hpp b/include/rive/generated/node_base.hpp index 32ec3ae..2dc0f1d 100644 --- a/include/rive/generated/node_base.hpp +++ b/include/rive/generated/node_base.hpp
@@ -18,10 +18,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -62,12 +60,8 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case xPropertyKey: - m_X = CoreDoubleType::deserialize(reader); - return true; - case yPropertyKey: - m_Y = CoreDoubleType::deserialize(reader); - return true; + case xPropertyKey: m_X = CoreDoubleType::deserialize(reader); return true; + case yPropertyKey: m_Y = CoreDoubleType::deserialize(reader); return true; } return TransformComponent::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/shapes/clipping_shape_base.hpp b/include/rive/generated/shapes/clipping_shape_base.hpp index 4e94619..75a21b7 100644 --- a/include/rive/generated/shapes/clipping_shape_base.hpp +++ b/include/rive/generated/shapes/clipping_shape_base.hpp
@@ -16,10 +16,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case ClippingShapeBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/contour_mesh_vertex_base.hpp b/include/rive/generated/shapes/contour_mesh_vertex_base.hpp index c3c4ad0..645349a 100644 --- a/include/rive/generated/shapes/contour_mesh_vertex_base.hpp +++ b/include/rive/generated/shapes/contour_mesh_vertex_base.hpp
@@ -17,10 +17,8 @@ case MeshVertexBase::typeKey: case VertexBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/cubic_asymmetric_vertex_base.hpp b/include/rive/generated/shapes/cubic_asymmetric_vertex_base.hpp index b579f7b..61feee7 100644 --- a/include/rive/generated/shapes/cubic_asymmetric_vertex_base.hpp +++ b/include/rive/generated/shapes/cubic_asymmetric_vertex_base.hpp
@@ -19,10 +19,8 @@ case PathVertexBase::typeKey: case VertexBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/cubic_detached_vertex_base.hpp b/include/rive/generated/shapes/cubic_detached_vertex_base.hpp index ebbc236..5ab1116 100644 --- a/include/rive/generated/shapes/cubic_detached_vertex_base.hpp +++ b/include/rive/generated/shapes/cubic_detached_vertex_base.hpp
@@ -19,10 +19,8 @@ case PathVertexBase::typeKey: case VertexBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/cubic_mirrored_vertex_base.hpp b/include/rive/generated/shapes/cubic_mirrored_vertex_base.hpp index 7690d96..06e6915 100644 --- a/include/rive/generated/shapes/cubic_mirrored_vertex_base.hpp +++ b/include/rive/generated/shapes/cubic_mirrored_vertex_base.hpp
@@ -19,10 +19,8 @@ case PathVertexBase::typeKey: case VertexBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/cubic_vertex_base.hpp b/include/rive/generated/shapes/cubic_vertex_base.hpp index 1f3a68e..470207b 100644 --- a/include/rive/generated/shapes/cubic_vertex_base.hpp +++ b/include/rive/generated/shapes/cubic_vertex_base.hpp
@@ -17,10 +17,8 @@ case PathVertexBase::typeKey: case VertexBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/ellipse_base.hpp b/include/rive/generated/shapes/ellipse_base.hpp index 9911e9a..5bc81d7 100644 --- a/include/rive/generated/shapes/ellipse_base.hpp +++ b/include/rive/generated/shapes/ellipse_base.hpp
@@ -20,10 +20,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/image_base.hpp b/include/rive/generated/shapes/image_base.hpp index 6eb8647..71d9660 100644 --- a/include/rive/generated/shapes/image_base.hpp +++ b/include/rive/generated/shapes/image_base.hpp
@@ -20,10 +20,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -52,9 +50,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case assetIdPropertyKey: - m_AssetId = CoreUintType::deserialize(reader); - return true; + case assetIdPropertyKey: m_AssetId = CoreUintType::deserialize(reader); return true; } return Drawable::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/shapes/mesh_base.hpp b/include/rive/generated/shapes/mesh_base.hpp index a082b00..7b69271 100644 --- a/include/rive/generated/shapes/mesh_base.hpp +++ b/include/rive/generated/shapes/mesh_base.hpp
@@ -17,10 +17,8 @@ switch (typeKey) { case MeshBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/mesh_vertex_base.hpp b/include/rive/generated/shapes/mesh_vertex_base.hpp index 9957540..6c24c0f 100644 --- a/include/rive/generated/shapes/mesh_vertex_base.hpp +++ b/include/rive/generated/shapes/mesh_vertex_base.hpp
@@ -17,10 +17,8 @@ case MeshVertexBase::typeKey: case VertexBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -61,12 +59,8 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case uPropertyKey: - m_U = CoreDoubleType::deserialize(reader); - return true; - case vPropertyKey: - m_V = CoreDoubleType::deserialize(reader); - return true; + case uPropertyKey: m_U = CoreDoubleType::deserialize(reader); return true; + case vPropertyKey: m_V = CoreDoubleType::deserialize(reader); return true; } return Vertex::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/shapes/paint/fill_base.hpp b/include/rive/generated/shapes/paint/fill_base.hpp index 567bf0e..7127fc3 100644 --- a/include/rive/generated/shapes/paint/fill_base.hpp +++ b/include/rive/generated/shapes/paint/fill_base.hpp
@@ -17,10 +17,8 @@ case FillBase::typeKey: case ShapePaintBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/paint/gradient_stop_base.hpp b/include/rive/generated/shapes/paint/gradient_stop_base.hpp index 8c28d8d..699216b 100644 --- a/include/rive/generated/shapes/paint/gradient_stop_base.hpp +++ b/include/rive/generated/shapes/paint/gradient_stop_base.hpp
@@ -16,10 +16,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case GradientStopBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/paint/linear_gradient_base.hpp b/include/rive/generated/shapes/paint/linear_gradient_base.hpp index c070201..27ba435 100644 --- a/include/rive/generated/shapes/paint/linear_gradient_base.hpp +++ b/include/rive/generated/shapes/paint/linear_gradient_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case LinearGradientBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -96,18 +94,10 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case startXPropertyKey: - m_StartX = CoreDoubleType::deserialize(reader); - return true; - case startYPropertyKey: - m_StartY = CoreDoubleType::deserialize(reader); - return true; - case endXPropertyKey: - m_EndX = CoreDoubleType::deserialize(reader); - return true; - case endYPropertyKey: - m_EndY = CoreDoubleType::deserialize(reader); - return true; + case startXPropertyKey: m_StartX = CoreDoubleType::deserialize(reader); return true; + case startYPropertyKey: m_StartY = CoreDoubleType::deserialize(reader); return true; + case endXPropertyKey: m_EndX = CoreDoubleType::deserialize(reader); return true; + case endYPropertyKey: m_EndY = CoreDoubleType::deserialize(reader); return true; case opacityPropertyKey: m_Opacity = CoreDoubleType::deserialize(reader); return true;
diff --git a/include/rive/generated/shapes/paint/radial_gradient_base.hpp b/include/rive/generated/shapes/paint/radial_gradient_base.hpp index 037a035..68ce241 100644 --- a/include/rive/generated/shapes/paint/radial_gradient_base.hpp +++ b/include/rive/generated/shapes/paint/radial_gradient_base.hpp
@@ -16,10 +16,8 @@ case RadialGradientBase::typeKey: case LinearGradientBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/paint/shape_paint_base.hpp b/include/rive/generated/shapes/paint/shape_paint_base.hpp index 9f355f9..f4618aa 100644 --- a/include/rive/generated/shapes/paint/shape_paint_base.hpp +++ b/include/rive/generated/shapes/paint/shape_paint_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case ShapePaintBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/paint/solid_color_base.hpp b/include/rive/generated/shapes/paint/solid_color_base.hpp index 954584f..781610d 100644 --- a/include/rive/generated/shapes/paint/solid_color_base.hpp +++ b/include/rive/generated/shapes/paint/solid_color_base.hpp
@@ -15,10 +15,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case SolidColorBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/paint/stroke_base.hpp b/include/rive/generated/shapes/paint/stroke_base.hpp index cc5a6ba..e41ed91 100644 --- a/include/rive/generated/shapes/paint/stroke_base.hpp +++ b/include/rive/generated/shapes/paint/stroke_base.hpp
@@ -19,10 +19,8 @@ case StrokeBase::typeKey: case ShapePaintBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -90,12 +88,8 @@ case thicknessPropertyKey: m_Thickness = CoreDoubleType::deserialize(reader); return true; - case capPropertyKey: - m_Cap = CoreUintType::deserialize(reader); - return true; - case joinPropertyKey: - m_Join = CoreUintType::deserialize(reader); - return true; + case capPropertyKey: m_Cap = CoreUintType::deserialize(reader); return true; + case joinPropertyKey: m_Join = CoreUintType::deserialize(reader); return true; case transformAffectsStrokePropertyKey: m_TransformAffectsStroke = CoreBoolType::deserialize(reader); return true;
diff --git a/include/rive/generated/shapes/paint/trim_path_base.hpp b/include/rive/generated/shapes/paint/trim_path_base.hpp index 2154405..8c68f94 100644 --- a/include/rive/generated/shapes/paint/trim_path_base.hpp +++ b/include/rive/generated/shapes/paint/trim_path_base.hpp
@@ -16,10 +16,8 @@ bool isTypeOf(uint16_t typeKey) const override { switch (typeKey) { case TrimPathBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -84,15 +82,9 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case startPropertyKey: - m_Start = CoreDoubleType::deserialize(reader); - return true; - case endPropertyKey: - m_End = CoreDoubleType::deserialize(reader); - return true; - case offsetPropertyKey: - m_Offset = CoreDoubleType::deserialize(reader); - return true; + case startPropertyKey: m_Start = CoreDoubleType::deserialize(reader); return true; + case endPropertyKey: m_End = CoreDoubleType::deserialize(reader); return true; + case offsetPropertyKey: m_Offset = CoreDoubleType::deserialize(reader); return true; case modeValuePropertyKey: m_ModeValue = CoreUintType::deserialize(reader); return true;
diff --git a/include/rive/generated/shapes/parametric_path_base.hpp b/include/rive/generated/shapes/parametric_path_base.hpp index 9b72a85..b2f5224 100644 --- a/include/rive/generated/shapes/parametric_path_base.hpp +++ b/include/rive/generated/shapes/parametric_path_base.hpp
@@ -20,10 +20,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -87,12 +85,8 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case widthPropertyKey: - m_Width = CoreDoubleType::deserialize(reader); - return true; - case heightPropertyKey: - m_Height = CoreDoubleType::deserialize(reader); - return true; + case widthPropertyKey: m_Width = CoreDoubleType::deserialize(reader); return true; + case heightPropertyKey: m_Height = CoreDoubleType::deserialize(reader); return true; case originXPropertyKey: m_OriginX = CoreDoubleType::deserialize(reader); return true;
diff --git a/include/rive/generated/shapes/path_base.hpp b/include/rive/generated/shapes/path_base.hpp index faefd67..70336a4 100644 --- a/include/rive/generated/shapes/path_base.hpp +++ b/include/rive/generated/shapes/path_base.hpp
@@ -19,10 +19,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/path_vertex_base.hpp b/include/rive/generated/shapes/path_vertex_base.hpp index bb58c8a..e10c004 100644 --- a/include/rive/generated/shapes/path_vertex_base.hpp +++ b/include/rive/generated/shapes/path_vertex_base.hpp
@@ -16,10 +16,8 @@ case PathVertexBase::typeKey: case VertexBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/points_path_base.hpp b/include/rive/generated/shapes/points_path_base.hpp index 5273205..00543bf 100644 --- a/include/rive/generated/shapes/points_path_base.hpp +++ b/include/rive/generated/shapes/points_path_base.hpp
@@ -20,10 +20,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/polygon_base.hpp b/include/rive/generated/shapes/polygon_base.hpp index 187be2f..9069cd5 100644 --- a/include/rive/generated/shapes/polygon_base.hpp +++ b/include/rive/generated/shapes/polygon_base.hpp
@@ -22,10 +22,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -66,9 +64,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case pointsPropertyKey: - m_Points = CoreUintType::deserialize(reader); - return true; + case pointsPropertyKey: m_Points = CoreUintType::deserialize(reader); return true; case cornerRadiusPropertyKey: m_CornerRadius = CoreDoubleType::deserialize(reader); return true;
diff --git a/include/rive/generated/shapes/rectangle_base.hpp b/include/rive/generated/shapes/rectangle_base.hpp index d3738c0..fdacfb3 100644 --- a/include/rive/generated/shapes/rectangle_base.hpp +++ b/include/rive/generated/shapes/rectangle_base.hpp
@@ -22,10 +22,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/shape_base.hpp b/include/rive/generated/shapes/shape_base.hpp index f378ec0..e1ae215 100644 --- a/include/rive/generated/shapes/shape_base.hpp +++ b/include/rive/generated/shapes/shape_base.hpp
@@ -19,10 +19,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/star_base.hpp b/include/rive/generated/shapes/star_base.hpp index e019f89..f96d750 100644 --- a/include/rive/generated/shapes/star_base.hpp +++ b/include/rive/generated/shapes/star_base.hpp
@@ -22,10 +22,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/straight_vertex_base.hpp b/include/rive/generated/shapes/straight_vertex_base.hpp index bf430c6..59971b2 100644 --- a/include/rive/generated/shapes/straight_vertex_base.hpp +++ b/include/rive/generated/shapes/straight_vertex_base.hpp
@@ -18,10 +18,8 @@ case PathVertexBase::typeKey: case VertexBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -50,9 +48,7 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case radiusPropertyKey: - m_Radius = CoreDoubleType::deserialize(reader); - return true; + case radiusPropertyKey: m_Radius = CoreDoubleType::deserialize(reader); return true; } return PathVertex::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/shapes/triangle_base.hpp b/include/rive/generated/shapes/triangle_base.hpp index 638e77a..3226675 100644 --- a/include/rive/generated/shapes/triangle_base.hpp +++ b/include/rive/generated/shapes/triangle_base.hpp
@@ -20,10 +20,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/generated/shapes/vertex_base.hpp b/include/rive/generated/shapes/vertex_base.hpp index 67d325a..727929f 100644 --- a/include/rive/generated/shapes/vertex_base.hpp +++ b/include/rive/generated/shapes/vertex_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case VertexBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -59,12 +57,8 @@ bool deserialize(uint16_t propertyKey, BinaryReader& reader) override { switch (propertyKey) { - case xPropertyKey: - m_X = CoreDoubleType::deserialize(reader); - return true; - case yPropertyKey: - m_Y = CoreDoubleType::deserialize(reader); - return true; + case xPropertyKey: m_X = CoreDoubleType::deserialize(reader); return true; + case yPropertyKey: m_Y = CoreDoubleType::deserialize(reader); return true; } return ContainerComponent::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/transform_component_base.hpp b/include/rive/generated/transform_component_base.hpp index 8343b4c..251ba2c 100644 --- a/include/rive/generated/transform_component_base.hpp +++ b/include/rive/generated/transform_component_base.hpp
@@ -17,10 +17,8 @@ case TransformComponentBase::typeKey: case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } } @@ -75,12 +73,8 @@ case rotationPropertyKey: m_Rotation = CoreDoubleType::deserialize(reader); return true; - case scaleXPropertyKey: - m_ScaleX = CoreDoubleType::deserialize(reader); - return true; - case scaleYPropertyKey: - m_ScaleY = CoreDoubleType::deserialize(reader); - return true; + case scaleXPropertyKey: m_ScaleX = CoreDoubleType::deserialize(reader); return true; + case scaleYPropertyKey: m_ScaleY = CoreDoubleType::deserialize(reader); return true; } return WorldTransformComponent::deserialize(propertyKey, reader); }
diff --git a/include/rive/generated/world_transform_component_base.hpp b/include/rive/generated/world_transform_component_base.hpp index cce73d4..a11ac11 100644 --- a/include/rive/generated/world_transform_component_base.hpp +++ b/include/rive/generated/world_transform_component_base.hpp
@@ -16,10 +16,8 @@ switch (typeKey) { case WorldTransformComponentBase::typeKey: case ContainerComponentBase::typeKey: - case ComponentBase::typeKey: - return true; - default: - return false; + case ComponentBase::typeKey: return true; + default: return false; } }
diff --git a/include/rive/math/raw_path.hpp b/include/rive/math/raw_path.hpp index b02d524..7d704a3 100644 --- a/include/rive/math/raw_path.hpp +++ b/include/rive/math/raw_path.hpp
@@ -116,21 +116,11 @@ pts[i] = proc(rec.pts[i]); } switch (rec.verb) { - case PathVerb::move: - dst.move(pts[0]); - break; - case PathVerb::line: - dst.line(pts[0]); - break; - case PathVerb::quad: - dst.quad(pts[0], pts[1]); - break; - case PathVerb::cubic: - dst.cubic(pts[0], pts[1], pts[2]); - break; - case PathVerb::close: - dst.close(); - break; + case PathVerb::move: dst.move(pts[0]); break; + case PathVerb::line: dst.line(pts[0]); break; + case PathVerb::quad: dst.quad(pts[0], pts[1]); break; + case PathVerb::cubic: dst.cubic(pts[0], pts[1], pts[2]); break; + case PathVerb::close: dst.close(); break; } } return dst;
diff --git a/include/rive/shapes/paint/radial_gradient.hpp b/include/rive/shapes/paint/radial_gradient.hpp index f0a1ef7..db6d0b8 100644 --- a/include/rive/shapes/paint/radial_gradient.hpp +++ b/include/rive/shapes/paint/radial_gradient.hpp
@@ -4,8 +4,11 @@ namespace rive { class RadialGradient : public RadialGradientBase { public: - void makeGradient( - Vec2D start, Vec2D end, const ColorInt[], const float[], size_t count) override; + void makeGradient(Vec2D start, + Vec2D end, + const ColorInt[], + const float[], + size_t count) override; }; } // namespace rive
diff --git a/include/rive/text/line_breaker.hpp b/include/rive/text/line_breaker.hpp index 7964ac7..7ea42a6 100644 --- a/include/rive/text/line_breaker.hpp +++ b/include/rive/text/line_breaker.hpp
@@ -34,8 +34,9 @@ wsIndex(wsIndex), startX(startX) {} - static std::vector<RenderGlyphLine> - BreakLines(Span<const RenderGlyphRun> runs, Span<const int> breaks, float width); + static std::vector<RenderGlyphLine> BreakLines(Span<const RenderGlyphRun> runs, + Span<const int> breaks, + float width); // Compute values for top/baseline/bottom per line static void ComputeLineSpacing(rive::Span<RenderGlyphLine>,
diff --git a/include/utils/no_op_factory.hpp b/include/utils/no_op_factory.hpp index 32c83b6..5d8c8ed 100644 --- a/include/utils/no_op_factory.hpp +++ b/include/utils/no_op_factory.hpp
@@ -29,8 +29,9 @@ const float stops[], // [count] size_t count) override; - std::unique_ptr<RenderPath> - makeRenderPath(Span<const Vec2D> points, Span<const PathVerb> verbs, FillRule) override; + std::unique_ptr<RenderPath> makeRenderPath(Span<const Vec2D> points, + Span<const PathVerb> verbs, + FillRule) override; std::unique_ptr<RenderPath> makeEmptyRenderPath() override;
diff --git a/skia/font_converter/src/font.cpp b/skia/font_converter/src/font.cpp index 4a1c388..3f2107d 100644 --- a/skia/font_converter/src/font.cpp +++ b/skia/font_converter/src/font.cpp
@@ -108,8 +108,9 @@ // build vector of unique chars for (size_t i = 0; i < len; ++i) { uint16_t code = str[i]; - auto iter = std::find_if( - rec.begin(), rec.end(), [code](const auto& r) { return r.charCode == code; }); + auto iter = std::find_if(rec.begin(), rec.end(), [code](const auto& r) { + return r.charCode == code; + }); if (iter == rec.end()) { // gonna add code -- now see if its glyph is unique uint16_t srcGlyph = glyphIDs[i]; @@ -127,15 +128,17 @@ } } - std::sort( - rec.begin(), rec.end(), [](const Rec& a, const Rec& b) { return a.charCode < b.charCode; }); + std::sort(rec.begin(), rec.end(), [](const Rec& a, const Rec& b) { + return a.charCode < b.charCode; + }); for (const auto& r : rec) { printf("'%c' [%d] %d -> %d\n", r.charCode, r.charCode, r.srcGlyph, r.dstGlyph); fCMap.push_back({r.charCode, r.dstGlyph}); } - std::sort( - rec.begin(), rec.end(), [](const Rec& a, const Rec& b) { return a.dstGlyph < b.dstGlyph; }); + std::sort(rec.begin(), rec.end(), [](const Rec& a, const Rec& b) { + return a.dstGlyph < b.dstGlyph; + }); font.setLinearMetrics(true); auto append_glyph = [&](uint16_t srcGlyph) { @@ -239,12 +242,8 @@ } varray.push_back(verb); switch ((SkPathVerb)verb) { - case SkPathVerb::kMove: - add_point(pts[0]); - break; - case SkPathVerb::kLine: - add_point(pts[1]); - break; + case SkPathVerb::kMove: add_point(pts[0]); break; + case SkPathVerb::kLine: add_point(pts[1]); break; case SkPathVerb::kQuad: add_point(pts[1]); add_point(pts[2]); @@ -254,10 +253,8 @@ add_point(pts[2]); add_point(pts[3]); break; - case SkPathVerb::kClose: - break; - default: - assert(false); // unsupported + case SkPathVerb::kClose: break; + default: assert(false); // unsupported } } assert((int)varray.size() == path.countVerbs()); @@ -268,10 +265,8 @@ switch ((SkPathVerb)v) { case SkPathVerb::kLine: case SkPathVerb::kQuad: - case SkPathVerb::kCubic: - return false; - default: - break; + case SkPathVerb::kCubic: return false; + default: break; } } return true; @@ -336,8 +331,9 @@ dir.push_back({kAdvances_TableTag, advances.detach()}); } - std::sort( - dir.begin(), dir.end(), [](const DirRec& a, const DirRec& b) { return a.tag < b.tag; }); + std::sort(dir.begin(), dir.end(), [](const DirRec& a, const DirRec& b) { + return a.tag < b.tag; + }); ByteBuilder header; header.addU32(kSignature); @@ -432,24 +428,12 @@ int count = 0; for (int i = 0; i < verbCount; ++i) { switch ((SkPathVerb)verbs[i]) { - case SkPathVerb::kMove: - count += 1; - break; - case SkPathVerb::kLine: - count += 1; - break; - case SkPathVerb::kQuad: - count += 2; - break; - case SkPathVerb::kCubic: - count += 3; - break; - case SkPathVerb::kClose: - count += 0; - break; - default: - assert(false); - return -1; + case SkPathVerb::kMove: count += 1; break; + case SkPathVerb::kLine: count += 1; break; + case SkPathVerb::kQuad: count += 2; break; + case SkPathVerb::kCubic: count += 3; break; + case SkPathVerb::kClose: count += 0; break; + default: assert(false); return -1; } } return count;
diff --git a/skia/font_converter/src/font_arguments.hpp b/skia/font_converter/src/font_arguments.hpp index 649d4f4..65fee6a 100644 --- a/skia/font_converter/src/font_arguments.hpp +++ b/skia/font_converter/src/font_arguments.hpp
@@ -17,10 +17,14 @@ args::Group optional(m_Parser, "optional arguments:", args::Group::Validators::DontCare); args::ValueFlag<std::string> source(required, "path", "source filename", {'s', "source"}); - args::ValueFlag<std::string> destination( - required, "path", "destination filename", {'d', "destination"}); - args::ValueFlag<std::string> charset( - optional, "path", "charset filename", {'c', "charset"}); + args::ValueFlag<std::string> destination(required, + "path", + "destination filename", + {'d', "destination"}); + args::ValueFlag<std::string> charset(optional, + "path", + "charset filename", + {'c', "charset"}); args::CompletionFlag completion(m_Parser, {"complete"}); try {
diff --git a/skia/renderer/include/cg_factory.hpp b/skia/renderer/include/cg_factory.hpp index 5fee199..d1b624e 100644 --- a/skia/renderer/include/cg_factory.hpp +++ b/skia/renderer/include/cg_factory.hpp
@@ -31,8 +31,9 @@ const float stops[], // [count] size_t count) override; - std::unique_ptr<RenderPath> - makeRenderPath(Span<const Vec2D> points, Span<const PathVerb> verbs, FillRule) override; + std::unique_ptr<RenderPath> makeRenderPath(Span<const Vec2D> points, + Span<const PathVerb> verbs, + FillRule) override; std::unique_ptr<RenderPath> makeEmptyRenderPath() override;
diff --git a/skia/renderer/include/skia_factory.hpp b/skia/renderer/include/skia_factory.hpp index 772c047..b330ebb 100644 --- a/skia/renderer/include/skia_factory.hpp +++ b/skia/renderer/include/skia_factory.hpp
@@ -31,8 +31,9 @@ const float stops[], // [count] size_t count) override; - std::unique_ptr<RenderPath> - makeRenderPath(Span<const Vec2D> points, Span<const PathVerb> verbs, FillRule) override; + std::unique_ptr<RenderPath> makeRenderPath(Span<const Vec2D> points, + Span<const PathVerb> verbs, + FillRule) override; std::unique_ptr<RenderPath> makeEmptyRenderPath() override;
diff --git a/skia/renderer/src/cg_factory.cpp b/skia/renderer/src/cg_factory.cpp index 3a7c1ad..5df2bce 100644 --- a/skia/renderer/src/cg_factory.cpp +++ b/skia/renderer/src/cg_factory.cpp
@@ -111,13 +111,17 @@ p += 2; break; case PathVerb::cubic: - CGPathAddCurveToPoint( - m_path, nullptr, p[0].x, p[0].y, p[1].x, p[1].y, p[2].x, p[2].y); + CGPathAddCurveToPoint(m_path, + nullptr, + p[0].x, + p[0].y, + p[1].x, + p[1].y, + p[2].x, + p[2].y); p += 3; break; - case PathVerb::close: - CGPathCloseSubpath(m_path); - break; + case PathVerb::close: CGPathCloseSubpath(m_path); break; } } assert(p == pts.end()); @@ -459,8 +463,9 @@ new CGRadialGradientRenderShader(cx, cy, radius, colors, stops, count)); } -std::unique_ptr<RenderPath> -CGFactory::makeRenderPath(Span<const Vec2D> points, Span<const PathVerb> verbs, FillRule fillRule) { +std::unique_ptr<RenderPath> CGFactory::makeRenderPath(Span<const Vec2D> points, + Span<const PathVerb> verbs, + FillRule fillRule) { return std::make_unique<CGRenderPath>(points, verbs, fillRule); }
diff --git a/skia/renderer/src/cg_skia_factory.cpp b/skia/renderer/src/cg_skia_factory.cpp index 188829c..57352d9 100644 --- a/skia/renderer/src/cg_skia_factory.cpp +++ b/skia/renderer/src/cg_skia_factory.cpp
@@ -32,11 +32,8 @@ switch (CGImageGetAlphaInfo(image.get())) { case kCGImageAlphaNone: case kCGImageAlphaNoneSkipFirst: - case kCGImageAlphaNoneSkipLast: - isOpaque = true; - break; - default: - break; + case kCGImageAlphaNoneSkipLast: isOpaque = true; break; + default: break; } // Now create a drawing context to produce RGBA pixels
diff --git a/skia/renderer/src/renderfont_coretext.cpp b/skia/renderer/src/renderfont_coretext.cpp index 0ed00b3..21d79f5 100644 --- a/skia/renderer/src/renderfont_coretext.cpp +++ b/skia/renderer/src/renderfont_coretext.cpp
@@ -96,8 +96,10 @@ CFDictionaryAddValue(vars.get(), tagNum.get(), valueNum.get()); } - AutoCF attrs = CFDictionaryCreateMutable( - kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); + AutoCF attrs = CFDictionaryCreateMutable(kCFAllocatorDefault, + 1, + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); CFDictionarySetValue(attrs.get(), kCTFontVariationAttribute, vars.get()); AutoCF desc = (CTFontDescriptorRef)CTFontDescriptorCreateWithAttributes(attrs.get()); @@ -130,30 +132,26 @@ const CGPoint* points = element->points; switch (element->type) { - case kCGPathElementMoveToPoint: - path->moveTo(points[0].x, points[0].y); - break; + case kCGPathElementMoveToPoint: path->moveTo(points[0].x, points[0].y); break; - case kCGPathElementAddLineToPoint: - path->lineTo(points[0].x, points[0].y); - break; + case kCGPathElementAddLineToPoint: path->lineTo(points[0].x, points[0].y); break; case kCGPathElementAddQuadCurveToPoint: path->quadTo(points[0].x, points[0].y, points[1].x, points[1].y); break; case kCGPathElementAddCurveToPoint: - path->cubicTo( - points[0].x, points[0].y, points[1].x, points[1].y, points[2].x, points[2].y); + path->cubicTo(points[0].x, + points[0].y, + points[1].x, + points[1].y, + points[2].x, + points[2].y); break; - case kCGPathElementCloseSubpath: - path->close(); - break; + case kCGPathElementCloseSubpath: path->close(); break; - default: - assert(false); - break; + default: assert(false); break; } } @@ -230,8 +228,10 @@ const bool hasSurrogates = utf16.array.size() != tr.unicharCount; assert(!hasSurrogates); - AutoCF string = CFStringCreateWithCharactersNoCopy( - nullptr, utf16.array.data(), utf16.array.size(), kCFAllocatorNull); + AutoCF string = CFStringCreateWithCharactersNoCopy(nullptr, + utf16.array.data(), + utf16.array.size(), + kCFAllocatorNull); AutoCF attr = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
diff --git a/skia/renderer/src/renderfont_hb.cpp b/skia/renderer/src/renderfont_hb.cpp index 7cd7306..edf6bde 100644 --- a/skia/renderer/src/renderfont_hb.cpp +++ b/skia/renderer/src/renderfont_hb.cpp
@@ -170,8 +170,9 @@ }; constexpr int gNumFeatures = sizeof(gFeatures) / sizeof(gFeatures[0]); -static rive::RenderGlyphRun -shape_run(const rive::Unichar text[], const rive::RenderTextRun& tr, unsigned textOffset) { +static rive::RenderGlyphRun shape_run(const rive::Unichar text[], + const rive::RenderTextRun& tr, + unsigned textOffset) { hb_buffer_t* buf = hb_buffer_create(); hb_buffer_add_utf32(buf, text, tr.unicharCount, 0, tr.unicharCount); @@ -209,14 +210,16 @@ return gr; } -static rive::RenderGlyphRun -extract_subset(const rive::RenderGlyphRun& orig, size_t start, size_t end) { +static rive::RenderGlyphRun extract_subset(const rive::RenderGlyphRun& orig, + size_t start, + size_t end) { rive::RenderGlyphRun subset; subset.font = std::move(orig.font); subset.size = orig.size; subset.glyphs.insert(subset.glyphs.begin(), &orig.glyphs[start], &orig.glyphs[end]); - subset.textOffsets.insert( - subset.textOffsets.begin(), &orig.textOffsets[start], &orig.textOffsets[end]); + subset.textOffsets.insert(subset.textOffsets.begin(), + &orig.textOffsets[start], + &orig.textOffsets[end]); subset.xpos.insert(subset.xpos.begin(), &orig.xpos[start], &orig.xpos[end + 1]); subset.xpos.back() = 0; // since we're now the end of a run return subset;
diff --git a/skia/renderer/src/skia_factory.cpp b/skia/renderer/src/skia_factory.cpp index f948bf1..5e75c09 100644 --- a/skia/renderer/src/skia_factory.cpp +++ b/skia/renderer/src/skia_factory.cpp
@@ -96,12 +96,8 @@ void SkiaRenderPaint::style(RenderPaintStyle style) { switch (style) { - case RenderPaintStyle::fill: - m_Paint.setStyle(SkPaint::Style::kFill_Style); - break; - case RenderPaintStyle::stroke: - m_Paint.setStyle(SkPaint::Style::kStroke_Style); - break; + case RenderPaintStyle::fill: m_Paint.setStyle(SkPaint::Style::kFill_Style); break; + case RenderPaintStyle::stroke: m_Paint.setStyle(SkPaint::Style::kStroke_Style); break; } } void SkiaRenderPaint::color(unsigned int value) { m_Paint.setColor(value); } @@ -236,8 +232,12 @@ const ColorInt colors[], // [count] const float stops[], // [count] size_t count) { - auto sh = SkGradientShader::MakeRadial( - {cx, cy}, radius, (const SkColor*)colors, stops, count, SkTileMode::kClamp); + auto sh = SkGradientShader::MakeRadial({cx, cy}, + radius, + (const SkColor*)colors, + stops, + count, + SkTileMode::kClamp); return rcp<RenderShader>(new SkiaRenderShader(std::move(sh))); }
diff --git a/src/animation/keyframe_bool.cpp b/src/animation/keyframe_bool.cpp index 3e7de85..a7eba61 100644 --- a/src/animation/keyframe_bool.cpp +++ b/src/animation/keyframe_bool.cpp
@@ -7,7 +7,10 @@ CoreRegistry::setBool(object, propertyKey, value()); } -void KeyFrameBool::applyInterpolation( - Core* object, int propertyKey, float currentTime, const KeyFrame* nextFrame, float mix) { +void KeyFrameBool::applyInterpolation(Core* object, + int propertyKey, + float currentTime, + const KeyFrame* nextFrame, + float mix) { CoreRegistry::setBool(object, propertyKey, value()); } \ No newline at end of file
diff --git a/src/animation/keyframe_color.cpp b/src/animation/keyframe_color.cpp index 074d92e..a8feea2 100644 --- a/src/animation/keyframe_color.cpp +++ b/src/animation/keyframe_color.cpp
@@ -17,8 +17,11 @@ applyColor(object, propertyKey, mix, value()); } -void KeyFrameColor::applyInterpolation( - Core* object, int propertyKey, float currentTime, const KeyFrame* nextFrame, float mix) { +void KeyFrameColor::applyInterpolation(Core* object, + int propertyKey, + float currentTime, + const KeyFrame* nextFrame, + float mix) { auto kfc = nextFrame->as<KeyFrameColor>(); const KeyFrameColor& nextColor = *kfc; float f = (currentTime - seconds()) / (nextColor.seconds() - seconds());
diff --git a/src/animation/keyframe_double.cpp b/src/animation/keyframe_double.cpp index 887ade1..efefdc2 100644 --- a/src/animation/keyframe_double.cpp +++ b/src/animation/keyframe_double.cpp
@@ -13,8 +13,9 @@ CoreRegistry::setDouble(object, propertyKey, value); } else { float mixi = 1.0f - mix; - CoreRegistry::setDouble( - object, propertyKey, CoreRegistry::getDouble(object, propertyKey) * mixi + value * mix); + CoreRegistry::setDouble(object, + propertyKey, + CoreRegistry::getDouble(object, propertyKey) * mixi + value * mix); } } @@ -22,8 +23,11 @@ applyDouble(object, propertyKey, mix, value()); } -void KeyFrameDouble::applyInterpolation( - Core* object, int propertyKey, float currentTime, const KeyFrame* nextFrame, float mix) { +void KeyFrameDouble::applyInterpolation(Core* object, + int propertyKey, + float currentTime, + const KeyFrame* nextFrame, + float mix) { auto kfd = nextFrame->as<KeyFrameDouble>(); const KeyFrameDouble& nextDouble = *kfd; float f = (currentTime - seconds()) / (nextDouble.seconds() - seconds());
diff --git a/src/animation/keyframe_id.cpp b/src/animation/keyframe_id.cpp index 38a3f5d..00be39a 100644 --- a/src/animation/keyframe_id.cpp +++ b/src/animation/keyframe_id.cpp
@@ -7,7 +7,10 @@ CoreRegistry::setUint(object, propertyKey, value()); } -void KeyFrameId::applyInterpolation( - Core* object, int propertyKey, float currentTime, const KeyFrame* nextFrame, float mix) { +void KeyFrameId::applyInterpolation(Core* object, + int propertyKey, + float currentTime, + const KeyFrame* nextFrame, + float mix) { CoreRegistry::setUint(object, propertyKey, value()); } \ No newline at end of file
diff --git a/src/animation/linear_animation.cpp b/src/animation/linear_animation.cpp index 21114f8..b308664 100644 --- a/src/animation/linear_animation.cpp +++ b/src/animation/linear_animation.cpp
@@ -67,8 +67,7 @@ float LinearAnimation::globalToLocalSeconds(float seconds) const { switch (loop()) { - case Loop::oneShot: - return seconds + startSeconds(); + case Loop::oneShot: return seconds + startSeconds(); case Loop::loop: return std::fmod(seconds, (endSeconds() - startSeconds())) + startSeconds(); case Loop::pingPong:
diff --git a/src/animation/listener_bool_change.cpp b/src/animation/listener_bool_change.cpp index 0745b6b..7c2d968 100644 --- a/src/animation/listener_bool_change.cpp +++ b/src/animation/listener_bool_change.cpp
@@ -19,14 +19,8 @@ // If it's not null, it must be our correct type (why we validate at load time). auto boolInput = reinterpret_cast<SMIBool*>(inputInstance); switch (value()) { - case 0: - boolInput->value(false); - break; - case 1: - boolInput->value(true); - break; - default: - boolInput->value(!boolInput->value()); - break; + case 0: boolInput->value(false); break; + case 1: boolInput->value(true); break; + default: boolInput->value(!boolInput->value()); break; } } \ No newline at end of file
diff --git a/src/animation/state_machine_instance.cpp b/src/animation/state_machine_instance.cpp index 56ca5a5..d15bed5 100644 --- a/src/animation/state_machine_instance.cpp +++ b/src/animation/state_machine_instance.cpp
@@ -297,18 +297,11 @@ if (nestedAnimation->is<NestedStateMachine>()) { auto nestedStateMachine = nestedAnimation->as<NestedStateMachine>(); switch (hitType) { - case ListenerType::down: - nestedStateMachine->pointerDown(nestedPosition); - break; - case ListenerType::up: - nestedStateMachine->pointerUp(nestedPosition); - break; - case ListenerType::move: - nestedStateMachine->pointerMove(nestedPosition); - break; + case ListenerType::down: nestedStateMachine->pointerDown(nestedPosition); break; + case ListenerType::up: nestedStateMachine->pointerUp(nestedPosition); break; + case ListenerType::move: nestedStateMachine->pointerMove(nestedPosition); break; case ListenerType::enter: - case ListenerType::exit: - break; + case ListenerType::exit: break; } } }
diff --git a/src/animation/state_machine_layer.cpp b/src/animation/state_machine_layer.cpp index 594b0e2..911ff4b 100644 --- a/src/animation/state_machine_layer.cpp +++ b/src/animation/state_machine_layer.cpp
@@ -21,15 +21,9 @@ return code; } switch (state->coreType()) { - case AnyState::typeKey: - m_Any = state->as<AnyState>(); - break; - case EntryState::typeKey: - m_Entry = state->as<EntryState>(); - break; - case ExitState::typeKey: - m_Exit = state->as<ExitState>(); - break; + case AnyState::typeKey: m_Any = state->as<AnyState>(); break; + case EntryState::typeKey: m_Entry = state->as<EntryState>(); break; + case ExitState::typeKey: m_Exit = state->as<ExitState>(); break; } } if (m_Any == nullptr || m_Entry == nullptr || m_Exit == nullptr) {
diff --git a/src/animation/transition_number_condition.cpp b/src/animation/transition_number_condition.cpp index c15f82c..6a3aa87 100644 --- a/src/animation/transition_number_condition.cpp +++ b/src/animation/transition_number_condition.cpp
@@ -19,18 +19,12 @@ auto numberInput = reinterpret_cast<const SMINumber*>(inputInstance); switch (op()) { - case TransitionConditionOp::equal: - return numberInput->value() == value(); - case TransitionConditionOp::notEqual: - return numberInput->value() != value(); - case TransitionConditionOp::lessThanOrEqual: - return numberInput->value() <= value(); - case TransitionConditionOp::lessThan: - return numberInput->value() < value(); - case TransitionConditionOp::greaterThanOrEqual: - return numberInput->value() >= value(); - case TransitionConditionOp::greaterThan: - return numberInput->value() > value(); + case TransitionConditionOp::equal: return numberInput->value() == value(); + case TransitionConditionOp::notEqual: return numberInput->value() != value(); + case TransitionConditionOp::lessThanOrEqual: return numberInput->value() <= value(); + case TransitionConditionOp::lessThan: return numberInput->value() < value(); + case TransitionConditionOp::greaterThanOrEqual: return numberInput->value() >= value(); + case TransitionConditionOp::greaterThan: return numberInput->value() > value(); } return false; } \ No newline at end of file
diff --git a/src/bones/skinnable.cpp b/src/bones/skinnable.cpp index 5725944..e06a026 100644 --- a/src/bones/skinnable.cpp +++ b/src/bones/skinnable.cpp
@@ -6,10 +6,8 @@ Skinnable* Skinnable::from(Component* component) { switch (component->coreType()) { - case PointsPath::typeKey: - return component->as<PointsPath>(); - case Mesh::typeKey: - return component->as<Mesh>(); + case PointsPath::typeKey: return component->as<PointsPath>(); + case Mesh::typeKey: return component->as<Mesh>(); } return nullptr; }
diff --git a/src/constraints/distance_constraint.cpp b/src/constraints/distance_constraint.cpp index 0248d9a..272d49f 100644 --- a/src/constraints/distance_constraint.cpp +++ b/src/constraints/distance_constraint.cpp
@@ -29,8 +29,7 @@ return; } break; - case Mode::Exact: - break; + case Mode::Exact: break; } if (currentDistance < 0.001f) { return;
diff --git a/src/constraints/ik_constraint.cpp b/src/constraints/ik_constraint.cpp index fa403b3..41ac37b 100644 --- a/src/constraints/ik_constraint.cpp +++ b/src/constraints/ik_constraint.cpp
@@ -213,12 +213,8 @@ int count = (int)m_FkChain.size(); switch (count) { - case 1: - solve1(&m_FkChain[0], worldTargetTranslation); - break; - case 2: - solve2(&m_FkChain[0], &m_FkChain[1], worldTargetTranslation); - break; + case 1: solve1(&m_FkChain[0], worldTargetTranslation); break; + case 2: solve2(&m_FkChain[0], &m_FkChain[1], worldTargetTranslation); break; default: { auto last = count - 1; BoneChainLink* tip = &m_FkChain[last];
diff --git a/src/file.cpp b/src/file.cpp index 4f47437..eb4bef2 100644 --- a/src/file.cpp +++ b/src/file.cpp
@@ -76,25 +76,18 @@ if (id == -1) { // Still couldn't find it, give up. - fprintf( - stderr, "Unknown property key %d, missing from property ToC.\n", propertyKey); + fprintf(stderr, + "Unknown property key %d, missing from property ToC.\n", + propertyKey); delete object; return nullptr; } switch (id) { - case CoreUintType::id: - CoreUintType::deserialize(reader); - break; - case CoreStringType::id: - CoreStringType::deserialize(reader); - break; - case CoreDoubleType::id: - CoreDoubleType::deserialize(reader); - break; - case CoreColorType::id: - CoreColorType::deserialize(reader); - break; + case CoreUintType::id: CoreUintType::deserialize(reader); break; + case CoreStringType::id: CoreStringType::deserialize(reader); break; + case CoreDoubleType::id: CoreDoubleType::deserialize(reader); break; + case CoreColorType::id: CoreColorType::deserialize(reader); break; } } } @@ -163,9 +156,7 @@ } if (object->import(importStack) == StatusCode::Ok) { switch (object->coreType()) { - case Backboard::typeKey: - m_Backboard.reset(object->as<Backboard>()); - break; + case Backboard::typeKey: m_Backboard.reset(object->as<Backboard>()); break; case Artboard::typeKey: { Artboard* ab = object->as<Artboard>(); ab->m_Factory = m_Factory;
diff --git a/src/math/contour_measure.cpp b/src/math/contour_measure.cpp index 0e5527c..de325c5 100644 --- a/src/math/contour_measure.cpp +++ b/src/math/contour_measure.cpp
@@ -77,20 +77,17 @@ void ContourMeasure::Segment::extract(RawPath* dst, const Vec2D pts[]) const { pts += m_ptIndex; switch (m_type) { - case SegmentType::kLine: - dst->line(pts[1]); - break; - case SegmentType::kQuad: - dst->quad(pts[1], pts[2]); - break; - case SegmentType::kCubic: - dst->cubic(pts[1], pts[2], pts[3]); - break; + case SegmentType::kLine: dst->line(pts[1]); break; + case SegmentType::kQuad: dst->quad(pts[1], pts[2]); break; + case SegmentType::kCubic: dst->cubic(pts[1], pts[2], pts[3]); break; } } -void ContourMeasure::Segment::extract( - RawPath* dst, float fromT, float toT, const Vec2D pts[], bool moveTo) const { +void ContourMeasure::Segment::extract(RawPath* dst, + float fromT, + float toT, + const Vec2D pts[], + bool moveTo) const { assert(fromT <= toT); pts += m_ptIndex;
diff --git a/src/shapes/mesh.cpp b/src/shapes/mesh.cpp index baac40a..280732b 100644 --- a/src/shapes/mesh.cpp +++ b/src/shapes/mesh.cpp
@@ -124,6 +124,10 @@ if (skin() == nullptr) { renderer->transform(parent()->as<WorldTransformComponent>()->worldTransform()); } - renderer->drawImageMesh( - image, m_VertexRenderBuffer, m_UVRenderBuffer, m_IndexRenderBuffer, blendMode, opacity); + renderer->drawImageMesh(image, + m_VertexRenderBuffer, + m_UVRenderBuffer, + m_IndexRenderBuffer, + blendMode, + opacity); }
diff --git a/src/shapes/metrics_path.cpp b/src/shapes/metrics_path.cpp index c2f164d..38f77a9 100644 --- a/src/shapes/metrics_path.cpp +++ b/src/shapes/metrics_path.cpp
@@ -214,8 +214,11 @@ } } -void MetricsPath::extractSubPart( - int index, float startT, float endT, bool moveTo, RenderPath* result) { +void MetricsPath::extractSubPart(int index, + float startT, + float endT, + bool moveTo, + RenderPath* result) { assert(startT >= 0.0f && startT <= 1.0f && endT >= 0.0f && endT <= 1.0f); const PathPart& part = m_Parts[index]; switch (part.type) { @@ -307,8 +310,12 @@ } else { // End is not 1, so split again and cubic to the left side // of the split and remap endT to the new curve range - CubicUtilities::computeHull( - hull[5], hull[4], hull[2], to, (endT - startT) / (1.0f - startT), hull); + CubicUtilities::computeHull(hull[5], + hull[4], + hull[2], + to, + (endT - startT) / (1.0f - startT), + hull); result->cubic(hull[0], hull[3], hull[5]); }
diff --git a/src/shapes/paint/linear_gradient.cpp b/src/shapes/paint/linear_gradient.cpp index 1d28510..850c4eb 100644 --- a/src/shapes/paint/linear_gradient.cpp +++ b/src/shapes/paint/linear_gradient.cpp
@@ -96,8 +96,11 @@ } } -void LinearGradient::makeGradient( - Vec2D start, Vec2D end, const ColorInt colors[], const float stops[], size_t count) { +void LinearGradient::makeGradient(Vec2D start, + Vec2D end, + const ColorInt colors[], + const float stops[], + size_t count) { auto factory = artboard()->factory(); renderPaint()->shader( factory->makeLinearGradient(start.x, start.y, end.x, end.y, colors, stops, count));
diff --git a/src/shapes/paint/radial_gradient.cpp b/src/shapes/paint/radial_gradient.cpp index 25e8c2e..46ae43f 100644 --- a/src/shapes/paint/radial_gradient.cpp +++ b/src/shapes/paint/radial_gradient.cpp
@@ -4,9 +4,16 @@ using namespace rive; -void RadialGradient::makeGradient( - Vec2D start, Vec2D end, const ColorInt colors[], const float stops[], size_t count) { +void RadialGradient::makeGradient(Vec2D start, + Vec2D end, + const ColorInt colors[], + const float stops[], + size_t count) { auto factory = artboard()->factory(); - renderPaint()->shader(factory->makeRadialGradient( - start.x, start.y, Vec2D::distance(start, end), colors, stops, count)); + renderPaint()->shader(factory->makeRadialGradient(start.x, + start.y, + Vec2D::distance(start, end), + colors, + stops, + count)); }
diff --git a/src/shapes/path.cpp b/src/shapes/path.cpp index 891e8d1..0080809 100644 --- a/src/shapes/path.cpp +++ b/src/shapes/path.cpp
@@ -12,8 +12,9 @@ /// Compute an ideal control point distance to create a curve of the given /// radius. Based on "natural rounding" https://observablehq.com/@daformat/rounding-polygon-corners -static float -computeIdealControlPointDistance(const Vec2D& toPrev, const Vec2D& toNext, float radius) { +static float computeIdealControlPointDistance(const Vec2D& toPrev, + const Vec2D& toNext, + float radius) { // Get the angle between next and prev float angle = fabs(atan2(Vec2D::cross(toPrev, toNext), Vec2D::dot(toPrev, toNext)));
diff --git a/src/shapes/shape_paint_container.cpp b/src/shapes/shape_paint_container.cpp index f421fbf..0f22230 100644 --- a/src/shapes/shape_paint_container.cpp +++ b/src/shapes/shape_paint_container.cpp
@@ -12,10 +12,8 @@ ShapePaintContainer* ShapePaintContainer::from(Component* component) { switch (component->coreType()) { - case Artboard::typeKey: - return component->as<Artboard>(); - case Shape::typeKey: - return component->as<Shape>(); + case Artboard::typeKey: return component->as<Artboard>(); + case Shape::typeKey: return component->as<Shape>(); } return nullptr; }
diff --git a/src/shapes/vertex.cpp b/src/shapes/vertex.cpp index 419f8cc..a7c6890 100644 --- a/src/shapes/vertex.cpp +++ b/src/shapes/vertex.cpp
@@ -13,6 +13,9 @@ void Vertex::yChanged() { markGeometryDirty(); } void Vertex::deform(const Mat2D& worldTransform, const float* boneTransforms) { - m_Weight->translation() = Weight::deform( - Vec2D(x(), y()), m_Weight->indices(), m_Weight->values(), worldTransform, boneTransforms); + m_Weight->translation() = Weight::deform(Vec2D(x(), y()), + m_Weight->indices(), + m_Weight->values(), + worldTransform, + boneTransforms); } \ No newline at end of file
diff --git a/src/text/line_breaker.cpp b/src/text/line_breaker.cpp index f598298..a5fc7d6 100644 --- a/src/text/line_breaker.cpp +++ b/src/text/line_breaker.cpp
@@ -31,8 +31,9 @@ return (int)(iter - begin); } -std::vector<RenderGlyphLine> -RenderGlyphLine::BreakLines(Span<const RenderGlyphRun> runs, Span<const int> breaks, float width) { +std::vector<RenderGlyphLine> RenderGlyphLine::BreakLines(Span<const RenderGlyphRun> runs, + Span<const int> breaks, + float width) { assert(breaks.size() >= 2); std::vector<RenderGlyphLine> lines; @@ -85,8 +86,13 @@ // bulid the line const auto lineStartX = runs[startRun].xpos[startIndex]; - lines.push_back(RenderGlyphLine( - startRun, startIndex, prevRun, prevIndex, wsRun, wsIndex, lineStartX)); + lines.push_back(RenderGlyphLine(startRun, + startIndex, + prevRun, + prevIndex, + wsRun, + wsIndex, + lineStartX)); // update for the next line xlimit = runs[wsRun].xpos[wsIndex] + width;
diff --git a/tess/include/rive/tess/sokol/sokol_factory.hpp b/tess/include/rive/tess/sokol/sokol_factory.hpp index 78ff5a7..1f3df04 100644 --- a/tess/include/rive/tess/sokol/sokol_factory.hpp +++ b/tess/include/rive/tess/sokol/sokol_factory.hpp
@@ -34,8 +34,9 @@ size_t count) override; // Returns a full-formed RenderPath -- can be treated as immutable - std::unique_ptr<RenderPath> - makeRenderPath(Span<const Vec2D> points, Span<const PathVerb> verbs, FillRule) override; + std::unique_ptr<RenderPath> makeRenderPath(Span<const Vec2D> points, + Span<const PathVerb> verbs, + FillRule) override; std::unique_ptr<RenderPath> makeEmptyRenderPath() override;
diff --git a/tess/include/rive/tess/sokol/sokol_tess_renderer.hpp b/tess/include/rive/tess/sokol/sokol_tess_renderer.hpp index 5bc7aee..782f0ec 100644 --- a/tess/include/rive/tess/sokol/sokol_tess_renderer.hpp +++ b/tess/include/rive/tess/sokol/sokol_tess_renderer.hpp
@@ -25,8 +25,12 @@ public: SokolTessRenderer(); - void orthographicProjection( - float left, float right, float bottom, float top, float near, float far) override; + void orthographicProjection(float left, + float right, + float bottom, + float top, + float near, + float far) override; void drawImage(const RenderImage*, BlendMode, float opacity) override; void drawImageMesh(const RenderImage*,
diff --git a/tess/include/rive/tess/tess_renderer.hpp b/tess/include/rive/tess/tess_renderer.hpp index a91c32d..9f16959 100644 --- a/tess/include/rive/tess/tess_renderer.hpp +++ b/tess/include/rive/tess/tess_renderer.hpp
@@ -30,8 +30,12 @@ TessRenderer(); void projection(const Mat4& value); - virtual void orthographicProjection( - float left, float right, float bottom, float top, float near, float far) = 0; + virtual void orthographicProjection(float left, + float right, + float bottom, + float top, + float near, + float far) = 0; /// /// Checks if clipping is dirty and clears the clipping flag. Hard
diff --git a/tess/src/contour_stroke.cpp b/tess/src/contour_stroke.cpp index 653cd19..5c1eb37 100644 --- a/tess/src/contour_stroke.cpp +++ b/tess/src/contour_stroke.cpp
@@ -80,8 +80,7 @@ } break; } - default: - break; + default: break; } } m_TriangleStrip.push_back(lastA); @@ -299,8 +298,7 @@ } break; } - default: - break; + default: break; } }
diff --git a/tess/src/segmented_contour.cpp b/tess/src/segmented_contour.cpp index ac7df7b..ccf8edc 100644 --- a/tess/src/segmented_contour.cpp +++ b/tess/src/segmented_contour.cpp
@@ -88,9 +88,7 @@ segmentCubic(m_pen, rec.pts[0], rec.pts[1], rec.pts[2], 0.0f, 1.0f); m_pen = rec.pts[2]; break; - case PathVerb::close: - close(); - break; + case PathVerb::close: close(); break; case PathVerb::quad: // TODO: not currently used by render paths, however might be // necessary for fonts.
diff --git a/tess/src/sokol/sokol_factory.cpp b/tess/src/sokol/sokol_factory.cpp index 62cb783..d6b0963 100644 --- a/tess/src/sokol/sokol_factory.cpp +++ b/tess/src/sokol/sokol_factory.cpp
@@ -49,8 +49,9 @@ } // Returns a full-formed RenderPath -- can be treated as immutable -std::unique_ptr<RenderPath> -SokolFactory::makeRenderPath(Span<const Vec2D> points, Span<const PathVerb> verbs, FillRule) { +std::unique_ptr<RenderPath> SokolFactory::makeRenderPath(Span<const Vec2D> points, + Span<const PathVerb> verbs, + FillRule) { return std::make_unique<NoOpRenderPath>(); }
diff --git a/tess/src/sokol/sokol_tess_renderer.cpp b/tess/src/sokol/sokol_tess_renderer.cpp index 2f6d207..efc9169 100644 --- a/tess/src/sokol/sokol_tess_renderer.cpp +++ b/tess/src/sokol/sokol_tess_renderer.cpp
@@ -88,8 +88,12 @@ }); } -void SokolTessRenderer::orthographicProjection( - float left, float right, float bottom, float top, float near, float far) { +void SokolTessRenderer::orthographicProjection(float left, + float right, + float bottom, + float top, + float near, + float far) { m_Projection[0] = 2.0f / (right - left); m_Projection[1] = 0.0f; m_Projection[2] = 0.0f;
diff --git a/test/rive_file_reader.hpp b/test/rive_file_reader.hpp index 7fb4549..8672edd 100644 --- a/test/rive_file_reader.hpp +++ b/test/rive_file_reader.hpp
@@ -41,8 +41,9 @@ public: RenderObjectLeakChecker() { - std::copy( - rive::Counter::counts, rive::Counter::counts + rive::Counter::kNumTypes, m_before); + std::copy(rive::Counter::counts, + rive::Counter::counts + rive::Counter::kNumTypes, + m_before); } ~RenderObjectLeakChecker() { const int* after = rive::Counter::counts;
diff --git a/utils/no_op_factory.cpp b/utils/no_op_factory.cpp index c421e08..a75f8c4 100644 --- a/utils/no_op_factory.cpp +++ b/utils/no_op_factory.cpp
@@ -57,8 +57,9 @@ return nullptr; } -std::unique_ptr<RenderPath> -NoOpFactory::makeRenderPath(Span<const Vec2D> points, Span<const PathVerb> verbs, FillRule) { +std::unique_ptr<RenderPath> NoOpFactory::makeRenderPath(Span<const Vec2D> points, + Span<const PathVerb> verbs, + FillRule) { return std::make_unique<NoOpRenderPath>(); }
diff --git a/viewer/src/tess/bitmap_decoder.cpp b/viewer/src/tess/bitmap_decoder.cpp index 53c50a1..0168883 100644 --- a/viewer/src/tess/bitmap_decoder.cpp +++ b/viewer/src/tess/bitmap_decoder.cpp
@@ -13,12 +13,9 @@ size_t Bitmap::bytesPerPixel(PixelFormat format) const { switch (format) { - case PixelFormat::R: - return 1; - case PixelFormat::RGB: - return 3; - case PixelFormat::RGBA: - return 4; + case PixelFormat::R: return 1; + case PixelFormat::RGB: return 3; + case PixelFormat::RGBA: return 4; } }
diff --git a/viewer/src/tess/decode_png.cpp b/viewer/src/tess/decode_png.cpp index 5688217..432afd6 100644 --- a/viewer/src/tess/decode_png.cpp +++ b/viewer/src/tess/decode_png.cpp
@@ -9,8 +9,9 @@ size_t size; }; -static void -ReadDataFromMemory(png_structp png_ptr, png_bytep outBytes, png_size_t byteCountToRead) { +static void ReadDataFromMemory(png_structp png_ptr, + png_bytep outBytes, + png_size_t byteCountToRead) { png_voidp a = png_get_io_ptr(png_ptr); if (a == nullptr) { return; @@ -56,8 +57,15 @@ png_read_info(png_ptr, info_ptr); - png_get_IHDR( - png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL); + png_get_IHDR(png_ptr, + info_ptr, + &width, + &height, + &bit_depth, + &color_type, + &interlace_type, + NULL, + NULL); png_set_strip_16(png_ptr); @@ -103,15 +111,9 @@ Bitmap::PixelFormat pixelFormat; assert(bitDepth == 32 || bitDepth == 24 || bitDepth == 8); switch (bitDepth) { - case 32: - pixelFormat = Bitmap::PixelFormat::RGBA; - break; - case 24: - pixelFormat = Bitmap::PixelFormat::RGB; - break; - case 8: - pixelFormat = Bitmap::PixelFormat::R; - break; + case 32: pixelFormat = Bitmap::PixelFormat::RGBA; break; + case 24: pixelFormat = Bitmap::PixelFormat::RGB; break; + case 8: pixelFormat = Bitmap::PixelFormat::R; break; } return std::make_unique<Bitmap>(width, height, pixelFormat, pixelBuffer); }
diff --git a/viewer/src/tess/viewer_sokol_factory.cpp b/viewer/src/tess/viewer_sokol_factory.cpp index 1d66478..7f5b67e 100644 --- a/viewer/src/tess/viewer_sokol_factory.cpp +++ b/viewer/src/tess/viewer_sokol_factory.cpp
@@ -6,12 +6,9 @@ sg_pixel_format SgPixelFormat(Bitmap* bitmap) { switch (bitmap->pixelFormat()) { - case Bitmap::PixelFormat::R: - return SG_PIXELFORMAT_R8; - case Bitmap::PixelFormat::RGBA: - return SG_PIXELFORMAT_RGBA8; - default: - return SG_PIXELFORMAT_NONE; + case Bitmap::PixelFormat::R: return SG_PIXELFORMAT_R8; + case Bitmap::PixelFormat::RGBA: return SG_PIXELFORMAT_RGBA8; + default: return SG_PIXELFORMAT_NONE; } }
diff --git a/viewer/src/viewer.cpp b/viewer/src/viewer.cpp index 6299260..fde43f0 100644 --- a/viewer/src/viewer.cpp +++ b/viewer/src/viewer.cpp
@@ -130,21 +130,13 @@ break; case SAPP_EVENTTYPE_KEY_UP: switch (ev->key_code) { - case SAPP_KEYCODE_ESCAPE: - sapp_quit(); - break; - case SAPP_KEYCODE_T: - g_Content = ViewerContent::Text(".svg"); - break; - case SAPP_KEYCODE_P: - g_Content = ViewerContent::TextPath(""); - break; - default: - break; + case SAPP_KEYCODE_ESCAPE: sapp_quit(); break; + case SAPP_KEYCODE_T: g_Content = ViewerContent::Text(".svg"); break; + case SAPP_KEYCODE_P: g_Content = ViewerContent::TextPath(""); break; + default: break; } break; - default: - break; + default: break; } }
diff --git a/viewer/src/viewer_content/textpath_content.cpp b/viewer/src/viewer_content/textpath_content.cpp index 4ae3a53..2aeda05 100644 --- a/viewer/src/viewer_content/textpath_content.cpp +++ b/viewer/src/viewer_content/textpath_content.cpp
@@ -60,8 +60,9 @@ //////////////////////////////////////////////////////////////////////////////////// static std::unique_ptr<RenderPath> make_rpath(const RawPath& path) { - return ViewerContent::RiveFactory()->makeRenderPath( - path.points(), path.verbs(), FillRule::nonZero); + return ViewerContent::RiveFactory()->makeRenderPath(path.points(), + path.verbs(), + FillRule::nonZero); } static void stroke_path(Renderer* renderer, const RawPath& path, float size, ColorInt color) { @@ -254,8 +255,13 @@ float mx = m_oneLineX / m_gbounds.width(); const ColorInt colors[] = {0xFF88FFFF, 0xFF88FFFF, 0xFFFFFFFF, 0xFF88FFFF, 0xFF88FFFF}; const float stops[] = {0, mx / 2, mx, (1 + mx) / 2, 1}; - paint->shader(ViewerContent::RiveFactory()->makeLinearGradient( - m_gbounds.left(), 0, m_gbounds.right(), 0, colors, stops, 5)); + paint->shader(ViewerContent::RiveFactory()->makeLinearGradient(m_gbounds.left(), + 0, + m_gbounds.right(), + 0, + colors, + stops, + 5)); } struct EaseWindow {
diff --git a/viewer/src/viewer_content/trimpath_content.cpp b/viewer/src/viewer_content/trimpath_content.cpp index 014a5b7..fc7318a 100644 --- a/viewer/src/viewer_content/trimpath_content.cpp +++ b/viewer/src/viewer_content/trimpath_content.cpp
@@ -33,8 +33,9 @@ //////////////////////////////////////////////////////////////////////////////////// static std::unique_ptr<RenderPath> make_rpath(const RawPath& path) { - return ViewerContent::RiveFactory()->makeRenderPath( - path.points(), path.verbs(), FillRule::nonZero); + return ViewerContent::RiveFactory()->makeRenderPath(path.points(), + path.verbs(), + FillRule::nonZero); } static void stroke_path(Renderer* renderer, const RawPath& path, float size, ColorInt color) {