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 19:13:20 -04:00
commit 89faf903d7
5 changed files with 133 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/add-array.js
View file

@ -9,6 +9,12 @@
* array prototype helpers
******************************************************************* */
if (!AP.flat) {
AP.flat = function() {
return [].concat.apply([], this);
};
}
AP.equals = function(arr) {
if (!arr) return false;
if (arr.length !== this.length) return false;

78
js/geo-polygon.js
View file

@ -112,6 +112,84 @@ var gs_base_polygon = exports;
* Polygon Prototype Functions
******************************************************************* */
PRO.earcut = function(raw) {
// gather all points into a single array including inner polys
// keeping track of array offset indices for inners
let out = [];
let holes = [];
let last = undefined;
let diff = {x: false, y: false, z: false};
// flatten points into array for earcut()
this.points.forEach(p => {
if (last) {
diff.x = diff.x || last.x !== p.x;
diff.y = diff.y || last.y !== p.y;
diff.z = diff.z || last.z !== p.z;
}
last = p;
out.push(p.x, p.y, p.z);
});
// check which plane polygon arrived in
let swapz = diff.x === false ? 0 :
diff.y === false ? 1 : 2;
// swap planar coordinates into X,Y if not in Z plane
if (swapz < 2) {
for (let i=0; i<out.length; i+=3) {
let t = out[i+2];
out[i+2] = out[i+swapz];
out[i+swapz] = t;
}
}
// add hole offsets for inner polygons
if (this.inner) {
this.inner.forEach(p => {
holes.push(out.length / 3);
p.points.forEach(p => {
out.push(p.x, p.y, p.z);
})
});
}
// perform earcut();
let cut = earcut(out,holes,3);
// un-swap planar coordinates into X,Y if not in Z plane
// so that polygons are returned in their original plane
if (swapz < 2) {
for (let i=0; i<out.length; i+=3) {
let t = out[i+2];
out[i+2] = out[i+swapz];
out[i+swapz] = t;
}
}
let ret = [];
if (raw) {
for (let i=0; i<cut.length; i+=3) {
for (let j=0; j<3; j++) {
let n = cut[i + j] * 3;
p.push(out[n], out[n+1], out[n+2]);
}
}
} else {
for (let i=0; i<cut.length; i+=3) {
let p = new Polygon();
for (let j=0; j<3; j++) {
let n = cut[i + j] * 3;
p.add(out[n], out[n+1], out[n+2]);
}
ret.push(p);
}
}
return ret;
};
PRO.createConvexHull = function(points) {
function removeMiddle(a, b, c) {
var cross = (a.x - b.x) * (c.y - b.y) - (a.y - b.y) * (c.x - b.x);

76
js/meta.js
View file

@ -51,17 +51,20 @@ THREE.Face3.prototype.mVisible = function(show) {
WIN = self,
DOC = WIN.document,
LOC = WIN.location,
ABS = Math.abs,
MAX = Math.max,
MIN = Math.min,
BOUND = function(v,min,max) { return MAX(min,MIN(max,v))},
BASE = self.base,
BOUND = function(v,min,max) { return Math.max(min,Math.min(max,v)) },
ROUND = Math.round,
PI = Math.PI,
PI2 = PI/2,
PI2 = Math.PI/2,
ABS = Math.abs,
SCALE = 1,
HALF = SCALE / 2,
HAS = function(a,b) { return a.hasOwnProperty(b) },
// ---------------
POLY = BASE.polygons,
Layer = self.kiri.Layer,
Point = BASE.Point,
Polygon = BASE.Polygon,
// ---------------
MOTO = self.moto,
SPACE = MOTO.Space,
SDB = MOTO.KV,
@ -342,7 +345,6 @@ THREE.Face3.prototype.mVisible = function(show) {
}
if (cube.isSelected()) {
selectedFace = face;
console.log('sel',cube.pos,face.key,FACE[face.key])
scheduleUpdateFaces(cube, face);
}
let s = face.set, rot = { x: s.tx, y: s.ty, z: s.tz };
@ -1610,10 +1612,12 @@ console.log('sel',cube.pos,face.key,FACE[face.key])
let debuggroup = new THREE.Group();
let debugadded = false;
let layer = new Layer(debuggroup);
function selectionToGeometry2(scale) {
let vertices = [], normals = [], faceGroups = [], seen = {}, nid = 0;
layer.clear();
console.clear();
if (!debugadded) SPACE.platform.add(debugadded = debuggroup)
debuggroup.children.slice().forEach(c => debuggroup.remove(c));
@ -1621,10 +1625,8 @@ debuggroup.children.slice().forEach(c => debuggroup.remove(c));
function walk(cube_face, group) {
let cube = cube_face.cube;
let face_key = `${cube.key}-${cube_face.key}`;
// console.log("walk", face_key, seen[face_key] ? 'seen' : '....', group ? group.id : 'new');
// skip faces facing another cube
if (cube.adjacentCube(cube_face)) {
// console.log(" --|", face_key);
return true;
}
// skip seen faces
@ -1650,11 +1652,9 @@ debuggroup.children.slice().forEach(c => debuggroup.remove(c));
let adjacent = cube.adjacentCube(facedir);
if (adjacent) {
if (walk(adjacent.faces[cube_face.key], group)) {
// console.log(" ++ ", face_key, face_name);
sides.push(face_name);
}
} else {
// console.log(" +++", face_key, face_name);
sides.push(face_name);
}
});
@ -1705,15 +1705,6 @@ debuggroup.children.slice().forEach(c => debuggroup.remove(c));
if (!op2.p) op2.p = [op1]; else op2.p.push(op1);
points.push(op1);
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)
// SPACE.refresh();
});
});
}
@ -1726,18 +1717,16 @@ debuggroup.children.slice().forEach(c => debuggroup.remove(c));
});
});
console.log({GROUPS: faceGroups.length})
// return;
// console.log(">>>>>>>>>>>>>>>>>>>>>>>>")
let polys = [];
faceGroups.forEach((el,gi) => {
let {map, points} = el;
let seen = {};
console.log("<<< lines in",points.length/2);
let set = [];
// newstart: for (let ip=0; ip<points.length; ip++) {
let start = points[0];
// if (seen[start.k]) continue newstart;
// console.log({gi,start:ip})
newstart: for (let ip=0; ip<points.length; ip++) {
let start = points[ip];
if (seen[start.k]) continue newstart;
let point = start;
let out = [ point ];
let delta = [];
@ -1783,18 +1772,28 @@ console.log("<<< lines in",points.length/2);
out.pop();
}
console.log(">>> points out",out.length)
// console.log(out)
let m = 1.05 + (gi * 0.05);
let mat = new THREE.LineBasicMaterial( { color: 0xff0000 } );
let geo = new THREE.BufferGeometry().setFromPoints(
out.map(p => new THREE.Vector3(p.x*m,p.y*m,p.z*m))
);
let lnz = new THREE.Line(geo, mat);
debuggroup.add(lnz)
let poly = new Polygon();
out.forEach(p => {
poly.add(p.x,p.y,p.z);
});
set.push(poly);
}
polys.push(POLY.nest(set));
});
let cuts = polys.flat().map(p => p.earcut()).flat();
cuts.forEach(p => layer.poly(p, 0xff0000, true, false));
layer.render();
SPACE.refresh();
// }
// exports cut polys back to vertices
cuts.forEach(poly => {
poly.forEachPoint(p => {
vertices.push(p.x,p.y,p.z);
});
});
if (scale) {
@ -1802,6 +1801,7 @@ SPACE.refresh();
vertices[i] *= scale;
}
}
return {vertices: vertices, normals: null};
}

1
js/moto-ctrl.js
View file

@ -523,7 +523,6 @@ MOTO.CTRL = function (object, domElement, notify, slider) {
case 2: // two-fingered touch: dolly
if (scope.noZoom === true) return;
if (state !== STATE.TOUCH_DOLLY) return;
console.log(event)
let dx = event.touches[ 0 ].pageX - event.touches[ 1 ].pageX;
let dy = event.touches[ 0 ].pageY - event.touches[ 1 ].pageY;
let distance = Math.sqrt(dx * dx + dy * dy);

11
js/web-server.js
View file

@ -834,6 +834,17 @@ let ver = require('../js/license.js'),
"ext-earcut",
"add-array",
"add-three",
"geo",
"geo-debug",
"geo-render",
"geo-point",
"geo-slope",
"geo-line",
"geo-bounds",
"geo-polygon",
"geo-polygons",
"geo-gyroid",
"kiri-layer",
"moto-kv",
"moto-ajax",
"moto-ctrl",