tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

add panel.onRederFinished to be invoked after shader.render make sure coordinatorPlugin affected

Browse Source
This commit is contained in:
pengfei.zhou
2020-03-10 18:51:53 +08:00
committed by osborn
parent 01d736c5a6
commit f3f28c55f8
17 changed files with 290 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
doric-js/bundle/doric-lib.es5.js
View File

@@ -1014,7 +1014,7 @@ var Panel = /** @class */ (function () {
}, undefined);
};
Panel.prototype.nativeRender = function (model) {
this.context.callNative("shader", "render", model);
return this.context.callNative("shader", "render", model);
};
Panel.prototype.hookBeforeNativeCall = function () {
var e_2, _a, e_3, _b;
@@ -1050,12 +1050,13 @@ var Panel = /** @class */ (function () {
Panel.prototype.hookAfterNativeCall = function () {
var e_4, _a, e_5, _b;
var _this = this;
var promises = [];
if (Environment.platform !== 'web') {
//Here insert a native call to ensure the promise is resolved done.
nativeEmpty();
if (this.__root__.isDirty()) {
var model = this.__root__.toModel();
this.nativeRender(model);
promises.push(this.nativeRender(model));
}
try {
for (var _c = __values$2(this.headviews.values()), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -1065,7 +1066,7 @@ var Panel = /** @class */ (function () {
var v = _f.value;
if (v.isDirty()) {
var model = v.toModel();
this.nativeRender(model);
promises.push(this.nativeRender(model));
}
}
}
@@ -1091,7 +1092,7 @@ var Panel = /** @class */ (function () {
var e_6, _a, e_7, _b;
if (_this.__root__.isDirty()) {
var model = _this.__root__.toModel();
_this.nativeRender(model);
promises.push(_this.nativeRender(model));
_this.__root__.clean();
}
try {
@@ -1102,7 +1103,7 @@ var Panel = /** @class */ (function () {
var v = _f.value;
if (v.isDirty()) {
var model = v.toModel();
_this.nativeRender(model);
promises.push(_this.nativeRender(model));
v.clean();
}
}
@@ -1125,6 +1126,11 @@ var Panel = /** @class */ (function () {
}
});
}
Promise.all(promises).then(function (_) {
if (_this.onRenderFinished) {
_this.onRenderFinished();
}
});
};
__decorate$2([
NativeCall,
@@ -2897,42 +2903,6 @@ function statusbar(context) {
};
}
var __awaiter$1 = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __generator$1 = (undefined && undefined.__generator) || function (thisArg, body) {
var _ = { label: 0, sent: function() { if (t[0] & 1) { throw t[1]; } return t[1]; }, trys: [], ops: [] }, f, y, t, g;
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
function verb(n) { return function (v) { return step([n, v]); }; }
function step(op) {
if (f) { throw new TypeError("Generator is already executing."); }
while (_) { try {
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) { return t; }
if (y = 0, t) { op = [op[0] & 2, t.value]; }
switch (op[0]) {
case 0: case 1: t = op; break;
case 4: _.label++; return { value: op[1], done: false };
case 5: _.label++; y = op[1]; op = [0]; continue;
case 7: op = _.ops.pop(); _.trys.pop(); continue;
default:
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
if (t[2]) { _.ops.pop(); }
_.trys.pop(); continue;
}
op = body.call(thisArg, _);
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } }
if (op[0] & 5) { throw op[1]; } return { value: op[0] ? op[1] : void 0, done: true };
}
};
function viewIdChains(view) {
var viewIds = [];
var thisView = view;
@@ -2943,28 +2913,25 @@ function viewIdChains(view) {
return viewIds.reverse();
}
function coordinator(context) {
var _this = this;
return {
verticalScrolling: function (argument) { return __awaiter$1(_this, void 0, void 0, function () {
return __generator$1(this, function (_a) {
switch (_a.label) {
case 0: return [4 /*yield*/, context.callNative("coordinator", "ready")];
case 1:
_a.sent();
argument.scrollable = viewIdChains(argument.scrollable);
if (argument.target instanceof View) {
argument.target = viewIdChains(argument.target);
}
if (argument.changing.start instanceof Color) {
argument.changing.start = argument.changing.start.toModel();
}
if (argument.changing.end instanceof Color) {
argument.changing.end = argument.changing.end.toModel();
}
return [2 /*return*/, context.callNative("coordinator", "verticalScrolling", argument)];
}
});
}); }
verticalScrolling: function (argument) {
if (context.entity instanceof Panel) {
var panel = context.entity;
panel.onRenderFinished = function () {
argument.scrollable = viewIdChains(argument.scrollable);
if (argument.target instanceof View) {
argument.target = viewIdChains(argument.target);
}
if (argument.changing.start instanceof Color) {
argument.changing.start = argument.changing.start.toModel();
}
if (argument.changing.end instanceof Color) {
argument.changing.end = argument.changing.end.toModel();
}
return context.callNative("coordinator", "verticalScrolling", argument);
};
}
}
};
}

55
doric-js/bundle/doric-lib.js
View File

@@ -771,7 +771,7 @@ class Panel {
}, undefined);
}
nativeRender(model) {
this.context.callNative("shader", "render", model);
return this.context.callNative("shader", "render", model);
}
hookBeforeNativeCall() {
if (Environment.platform !== 'web') {
@@ -784,18 +784,19 @@ class Panel {
}
}
hookAfterNativeCall() {
const promises = [];
if (Environment.platform !== 'web') {
//Here insert a native call to ensure the promise is resolved done.
nativeEmpty();
if (this.__root__.isDirty()) {
const model = this.__root__.toModel();
this.nativeRender(model);
promises.push(this.nativeRender(model));
}
for (let map of this.headviews.values()) {
for (let v of map.values()) {
if (v.isDirty()) {
const model = v.toModel();
this.nativeRender(model);
promises.push(this.nativeRender(model));
}
}
}
@@ -804,20 +805,25 @@ class Panel {
Promise.resolve().then(() => {
if (this.__root__.isDirty()) {
const model = this.__root__.toModel();
this.nativeRender(model);
promises.push(this.nativeRender(model));
this.__root__.clean();
}
for (let map of this.headviews.values()) {
for (let v of map.values()) {
if (v.isDirty()) {
const model = v.toModel();
this.nativeRender(model);
promises.push(this.nativeRender(model));
v.clean();
}
}
}
});
}
Promise.all(promises).then(_ => {
if (this.onRenderFinished) {
this.onRenderFinished();
}
});
}
}
__decorate$2([
@@ -2189,15 +2195,6 @@ function statusbar(context) {
};
}
var __awaiter$1 = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
function viewIdChains(view) {
const viewIds = [];
let thisView = view;
@@ -2209,20 +2206,24 @@ function viewIdChains(view) {
}
function coordinator(context) {
return {
verticalScrolling: (argument) => __awaiter$1(this, void 0, void 0, function* () {
yield context.callNative("coordinator", "ready");
argument.scrollable = viewIdChains(argument.scrollable);
if (argument.target instanceof View) {
argument.target = viewIdChains(argument.target);
verticalScrolling: (argument) => {
if (context.entity instanceof Panel) {
const panel = context.entity;
panel.onRenderFinished = () => {
argument.scrollable = viewIdChains(argument.scrollable);
if (argument.target instanceof View) {
argument.target = viewIdChains(argument.target);
}
if (argument.changing.start instanceof Color) {
argument.changing.start = argument.changing.start.toModel();
}
if (argument.changing.end instanceof Color) {
argument.changing.end = argument.changing.end.toModel();
}
return context.callNative("coordinator", "verticalScrolling", argument);
};
}
if (argument.changing.start instanceof Color) {
argument.changing.start = argument.changing.start.toModel();
}
if (argument.changing.end instanceof Color) {
argument.changing.end = argument.changing.end.toModel();
}
return context.callNative("coordinator", "verticalScrolling", argument);
})
}
};
}

55
doric-js/bundle/doric-vm.js
View File

@@ -2230,7 +2230,7 @@ class Panel {
}, undefined);
}
nativeRender(model) {
this.context.callNative("shader", "render", model);
return this.context.callNative("shader", "render", model);
}
hookBeforeNativeCall() {
if (Environment.platform !== 'web') {
@@ -2243,18 +2243,19 @@ class Panel {
}
}
hookAfterNativeCall() {
const promises = [];
if (Environment.platform !== 'web') {
//Here insert a native call to ensure the promise is resolved done.
nativeEmpty();
if (this.__root__.isDirty()) {
const model = this.__root__.toModel();
this.nativeRender(model);
promises.push(this.nativeRender(model));
}
for (let map of this.headviews.values()) {
for (let v of map.values()) {
if (v.isDirty()) {
const model = v.toModel();
this.nativeRender(model);
promises.push(this.nativeRender(model));
}
}
}
@@ -2263,20 +2264,25 @@ class Panel {
Promise.resolve().then(() => {
if (this.__root__.isDirty()) {
const model = this.__root__.toModel();
this.nativeRender(model);
promises.push(this.nativeRender(model));
this.__root__.clean();
}
for (let map of this.headviews.values()) {
for (let v of map.values()) {
if (v.isDirty()) {
const model = v.toModel();
this.nativeRender(model);
promises.push(this.nativeRender(model));
v.clean();
}
}
}
});
}
Promise.all(promises).then(_ => {
if (this.onRenderFinished) {
this.onRenderFinished();
}
});
}
}
__decorate$2([
@@ -3648,15 +3654,6 @@ function statusbar(context) {
};
}
var __awaiter$1 = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
function viewIdChains(view) {
const viewIds = [];
let thisView = view;
@@ -3668,20 +3665,24 @@ function viewIdChains(view) {
}
function coordinator(context) {
return {
verticalScrolling: (argument) => __awaiter$1(this, void 0, void 0, function* () {
yield context.callNative("coordinator", "ready");
argument.scrollable = viewIdChains(argument.scrollable);
if (argument.target instanceof View) {
argument.target = viewIdChains(argument.target);
verticalScrolling: (argument) => {
if (context.entity instanceof Panel) {
const panel = context.entity;
panel.onRenderFinished = () => {
argument.scrollable = viewIdChains(argument.scrollable);
if (argument.target instanceof View) {
argument.target = viewIdChains(argument.target);
}
if (argument.changing.start instanceof Color) {
argument.changing.start = argument.changing.start.toModel();
}
if (argument.changing.end instanceof Color) {
argument.changing.end = argument.changing.end.toModel();
}
return context.callNative("coordinator", "verticalScrolling", argument);
};
}
if (argument.changing.start instanceof Color) {
argument.changing.start = argument.changing.start.toModel();
}
if (argument.changing.end instanceof Color) {
argument.changing.end = argument.changing.end.toModel();
}
return context.callNative("coordinator", "verticalScrolling", argument);
})
}
};
}