@nativescript/canvas 2.0.0-alpha.20 → 2.0.0-alpha.22

package/platforms/ios/src/cpp/canvas2d/Path2D.h

@@ -3,25 +3,54 @@
 //
 
 #pragma once
-#include "rust/cxx.h"
-#include "canvas-cxx/src/lib.rs.h"
-#import <NativeScript/JSIRuntime.h>
+
+#include "Common.h"
 #include "Helpers.h"
 #include <vector>
 
-using namespace facebook;
-using namespace org::nativescript::canvas;
-
-class JSI_EXPORT Path2D : public jsi::HostObject {
+class Path2D {
 public:
-    Path2D(rust::Box<Path> path);
+    Path2D(Path* path);
+    ~Path2D(){
+        canvas_native_path_destroy(this->GetPath());
+        this->path_ = nullptr;
+    }
+
+    Path* GetPath();
+
+    static void Init(v8::Local<v8::Object> canvasModule, v8::Isolate *isolate);
+
+    static Path2D *GetPointer(const v8::Local<v8::Object> &object);
+
+    static v8::Local<v8::FunctionTemplate> GetCtor(v8::Isolate *isolate);
+
+    static void Ctor(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void AddPath(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void Arc(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void ArcTo(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void BezierCurveTo(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void ClosePath(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void Ellipse(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void LineTo(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void MoveTo(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void QuadraticCurveTo(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void Rect(const v8::FunctionCallbackInfo<v8::Value> &args);
 
-    jsi::Value get(jsi::Runtime &, const jsi::PropNameID &name) override;
+    static void RoundRect(const v8::FunctionCallbackInfo<v8::Value> &args);
 
-    std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &rt) override;
+    static void __toSVG(const v8::FunctionCallbackInfo<v8::Value> &args);
 
-    Path &GetPath();
 
 private:
-    rust::Box<Path> path_;
+    Path* path_;
 };

package/platforms/ios/src/cpp/canvas2d/TextMetricsImpl.cpp

@@ -0,0 +1,253 @@
+//
+// Created by Osei Fortune on 18/04/2022.
+//
+
+#include "TextMetricsImpl.h"
+#include "Caches.h"
+
+TextMetricsImpl::TextMetricsImpl(TextMetrics* metrics) : metrics_(metrics) {}
+
+void TextMetricsImpl::Init(v8::Local<v8::Object> canvasModule, v8::Isolate *isolate) {
+    v8::Locker locker(isolate);
+    v8::Isolate::Scope isolate_scope(isolate);
+    v8::HandleScope handle_scope(isolate);
+
+    auto ctor = GetCtor(isolate);
+    auto context = isolate->GetCurrentContext();
+    auto func = ctor->GetFunction(context).ToLocalChecked();
+
+    canvasModule->Set(context, ConvertToV8String(isolate, "TextMetrics"), func);
+}
+
+TextMetricsImpl *TextMetricsImpl::GetPointer(v8::Local<v8::Object> object) {
+    auto ptr = object->GetInternalField(0).As<v8::External>()->Value();
+    if (ptr == nullptr) {
+        return nullptr;
+    }
+    return static_cast<TextMetricsImpl *>(ptr);
+}
+
+v8::Local<v8::FunctionTemplate> TextMetricsImpl::GetCtor(v8::Isolate *isolate) {
+    auto cache = Caches::Get(isolate);
+    auto ctor = cache->TextMetricsTmpl.get();
+    if (ctor != nullptr) {
+        return ctor->Get(isolate);
+    }
+
+    v8::Local<v8::FunctionTemplate> ctorTmpl = v8::FunctionTemplate::New(isolate);
+    ctorTmpl->InstanceTemplate()->SetInternalFieldCount(1);
+    ctorTmpl->SetClassName(ConvertToV8String(isolate, "TextMetrics"));
+
+    auto tmpl = ctorTmpl->InstanceTemplate();
+    tmpl->SetInternalFieldCount(1);
+
+    tmpl->SetAccessor(
+            ConvertToV8String(isolate, "width"),
+            &GetWidth);
+
+    tmpl->SetAccessor(
+            ConvertToV8String(isolate, "actualBoundingBoxLeft"),
+            &GetActualBoundingBoxLeft);
+
+    tmpl->SetAccessor(
+            ConvertToV8String(isolate, "actualBoundingBoxRight"),
+            &GetActualBoundingBoxRight);
+
+    tmpl->SetAccessor(
+            ConvertToV8String(isolate, "actualBoundingBoxAscent"),
+            &GetActualBoundingBoxAscent);
+
+    tmpl->SetAccessor(
+            ConvertToV8String(isolate, "actualBoundingBoxDescent"),
+            &GetActualBoundingBoxDescent);
+
+    tmpl->SetAccessor(
+            ConvertToV8String(isolate, "fontBoundingBoxAscent"),
+            &GetFontBoundingBoxAscent);
+
+    tmpl->SetAccessor(
+            ConvertToV8String(isolate, "fontBoundingBoxDescent"),
+            &GetFontBoundingBoxDescent);
+
+
+    tmpl->SetAccessor(
+            ConvertToV8String(isolate, "emHeightAscent"),
+            &GetEmHeightAscent);
+
+    tmpl->SetAccessor(
+            ConvertToV8String(isolate, "emHeightDescent"),
+            &GetEmHeightDescent);
+
+    tmpl->SetAccessor(
+            ConvertToV8String(isolate, "hangingBaseline"),
+            &GetHangingBaseline);
+
+    tmpl->SetAccessor(
+            ConvertToV8String(isolate, "alphabeticBaseline"),
+            &GetAlphabeticBaseline);
+
+    tmpl->SetAccessor(
+            ConvertToV8String(isolate, "ideographicBaseline"),
+            &GetIdeographicBaseline);
+
+    cache->TextMetricsTmpl =
+            std::make_unique<v8::Persistent<v8::FunctionTemplate>>(isolate, ctorTmpl);
+    return ctorTmpl;
+}
+
+
+void TextMetricsImpl::GetWidth(v8::Local<v8::String> property,
+                               const v8::PropertyCallbackInfo<v8::Value> &info) {
+    TextMetricsImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+        info.GetReturnValue().Set(0);
+        return;
+    }
+
+    info.GetReturnValue().Set((double) canvas_native_text_metrics_get_width(ptr->GetTextMetrics()));
+}
+
+
+void TextMetricsImpl::GetActualBoundingBoxLeft(v8::Local<v8::String> property,
+                                               const v8::PropertyCallbackInfo<v8::Value> &info) {
+    TextMetricsImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+        info.GetReturnValue().Set(0);
+        return;
+    }
+
+    info.GetReturnValue().Set((double) canvas_native_text_metrics_get_actual_bounding_box_left(
+            ptr->GetTextMetrics()));
+}
+
+
+void TextMetricsImpl::GetActualBoundingBoxRight(v8::Local<v8::String> property,
+                                                const v8::PropertyCallbackInfo<v8::Value> &info) {
+    TextMetricsImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+        info.GetReturnValue().Set(0);
+        return;
+    }
+
+    info.GetReturnValue().Set((double) canvas_native_text_metrics_get_actual_bounding_box_right(
+            ptr->GetTextMetrics()));
+}
+
+
+void TextMetricsImpl::GetActualBoundingBoxAscent(v8::Local<v8::String> property,
+                                                 const v8::PropertyCallbackInfo<v8::Value> &info) {
+    TextMetricsImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+        info.GetReturnValue().Set(0);
+        return;
+    }
+
+    info.GetReturnValue().Set((double) canvas_native_text_metrics_get_actual_bounding_box_ascent(
+            ptr->GetTextMetrics()));
+}
+
+
+void TextMetricsImpl::GetActualBoundingBoxDescent(v8::Local<v8::String> property,
+                                                  const v8::PropertyCallbackInfo<v8::Value> &info) {
+    TextMetricsImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+        info.GetReturnValue().Set(0);
+        return;
+    }
+
+    info.GetReturnValue().Set((double) canvas_native_text_metrics_get_actual_bounding_box_descent(
+            ptr->GetTextMetrics()));
+}
+
+
+void TextMetricsImpl::GetFontBoundingBoxAscent(v8::Local<v8::String> property,
+                                               const v8::PropertyCallbackInfo<v8::Value> &info) {
+    TextMetricsImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+        info.GetReturnValue().Set(0);
+        return;
+    }
+
+    info.GetReturnValue().Set((double) canvas_native_text_metrics_get_font_bounding_box_ascent(
+            ptr->GetTextMetrics()));
+}
+
+
+void TextMetricsImpl::GetFontBoundingBoxDescent(v8::Local<v8::String> property,
+                                                const v8::PropertyCallbackInfo<v8::Value> &info) {
+    TextMetricsImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+        info.GetReturnValue().Set(0);
+        return;
+    }
+
+    info.GetReturnValue().Set((double) canvas_native_text_metrics_get_font_bounding_box_descent(
+            ptr->GetTextMetrics()));
+}
+
+
+void TextMetricsImpl::GetEmHeightAscent(v8::Local<v8::String> property,
+                                        const v8::PropertyCallbackInfo<v8::Value> &info) {
+    TextMetricsImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+        info.GetReturnValue().Set(0);
+        return;
+    }
+
+    info.GetReturnValue().Set(
+            (double) canvas_native_text_metrics_get_em_height_ascent(ptr->GetTextMetrics()));
+}
+
+
+void TextMetricsImpl::GetEmHeightDescent(v8::Local<v8::String> property,
+                                         const v8::PropertyCallbackInfo<v8::Value> &info) {
+    TextMetricsImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+        info.GetReturnValue().Set(0);
+        return;
+    }
+
+    info.GetReturnValue().Set(
+            (double) canvas_native_text_metrics_get_em_height_descent(ptr->GetTextMetrics()));
+}
+
+
+void TextMetricsImpl::GetHangingBaseline(v8::Local<v8::String> property,
+                                         const v8::PropertyCallbackInfo<v8::Value> &info) {
+    TextMetricsImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+        info.GetReturnValue().Set(0);
+        return;
+    }
+
+    info.GetReturnValue().Set(
+            (double) canvas_native_text_metrics_get_hanging_baseline(ptr->GetTextMetrics()));
+}
+
+void TextMetricsImpl::GetAlphabeticBaseline(v8::Local<v8::String> property,
+                                            const v8::PropertyCallbackInfo<v8::Value> &info) {
+    TextMetricsImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+        info.GetReturnValue().Set(0);
+        return;
+    }
+
+    info.GetReturnValue().Set(
+            (double) canvas_native_text_metrics_get_alphabetic_baseline(ptr->GetTextMetrics()));
+}
+
+void TextMetricsImpl::GetIdeographicBaseline(v8::Local<v8::String> property,
+                                             const v8::PropertyCallbackInfo<v8::Value> &info) {
+    TextMetricsImpl *ptr = GetPointer(info.This());
+    if (ptr == nullptr) {
+        info.GetReturnValue().Set(0);
+        return;
+    }
+
+    info.GetReturnValue().Set(
+            (double) canvas_native_text_metrics_get_ideographic_baseline(ptr->GetTextMetrics()));
+}
+
+TextMetrics* TextMetricsImpl::GetTextMetrics() {
+    return this->metrics_;
+}

package/platforms/ios/src/cpp/canvas2d/TextMetricsImpl.h

@@ -4,26 +4,64 @@
 
 #pragma once
 
-#include "rust/cxx.h"
-#include "canvas-cxx/src/lib.rs.h"
-#import <NativeScript/JSIRuntime.h>
 #include <vector>
+#include "Helpers.h"
 
-using namespace facebook;
-using namespace org::nativescript::canvas;
-
-class JSI_EXPORT TextMetricsImpl : public jsi::HostObject {
+class TextMetricsImpl {
 public:
-    TextMetricsImpl(rust::Box<TextMetrics> metrics);
+    TextMetricsImpl(TextMetrics* metrics);
+    
+    ~TextMetricsImpl(){
+        canvas_native_text_metrics_destroy(this->GetTextMetrics());
+        this->metrics_ = nullptr;
+    }
+
+    TextMetrics* GetTextMetrics();
+
+    static void Init(v8::Local<v8::Object> canvasModule, v8::Isolate *isolate);
+
+    static TextMetricsImpl *GetPointer(v8::Local<v8::Object> object);
+
+    static v8::Local<v8::FunctionTemplate> GetCtor(v8::Isolate *isolate);
+
+    static void GetWidth(v8::Local<v8::String> name,
+                         const v8::PropertyCallbackInfo<v8::Value> &info);
+
+    static void GetActualBoundingBoxLeft(v8::Local<v8::String> name,
+                         const v8::PropertyCallbackInfo<v8::Value> &info);
+
+
+    static void GetActualBoundingBoxRight(v8::Local<v8::String> name,
+                                         const v8::PropertyCallbackInfo<v8::Value> &info);
+
+    static void GetActualBoundingBoxAscent(v8::Local<v8::String> name,
+                                          const v8::PropertyCallbackInfo<v8::Value> &info);
+
+    static void GetActualBoundingBoxDescent(v8::Local<v8::String> name,
+                                           const v8::PropertyCallbackInfo<v8::Value> &info);
+
+    static void GetFontBoundingBoxAscent(v8::Local<v8::String> name,
+                                           const v8::PropertyCallbackInfo<v8::Value> &info);
+
+    static void GetFontBoundingBoxDescent(v8::Local<v8::String> name,
+                                            const v8::PropertyCallbackInfo<v8::Value> &info);
+
+    static void GetEmHeightAscent(v8::Local<v8::String> name,
+                                         const v8::PropertyCallbackInfo<v8::Value> &info);
 
-    jsi::Value get(jsi::Runtime &, const jsi::PropNameID &name) override;
+    static void GetEmHeightDescent(v8::Local<v8::String> name,
+                                          const v8::PropertyCallbackInfo<v8::Value> &info);
 
-    std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &rt) override;
+    static void GetHangingBaseline(v8::Local<v8::String> name,
+                                   const v8::PropertyCallbackInfo<v8::Value> &info);
 
-    TextMetrics &GetTextMetrics();
+    static void GetAlphabeticBaseline(v8::Local<v8::String> name,
+                                   const v8::PropertyCallbackInfo<v8::Value> &info);
 
+    static void GetIdeographicBaseline(v8::Local<v8::String> name,
+                                   const v8::PropertyCallbackInfo<v8::Value> &info);
 
 private:
-    rust::Box<TextMetrics> metrics_;
+    TextMetrics* metrics_;
 };
 

package/platforms/ios/src/cpp/gl.h

@@ -4,14 +4,20 @@
 
 #pragma once
 
-#import "canvas-cxx/src/lib.rs.h"
 
-#import <OpenGLES/ES1/gl.h>
-#import <OpenGLES/ES1/glext.h>
-#import <OpenGLES/ES2/gl.h>
-#import <OpenGLES/ES2/glext.h>
-#import <OpenGLES/ES3/gl.h>
-#import <OpenGLES/ES3/glext.h>
+#ifdef __ANDROID__
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#include "gles3jni.h"
+#endif
+
+#ifdef __APPLE__
+#include <OpenGLES/ES1/gl.h>
+#include <OpenGLES/ES1/glext.h>
+#include <OpenGLES/ES2/gl.h>
+#include <OpenGLES/ES2/glext.h>
+#include <OpenGLES/ES3/gl.h>
+#include <OpenGLES/ES3/glext.h>
 
 #define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0
 #define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1
@@ -27,3 +33,47 @@
 #define GL_ATC_RGBA_EXPLICIT_ALPHA_AMD    0x8C93
 #define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD 0x87EE
 
+
+
+#define GL_COLOR_ATTACHMENT0_EXT GL_COLOR_ATTACHMENT0
+#define GL_COLOR_ATTACHMENT1_EXT GL_COLOR_ATTACHMENT1
+#define GL_COLOR_ATTACHMENT2_EXT GL_COLOR_ATTACHMENT2
+#define GL_COLOR_ATTACHMENT3_EXT GL_COLOR_ATTACHMENT3
+#define GL_COLOR_ATTACHMENT4_EXT GL_COLOR_ATTACHMENT4
+#define GL_COLOR_ATTACHMENT5_EXT GL_COLOR_ATTACHMENT5
+#define GL_COLOR_ATTACHMENT6_EXT GL_COLOR_ATTACHMENT6
+#define GL_COLOR_ATTACHMENT7_EXT GL_COLOR_ATTACHMENT7
+#define GL_COLOR_ATTACHMENT8_EXT GL_COLOR_ATTACHMENT8
+#define GL_COLOR_ATTACHMENT9_EXT GL_COLOR_ATTACHMENT9
+#define GL_COLOR_ATTACHMENT10_EXT GL_COLOR_ATTACHMENT10
+#define GL_COLOR_ATTACHMENT11_EXT GL_COLOR_ATTACHMENT11
+#define GL_COLOR_ATTACHMENT12_EXT GL_COLOR_ATTACHMENT12
+#define GL_COLOR_ATTACHMENT13_EXT GL_COLOR_ATTACHMENT13
+#define GL_COLOR_ATTACHMENT14_EXT GL_COLOR_ATTACHMENT14
+#define GL_COLOR_ATTACHMENT15_EXT GL_COLOR_ATTACHMENT15
+
+
+#define GL_DRAW_BUFFER0_EXT GL_DRAW_BUFFER0
+#define GL_DRAW_BUFFER1_EXT GL_DRAW_BUFFER1
+#define GL_DRAW_BUFFER2_EXT GL_DRAW_BUFFER2
+#define GL_DRAW_BUFFER3_EXT GL_DRAW_BUFFER3
+#define GL_DRAW_BUFFER4_EXT GL_DRAW_BUFFER4
+#define GL_DRAW_BUFFER5_EXT GL_DRAW_BUFFER5
+#define GL_DRAW_BUFFER6_EXT GL_DRAW_BUFFER6
+#define GL_DRAW_BUFFER7_EXT GL_DRAW_BUFFER7
+#define GL_DRAW_BUFFER8_EXT GL_DRAW_BUFFER8
+#define GL_DRAW_BUFFER9_EXT GL_DRAW_BUFFER9
+#define GL_DRAW_BUFFER10_EXT GL_DRAW_BUFFER10
+#define GL_DRAW_BUFFER11_EXT GL_DRAW_BUFFER11
+#define GL_DRAW_BUFFER12_EXT GL_DRAW_BUFFER12
+#define GL_DRAW_BUFFER13_EXT GL_DRAW_BUFFER13
+#define GL_DRAW_BUFFER14_EXT GL_DRAW_BUFFER14
+#define GL_DRAW_BUFFER15_EXT GL_DRAW_BUFFER15
+
+#define GL_MAX_COLOR_ATTACHMENTS_EXT GL_MAX_COLOR_ATTACHMENTS
+#define GL_MAX_DRAW_BUFFERS_EXT GL_MAX_DRAW_BUFFERS
+
+
+
+#endif
+