n0rdye/puzzle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modified: object.js

Browse Source 
modified:   public/lib/fn.js
	modified:   public/lib/inter.js
	modified:   public/lib/inter_group_object.js
	modified:   public/lib/inter_temp.js
	modified:   views/admin/objects/group_object.ejs
	modified:   views/admin/objects/object_creation.ejs
	modified:   views/admin/objects/object_edit.ejs
	modified:   views/project.ejs
This commit is contained in:
n0rdye
2023-11-16 17:32:11 +00:00
parent 38418b5e59
commit 1a8831d6ad
9 changed files with 116 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/lib/fn.js
View File

@ -302,7 +302,7 @@ async function removeImageBackground(image) {
}
ctx.putImageData(imageData, 0, 0);
return canvas.toDataURL(`image/png`);
return canvas.toDataURL(`image/jpg`);
}
function downloadImg(url, filename) {

17
public/lib/inter.js
View File

@ -1,6 +1,6 @@
window.dragMoveListener = dragMoveListener;
let root = document.getElementById("drags");
let objs = { height:"2",width:"4",color:"#FFFFFF"};
let objs = { height:"2",width:"3",color:"#FFFFFF"};
let objs_store = {};
let proj_from = "cloud";
let cur_obj;
@ -19,7 +19,18 @@ function create(clas,x,y,color = null,id,size,layer = 0){
clas.forEach(cl => {
obj.classList.add(cl);
});
get_obj(main_clas,(db_data)=>{
if(objs_store[main_clas] == null){
load_objs(()=>{
make_obj(objs_store[main_clas])
});
}
else{
make_obj(objs_store[main_clas])
}
// get_obj(main_clas,(db_data)=>{
// })
function make_obj(db_data) {
// console.log(db_data);
// console.log(db_data);
// db_data.forEach(db_data => {
@ -60,7 +71,7 @@ function create(clas,x,y,color = null,id,size,layer = 0){
}
}
calc_total();
})
}
obj.setAttribute("decoding","async");
obj.setAttribute("loading","lazy");
if(id != "none"){obj.setAttribute("onclick",`obj_click("${id}")`);}

20
public/lib/inter_group_object.js
View File

@ -1,6 +1,6 @@
window.dragMoveListener = dragMoveListener;
let root = document.getElementById("drags");
let objs = { height:"2",width:"4",color:"#FFFFFF"};
let objs = { height:"2",width:"2",color:"#ffffff",total:0};
let objs_store = {};
let proj_from = "cloud";
let cur_obj;
@ -19,7 +19,18 @@ function create(clas,x,y,color = null,id,size,layer = 0){
clas.forEach(cl => {
obj.classList.add(cl);
});
get_obj(main_clas,(db_data)=>{
if(objs_store[main_clas] == null){
load_objs(()=>{
make_obj(objs_store[main_clas])
});
}
else{
make_obj(objs_store[main_clas])
}
// get_obj(main_clas,(db_data)=>{
// })
function make_obj(db_data) {
// console.log(db_data);
// console.log(db_data);
// db_data.forEach(db_data => {
@ -60,7 +71,7 @@ function create(clas,x,y,color = null,id,size,layer = 0){
}
}
calc_total();
})
}
obj.setAttribute("decoding","async");
obj.setAttribute("loading","lazy");
if(id != "none"){obj.setAttribute("onclick",`obj_click("${id}")`);}
@ -219,7 +230,10 @@ function load(objss){
}
if (keys == "color"){
console.log(values);
document.getElementById("trans_checkbox").checked = (values == "#ffffff")? true:false;
document.getElementById("wall").style.backgroundColor = values;
wall_color_change()
}
if (keys == Object.keys(objs).at(-1)){
proj_state = "loaded";

17
public/lib/inter_temp.js
View File

@ -1,6 +1,6 @@
window.dragMoveListener = dragMoveListener;
let root = document.getElementById("drags");
let objs = { height:"2",width:"4",color:"#FFFFFF",total:0};
let objs = { height:"2",width:"3",color:"#FFFFFF",total:0};
let objs_store = {};
let proj_from = "cloud";
let cur_obj;
@ -19,7 +19,18 @@ function create(clas,x,y,color = null,id,size,layer = 0){
clas.forEach(cl => {
obj.classList.add(cl);
});
get_obj(main_clas,(db_data)=>{
if(objs_store[main_clas] == null){
load_objs(()=>{
make_obj(objs_store[main_clas])
});
}
else{
make_obj(objs_store[main_clas])
}
// get_obj(main_clas,(db_data)=>{
// })
function make_obj(db_data) {
// console.log(db_data);
// console.log(db_data);
// db_data.forEach(db_data => {
@ -60,7 +71,7 @@ function create(clas,x,y,color = null,id,size,layer = 0){
}
}
calc_total();
})
}
obj.setAttribute("decoding","async");
obj.setAttribute("loading","lazy");
if(id != "none"){obj.setAttribute("onclick",`obj_click("${id}")`);}