vmario
/
doodle3d-client
mirror of https://github.com/Doodle3D/doodle3d-client.git
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client 

Conflicts:
	js/gcodeGenerating_v01.js
This commit is contained in:
peteruithoven 2013-09-18 17:01:45 +02:00
parent 0b49256fd5 8a88c173e5
commit ac5f129e47
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
css/settingsPopup.css
View File

@ -70,4 +70,5 @@ div.content .btnOK {
height: 86px;
background: url('../img/buttons/btnOk_settings.png') no-repeat;
margin: 0 0 0 10px;
cursor: pointer;
}

2
js/gcodeGenerating_v01.js
View File

@ -155,7 +155,7 @@ function generate_gcode(callback) {
// sort-of in de buurt van (360/2.5)
// // -> aight.. er zijn 750 lines vs 1000 in de d3d app. 135 = .75 * 180... dit kan je nog rechttrekken als je NET wat slimmer nadenkt :)
// update: NEE, het is niet .75 * 180 want 135 was niet de beste value. //TODO dus.
// update: NEE, het is niet .75 * 180 want 135 was niet de beste value.
//pointsRotate(p, rStep * progress * 139);
pointsRotate(p, rStepGCode * layer);