Skip to content

Commit

Permalink
feat: support manual render mode
Browse files Browse the repository at this point in the history
  • Loading branch information
@triniwiz
triniwiz committed Feb 1, 2024
1 parent 198a115 commit a63052e
Show file tree
Hide file tree
Showing 31 changed files with 550 additions and 186 deletions.
9 changes: 9 additions & 0 deletions apps/demo/src/plugin-demos/canvas.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,15 @@ export class DemoModel extends DemoSharedCanvas {
{ x: 128, y: 0 },
];

start = { x: 0, y: 0 };
end = { x: 256, y: 256 };


start1 = { x: 128, y: 128 };
end1 = { x: 128, y: 16 };

colors = ['blue', 'yellow'];

image = new ImageAsset();

width = 256;
Expand Down
24 changes: 19 additions & 5 deletions apps/demo/src/plugin-demos/canvas.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<GridLayout rows="*" columns="*" loaded="{{ gridLoaded }}" iosOverflowSafeArea="false" width="100%" height="100%">

<!-- <ui:Dom rowSpan="2" colSpan="2"> -->
<ui:Dom rowSpan="2" colSpan="2">

<!-- <ui:Fill color="#e8f4f8" />
Expand All @@ -21,7 +21,21 @@
r="25"
color="lightblue"
/> -->
<!-- <ui:Circle cx="128" cy="128" r="128" color="lightblue" /> -->
<ui:Rect x="0" y="0" width="256" height="256">
<!-- <ui:LinearGradient
start="{{ start }}"
end="{{ end }}"
colors="{{colors}}"
/> -->

<ui:TwoPointConicalGradient
start="{{ start1 }}"
startR="128"
end="{{ end1 }}"
endR="16"
colors="{{colors}}"
/>
</ui:Rect>

<!-- <ui:Points
points="{{ points }}"
Expand Down Expand Up @@ -91,12 +105,12 @@
</ui:RoundedRect>
-->

<!-- </ui:Dom> -->
</ui:Dom>


<!-- <WebView rowSpan="2" colSpan="2" height="100%" width="100%" loaded="loaded"/> -->
<canvas:Canvas rowSpan="2" colSpan="2" width="100%" height="100%" ready="{{ canvasLoaded }}"
layoutChanged="{{ onLayout }}"/>
<!-- <canvas:Canvas rowSpan="2" colSpan="2" ready="{{ canvasLoaded }}"
layoutChanged="{{ onLayout }}"/> -->
<!-- <canvas:Svg id="1" width="100%" height="100%" src="{{src1}}" loaded="{{svgViewLoaded}}"/>
<canvas:Svg id="2" col="1" width="100%" height="100%" src="{{src2}}" loaded="{{svgViewLoaded}}"/>
<canvas:Svg id="3" row="1" width="100%" height="100%" src="{{src3}}" loaded="{{svgViewLoaded}}"/>
Expand Down
Binary file modified packages/canvas/platforms/android/canvas-release.aar
View file
Binary file not shown.
Binary file modified ...nvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions ...rms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/canvas_native.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1213,6 +1213,8 @@ bool canvas_native_webgl_make_current(struct WebGLState *state);

bool canvas_native_webgl_swap_buffers(struct WebGLState *state);

bool canvas_native_webgl_make_current_and_swap_buffers(struct WebGLState *state);

void canvas_native_webgl_resized(struct WebGLState *_state);

const char *canvas_native_webgl_to_data_url(struct WebGLState *state,
Expand Down
Binary file modified ...amework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative
View file
Binary file not shown.
Binary file modified ...s/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions ...ive.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Headers/canvas_native.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1213,6 +1213,8 @@ bool canvas_native_webgl_make_current(struct WebGLState *state);

bool canvas_native_webgl_swap_buffers(struct WebGLState *state);

bool canvas_native_webgl_make_current_and_swap_buffers(struct WebGLState *state);

void canvas_native_webgl_resized(struct WebGLState *_state);

const char *canvas_native_webgl_to_data_url(struct WebGLState *state,
Expand Down
4 changes: 2 additions & 2 deletions ...cframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</data>
<key>Headers/canvas_native.h</key>
<data>
XsX2QGyWWWRx+Re/2nxFcoBoMjg=
fHjKG7aDZ9ZVi79Vu9g8z8IS9lo=
</data>
<key>Info.plist</key>
<data>
Expand Down Expand Up @@ -108,7 +108,7 @@
<dict>
<key>hash2</key>
<data>
xQtVdm5vJz/Oga/nNrCvEeqLDQmYAbn6yURH5MwoH0k=
aufqGvTGgpXa9ipXAyNSFoJPEdAdB2J5O3Cf8sPHYMM=
</data>
</dict>
<key>Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
Expand Down
Binary file modified ..._x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative
View file
Binary file not shown.
155 changes: 111 additions & 44 deletions packages/canvas/platforms/ios/src/cpp/canvas2d/CanvasRenderingContext2DImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
#include "Caches.h"
#include "OneByteStringResource.h"

v8::CFunction CanvasRenderingContext2DImpl::fast_start_raf_(
v8::CFunction::Make(CanvasRenderingContext2DImpl::__FastStartRaf));

v8::CFunction CanvasRenderingContext2DImpl::fast_stop_raf_(
v8::CFunction::Make(CanvasRenderingContext2DImpl::__FastStopRaf));

v8::CFunction CanvasRenderingContext2DImpl::fast_draw_point_(
v8::CFunction::Make(CanvasRenderingContext2DImpl::FastDrawPoint));
Expand Down Expand Up @@ -251,6 +256,27 @@ CanvasRenderingContext2DImpl::GetPointer(const v8::Local<v8::Object> &object) {
return static_cast<CanvasRenderingContext2DImpl *>(ptr);
}


void CanvasRenderingContext2DImpl::StartRaf() {
auto raf = this->GetRaf();
if (raf != nullptr) {
if (!canvas_native_raf_get_started(raf->GetRaf())) {
canvas_native_raf_start(raf->GetRaf());
}
}
}


void CanvasRenderingContext2DImpl::StopRaf() {
auto raf = this->GetRaf();
if (raf != nullptr) {
if (canvas_native_raf_get_started(raf->GetRaf())) {
canvas_native_raf_stop(raf->GetRaf());
}
}
}


v8::Local<v8::FunctionTemplate> CanvasRenderingContext2DImpl::GetCtor(v8::Isolate *isolate) {
auto cache = Caches::Get(isolate);
auto ctor = cache->CanvasRenderingContext2DTmpl.get();
Expand All @@ -264,6 +290,13 @@ v8::Local<v8::FunctionTemplate> CanvasRenderingContext2DImpl::GetCtor(v8::Isolat
auto tmpl = ctorTmpl->InstanceTemplate();
tmpl->SetInternalFieldCount(2);


SetFastMethod(isolate, tmpl, "__startRaf", __StartRaf, &fast_start_raf_,
v8::Local<v8::Value>());

SetFastMethod(isolate, tmpl, "__stopRaf", __StopRaf, &fast_stop_raf_,
v8::Local<v8::Value>());

SetFastMethod(isolate, tmpl, "drawPoint", DrawPoint, &fast_draw_point_, v8::Local<v8::Value>());

tmpl->Set(ConvertToV8String(isolate, "drawPoints"),
Expand All @@ -278,6 +311,9 @@ v8::Local<v8::FunctionTemplate> CanvasRenderingContext2DImpl::GetCtor(v8::Isolat
v8::FunctionTemplate::New(isolate, __GetPointer));
tmpl->Set(ConvertToV8String(isolate, "__resize"), v8::FunctionTemplate::New(isolate, __Resize));

tmpl->SetAccessor(ConvertToV8String(isolate, "continuousRenderMode"), GetContinuousRenderMode,
SetContinuousRenderMode);

tmpl->SetAccessor(ConvertToV8String(isolate, "filter"), GetFilter, SetFilter);
tmpl->SetAccessor(ConvertToV8String(isolate, "font"), GetFont, SetFont);
tmpl->SetAccessor(ConvertToV8String(isolate, "letterSpacing"), GetLetterSpacing,
Expand Down Expand Up @@ -319,24 +355,19 @@ v8::Local<v8::FunctionTemplate> CanvasRenderingContext2DImpl::GetCtor(v8::Isolat

SetFastMethod(isolate, tmpl, "beginPath", BeginPath, &fast_begin_path_, v8::Local<v8::Value>());


SetFastMethod(isolate, tmpl, "bezierCurveTo", BezierCurveTo, &fast_bezier_curve_to_,
v8::Local<v8::Value>());


tmpl->Set(ConvertToV8String(isolate, "clearHitRegions"),
v8::FunctionTemplate::New(isolate, &ClearHitRegions));


SetFastMethod(isolate, tmpl, "clearRect", ClearRect, &fast_clear_rect_, v8::Local<v8::Value>());


SetFastMethodWithOverLoads(isolate, tmpl, "clip", Clip, fast_clip_overloads_,
v8::Local<v8::Value>());

SetFastMethod(isolate, tmpl, "closePath", ClosePath, &fast_close_path_, v8::Local<v8::Value>());


tmpl->Set(ConvertToV8String(isolate, "createImageData"),
v8::FunctionTemplate::New(isolate, &CreateImageData));
tmpl->Set(ConvertToV8String(isolate, "createPattern"),
Expand All @@ -352,7 +383,6 @@ v8::Local<v8::FunctionTemplate> CanvasRenderingContext2DImpl::GetCtor(v8::Isolat
tmpl->Set(ConvertToV8String(isolate, "drawFocusIfNeeded"),
v8::FunctionTemplate::New(isolate, &DrawFocusIfNeeded));


SetFastMethodWithOverLoads(isolate, tmpl, "drawImage", DrawImage, fast_draw_overloads_,
v8::Local<v8::Value>());

Expand Down Expand Up @@ -466,6 +496,59 @@ RafImpl *CanvasRenderingContext2DImpl::GetRaf() {
return this->raf_.get();
}


void CanvasRenderingContext2DImpl::__StartRaf(const v8::FunctionCallbackInfo<v8::Value> &args) {
CanvasRenderingContext2DImpl *ptr = GetPointer(args.This());
if (ptr == nullptr) {
return;
}

ptr->StartRaf();

}

void CanvasRenderingContext2DImpl::__StopRaf(const v8::FunctionCallbackInfo<v8::Value> &args) {
CanvasRenderingContext2DImpl *ptr = GetPointer(args.This());
if (ptr == nullptr) {
return;
}

ptr->StopRaf();

}


void CanvasRenderingContext2DImpl::GetContinuousRenderMode(v8::Local<v8::String> property,
const v8::PropertyCallbackInfo<v8::Value> &info) {
CanvasRenderingContext2DImpl *ptr = GetPointer(info.This());
if (ptr == nullptr) {
info.GetReturnValue().Set(false);
return;
}
info.GetReturnValue().Set(ptr->continuousRender_);
}

void CanvasRenderingContext2DImpl::SetContinuousRenderMode(v8::Local<v8::String> property,
v8::Local<v8::Value> value,
const v8::PropertyCallbackInfo<void> &info) {
CanvasRenderingContext2DImpl *ptr = GetPointer(info.This());
if (ptr == nullptr) {
return;
}
auto isolate = info.GetIsolate();
auto val = value->BooleanValue(isolate);
if (val == ptr->continuousRender_) {
return;
}
if (val) {
ptr->StartRaf();
} else {
ptr->StopRaf();
}
ptr->continuousRender_ = val;
}


/* Non Standard 2D */

void CanvasRenderingContext2DImpl::DrawPoint(const v8::FunctionCallbackInfo<v8::Value> &args) {
Expand All @@ -490,53 +573,41 @@ void CanvasRenderingContext2DImpl::DrawPoints(const v8::FunctionCallbackInfo<v8:
if (ptr == nullptr) {
return;
}

auto isolate = args.GetIsolate();
auto context = isolate->GetCurrentContext();


auto mode = ConvertFromV8String(isolate, args[0]);
auto mode = args[0];
auto points = args[1].As<v8::Array>();
auto size = points->Length();


if ((size % 2) == 0) {
int32_t pointMode = -1;
if (mode == "points") {
pointMode = 0;
} else if (mode == "lines") {
pointMode = 1;
} else if (mode == "polygon") {
pointMode = 2;
}
if (pointMode == -1) {
return;
}

if (size == 0){return;}
uint32_t pointMode = 0;
if(mode->IsUint32() && mode->Uint32Value(context).To(&pointMode)){
std::vector<float> store;
store.reserve(size);
int next = 0;
auto len = size * 2;
store.reserve(len);
for (int i = 0; i < size; i++) {

auto object = points->Get(
context, i).ToLocalChecked().As<v8::Object>();

context, i).ToLocalChecked().As<v8::Object>();
auto x = object->Get(context,
ConvertToV8String(isolate, "x")).ToLocalChecked()->NumberValue(
context).ToChecked();
context).ToChecked();
auto y = object->Get(context,
ConvertToV8String(isolate, "y")).ToLocalChecked()->NumberValue(
context).ToChecked();
store[next] = (float) x;
store[next + 1] = (float) y;

next = i + 2;
context).ToChecked();
store.emplace_back((float) x);
store.emplace_back((float) y);
}

canvas_native_context_draw_points(
ptr->GetContext(), pointMode,
store.data(), store.size());


ptr->GetContext(), pointMode,
store.data(), store.size());
ptr->UpdateInvalidateState();
}
}
Expand Down Expand Up @@ -2785,11 +2856,7 @@ void CanvasRenderingContext2DImpl::Flush() {
auto state = (int) this->GetInvalidateState() & (int) InvalidateState::InvalidateStatePending;
if (state == (int) InvalidateState::InvalidateStatePending) {
this->SetInvalidateState(InvalidateState::InvalidateStateInvalidating);
// canvas_native_context_flush(ptr->GetContext());

canvas_native_context_render(this->GetContext());
// canvas_native_context_gl_make_current(ptr->GetContext());
// canvas_native_context_gl_swap_buffers(ptr->GetContext());
this->SetInvalidateState(InvalidateState::InvalidateStateNone);
}
}
Expand Down
Loading

0 comments on commit a63052e

Please sign in to comment.