@nativescript/canvas 2.0.0-alpha.24 → 2.0.0-alpha.25

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

@@ -6,7 +6,7 @@
 #include "MatrixImpl.h"
 #include "Caches.h"
 
-MatrixImpl::MatrixImpl(Matrix* matrix) : matrix_(matrix) {}
+MatrixImpl::MatrixImpl(Matrix *matrix) : matrix_(matrix) {}
 
 void MatrixImpl::Init(v8::Local<v8::Object> canvasModule, v8::Isolate *isolate) {
     v8::Locker locker(isolate);
@@ -218,6 +218,8 @@ void MatrixImpl::Ctor(const v8::FunctionCallbackInfo<v8::Value> &args) {
 
                 ret->SetInternalField(0, ext);
 
+                SetNativeType(isolate, ret, NativeType::Matrix);
+
                 args.GetReturnValue().Set(ret);
 
                 return;
@@ -241,6 +243,8 @@ void MatrixImpl::Ctor(const v8::FunctionCallbackInfo<v8::Value> &args) {
 
                 ret->SetInternalField(0, ext);
 
+                SetNativeType(isolate, ret, NativeType::Matrix);
+
                 args.GetReturnValue().Set(ret);
                 return;
             }
@@ -254,6 +258,8 @@ void MatrixImpl::Ctor(const v8::FunctionCallbackInfo<v8::Value> &args) {
 
         ret->SetInternalField(0, ext);
 
+        SetNativeType(isolate, ret, NativeType::Matrix);
+
         args.GetReturnValue().Set(ret);
         return;
     }
@@ -795,6 +801,6 @@ void MatrixImpl::SetM44(v8::Local<v8::String> property,
     canvas_native_matrix_set_m44(ptr->GetMatrix(), (float) value->NumberValue(context).ToChecked());
 }
 
-Matrix* MatrixImpl::GetMatrix() {
+Matrix *MatrixImpl::GetMatrix() {
     return this->matrix_;
 }

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

@@ -118,7 +118,7 @@ void Path2D::Ctor(const v8::FunctionCallbackInfo<v8::Value> &args) {
         if (value->IsString()) {
             auto d = ConvertFromV8String(isolate, value);
             auto path = canvas_native_path_create_with_string(d.c_str());
-            auto object = new Path2D(std::move(path));
+            auto object = new Path2D(path);
 
             auto ext = v8::External::New(isolate, object);
 

package/platforms/ios/src/cpp/webgl/WebGLRenderingContext.cpp

@@ -336,11 +336,7 @@ void WebGLRenderingContext::AttachShader(const v8::FunctionCallbackInfo<v8::Valu
         shader = WebGLShader::GetPointer(shaderValue.As<v8::Object>());
     }
 
-    if (program == nullptr) {
-        return;
-    }
-
-    if (shader == nullptr) {
+    if (program == nullptr || shader == nullptr) {
         return;
     }
 
@@ -389,7 +385,7 @@ void WebGLRenderingContext::BindBuffer(const v8::FunctionCallbackInfo<v8::Value>
     auto target = args[0]->Uint32Value(context).ToChecked();
     if (!args[1]->IsNull() &&
         args[1]->IsObject()) {
-        auto type = GetNativeType(isolate, args[1].As<v8::Object>());
+        auto type = GetNativeType(isolate, args[1]);
         if (type == NativeType::WebGLBuffer) {
             auto buffer = WebGLBuffer::GetPointer(args[1].As<v8::Object>());
             if (buffer ==
@@ -421,27 +417,25 @@ void WebGLRenderingContext::BindFramebuffer(const v8::FunctionCallbackInfo<v8::V
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    if (args[0]->IsNumber()) {
-        auto target = args[0]->Uint32Value(context).ToChecked();
-        if (args[1]->IsObject()) {
-            auto type = GetNativeType(isolate, args[1]);
-            if (type == NativeType::WebGLFramebuffer) {
-                auto framebuffer = WebGLFramebuffer::GetPointer(args[1].As<v8::Object>());
-                canvas_native_webgl_bind_frame_buffer(
-                        target,
-                        framebuffer->GetFrameBuffer(),
-                        ptr->GetState()
-                );
-            }
-        } else {
-            // null value
-            // unbind
+    auto target = args[0]->Uint32Value(context).ToChecked();
+    if (args[1]->IsObject()) {
+        auto type = GetNativeType(isolate, args[1]);
+        if (type == NativeType::WebGLFramebuffer) {
+            auto framebuffer = WebGLFramebuffer::GetPointer(args[1].As<v8::Object>());
             canvas_native_webgl_bind_frame_buffer(
                     target,
-                    0,
+                    framebuffer->GetFrameBuffer(),
                     ptr->GetState()
             );
         }
+    } else {
+        // null value
+        // unbind
+        canvas_native_webgl_bind_frame_buffer(
+                target,
+                0,
+                ptr->GetState()
+        );
     }
 }
 
@@ -456,7 +450,7 @@ void WebGLRenderingContext::BindRenderbuffer(const v8::FunctionCallbackInfo<v8::
 
     auto target = args[0]->Uint32Value(context).ToChecked();
     if (args[1]->IsObject()) {
-        auto type = GetNativeType(isolate, args[1].As<v8::Object>());
+        auto type = GetNativeType(isolate, args[1]);
         if (type == NativeType::WebGLRenderbuffer) {
             auto renderbuffer = WebGLRenderbuffer::GetPointer(args[1].As<v8::Object>());
 
@@ -784,21 +778,15 @@ WebGLRenderingContext::CheckFramebufferStatus(const v8::FunctionCallbackInfo<v8:
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto count = args.Length();
-
-    if (args[0]->IsNumber()) {
-        auto target = args[0]->Uint32Value(context).ToChecked();
 
-        auto ret = canvas_native_webgl_check_frame_buffer_status(
-                target,
-                ptr->GetState()
-        );
+    auto target = args[0]->Uint32Value(context).ToChecked();
 
-        args.GetReturnValue().Set(ret);
-        return;
-    }
+    auto ret = canvas_native_webgl_check_frame_buffer_status(
+            target,
+            ptr->GetState()
+    );
 
-    args.GetReturnValue().Set(0);
+    args.GetReturnValue().Set(ret);
 }
 
 void WebGLRenderingContext::ClearColor(const v8::FunctionCallbackInfo<v8::Value> &args) {
@@ -1016,44 +1004,42 @@ WebGLRenderingContext::CompressedTexSubImage2D(const v8::FunctionCallbackInfo<v8
     auto width = args[4]->Int32Value(context).ToChecked();
     auto height = args[5]->Int32Value(context).ToChecked();
     auto format = args[6]->Uint32Value(context).ToChecked();
-    if (args[7]->IsObject()) {
-        auto pixels = args[7];
-        if (pixels->IsArrayBufferView()) {
-            auto buf = pixels.As<v8::ArrayBufferView>();
-            auto array = buf->Buffer();
-            auto offset = buf->ByteOffset();
-            auto size = array->ByteLength();
-            auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<uint8_t *>((void *) data_ptr);
+    auto pixels = args[7];
+    if (pixels->IsArrayBufferView()) {
+        auto buf = pixels.As<v8::ArrayBufferView>();
+        auto array = buf->Buffer();
+        auto offset = buf->ByteOffset();
+        auto size = array->ByteLength();
+        auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+        auto data = static_cast<uint8_t *>((void *) data_ptr);
 
-            canvas_native_webgl_compressed_tex_sub_image2d(
-                    target,
-                    level,
-                    xoffset,
-                    yoffset,
-                    width,
-                    height,
-                    format,
-                    data, size,
-                    ptr->GetState()
-            );
-        } else if (pixels->IsArrayBuffer()) {
-            auto array = pixels.As<v8::ArrayBuffer>();
-            auto size = array->ByteLength();
-            auto data = (uint8_t *) array->GetBackingStore()->Data();
+        canvas_native_webgl_compressed_tex_sub_image2d(
+                target,
+                level,
+                xoffset,
+                yoffset,
+                width,
+                height,
+                format,
+                data, size,
+                ptr->GetState()
+        );
+    } else if (pixels->IsArrayBuffer()) {
+        auto array = pixels.As<v8::ArrayBuffer>();
+        auto size = array->ByteLength();
+        auto data = (uint8_t *) array->GetBackingStore()->Data();
 
-            canvas_native_webgl_compressed_tex_sub_image2d(
-                    target,
-                    level,
-                    xoffset,
-                    yoffset,
-                    width,
-                    height,
-                    format,
-                    data, size,
-                    ptr->GetState()
-            );
-        }
+        canvas_native_webgl_compressed_tex_sub_image2d(
+                target,
+                level,
+                xoffset,
+                yoffset,
+                width,
+                height,
+                format,
+                data, size,
+                ptr->GetState()
+        );
     }
 
 }
@@ -1303,7 +1289,7 @@ void WebGLRenderingContext::DeleteBuffer(const v8::FunctionCallbackInfo<v8::Valu
 
 
     auto value = args[0];
-    auto type = GetNativeType(isolate, value.As<v8::Object>());
+    auto type = GetNativeType(isolate, value);
     if (type == NativeType::WebGLBuffer) {
         auto buffer = WebGLBuffer::GetPointer(value.As<v8::Object>());
         if (buffer != nullptr) {
@@ -1324,7 +1310,6 @@ void WebGLRenderingContext::DeleteFramebuffer(const v8::FunctionCallbackInfo<v8:
 
     auto isolate = args.GetIsolate();
 
-
     auto value = args[0];
     auto type = GetNativeType(isolate, value);
     if (type == NativeType::WebGLFramebuffer) {
@@ -1377,7 +1362,7 @@ void WebGLRenderingContext::DeleteRenderbuffer(const v8::FunctionCallbackInfo<v8
     auto value = args[0];
     auto type = GetNativeType(isolate, value);
 
-    if (type == NativeType::WebGLProgram) {
+    if (type == NativeType::WebGLRenderbuffer) {
         auto buffer = WebGLRenderbuffer::GetPointer(value.As<v8::Object>());
         if (buffer != nullptr) {
             canvas_native_webgl_delete_renderbuffer(
@@ -1402,7 +1387,7 @@ void WebGLRenderingContext::DeleteShader(const v8::FunctionCallbackInfo<v8::Valu
     auto value = args[0];
     auto type = GetNativeType(isolate, value);
 
-    if (type == NativeType::WebGLProgram) {
+    if (type == NativeType::WebGLShader) {
         auto shader = WebGLShader::GetPointer(value.As<v8::Object>());
         if (shader != nullptr) {
             canvas_native_webgl_delete_shader(
@@ -1425,7 +1410,7 @@ void WebGLRenderingContext::DeleteTexture(const v8::FunctionCallbackInfo<v8::Val
     auto value = args[0];
     auto type = GetNativeType(isolate, value);
 
-    if (type == NativeType::WebGLProgram) {
+    if (type == NativeType::WebGLTexture) {
         auto texture = WebGLTexture::GetPointer(value.As<v8::Object>());
         if (texture != nullptr) {
             canvas_native_webgl_delete_texture(
@@ -2430,22 +2415,16 @@ WebGLRenderingContext::GetRenderbufferParameter(const v8::FunctionCallbackInfo<v
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    if (args.Length() > 1) {
-        auto target = args[0]->Uint32Value(
-                context).ToChecked();
-        auto pname = args[1]->Uint32Value(
-                context).ToChecked();
-        auto ret = canvas_native_webgl_get_renderbuffer_parameter(
-                target,
-                pname,
-                ptr->GetState()
-        );
-        args.GetReturnValue().Set(ret);
-        return;
-    }
-
-    // todo check return
-    args.GetReturnValue().SetNull();
+    auto target = args[0]->Uint32Value(
+            context).ToChecked();
+    auto pname = args[1]->Uint32Value(
+            context).ToChecked();
+    auto ret = canvas_native_webgl_get_renderbuffer_parameter(
+            target,
+            pname,
+            ptr->GetState()
+    );
+    args.GetReturnValue().Set(ret);
 }
 
 void WebGLRenderingContext::GetShaderInfoLog(const v8::FunctionCallbackInfo<v8::Value> &args) {
@@ -2685,7 +2664,7 @@ WebGLRenderingContext::GetUniformLocation(const v8::FunctionCallbackInfo<v8::Val
     if (type == NativeType::WebGLProgram && nameValue->IsString()) {
         auto program = WebGLProgram::GetPointer(programValue.As<v8::Object>());
         if (program != nullptr) {
-            auto name = ConvertFromV8String(isolate, args[1]);
+            auto name = ConvertFromV8String(isolate, nameValue);
 
             auto ret = canvas_native_webgl_get_uniform_location(
                     program->GetProgram(),
@@ -2726,7 +2705,6 @@ WebGLRenderingContext::GetUniform(const v8::FunctionCallbackInfo<v8::Value> &arg
         auto program = WebGLProgram::GetPointer(programValue.As<v8::Object>());
         auto location = WebGLUniformLocation::GetPointer(locationValue.As<v8::Object>());
 
-
         if (program != nullptr &&
             location != nullptr) {
 

package/platforms/ios/src/cpp/webgl/extensions/ANGLE_instanced_arraysImpl.cpp

@@ -50,13 +50,13 @@ void ANGLE_instanced_arraysImpl::DrawElementsInstancedANGLE(
     auto context = isolate->GetCurrentContext();
 
     auto mode = args[0]->Uint32Value(context).ToChecked();
-    auto count_ = args[1]->Int32Value(context).ToChecked();
+    auto count = args[1]->Int32Value(context).ToChecked();
     auto type = args[2]->Uint32Value(context).ToChecked();
     auto offset = args[3]->Int32Value(context).ToChecked();
     auto primcount = args[4]->Int32Value(context).ToChecked();
     canvas_native_webgl_angle_instanced_arrays_draw_elements_instanced_angle(
             mode,
-            count_,
+            count,
             type,
             offset,
             primcount,

package/platforms/ios/src/cpp/webgl/extensions/ANGLE_instanced_arraysImpl.h

@@ -3,15 +3,16 @@
 //
 
 #pragma once
+
 #include "Helpers.h"
 #include <vector>
 
 
 class ANGLE_instanced_arraysImpl {
 public:
-    ANGLE_instanced_arraysImpl(ANGLE_instanced_arrays* arrays);
+    ANGLE_instanced_arraysImpl(ANGLE_instanced_arrays *arrays);
 
-    ANGLE_instanced_arrays* GetArrays();
+    ANGLE_instanced_arrays *GetArrays();
 
     static ANGLE_instanced_arraysImpl *GetPointer(const v8::Local<v8::Object> &object);
 
@@ -36,6 +37,6 @@ public:
     static void VertexAttribDivisorANGLE(const v8::FunctionCallbackInfo<v8::Value> &args);
 
 private:
-    ANGLE_instanced_arrays* arrays_;
+    ANGLE_instanced_arrays *arrays_;
 };
 

package/platforms/ios/src/cpp/webgl/extensions/EXT_disjoint_timer_queryImpl.cpp

@@ -88,7 +88,6 @@ void EXT_disjoint_timer_queryImpl::CreateQueryExt(
         return;
     }
     auto isolate = args.GetIsolate();
-    auto context = isolate->GetCurrentContext();
 
     auto ret = canvas_native_webgl_ext_disjoint_timer_query_create_query_ext(
             ptr->GetQuery());
@@ -96,10 +95,7 @@ void EXT_disjoint_timer_queryImpl::CreateQueryExt(
     auto object = new WebGLQuery(
             ret);
 
-    auto value = WebGLQuery::GetCtor(isolate)->GetFunction(context).ToLocalChecked()->NewInstance(
-            context).ToLocalChecked();
-    value->SetInternalField(0, v8::External::New(isolate, object));
-    SetNativeType(isolate, value, NativeType::WebGLQuery);
+    auto value = WebGLQuery::NewInstance(isolate, object);
     args.GetReturnValue().Set(value);
 }
 

package/platforms/ios/src/cpp/webgl/extensions/EXT_disjoint_timer_queryImpl.h

@@ -11,14 +11,14 @@
 
 class EXT_disjoint_timer_queryImpl {
 public:
-    EXT_disjoint_timer_queryImpl(EXT_disjoint_timer_query* query);
-    
-    ~EXT_disjoint_timer_queryImpl(){
+    EXT_disjoint_timer_queryImpl(EXT_disjoint_timer_query *query);
+
+    ~EXT_disjoint_timer_queryImpl() {
         canvas_native_webgl_EXT_disjoint_timer_query_destroy(this->GetQuery());
         this->query_ = nullptr;
     }
 
-    EXT_disjoint_timer_query* GetQuery();
+    EXT_disjoint_timer_query *GetQuery();
 
     static v8::Local<v8::FunctionTemplate> GetCtor(v8::Isolate *isolate);
 
@@ -58,5 +58,5 @@ public:
 
 
 private:
-    EXT_disjoint_timer_query* query_;
+    EXT_disjoint_timer_query *query_;
 };