Merge branch 'rel-4.1' of https://github.com/GridSpace/grid-apps into cam-arcs
This commit is contained in:
commit
3ffc3ab853
10 changed files with 207 additions and 125 deletions
|
|
@ -19,6 +19,7 @@ function show(message, time) {
|
|||
api.event.emit('alert', rec);
|
||||
} else {
|
||||
alerts.push(rec);
|
||||
setTimeout( update, time+0.02);
|
||||
update();
|
||||
}
|
||||
return rec;
|
||||
|
|
|
|||
|
|
@ -521,6 +521,7 @@ const conf = exports({
|
|||
camDrillLift: 2,
|
||||
camDrillMark: false,
|
||||
camDrillThru: 5,
|
||||
camDrillPrecision: 1,
|
||||
camDrillingOn: false,
|
||||
camRegisterSpeed: 1000,
|
||||
camRegisterThru: 5,
|
||||
|
|
|
|||
|
|
@ -545,6 +545,9 @@ class Widget {
|
|||
this.setWireframe(false);
|
||||
this.clearSlices();
|
||||
mesh.geometry.applyMatrix4(new THREE.Matrix4().makeScale(x, y, z));
|
||||
if (this.outline) {
|
||||
this.setEdges(true);
|
||||
}
|
||||
scale.x *= (x || 1.0);
|
||||
scale.y *= (y || 1.0);
|
||||
scale.z *= (z || 1.0);
|
||||
|
|
@ -558,6 +561,9 @@ class Widget {
|
|||
if (center) {
|
||||
this.center(false);
|
||||
}
|
||||
if (this.outline) {
|
||||
this.setEdges(true);
|
||||
}
|
||||
if ((x || y || z) && api && api.event) {
|
||||
api.event.emit('widget.rotate', {widget: this, x, y, z});
|
||||
}
|
||||
|
|
@ -698,7 +704,10 @@ class Widget {
|
|||
|
||||
getBoundingBox(refresh) {
|
||||
if (!this.bounds || refresh || this.boundingBoxNeedsUpdate) {
|
||||
this.bounds = new THREE.Box3().setFromArray(this.getGeoVertices());
|
||||
this.bounds = new THREE.Box3().setFromArray(this.getGeoVertices({
|
||||
translate: true,
|
||||
unroll: false
|
||||
}));
|
||||
this.boundingBoxNeedsUpdate = false;
|
||||
}
|
||||
return this.bounds;
|
||||
|
|
|
|||
Loading…
Reference in a new issue