Nnnn merge fills and strokes

This PR is the ground work to support feathers. In order to simplify the UI and managing of different paint types, we're combining fills and strokes into a single list. As part of this effort, the most relevant parts are the way we sort old and new fills and strokes, and how we inject a new type of core object to handle foreground paints in layouts. Relevant parts are commented. The rest of the code changes is adjusting tests and interfaces. Diffs= f4c87ee495 Nnnn merge fills and strokes (#8465)
rive-app · Nov 5, 2024 · 624abf7 · 624abf7
1 parent 4b2ed24
commit 624abf7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.rive_head b/.rive_head
@@ -1 +1 @@
-af9e217d237bab4121dc7a002feca1931f6b5009
+f4c87ee495ea57e94210c6284d888d93ce7832cd
diff --git a/submodules/rive-runtime b/submodules/rive-runtime
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		af9e217d237bab4121dc7a002feca1931f6b5009
		f4c87ee495ea57e94210c6284d888d93ce7832cd
+1 −1		.rive_head
+8 −0		dev/defs/foreground_layout_drawable.json
+19 −0		include/rive/foreground_layout_drawable.hpp
+3 −0		include/rive/generated/core_registry.hpp
+41 −0		include/rive/generated/foreground_layout_drawable_base.hpp
+3 −0		include/rive/layout_component.hpp
+28 −3		src/artboard.cpp
+41 −0		src/foreground_layout_drawable.cpp
+11 −0		src/generated/foreground_layout_drawable_base.cpp
+6 −16		src/layout_component.cpp
+3 −0		src/shapes/shape_paint_container.cpp