cpu contour not obeying z bottom
This commit is contained in:
parent
b36dc4bf50
commit
e5e189cf90
2 changed files with 4 additions and 3 deletions
|
|
@ -109,7 +109,7 @@ class OpContour extends CamOp {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
contour: op,
|
contour: op,
|
||||||
state: state
|
state
|
||||||
});
|
});
|
||||||
|
|
||||||
// computed if set to 0
|
// computed if set to 0
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ export class Topo {
|
||||||
|
|
||||||
let { controller, process } = settings,
|
let { controller, process } = settings,
|
||||||
{ webGPU } = controller,
|
{ webGPU } = controller,
|
||||||
|
{ workarea } = state,
|
||||||
animesh = parseInt(controller.animesh || 100) * 2500,
|
animesh = parseInt(controller.animesh || 100) * 2500,
|
||||||
axis = contour.axis.toLowerCase(),
|
axis = contour.axis.toLowerCase(),
|
||||||
contourX = axis === "x",
|
contourX = axis === "x",
|
||||||
|
|
@ -31,8 +32,8 @@ export class Topo {
|
||||||
maxX = bounds.max.x,
|
maxX = bounds.max.x,
|
||||||
minY = bounds.min.y,
|
minY = bounds.min.y,
|
||||||
maxY = bounds.max.y,
|
maxY = bounds.max.y,
|
||||||
zBottom = contour.bottom ? state.zBottom : 0,
|
zBottom = contour.bottom ? workarea.bottom_z : 0,
|
||||||
zMin = Math.max(bounds.min.z, zBottom) + 0.0001,
|
zMin = workarea.bottom_z + 0.0001, //Math.max(bounds.min.z, zBottom) + 0.0001,
|
||||||
boundsX = maxX - minX,
|
boundsX = maxX - minX,
|
||||||
boundsY = maxY - minY,
|
boundsY = maxY - minY,
|
||||||
inside = contour.inside,
|
inside = contour.inside,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue