Remove obsolete ViewerSkiaRenderer Diffs= a9bfb7f6d Remove obsolete ViewerSkiaRenderer
diff --git a/.rive_head b/.rive_head index 7931a13..184f1bc 100644 --- a/.rive_head +++ b/.rive_head
@@ -1 +1 @@ -7093089a798479fc840dba7aadc88ce27b10ca44 +a9bfb7f6d431c3a4b46ca7cb69b11a93830a8d85
diff --git a/viewer/include/viewer/skia/viewer_skia_renderer.hpp b/viewer/include/viewer/skia/viewer_skia_renderer.hpp deleted file mode 100644 index 8d8a869..0000000 --- a/viewer/include/viewer/skia/viewer_skia_renderer.hpp +++ /dev/null
@@ -1,13 +0,0 @@ -#ifndef _RIVE_VIEWER_SKIA_RENDERER_HPP_ -#define _RIVE_VIEWER_SKIA_RENDERER_HPP_ - -#ifdef RIVE_RENDERER_SKIA -#include "skia_renderer.hpp" - -class ViewerSkiaRenderer : public rive::SkiaRenderer { -public: - ViewerSkiaRenderer(SkCanvas* canvas) : rive::SkiaRenderer(canvas) {} - SkCanvas* canvas() { return m_Canvas; } -}; -#endif -#endif \ No newline at end of file
diff --git a/viewer/include/viewer/viewer_content.hpp b/viewer/include/viewer/viewer_content.hpp index e76f428..e78b39f 100644 --- a/viewer/include/viewer/viewer_content.hpp +++ b/viewer/include/viewer/viewer_content.hpp
@@ -8,11 +8,6 @@ #include "rive/span.hpp" #include "imgui.h" -#ifdef RIVE_RENDERER_SKIA -#include "SkCanvas.h" -#include "viewer/skia/viewer_skia_renderer.hpp" -#endif - namespace rive { class Renderer; class Factory;
diff --git a/viewer/src/viewer.cpp b/viewer/src/viewer.cpp index fd65d70..a80db62 100644 --- a/viewer/src/viewer.cpp +++ b/viewer/src/viewer.cpp
@@ -15,7 +15,7 @@ #include <memory> #ifdef RIVE_RENDERER_SKIA -#include "viewer/skia/viewer_skia_renderer.hpp" +#include "skia_renderer.hpp" sk_sp<GrDirectContext> g_SkiaContext; sk_sp<SkSurface> g_SkiaSurface; #endif @@ -80,7 +80,7 @@ paint.setColor(backgroundColor); canvas->drawPaint(paint); - ViewerSkiaRenderer skiaRenderer(canvas); + rive::SkiaRenderer skiaRenderer(canvas); if (g_Content) { g_Content->handleDraw(&skiaRenderer, sapp_frame_duration()); }