@shopify/react-native-skia 0.1.151 → 0.1.153

package/android/cpp/jni/JniSkiaDrawView.cpp

@@ -1,113 +0,0 @@
-#include "JniSkiaDrawView.h"
-#include "RNSkLog.h"
-
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <GLES2/gl2.h>
-#include <EGL/eglplatform.h>
-#include <android/native_window.h>
-#include <android/native_window_jni.h>
-
-#include <SkCanvas.h>
-#include <SkImageInfo.h>
-#include <SkSurface.h>
-#include <gpu/GrDirectContext.h>
-#include <gpu/GrBackendSurface.h>
-#include <gpu/gl/GrGLInterface.h>
-#include <gpu/gl/GrGLTypes.h>
-#include <gpu/GrTypes.h>
-#include <RNSkInfoParameter.h>
-
-namespace RNSkia
-{
-    using namespace facebook;
-    using namespace jni;
-
-    using TSelf = local_ref<HybridClass<JniSkiaDrawView>::jhybriddata>;
-
-    /**** DTOR ***/
-    JniSkiaDrawView::~JniSkiaDrawView()
-    {
-    }
-
-    /**** JNI ****/
-
-    TSelf JniSkiaDrawView::initHybrid(
-            alias_ref<HybridClass::jhybridobject> jThis,
-            JavaSkiaManager skiaManager)
-    {
-        return makeCxxInstance(jThis, skiaManager);
-    }
-
-    void JniSkiaDrawView::registerNatives()
-    {
-        registerHybrid({makeNativeMethod("initHybrid", JniSkiaDrawView::initHybrid),
-                        makeNativeMethod("surfaceAvailable", JniSkiaDrawView::surfaceAvailable),
-                        makeNativeMethod("surfaceDestroyed", JniSkiaDrawView::surfaceDestroyed),
-                        makeNativeMethod("surfaceSizeChanged", JniSkiaDrawView::surfaceSizeChanged),
-                        makeNativeMethod("setMode", JniSkiaDrawView::setMode),
-                        makeNativeMethod("setDebugMode", JniSkiaDrawView::setDebugMode),
-                        makeNativeMethod("updateTouchPoints", JniSkiaDrawView::updateTouchPoints)});
-    }
-
-    void JniSkiaDrawView::setMode(std::string mode)
-    {
-        if (mode.compare("continuous") == 0)
-        {
-            _drawView->setDrawingMode(RNSkDrawingMode::Continuous);
-        }
-        else
-        {
-            _drawView->setDrawingMode(RNSkDrawingMode::Default);
-        }
-    }
-
-    void JniSkiaDrawView::setDebugMode(bool show)
-    {
-        _drawView->setShowDebugOverlays(show);
-    }
-
-    void JniSkiaDrawView::updateTouchPoints(jni::JArrayDouble touches)
-    {
-        // Create touch points
-        std::vector<RNSkia::RNSkTouchPoint> points;
-        auto pin = touches.pin();
-        auto scale = _drawView->getPixelDensity();
-        points.reserve(pin.size() / 5);
-        for (size_t i = 0; i < pin.size(); i += 5)
-        {
-            RNSkTouchPoint point;
-            point.x = pin[i] / scale;
-            point.y = pin[i + 1] / scale;
-            point.force = pin[i + 2];
-            point.type = (RNSkia::RNSkTouchType)pin[i + 3];
-            point.id = pin[i + 4];
-            points.push_back(point);
-        }
-        _drawView->updateTouchState(std::move(points));
-    }
-
-    void JniSkiaDrawView::surfaceAvailable(jobject surface, int width, int height)
-    {
-        _drawView->surfaceAvailable(ANativeWindow_fromSurface(Environment::current(), surface), width, height);
-    }
-
-    void JniSkiaDrawView::surfaceSizeChanged(int width, int height)
-    {
-        _drawView->surfaceSizeChanged(width, height);
-    }
-
-    void JniSkiaDrawView::surfaceDestroyed()
-    {
-        _drawView->surfaceDestroyed();
-    }
-
-    void JniSkiaDrawView::releaseSurface() {
-        jni::ThreadScope ts;
-        static auto method = javaPart_->getClass()->getMethod<void(void)>("releaseSurface");
-        method(javaPart_.get());
-    }
-} // namespace RNSkia

package/android/cpp/rnskia-android/RNSkDrawViewImpl.cpp

@@ -1,73 +0,0 @@
-#include <RNSkDrawViewImpl.h>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include <SkSurface.h>
-#include <SkCanvas.h>
-
-#pragma clang diagnostic pop
-
-#include <RNSkLog.h>
-
-namespace RNSkia {
-    RNSkDrawViewImpl::RNSkDrawViewImpl(std::shared_ptr <RNSkia::RNSkPlatformContext> context, std::function<void()> releaseSurfaceCallback) :
-        RNSkia::RNSkDrawView(context),
-        _releaseSurfaceCallback(std::move(releaseSurfaceCallback)) {}
-
-    void RNSkDrawViewImpl::surfaceAvailable(ANativeWindow* surface, int width, int height) {
-        _scaledWidth = width;
-        _scaledHeight = height;
-
-        if (_renderer == nullptr)
-        {
-            // Create renderer!
-            _renderer = std::make_unique<SkiaOpenGLRenderer>(surface, getNativeId());
-
-            // Redraw
-            requestRedraw();
-        }
-    }
-
-    void RNSkDrawViewImpl::surfaceDestroyed() {
-        if (_renderer != nullptr)
-        {
-            // Start teardown
-            _renderer->teardown();
-
-            // Teardown renderer on the render thread since OpenGL demands
-            // same thread access for OpenGL contexts.
-            getPlatformContext()->runOnRenderThread([weakSelf = weak_from_this()]() {
-                auto self = weakSelf.lock();
-                if(self) {
-                    auto drawViewImpl = std::dynamic_pointer_cast<RNSkDrawViewImpl>(self);
-                    if(drawViewImpl->_renderer != nullptr) {
-                        drawViewImpl->_renderer->run(nullptr, 0, 0);
-                    }
-                    // Remove renderer
-                    drawViewImpl->_renderer = nullptr;
-                    drawViewImpl->_releaseSurfaceCallback();
-                }
-            });
-        }
-    }
-
-    void RNSkDrawViewImpl::surfaceSizeChanged(int width, int height) {
-        if(width == 0 && height == 0) {
-            // Setting width/height to zero is nothing we need to care about when
-            // it comes to invalidating the surface.
-            return;
-        }
-        _scaledWidth = width;
-        _scaledHeight = height;
-
-        // Redraw after size change
-        requestRedraw();
-    }
-
-    void RNSkDrawViewImpl::renderToSkiaCanvas(const std::function<void(SkCanvas*)>& cb) {
-        if(_renderer != nullptr) {
-            _renderer->run(cb, _scaledWidth, _scaledHeight);
-        }
-    }
-}

package/android/cpp/rnskia-android/RNSkDrawViewImpl.h

@@ -1,48 +0,0 @@
-#pragma once
-
-#include <RNSkDrawView.h>
-
-#include <SkiaOpenGLRenderer.h>
-#include <android/native_window.h>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include <SkPicture.h>
-#include <SkRefCnt.h>
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-    class RNSkDrawViewImpl : public RNSkia::RNSkDrawView {
-    public:
-        RNSkDrawViewImpl(std::shared_ptr <RNSkia::RNSkPlatformContext> context,
-                         std::function<void()> releaseSurfaceCallback);
-
-        void surfaceAvailable(ANativeWindow* surface, int, int);
-        void surfaceDestroyed();
-        void surfaceSizeChanged(int, int);
-
-        float getPixelDensity() {
-            return getPlatformContext()->getPixelDensity();
-        }
-
-    protected:
-        float getScaledWidth() override { return _scaledWidth; };
-
-        float getScaledHeight() override { return _scaledHeight; };
-
-        void renderToSkiaCanvas(const std::function<void(SkCanvas*)>&) override;
-
-    private:
-        bool createSkiaSurface();
-
-        std::unique_ptr<SkiaOpenGLRenderer> _renderer = nullptr;
-
-        int _nativeId;
-        float _scaledWidth = -1;
-        float _scaledHeight = -1;
-
-        std::function<void()> _releaseSurfaceCallback;
-    };
-}

package/cpp/rnskia/RNSkDrawView.cpp

@@ -1,315 +0,0 @@
-//
-// Created by Christian Falch on 23/08/2021.
-//
-
-#include "RNSkDrawView.h"
-
-#include <chrono>
-#include <functional>
-#include <sstream>
-#include <string>
-#include <memory>
-#include <vector>
-#include <utility>
-
-#include <JsiSkCanvas.h>
-#include <RNSkLog.h>
-#include <RNSkPlatformContext.h>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include <SkBBHFactory.h>
-#include <SkCanvas.h>
-#include <SkFont.h>
-#include <SkFontTypes.h>
-#include <SkGraphics.h>
-#include <SkPaint.h>
-#include <SkPictureRecorder.h>
-#include <SkSurface.h>
-#include <SkRect.h>
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-using namespace std::chrono;
-
-RNSkDrawView::RNSkDrawView(std::shared_ptr<RNSkPlatformContext> context)
-    : _jsiCanvas(std::make_shared<JsiSkCanvas>(context)),
-      _platformContext(std::move(context)),
-      _infoObject(std::make_shared<RNSkInfoObject>()),
-      _jsDrawingLock(std::make_shared<std::timed_mutex>()),
-      _gpuDrawingLock(std::make_shared<std::timed_mutex>()),
-      _jsTimingInfo("SKIA/JS"),
-      _gpuTimingInfo("SKIA/GPU")
-      {}
-
-RNSkDrawView::~RNSkDrawView() {
-  endDrawingLoop();
-}
-
-void RNSkDrawView::setJsiProperties(std::unordered_map<std::string, JsiValueWrapper> &props) {
-  for(auto& prop: props) {
-    if(prop.first == "drawCallback") {
-      if(prop.second.isUndefinedOrNull()) {
-        // Clear drawcallback
-        _drawCallback = nullptr;
-        // We can just reset everything - this is a signal that we're done.
-        endDrawingLoop();
-        return;
-      } else if (prop.second.getType() != JsiWrapperValueType::Function) {
-        // We expect a function for the draw callback custom property
-        throw std::runtime_error("Expected a function for the drawCallback custom property.");
-      }
-
-      // Save callback
-      _drawCallback = prop.second.getAsFunction();
-
-      // Request redraw
-      requestRedraw();
-
-    } else {
-      throw std::runtime_error("Property " + prop.first + " not found.");
-    }
-  }
-}
-
-jsi::Value RNSkDrawView::callJsiMethod(jsi::Runtime& runtime,
-                                       const std::string& name,
-                                       const jsi::Value *arguments,
-                                       size_t count) {
-  
-  // This subclass doesn't support any jsi methods at the moment, but
-  // new subclasses created in the future will.
-  throw std::runtime_error("RNSkDrawView does not support any JSI methods. Method " + name + "() not found.");
-  return jsi::Value::undefined();
-}
-
-void RNSkDrawView::setNativeId(size_t nativeId) {
-  _nativeId = nativeId;
-  beginDrawingLoop();
-}
-
-void RNSkDrawView::callJsDrawCallback(std::shared_ptr<JsiSkCanvas> canvas,
-                                      int width,
-                                      int height,
-                                      double timestamp) {
-  if(_drawCallback == nullptr) {
-    return;
-  }
-
-  // Reset timing info
-  _jsTimingInfo.reset();
-  _gpuTimingInfo.reset();
-
-  auto runtime = getPlatformContext()->getJsRuntime();
-
-  // Update info parameter
-  _infoObject->beginDrawOperation(width, height, timestamp);
-
-  // Set up arguments array
-  std::vector<jsi::Value> args(2);
-  args[0] = jsi::Object::createFromHostObject(*runtime, canvas);
-  args[1] = jsi::Object::createFromHostObject(*runtime, _infoObject);
-
-  // To be able to call the drawing function we'll wrap it once again
-  _drawCallback->call(*runtime,
-                      static_cast<const jsi::Value *>(args.data()),
-                      (size_t)2);
-
-  // Reset touches
-  _infoObject->endDrawOperation();
-
-  // Draw debug overlays
-  if (_showDebugOverlay) {
-
-    // Display average rendering timer
-    auto jsAvg = _jsTimingInfo.getAverage();
-    //auto jsFps = _jsTimingInfo.getFps();
-
-    auto gpuAvg = _gpuTimingInfo.getAverage();
-    //auto gpuFps = _gpuTimingInfo.getFps();
-
-    auto total = jsAvg + gpuAvg;
-
-    // Build string
-    std::ostringstream stream;
-    stream << "js: " << jsAvg << "ms gpu: " << gpuAvg << "ms " << " total: " << total << "ms";
-
-    std::string debugString = stream.str();
-
-    // Set up debug font/paints
-    auto font = SkFont();
-    font.setSize(14);
-    auto paint = SkPaint();
-    paint.setColor(SkColors::kRed);
-    canvas->getCanvas()->drawSimpleText(
-            debugString.c_str(), debugString.size(), SkTextEncoding::kUTF8, 8,
-            18, font, paint);
-  }
-}
-
-void RNSkDrawView::drawInCanvas(std::shared_ptr<JsiSkCanvas> canvas,
-                                int width,
-                                int height,
-                                double time) {
-  
-  // Call the draw drawCallback and perform js based drawing
-  auto skCanvas = canvas->getCanvas();
-  if (_drawCallback != nullptr && skCanvas != nullptr) {
-    // Make sure to scale correctly
-    auto pd = _platformContext->getPixelDensity();
-    skCanvas->save();
-    skCanvas->scale(pd, pd);
-    
-    // Call draw function.
-    callJsDrawCallback(canvas, width / pd, height / pd, time);
-    
-    // Restore and flush canvas
-    skCanvas->restore();
-    skCanvas->flush();
-  }
-}
-
-sk_sp<SkImage> RNSkDrawView::makeImageSnapshot(std::shared_ptr<SkRect> bounds) {
-  // Assert width/height
-  auto surface = SkSurface::MakeRasterN32Premul(getScaledWidth(), getScaledHeight());
-  auto canvas = surface->getCanvas();
-  auto jsiCanvas = std::make_shared<JsiSkCanvas>(_platformContext);
-  jsiCanvas->setCanvas(canvas);
-  
-  milliseconds ms = duration_cast<milliseconds>(
-      system_clock::now().time_since_epoch());
-  
-  drawInCanvas(jsiCanvas, getScaledWidth(), getScaledHeight(), ms.count() / 1000);
-  
-  if(bounds != nullptr) {
-    SkIRect b = SkIRect::MakeXYWH(bounds->x(), bounds->y(), bounds->width(), bounds->height());
-    return surface->makeImageSnapshot(b);
-  } else {
-    return surface->makeImageSnapshot();
-  }
-}
-
-void RNSkDrawView::updateTouchState(std::vector<RNSkTouchPoint>&& points) {
-  _infoObject->updateTouches(std::move(points));
-  requestRedraw();
-}
-
-void RNSkDrawView::performDraw() {
-  // Start timing
-  _jsTimingInfo.beginTiming();
-  
-  // Record the drawing operations on the JS thread so that we can
-  // move the actual drawing onto the render thread later
-  SkPictureRecorder recorder;
-  SkRTreeFactory factory;
-  SkCanvas* canvas = recorder.beginRecording(getScaledWidth(), getScaledHeight(), &factory);
-  _jsiCanvas->setCanvas(canvas);
-  
-  // Get current milliseconds
-  milliseconds ms = duration_cast<milliseconds>(
-          system_clock::now().time_since_epoch());
-  
-  try {
-    // Perform the javascript drawing
-    drawInCanvas(_jsiCanvas, getScaledWidth(), getScaledHeight(), ms.count() / 1000.0);
-  } catch(...) {
-    _jsTimingInfo.stopTiming();
-    _jsDrawingLock->unlock();
-    throw;
-  }
-  
-  // Finish drawing operations
-  auto p = recorder.finishRecordingAsPicture();
-
-  _jsiCanvas->setCanvas(nullptr);
-  
-  // Calculate duration
-  _jsTimingInfo.stopTiming();
-  
-  if(_gpuDrawingLock->try_lock()) {
-
-    // Post drawing message to the render thread where the picture recorded
-    // will be sent to the GPU/backend for rendering to screen.
-    auto gpuLock = _gpuDrawingLock;
-    _platformContext->runOnRenderThread([weakSelf = weak_from_this(), p = std::move(p), gpuLock]() {
-      auto self = weakSelf.lock();
-      if (self) {
-        // Draw the picture recorded on the real GPU canvas
-        self->_gpuTimingInfo.beginTiming();
-        self->renderToSkiaCanvas([p = std::move(p)](SkCanvas* canvas) {
-          canvas->drawPicture(p);
-        });
-        self->_gpuTimingInfo.stopTiming();
-      }
-      // Unlock GPU drawing
-      gpuLock->unlock();
-    });
-  } else {
-#ifdef DEBUG
-    _gpuTimingInfo.markSkipped();
-#endif
-    // Request a new redraw since the last frame was skipped.
-    requestRedraw();
-  }
-  
-  // Unlock JS drawing
-  _jsDrawingLock->unlock();
-}
-
-void RNSkDrawView::requestRedraw() {
-  _redrawRequestCounter++;
-}
-
-void RNSkDrawView::beginDrawingLoop() {
-  if (_drawingLoopId != 0 || _nativeId == 0) {
-    return;
-  }
-  // Set to zero to avoid calling beginDrawLoop before we return
-  _drawingLoopId = _platformContext->beginDrawLoop(_nativeId,
-    [weakSelf = weak_from_this()](bool invalidated) {
-    auto self = weakSelf.lock();
-    if(self) {
-      self->drawLoopCallback(invalidated);
-    }
-  });
-}
-
-void RNSkDrawView::drawLoopCallback(bool invalidated) {
-  if(_redrawRequestCounter > 0 || _drawingMode == RNSkDrawingMode::Continuous) {
-      _redrawRequestCounter = 0;
-      
-    // We render on the javascript thread.
-    if(_jsDrawingLock->try_lock()) {
-      _platformContext->runOnJavascriptThread([weakSelf = weak_from_this()](){
-        auto self = weakSelf.lock();
-        if(self) {
-          self->performDraw();
-        }
-      });
-    } else {
-#ifdef DEBUG
-      _jsTimingInfo.markSkipped();
-#endif
-      requestRedraw();
-    }
-  }
-}
-
-void RNSkDrawView::endDrawingLoop() {
-  if(_drawingLoopId != 0) {
-    _drawingLoopId = 0;
-    _platformContext->endDrawLoop(_nativeId);
-  }
-}
-
-void RNSkDrawView::setDrawingMode(RNSkDrawingMode mode) {
-  if(mode == _drawingMode || _nativeId == 0) {
-    return;
-  }
-  _drawingMode = mode;
-}
-
-} // namespace RNSkia