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

round trip indexed geomtery in persisted workspaces

Browse source
This commit is contained in:
Stewart Allen 2021-09-20 23:40:49 -04:00
commit 0bba1ca58e
1 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/kiri/widget.js
View file

@ -217,11 +217,12 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
KIRI.odb.get('ws-save-'+id, function(data) { KIRI.odb.get('ws-save-'+id, function(data) {
if (data) { if (data) {
let vertices = data.geo || data, let vertices = data.geo || data,
indices = data.ind || undefined,
track = data.track || undefined, track = data.track || undefined,
group = data.group || id, group = data.group || id,
widget = newWidget(id, Group.forid(group)), widget = newWidget(id, Group.forid(group)),
meta = data.meta || widget.meta, meta = data.meta || widget.meta,
ptr = widget.loadVertices(vertices); ptr = widget.loadVertices({vertices, indices});
widget.meta = meta; widget.meta = meta;
// restore widget position if specified // restore widget position if specified
if (move && track && track.pos) { if (move && track && track.pos) {
@ -248,7 +249,7 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
let time = UTIL.time(); let time = UTIL.time();
widget.meta.file = filename; widget.meta.file = filename;
widget.meta.save = time; widget.meta.save = time;
KIRI.catalog.putFile(filename, this.getGeoVertices(), function(vertices) { KIRI.catalog.putFile(filename, this.getGeoVertices(true), function(vertices) {
if (vertices && vertices.length) { if (vertices && vertices.length) {
console.log("saving decimated mesh ["+vertices.length+"] time ["+(UTIL.time()-time)+"]"); console.log("saving decimated mesh ["+vertices.length+"] time ["+(UTIL.time()-time)+"]");
widget.loadVertices(vertices); widget.loadVertices(vertices);
@ -260,7 +261,8 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
PRO.saveState = function(ondone) { PRO.saveState = function(ondone) {
let widget = this; let widget = this;
KIRI.odb.put('ws-save-'+this.id, { KIRI.odb.put('ws-save-'+this.id, {
geo: widget.getGeoVertices(), geo: widget.getGeoVertices(false),
ind: widget.getGeoIndices(),
track: widget.track, track: widget.track,
group: this.group.id, group: this.group.id,
meta: this.meta meta: this.meta
@ -338,6 +340,16 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
PRO.loadData = PRO.loadVertices; PRO.loadData = PRO.loadVertices;
PRO.indexGeo = function() {
let indices = this.getGeoIndices();
if (!indices) {
let mesh = new BASE.Mesh({vertices: this.getGeoVertices()});
vertices = mesh.vertices.toFloat32();
indices = Uint32Array.from(mesh.faces.map(v => v/3));
this.loadData({vertices, indices});
}
};
PRO.heal = function(debug) { PRO.heal = function(debug) {
if (debug) { if (debug) {
let mesh = this.debugMesh().heal(); let mesh = this.debugMesh().heal();
@ -690,10 +702,10 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
this.points = null; this.points = null;
}; };
PRO.getGeoVertices = function() { PRO.getGeoVertices = function(unroll) {
let geo = this.mesh.geometry; let geo = this.mesh.geometry;
let pos = geo.getAttribute('position').array; let pos = geo.getAttribute('position').array;
if (geo.index) { if (geo.index && unroll !== false) {
let idx = geo.index.array; let idx = geo.index.array;
let len = idx.length; let len = idx.length;
let p2 = new Float32Array(len * 3); let p2 = new Float32Array(len * 3);
@ -711,6 +723,11 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
} }
}; };
PRO.getGeoIndices = function() {
let indices = this.mesh.geometry.index;
return indices ? indices.array : undefined;
};
PRO.iterPoints = function() { PRO.iterPoints = function() {
let verts = this.getGeoVertices(); let verts = this.getGeoVertices();
let index = 0; let index = 0;