FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Render in planes

pull/1916/head
Martin Boonk 2022-03-12 08:43:01 +01:00
parent 0efe1dd6a5
commit 555a5e34b5
2 changed files with 99 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/imageclock/app.js
View File

@ -218,7 +218,7 @@ function drawNumber(graphics, resources, element, offset){
endPerfLog("drawNumber");
}
function setColors(properties){
function setColors(graphics, properties){
if (properties.fg) graphics.setColor(properties.fg);
if (properties.bg) graphics.setBgColor(properties.bg);
}
@ -251,7 +251,7 @@ function drawElement(graphics, resources, pos, offset, element, lastElem){
//print("drawElement offset", offset, pos.X, pos.Y);
//print("resource ", resource,pos, offset, path, lastElem);
var imageOffset = updateColors(pos, offset);
setColors(imageOffset);
setColors(graphics, imageOffset);
//print("drawImage from drawElement", image, pos, offset);
var options={};
if (pos.RotationValue){

51
apps/imageclock/custom.html
View File

@ -550,6 +550,7 @@
combineProperty("RotationOffset",element,next);
combineProperty("MinRotationValue",element,next);
combineProperty("MaxRotationValue",element,next);
if (typeof element.Plane == "number") next.Plane = element.Plane;
next.Layer = element.Layer ? (element.Layer) : "" + c;
if (["MultiState","Image","CodedImage","Number","Poly","Rect","Scale"].includes(c)){
@ -570,31 +571,32 @@
code += "var promise = Promise.resolve();\n";
//get mapped by layer
var layers = {};
var counter = 0;
var planes = 0;
var planes = {};
var planeNumbers = [];
for (var i = 0; i< elements.length; i++){
var c = elements[i].value;
console.log("Check element", c);
var name = c.Layer;
if (c.type == "Standalone") name = "standalone" + counter++;
if (c.Plane) planes = Math.max(c.Plane, planes);
if (!layers[name]) layers[name] = [];
layers[name].push({index: i, element: c});
var plane = wrapInTimeouts ? 1 : 0;
if (typeof c.Plane == "number"){
plane = c.Plane;
}
console.log("Found plane for element", plane, c);
if (!planeNumbers.includes(plane)) planeNumbers.push(plane);
if (!planes[plane]) planes[plane] = {};
if (!planes[plane][name]) planes[plane][name] = [];
planes[plane][name].push({index: i, element: c});
}
planeNumbers.sort().reverse();
console.log("Found planes", planes)
console.log("Found planes", planes, "with numbers", planeNumbers)
if (wrapInTimeouts && planes == 0) planes = 1;
code += "plane0 = g;\n";
if (planes > 0){
for (var i = 1; i <= planes; i++){
code += "if (!plane" + i + ") plane" + i + " = Graphics.createArrayBuffer(g.getWidth(),g.getHeight(),16,{msb:true});\n";
}
}
code += `
if (clearOnRedraw){
var currentDrawingTime = Date.now();
@ -605,15 +607,21 @@ if (clearOnRedraw){
}
`
console.log("Got layers", layers);
for (var planeIndex = 0; planeIndex < planeNumbers.length; planeIndex++){
var layers = planes[planeNumbers[planeIndex]];
var plane = planeNumbers[planeIndex];
if (plane != 0) code += "if (!plane" + plane + ") plane" + plane + " = Graphics.createArrayBuffer(g.getWidth(),g.getHeight(),16,{msb:true});\n";
console.log("Got layers", layers);
for (var layername in layers){
var layerElements = layers[layername];
console.log("Layer elements", layername, layerElements);
//code for whole layer
if (wrapInTimeouts){
if (wrapInTimeouts && plane != 0){
code += "promise = promise.then(()=>delay(0)).then(()=>{\n";
code += "var currentDrawTime=Date.now();\n";
}
@ -663,8 +671,7 @@ if (clearOnRedraw){
condition += "firstDraw";
}
var planeName = "plane" + (typeof c.value.Plane == "number" ? c.value.Plane : planes) ;
var planeName = "plane" + plane;
var colorsetting = "";
if (c.value.ForegroundColor) colorsetting += planeName + ".setColor(\"" + c.value.ForegroundColor + "\");\n";
else colorsetting += planeName + ".setColor(g.theme.fg);\n";
@ -678,24 +685,24 @@ if (clearOnRedraw){
code += (condition.length > 0 ? "}\n" : "");
}
if (wrapInTimeouts){
if (wrapInTimeouts && plane != 0){
code += "drawingTime += Date.now() - currentDrawTime;\n";
code += "});\n";
}
}
if (planes > 0){
console.log("Current plane is", plane);
if (plane != 0){
code += "promise = promise.then(()=>{\n";
code += "var currentDrawTime=Date.now();\n";
for (var i = 1; i <= planes; i++){
//code += "g.drawImage(plane" + i + ".asImage());";
code += "g.drawImage(g.drawImage({width: plane" + i + ".getWidth(), height: plane" + i + ".getHeight(), bpp: plane" + i + ".getBPP(), buffer: plane" + i + ".buffer}));";
}
code += "g.drawImage({width: plane" + plane + ".getWidth(), height: plane" + plane + ".getHeight(), bpp: plane" + plane + ".getBPP(), buffer: plane" + plane + ".buffer});\n";
code += "drawingTime += Date.now() - currentDrawTime;\n";
code += "});\n";
}
}
code += "return promise;})";
console.log("Code:", code);