fix o=tools hotkey. add more animation resolutions. change move clear distance based on tool type
This commit is contained in:
parent
af1ab0e572
commit
2cb691d3d8
4 changed files with 10 additions and 3 deletions
|
|
@ -391,7 +391,7 @@
|
||||||
case cca('g'): // CAM animate
|
case cca('g'): // CAM animate
|
||||||
API.function.animate();
|
API.function.animate();
|
||||||
break;
|
break;
|
||||||
case cca('o'): // manual rotation
|
case cca('O'): // manual rotation
|
||||||
rotateInputSelection();
|
rotateInputSelection();
|
||||||
break;
|
break;
|
||||||
case cca('r'): // recent files
|
case cca('r'): // recent files
|
||||||
|
|
|
||||||
|
|
@ -178,7 +178,11 @@
|
||||||
{ name: "200" },
|
{ name: "200" },
|
||||||
{ name: "300" },
|
{ name: "300" },
|
||||||
{ name: "400" },
|
{ name: "400" },
|
||||||
{ name: "500" }
|
{ name: "500" },
|
||||||
|
{ name: "600" },
|
||||||
|
{ name: "700" },
|
||||||
|
{ name: "800" },
|
||||||
|
{ name: "900" }
|
||||||
],
|
],
|
||||||
trace: [
|
trace: [
|
||||||
{ name: "follow" },
|
{ name: "follow" },
|
||||||
|
|
|
||||||
|
|
@ -319,6 +319,7 @@ self.kiri.loader.push(function() {
|
||||||
|
|
||||||
function checkStash(send) {
|
function checkStash(send) {
|
||||||
if (!skipMode && skipStash.length) {
|
if (!skipMode && skipStash.length) {
|
||||||
|
// merge & compress stash stack
|
||||||
skipStash.forEach(mesh_update => {
|
skipStash.forEach(mesh_update => {
|
||||||
send.data({ id: 0, mesh_update }, [ mesh_update.buffer ]);
|
send.data({ id: 0, mesh_update }, [ mesh_update.buffer ]);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -85,6 +85,7 @@
|
||||||
printPoint,
|
printPoint,
|
||||||
isNewMode,
|
isNewMode,
|
||||||
tool,
|
tool,
|
||||||
|
toolType,
|
||||||
toolDiam,
|
toolDiam,
|
||||||
toolDiamMove,
|
toolDiamMove,
|
||||||
feedRate,
|
feedRate,
|
||||||
|
|
@ -118,8 +119,9 @@
|
||||||
function setTool(toolID, feed, plunge) {
|
function setTool(toolID, feed, plunge) {
|
||||||
if (toolID !== lastTool) {
|
if (toolID !== lastTool) {
|
||||||
tool = new CAM.Tool(settings, toolID);
|
tool = new CAM.Tool(settings, toolID);
|
||||||
|
toolType = tool.getType();
|
||||||
toolDiam = tool.fluteDiameter();
|
toolDiam = tool.fluteDiameter();
|
||||||
toolDiamMove = toolDiam; // TODO validate w/ multiple models
|
toolDiamMove = toolType === 'endmill' ? toolDiam : tolerance;
|
||||||
lastTool = toolID;
|
lastTool = toolID;
|
||||||
}
|
}
|
||||||
feedRate = feed;
|
feedRate = feed;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue