-
+
-
+
);
diff --git a/src/interface/utils.js b/src/interface/utils.js
index 9c18fc3..1379ff5 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -2,6 +2,8 @@ import * as THREE from 'three';
import 'three/examples/js/controls/EditorControls';
import 'three/examples/js/controls/TransformControls';
+const MAX_SPEED = 100 * 60;
+
export function placeOnGround(mesh) {
const boundingBox = new THREE.Box3();
const vertices = mesh.geometry.vertices.map(vertex => vertex.clone().applyMatrix4(mesh.matrix));
@@ -81,3 +83,37 @@ export function createScene(canvas, props, state) {
return { control, editorControls, scene, mesh, camera, renderer, render };
}
+
+export function createGcodeGeometry(gcode) {
+ const geometry = new THREE.Geometry();
+
+ let lastPoint
+ for (let i = 0; i < gcode.length; i ++) {
+ const { G, F, X, Y, Z } = gcode[i];
+
+ if (X || Y || Z) {
+ const point = new THREE.Vector3(Y, Z, X);
+
+ let color;
+ if (G === 0) {
+ color = new THREE.Color(0x00ff00);
+ } else if (G === 1) {
+ color = new THREE.Color().setHSL(F / MAX_SPEED, 0.5, 0.5);
+ }
+
+ if (G === 1) {
+ if (lastPoint) geometry.vertices.push(lastPoint);
+ geometry.vertices.push(new THREE.Vector3(Y, Z, X));
+ geometry.colors.push(color);
+ geometry.colors.push(color);
+ }
+
+ lastPoint = point;
+ }
+ }
+
+ const material = new THREE.LineBasicMaterial({ vertexColors: THREE.VertexColors });
+ const line = new THREE.LineSegments(geometry, material);
+
+ return line;
+}
diff --git a/src/sliceActions/helpers/GCode.js b/src/sliceActions/helpers/GCode.js
index 71f9a65..980d34f 100644
--- a/src/sliceActions/helpers/GCode.js
+++ b/src/sliceActions/helpers/GCode.js
@@ -1,20 +1,20 @@
import * as THREE from 'three';
import { PRECISION } from '../../constants.js';
-const MOVE = 'G';
-const M_COMMAND = 'M';
-const FAN_SPEED = 'S';
-const SPEED = 'F';
-const EXTRUDER = 'E';
-const POSITION_X = 'X';
-const POSITION_Y = 'Y';
-const POSITION_Z = 'Z';
+export const MOVE = 'G';
+export const M_COMMAND = 'M';
+export const FAN_SPEED = 'S';
+export const SPEED = 'F';
+export const EXTRUDER = 'E';
+export const POSITION_X = 'X';
+export const POSITION_Y = 'Y';
+export const POSITION_Z = 'Z';
export default class {
constructor(nozzleToFilamentRatio) {
this._nozzleToFilamentRatio = nozzleToFilamentRatio;
- this._gcode = '';
+ this._gcode = [];
this._currentValues = {};
this._nozzlePosition = new THREE.Vector2(0, 0);
this._extruder = 0.0;
@@ -24,24 +24,7 @@ export default class {
}
_addGCode(command) {
- let str = '';
-
- let first = true;
- for (const action in command) {
- const value = command[action];
- const currentValue = this._currentValues[action];
- if (first) {
- str = action + value;
-
- first = false;
- } else if (currentValue !== value) {
- str += ` ${action}${value}`;
-
- this._currentValues[action] = value;
- }
- }
-
- this._gcode += `${str}\n`;
+ this._gcode.push(command);
}
turnFanOn(fanSpeed) {