diff --git a/js/cam/assemblers/AssemblerPost.js b/js/cam/assemblers/AssemblerPost.js index 667cb95b960071c1f0ca31db4894aecdb02beb19..ea95ebb58d5ae12df38f7138438acbc555fdc214 100644 --- a/js/cam/assemblers/AssemblerPost.js +++ b/js/cam/assemblers/AssemblerPost.js @@ -61,7 +61,7 @@ define(['underscore', 'appState', 'lattice', 'cam'], function(_, appState, latti this.customChangeZLayer = function(currentIndex, lastIndex, exporter, settings, context, self){ var data = ""; if (lastIndex === null || (currentIndex.z-lastIndex.z)%2 != 0){ - data += exporter.addLine("G0", ["A" + (currentIndex.z%2*0.3125).toFixed(4)], "new layer"); + data += exporter.addLine("G0", ["A" + ((currentIndex.z%2+1)*0.3125).toFixed(4)], "new layer"); data += "\n"; } return data; diff --git a/js/plists/CamPList.js b/js/plists/CamPList.js index a8f9271afc595a03251cbe4ce93728711c9f335c..e8e41c182a7d520bf74a11638a5fc0de0df02907 100644 --- a/js/plists/CamPList.js +++ b/js/plists/CamPList.js @@ -102,7 +102,7 @@ define(['three'], function(THREE){ stock:{ stock1: { description:{ - materialName: "brass", + materialName: "fiberGlass", length: 4 }, name: "Stock 1", @@ -111,7 +111,7 @@ define(['three'], function(THREE){ }, stock2: { description:{ - materialName: "fiberGlass", + materialName: "brass", length: 4 }, name: "Stock 2",