Skip to content

T
three.js

车家大少爷 / three.js
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 ce16713e 编写于 作者: J José Ferrão 提交者： GitHub
浏览文件
操作

GCodeLoader ES6 variables (let/const) (#21630) 

* Clean up

* Clean up

* Const
上级 d31a1761
隐藏空白更改
内联 并排
Showing with 68 addition and 65 deletion
examples/js/loaders/GCodeLoader.js
浏览文件 @ ce16713e
......@@ -53,7 +53,7 @@
parse( data ) {
var state = {
let state = {
x: 0,
y: 0,
z: 0,
......@@ -62,16 +62,19 @@
extruding: false,
relative: false
};
var layers = [];
var currentLayer = undefined;
var pathMaterial = new THREE.LineBasicMaterial( {
let layers = [];
let currentLayer = undefined;
const pathMaterial = new THREE.LineBasicMaterial( {
color: 0xFF0000
} );
pathMaterial.name = 'path';
var extrudingMaterial = new THREE.LineBasicMaterial( {
const extrudingMaterial = new THREE.LineBasicMaterial( {
color: 0x00FF00
} );
extrudingMaterial.name = 'extruded';
function newLayer( line ) {
......@@ -93,7 +96,7 @@
}
if ( line.extruding ) {
if ( state.extruding ) {
currentLayer.vertex.push( p1.x, p1.y, p1.z );
currentLayer.vertex.push( p2.x, p2.y, p2.z );
......@@ -119,20 +122,20 @@
}
var lines = data.replace( /;.+/g, '' ).split( '\n' );
let lines = data.replace( /;.+/g, '' ).split( '\n' );
for ( var i = 0; i < lines.length; i ++ ) {
for ( let i = 0; i < lines.length; i ++ ) {
var tokens = lines[ i ].split( ' ' );
var cmd = tokens[ 0 ].toUpperCase(); //Argumments
let tokens = lines[ i ].split( ' ' );
let cmd = tokens[ 0 ].toUpperCase(); //Argumments
var args = {};
let args = {};
tokens.splice( 1 ).forEach( function ( token ) {
if ( token[ 0 ] !== undefined ) {
var key = token[ 0 ].toLowerCase();
var value = parseFloat( token.substring( 1 ) );
let key = token[ 0 ].toLowerCase();
let value = parseFloat( token.substring( 1 ) );
args[ key ] = value;
}
......@@ -142,7 +145,7 @@
if ( cmd === 'G0' || cmd === 'G1' ) {
var line = {
let line = {
x: args.x !== undefined ? absolute( state.x, args.x ) : state.x,
y: args.y !== undefined ? absolute( state.y, args.y ) : state.y,
z: args.z !== undefined ? absolute( state.z, args.z ) : state.z,
......@@ -180,7 +183,7 @@
} else if ( cmd === 'G92' ) {
//G92: Set Position
var line = state;
let line = state;
line.x = args.x !== undefined ? args.x : line.x;
line.y = args.y !== undefined ? args.y : line.y;
line.z = args.z !== undefined ? args.z : line.z;
......@@ -192,47 +195,47 @@
}
function addObject( vertex, extruding ) {
function addObject( vertex, extruding, i ) {
var geometry = new THREE.BufferGeometry();
let geometry = new THREE.BufferGeometry();
geometry.setAttribute( 'position', new THREE.Float32BufferAttribute( vertex, 3 ) );
var segments = new THREE.LineSegments( geometry, extruding ? extrudingMaterial : pathMaterial );
let segments = new THREE.LineSegments( geometry, extruding ? extrudingMaterial : pathMaterial );
segments.name = 'layer' + i;
object.add( segments );
}
var object = new THREE.Group();
const object = new THREE.Group();
object.name = 'gcode';
if ( this.splitLayer ) {
for ( var i = 0; i < layers.length; i ++ ) {
for ( let i = 0; i < layers.length; i ++ ) {
var layer = layers[ i ];
addObject( layer.vertex, true );
addObject( layer.pathVertex, false );
let layer = layers[ i ];
addObject( layer.vertex, true, i );
addObject( layer.pathVertex, false, i );
}
} else {
var vertex = [],
const vertex = [],
pathVertex = [];
for ( var i = 0; i < layers.length; i ++ ) {
for ( let i = 0; i < layers.length; i ++ ) {
var layer = layers[ i ];
var layerVertex = layer.vertex;
var layerPathVertex = layer.pathVertex;
let layer = layers[ i ];
let layerVertex = layer.vertex;
let layerPathVertex = layer.pathVertex;
for ( var j = 0; j < layerVertex.length; j ++ ) {
for ( let j = 0; j < layerVertex.length; j ++ ) {
vertex.push( layerVertex[ j ] );
}
for ( var j = 0; j < layerPathVertex.length; j ++ ) {
for ( let j = 0; j < layerPathVertex.length; j ++ ) {
pathVertex.push( layerPathVertex[ j ] );
......@@ -240,8 +243,8 @@
}
addObject( vertex, true );
addObject( pathVertex, false );
addObject( vertex, true, layers.length );
addObject( pathVertex, false, layers.length );
}
......
examples/jsm/loaders/GCodeLoader.js
浏览文件 @ ce16713e
......@@ -64,15 +64,15 @@ class GCodeLoader extends Loader {
parse( data ) {
var state = { x: 0, y: 0, z: 0, e: 0, f: 0, extruding: false, relative: false };
var layers = [];
let state = { x: 0, y: 0, z: 0, e: 0, f: 0, extruding: false, relative: false };
let layers = [];
var currentLayer = undefined;
let currentLayer = undefined;
var pathMaterial = new LineBasicMaterial( { color: 0xFF0000 } );
const pathMaterial = new LineBasicMaterial( { color: 0xFF0000 } );
pathMaterial.name = 'path';
var extrudingMaterial = new LineBasicMaterial( { color: 0x00FF00 } );
const extrudingMaterial = new LineBasicMaterial( { color: 0x00FF00 } );
extrudingMaterial.name = 'extruded';
function newLayer( line ) {
......@@ -91,7 +91,7 @@ class GCodeLoader extends Loader {
}
if ( line.extruding ) {
if ( state.extruding ) {
currentLayer.vertex.push( p1.x, p1.y, p1.z );
currentLayer.vertex.push( p2.x, p2.y, p2.z );
......@@ -117,21 +117,21 @@ class GCodeLoader extends Loader {
}
var lines = data.replace( /;.+/g, '' ).split( '\n' );
let lines = data.replace( /;.+/g, '' ).split( '\n' );
for ( var i = 0; i < lines.length; i ++ ) {
for ( let i = 0; i < lines.length; i ++ ) {
var tokens = lines[ i ].split( ' ' );
var cmd = tokens[ 0 ].toUpperCase();
let tokens = lines[ i ].split( ' ' );
let cmd = tokens[ 0 ].toUpperCase();
//Argumments
var args = {};
let args = {};
tokens.splice( 1 ).forEach( function ( token ) {
if ( token[ 0 ] !== undefined ) {
var key = token[ 0 ].toLowerCase();
var value = parseFloat( token.substring( 1 ) );
let key = token[ 0 ].toLowerCase();
let value = parseFloat( token.substring( 1 ) );
args[ key ] = value;
}
......@@ -142,7 +142,7 @@ class GCodeLoader extends Loader {
//G0/G1 – Linear Movement
if ( cmd === 'G0' || cmd === 'G1' ) {
var line = {
let line = {
x: args.x !== undefined ? absolute( state.x, args.x ) : state.x,
y: args.y !== undefined ? absolute( state.y, args.y ) : state.y,
z: args.z !== undefined ? absolute( state.z, args.z ) : state.z,
......@@ -184,7 +184,7 @@ class GCodeLoader extends Loader {
} else if ( cmd === 'G92' ) {
//G92: Set Position
var line = state;
let line = state;
line.x = args.x !== undefined ? args.x : line.x;
line.y = args.y !== undefined ? args.y : line.y;
line.z = args.z !== undefined ? args.z : line.z;
......@@ -199,47 +199,47 @@ class GCodeLoader extends Loader {
}
function addObject( vertex, extruding ) {
function addObject( vertex, extruding, i ) {
var geometry = new BufferGeometry();
let geometry = new BufferGeometry();
geometry.setAttribute( 'position', new Float32BufferAttribute( vertex, 3 ) );
var segments = new LineSegments( geometry, extruding ? extrudingMaterial : pathMaterial );
let segments = new LineSegments( geometry, extruding ? extrudingMaterial : pathMaterial );
segments.name = 'layer' + i;
object.add( segments );
}
var object = new Group();
const object = new Group();
object.name = 'gcode';
if ( this.splitLayer ) {
for ( var i = 0; i < layers.length; i ++ ) {
for ( let i = 0; i < layers.length; i ++ ) {
var layer = layers[ i ];
addObject( layer.vertex, true );
addObject( layer.pathVertex, false );
let layer = layers[ i ];
addObject( layer.vertex, true, i );
addObject( layer.pathVertex, false, i );
}
} else {
var vertex = [], pathVertex = [];
const vertex = [],
pathVertex = [];
for ( var i = 0; i < layers.length; i ++ ) {
for ( let i = 0; i < layers.length; i ++ ) {
var layer = layers[ i ];
var layerVertex = layer.vertex;
var layerPathVertex = layer.pathVertex;
let layer = layers[ i ];
let layerVertex = layer.vertex;
let layerPathVertex = layer.pathVertex;
for ( var j = 0; j < layerVertex.length; j ++ ) {
for ( let j = 0; j < layerVertex.length; j ++ ) {
vertex.push( layerVertex[ j ] );
}
for ( var j = 0; j < layerPathVertex.length; j ++ ) {
for ( let j = 0; j < layerPathVertex.length; j ++ ) {
pathVertex.push( layerPathVertex[ j ] );
......@@ -247,8 +247,8 @@ class GCodeLoader extends Loader {
}
addObject( vertex, true );
addObject( pathVertex, false );
addObject( vertex, true, layers.length );
addObject( pathVertex, false, layers.length );
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或