Fixing renderer and skia viewer for new /rive include folder.
diff --git a/skia/renderer/include/skia_renderer.hpp b/skia/renderer/include/skia_renderer.hpp index f628c3c..27bdf86 100644 --- a/skia/renderer/include/skia_renderer.hpp +++ b/skia/renderer/include/skia_renderer.hpp
@@ -4,7 +4,7 @@ #include "SkCanvas.h" #include "SkPaint.h" #include "SkPath.h" -#include "renderer.hpp" +#include "rive/renderer.hpp" #include <vector> namespace rive
diff --git a/skia/renderer/include/to_skia.hpp b/skia/renderer/include/to_skia.hpp index 68b0ad4..cf3f7d9 100644 --- a/skia/renderer/include/to_skia.hpp +++ b/skia/renderer/include/to_skia.hpp
@@ -2,11 +2,11 @@ #define _RIVE_TO_SKIA_HPP_ #include "SkPaint.h" -#include "math/mat2d.hpp" -#include "math/vec2d.hpp" -#include "shapes/paint/stroke_cap.hpp" -#include "shapes/paint/stroke_join.hpp" -#include "shapes/paint/blend_mode.hpp" +#include "rive/math/mat2d.hpp" +#include "rive/math/vec2d.hpp" +#include "rive/shapes/paint/stroke_cap.hpp" +#include "rive/shapes/paint/stroke_join.hpp" +#include "rive/shapes/paint/blend_mode.hpp" namespace rive {
diff --git a/skia/renderer/src/skia_renderer.cpp b/skia/renderer/src/skia_renderer.cpp index dc0fce4..4d05007 100644 --- a/skia/renderer/src/skia_renderer.cpp +++ b/skia/renderer/src/skia_renderer.cpp
@@ -1,8 +1,8 @@ #include "skia_renderer.hpp" #include "SkGradientShader.h" #include "SkPath.h" -#include "math/vec2d.hpp" -#include "shapes/paint/color.hpp" +#include "rive/math/vec2d.hpp" +#include "rive/shapes/paint/color.hpp" #include "to_skia.hpp" using namespace rive;
diff --git a/skia/viewer/src/main.cpp b/skia/viewer/src/main.cpp index 25f61a0..fc138a9 100644 --- a/skia/viewer/src/main.cpp +++ b/skia/viewer/src/main.cpp
@@ -13,16 +13,16 @@ #include "SkTypes.h" #include "gl/GrGLInterface.h" -#include "animation/linear_animation_instance.hpp" -#include "animation/state_machine_instance.hpp" -#include "animation/state_machine_input_instance.hpp" -#include "animation/state_machine_number.hpp" -#include "animation/state_machine_bool.hpp" -#include "animation/state_machine_trigger.hpp" -#include "artboard.hpp" -#include "file.hpp" -#include "layout.hpp" -#include "math/aabb.hpp" +#include "rive/animation/linear_animation_instance.hpp" +#include "rive/animation/state_machine_instance.hpp" +#include "rive/animation/state_machine_input_instance.hpp" +#include "rive/animation/state_machine_number.hpp" +#include "rive/animation/state_machine_bool.hpp" +#include "rive/animation/state_machine_trigger.hpp" +#include "rive/artboard.hpp" +#include "rive/file.hpp" +#include "rive/layout.hpp" +#include "rive/math/aabb.hpp" #include "skia_renderer.hpp" #include "imgui/backends/imgui_impl_glfw.h"