bombinans
/
fourdjs
1
1
Fork 0
Code Issues 11 Pull Requests Packages Projects Releases Wiki Activity

Added tetrahedra inscriptions for dodecahedron, rearranged UI

feature-3d-shapes
Mike Lynch 2023-09-15 18:33:33 +10:00
parent fb8067a13e
commit 6e8cfa8763
3 changed files with 51 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui.js
View File

@ -45,8 +45,8 @@ class FourDGUI {
}; };
this.gui.add(this.params, 'shape', this.gui.add(this.params, 'shape',
[ '5-cell', '16-cell', 'tesseract', [ 'dodecahedron', '5-cell', '16-cell', 'tesseract',
'24-cell', '600-cell', '120-cell', 'dodecahedron' ] '24-cell', '600-cell', '120-cell' ]
).onChange(changeShape) ).onChange(changeShape)
this.gui.add(this.params, 'inscribed').onChange(changeShape); this.gui.add(this.params, 'inscribed').onChange(changeShape);
this.gui.add(this.params, 'inscribe_all').onChange(changeShape); this.gui.add(this.params, 'inscribe_all').onChange(changeShape);

2
main.js
View File

@ -74,6 +74,7 @@ const INSCRIBED = {
'24-cell': POLYTOPES.cell24_inscribed(), '24-cell': POLYTOPES.cell24_inscribed(),
'120-cell': POLYTOPES.cell120_inscribed(), '120-cell': POLYTOPES.cell120_inscribed(),
'600-cell': POLYTOPES.cell600_inscribed(), '600-cell': POLYTOPES.cell600_inscribed(),
'dodecahedron': POLYTOPES.dodecahedron_inscribed(),
}; };
const ALL_INSCRIBED = { const ALL_INSCRIBED = {
@ -81,6 +82,7 @@ const ALL_INSCRIBED = {
'24-cell': POLYTOPES.cell24_all_inscribed(), '24-cell': POLYTOPES.cell24_all_inscribed(),
'120-cell': POLYTOPES.cell120_all_inscribed(), '120-cell': POLYTOPES.cell120_all_inscribed(),
'600-cell': POLYTOPES.cell600_all_inscribed(), '600-cell': POLYTOPES.cell600_all_inscribed(),
'dodecahedron': POLYTOPES.dodecahedron_all_inscribed(),
} }
let shape = false; let shape = false;

78
polytopes.js
View File

@ -652,16 +652,6 @@ const cell600_some_inscribed = (ps) => {
link_size: 0.02 link_size: 0.02
}, },
} }
return {
nodes: nodes,
links: links,
geometry: {
node_size: 0.02,
link_size: 0.02
}
}
} }
@ -675,32 +665,32 @@ function make_dodecahedron_vertices() {
const phiinv = 1 / phi; const phiinv = 1 / phi;
const nodes = [ const nodes = [
{ x: 1, y: 1, z: 1, w: 0 }, { x: 1, y: 1, z: 1, w: 0, label: 4 },
{ x: 1, y: 1, z: -1, w: 0 }, { x: 1, y: 1, z: -1, w: 0, label: 3 },
{ x: 1, y: -1, z: 1, w: 0 }, { x: 1, y: -1, z: 1, w: 0, label: 3 },
{ x: 1, y: -1, z: -1, w: 0 }, { x: 1, y: -1, z: -1, w: 0, label: 2 },
{ x: -1, y: 1, z: 1, w: 0 }, { x: -1, y: 1, z: 1, w: 0, label: 3 },
{ x: -1, y: 1, z: -1, w: 0 }, { x: -1, y: 1, z: -1, w: 0, label: 1 },
{ x: -1, y: -1, z: 1, w: 0 }, { x: -1, y: -1, z: 1, w: 0, label: 5 },
{ x: -1, y: -1, z: -1, w: 0 }, { x: -1, y: -1, z: -1, w: 0, label: 3 },
{ x: 0, y: phi, z: phiinv, w: 0 }, { x: 0, y: phi, z: phiinv, w: 0, label: 5 },
{ x: 0, y: phi, z: -phiinv, w: 0 }, { x: 0, y: phi, z: -phiinv, w: 0 , label: 2 },
{ x: 0, y: -phi, z: phiinv, w: 0 }, { x: 0, y: -phi, z: phiinv, w: 0, label: 4 },
{ x: 0, y: -phi, z: -phiinv, w: 0 }, { x: 0, y: -phi, z: -phiinv, w: 0 , label: 1 },
{ x: phiinv, y: 0, z: phi, w: 0 }, { x: phiinv, y: 0, z: phi, w: 0 , label: 2},
{ x: phiinv, y: 0, z: -phi, w: 0 }, { x: phiinv, y: 0, z: -phi, w: 0 , label: 4},
{ x: -phiinv, y: 0, z: phi, w: 0 }, { x: -phiinv, y: 0, z: phi, w: 0 , label: 1},
{ x: -phiinv, y: 0, z: -phi, w: 0 }, { x: -phiinv, y: 0, z: -phi, w: 0 , label: 5},
{ x: phi, y: phiinv, z:0, w: 0 }, { x: phi, y: phiinv, z:0, w: 0 , label: 1},
{ x: phi, y: -phiinv, z:0, w: 0 }, { x: phi, y: -phiinv, z:0, w: 0 , label: 5},
{ x: -phi, y: phiinv, z:0, w: 0 }, { x: -phi, y: phiinv, z:0, w: 0 , label: 4},
{ x: -phi, y: -phiinv, z:0, w: 0 }, { x: -phi, y: -phiinv, z:0, w: 0 , label: 2},
]; ];
index_nodes(nodes);; index_nodes(nodes);
return nodes; return nodes;
} }
@ -718,4 +708,30 @@ export const dodecahedron = () => {
} }
} }
const dodecahedron_some_inscribed = (ps) => {
const nodes = make_dodecahedron_vertices();
const links = auto_detect_edges(nodes, 3);
const all_links = links;
all_links.map((l) => l.label = 0);
for( const p of ps) {
const tetran = nodes.filter((n) => n.label === p);
const tetral = auto_detect_edges(tetran, 3);
tetral.map((l) => l.label = p);
all_links.push(...tetral);
}
return {
nodes: nodes,
links: all_links,
geometry: {
node_size: 0.02,
link_size: 0.02
},
}
}
export const dodecahedron_inscribed = () => dodecahedron_some_inscribed([1]);
export const dodecahedron_all_inscribed = () => dodecahedron_some_inscribed([1,2,3,4,5]);