AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

meta debug checkpoint

Browse source
This commit is contained in:
Stewart Allen 2020-03-21 12:47:48 -04:00
commit df798d7344
2 changed files with 56 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

79
js/meta.js
View file

@ -27,7 +27,7 @@ let gs_meta = exports;
THREE.Material.prototype.motoSetup = function() { THREE.Material.prototype.motoSetup = function() {
this.fog = false; this.fog = false;
this.transparent = false; // this.transparent = false;
let hidden = this.clone(); let hidden = this.clone();
hidden.visible = false; hidden.visible = false;
@ -94,8 +94,8 @@ THREE.Face3.prototype.mVisible = function(show) {
FACE = { FACE = {
rl: { mi:0, x: HALF, y:0, z:0, rx:0, ry:PI2, rz:0, ox: 1, oy:0, oz:0, tx:PI2, ty:0, tz:0 }, rl: { mi:0, x: HALF, y:0, z:0, rx:0, ry:PI2, rz:0, ox: 1, oy:0, oz:0, tx:PI2, ty:0, tz:0 },
lr: { mi:1, x:-HALF, y:0, z:0, rx:0, ry:PI2, rz:0, ox:-1, oy:0, oz:0, tx:PI2, ty:0, tz:0 }, lr: { mi:1, x:-HALF, y:0, z:0, rx:0, ry:PI2, rz:0, ox:-1, oy:0, oz:0, tx:PI2, ty:0, tz:0 },
bf: { mi:2, x:0, y:-HALF, z:0, rx:0, ry:0, rz:0, ox:0, oy: 1, oz:0, tx:PI2, ty:0, tz:0 }, bf: { mi:2, x:0, y: HALF, z:0, rx:0, ry:0, rz:0, ox:0, oy: 1, oz:0, tx:PI2, ty:0, tz:0 },
fb: { mi:3, x:0, y: HALF, z:0, rx:0, ry:0, rz:0, ox:0, oy:-1, oz:0, tx:PI2, ty:0, tz:0 }, fb: { mi:3, x:0, y:-HALF, z:0, rx:0, ry:0, rz:0, ox:0, oy:-1, oz:0, tx:PI2, ty:0, tz:0 },
tb: { mi:4, x:0, y:0, z: HALF, rx:PI2, ry:0, rz:0, ox:0, oy:0, oz: 1, tx:0, ty:0, tz:0 }, tb: { mi:4, x:0, y:0, z: HALF, rx:PI2, ry:0, rz:0, ox:0, oy:0, oz: 1, tx:0, ty:0, tz:0 },
bt: { mi:5, x:0, y:0, z:-HALF, rx:PI2, ry:0, rz:0, ox:0, oy:0, oz:-1, tx:0, ty:0, tz:0 } bt: { mi:5, x:0, y:0, z:-HALF, rx:PI2, ry:0, rz:0, ox:0, oy:0, oz:-1, tx:0, ty:0, tz:0 }
}, },
@ -342,6 +342,7 @@ THREE.Face3.prototype.mVisible = function(show) {
} }
if (cube.isSelected()) { if (cube.isSelected()) {
selectedFace = face; selectedFace = face;
console.log('sel',cube.pos,face.key,FACE[face.key])
scheduleUpdateFaces(cube, face); scheduleUpdateFaces(cube, face);
} }
let s = face.set, rot = { x: s.tx, y: s.ty, z: s.tz }; let s = face.set, rot = { x: s.tx, y: s.ty, z: s.tz };
@ -1607,24 +1608,35 @@ THREE.Face3.prototype.mVisible = function(show) {
return {vertices: vertices, normals: null}; return {vertices: vertices, normals: null};
} }
function selectionToGeometry2(scale) { let debuggroup = new THREE.Group();
let vertices = [], normals = [], let debugadded = false;
seenFaces = {}, faceGroups = [];
function walk(cube_face, group) { function selectionToGeometry2(scale) {
let vertices = [], normals = [], faceGroups = [];
console.clear();
if (!debugadded) SPACE.platform.add(debugadded = debuggroup)
debuggroup.children.slice().forEach(c => debuggroup.remove(c));
function walk(cube_face, group, seen) {
let cube = cube_face.cube; let cube = cube_face.cube;
let face_key = `${cube.key}-${cube_face.key}`; let face_key = `${cube.key}-${cube_face.key}`;
console.log("walk", cube.pos, face_key)
// skip seen faces // skip seen faces
if (seenFaces[face_key]) return true; if (seen[face_key]) {
console.log("seen", cube.pos, face_key, false)
return false;
}
// mark face as seen // mark face as seen
seenFaces[face_key] = cube_face; seen[face_key] = cube_face;
// skip faces facing another cube // skip faces facing another cube
if (cube.adjacentCube(cube_face)) { if (cube.adjacentCube(cube_face)) {
return false; console.log("blok", cube.pos, face_key, true)
return true;
} }
let sides = []; let sides = [];
let newgroup = !group; let newgroup = !group;
if (newgroup) group = []; if (newgroup) { group = []; seen = {} }
group.push({pos: cube.pos, key: cube_face.key, sides}); group.push({pos: cube.pos, key: cube_face.key, sides});
// walk four directions perpendicular to face // walk four directions perpendicular to face
let skip = [cube_face.key, cube_face.key.reverse()]; let skip = [cube_face.key, cube_face.key.reverse()];
@ -1634,11 +1646,14 @@ THREE.Face3.prototype.mVisible = function(show) {
// if adjacent cube, check it out // if adjacent cube, check it out
let facedir = cube.faces[face_name]; let facedir = cube.faces[face_name];
let adjacent = cube.adjacentCube(facedir); let adjacent = cube.adjacentCube(facedir);
console.log("test", cube.pos, face_key, face_name, adjacent ? "adj" : "opn")
if (adjacent) { if (adjacent) {
if (!walk(adjacent.faces[cube_face.key], group)) { if (walk(adjacent.faces[cube_face.key], group, seen)) {
console.log("+++|", cube.pos, face_key, face_name)
sides.push(face_name); sides.push(face_name);
} }
} else { } else {
console.log(adjacent ? "++++" : " ++ ", cube.pos, face_key, face_name)
sides.push(face_name); sides.push(face_name);
} }
}); });
@ -1649,10 +1664,11 @@ THREE.Face3.prototype.mVisible = function(show) {
group.forEach(face => { group.forEach(face => {
let pos = face.pos; let pos = face.pos;
let fac = FACE[face.key]; let fac = FACE[face.key];
let MUL = 0.9;
let xyz = { let xyz = {
x: pos.x + fac.x, x: pos.x + fac.x * MUL,
y: pos.y + fac.y, y: pos.y + fac.y * MUL,
z: pos.z + fac.z z: pos.z + fac.z * MUL
}; };
face.sides.forEach(side => { face.sides.forEach(side => {
let off = FACE[side]; let off = FACE[side];
@ -1661,10 +1677,11 @@ THREE.Face3.prototype.mVisible = function(show) {
y: fac.y == off.y ? HALF : 0, y: fac.y == off.y ? HALF : 0,
z: fac.z == off.z ? HALF : 0 z: fac.z == off.z ? HALF : 0
}; };
tt.x *= MUL; tt.y *= MUL; tt.z *= MUL;
let mid = { let mid = {
x: xyz.x + off.x, x: xyz.x + off.x * MUL,
y: xyz.y + off.y, y: xyz.y + off.y * MUL,
z: xyz.z + off.z z: xyz.z + off.z * MUL
}; };
let p1 = { let p1 = {
x: mid.x - tt.x, x: mid.x - tt.x,
@ -1686,20 +1703,36 @@ THREE.Face3.prototype.mVisible = function(show) {
if (!op2.p) op2.p = [op1]; else op2.p.push(op1); if (!op2.p) op2.p = [op1]; else op2.p.push(op1);
points.push(op1); points.push(op1);
points.push(op2); points.push(op2);
let mat = new THREE.LineBasicMaterial( { color: 0x0000ff } );
let geo = new THREE.BufferGeometry().setFromPoints([
new THREE.Vector3(op1.x,op1.y,op1.z),
new THREE.Vector3(op2.x,op2.y,op2.z)
]);
let lnz = new THREE.Line(geo, mat);
debuggroup.add(lnz)
}); });
}); });
console.log("-----------------------")
console.log(group); console.log(group);
console.table(points); console.table(points);
} }
return true; console.log("done", cube.pos, face_key, true)
return false;
} }
selected.forEach(cube => { selected.forEach(cube => {
console.log("(((((---", cube.pos, "---)))))")
FACES.forEach(face_name => { FACES.forEach(face_name => {
walk(cube.faces[face_name]); console.log("FACE", "<<<", face_name, ">>>");
walk(cube.faces[face_name], null, {});
SPACE.refresh();
// die
}); });
}); });
return
console.log(">>>>>>>>>>>>>>>>>>>>>>>>")
faceGroups.forEach((el,gi) => { faceGroups.forEach((el,gi) => {
let {map, points} = el; let {map, points} = el;
let seen = {}; let seen = {};
@ -1707,7 +1740,7 @@ console.table(points);
// newstart: for (let ip=0; ip<points.length; ip++) { // newstart: for (let ip=0; ip<points.length; ip++) {
let start = points[0]; let start = points[0];
// if (seen[start.k]) continue newstart; // if (seen[start.k]) continue newstart;
// console.log({gi,start:ip}) console.log({gi,start:ip})
let point = start; let point = start;
let out = [ point ]; let out = [ point ];
seen[point.k] = point; seen[point.k] = point;
@ -1724,7 +1757,7 @@ console.table(points);
} }
break; break;
} }
console.log(out.length); console.log(out)
// } // }
}); });

1
js/moto-space.js
View file

@ -539,6 +539,7 @@ var MOTO = window.moto = window.moto || {};
onEnterKey: onEnterKey, onEnterKey: onEnterKey,
onResize: onResize, onResize: onResize,
update: requestRefresh, update: requestRefresh,
refresh: refresh,
showSkyGrid: function(b) { showSkyGrid = b }, showSkyGrid: function(b) { showSkyGrid = b },
setSkyColor: function(c) { skyColor = c }, setSkyColor: function(c) { skyColor = c },