Backup_Repos/jsketcher
1
0
Fork 0
mirror of https://github.com/xibyte/jsketcher synced 2025-12-06 16:33:15 +01:00
Code Issues Projects Releases Wiki Activity

no-var rule for javascript / manual fixes

Browse source
This commit is contained in:
Val Erastov 2022-08-15 19:29:42 -07:00
parent c2332870ce
commit 5aaee1c8ed
6 changed files with 33 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
modules/scene/controls/CADTrackballControls.js
View file

@ -546,18 +546,18 @@ export function CADTrackballControls( object, domElement ) {
_movePrev.copy( _moveCurr );
break;
default: // 2 or more
default: { // 2 or more
_state = STATE.TOUCH_ZOOM_PAN;
var dx = event.touches[ 0 ].pageX - event.touches[ 1 ].pageX;
var dy = event.touches[ 0 ].pageY - event.touches[ 1 ].pageY;
const dx = event.touches[ 0 ].pageX - event.touches[ 1 ].pageX;
const dy = event.touches[ 0 ].pageY - event.touches[ 1 ].pageY;
_touchZoomDistanceEnd = _touchZoomDistanceStart = Math.sqrt( dx * dx + dy * dy );
var x = ( event.touches[ 0 ].pageX + event.touches[ 1 ].pageX ) / 2;
var y = ( event.touches[ 0 ].pageY + event.touches[ 1 ].pageY ) / 2;
const x = ( event.touches[ 0 ].pageX + event.touches[ 1 ].pageX ) / 2;
const y = ( event.touches[ 0 ].pageY + event.touches[ 1 ].pageY ) / 2;
_panStart.copy( getMouseOnScreen( x, y ) );
_panEnd.copy( _panStart );
break;
}
}
_this.dispatchEvent( startEvent );
@ -578,16 +578,16 @@ export function CADTrackballControls( object, domElement ) {
_moveCurr.copy( getMouseOnCircle( event.touches[ 0 ].pageX, event.touches[ 0 ].pageY ) );
break;
default: // 2 or more
var dx = event.touches[ 0 ].pageX - event.touches[ 1 ].pageX;
var dy = event.touches[ 0 ].pageY - event.touches[ 1 ].pageY;
default: { // 2 or more
const dx = event.touches[ 0 ].pageX - event.touches[ 1 ].pageX;
const dy = event.touches[ 0 ].pageY - event.touches[ 1 ].pageY;
_touchZoomDistanceEnd = Math.sqrt( dx * dx + dy * dy );
var x = ( event.touches[ 0 ].pageX + event.touches[ 1 ].pageX ) / 2;
var y = ( event.touches[ 0 ].pageY + event.touches[ 1 ].pageY ) / 2;
const x = ( event.touches[ 0 ].pageX + event.touches[ 1 ].pageX ) / 2;
const y = ( event.touches[ 0 ].pageY + event.touches[ 1 ].pageY ) / 2;
_panEnd.copy( getMouseOnScreen( x, y ) );
break;
}
}
}

8
web/app/cad/legacy/mesh/workbench.js
View file

@ -71,7 +71,7 @@ export function polygonsToSegments(polygons) {
//
//});
//magnitude of cross product is the area of parallelogram
//var area = points[b].pos.minus(points[a].pos).cross(points[c].pos.minus(points[a].pos)).length() / 2.0;
//let area = points[b].pos.minus(points[a].pos).cross(points[c].pos.minus(points[a].pos)).length() / 2.0;
//if (selfIntersecting(points[a].pos, points[b].pos, points[c].pos)) {
//continue;
//}
@ -80,7 +80,7 @@ export function polygonsToSegments(polygons) {
for (let pi = 0; pi < polygons.length; pi++) {
let segments = [];
let poly = polygons[pi];
var p, q, n = poly.vertices.length;
let p, q, n = poly.vertices.length;
for(p = n - 1, q = 0; q < n; p = q ++) {
let a = poly.vertices[p];
let b = poly.vertices[q];
@ -105,7 +105,7 @@ export function reconstructSketchBounds(csg, face, strict) {
}
continue;
}
var p, q, n = poly.vertices.length;
let p, q, n = poly.vertices.length;
for(p = n - 1, q = 0; q < n; p = q ++) {
let a = poly.vertices[p];
let b = poly.vertices[q];
@ -234,7 +234,7 @@ function removeTJoints(segments) {
let eq = strictEqual;
for (let pi1 = 0; pi1 < points.length; ++pi1) {
let point = points[pi1];
var best = null, bestFactor;
let best = null, bestFactor;
for (let pi2 = 0; pi2 < segments.length; ++pi2) {
let seg = segments[pi2];
if (eq(seg[0], point) || eq(seg[1], point)) continue;

10
web/app/cad/stl/stlAsciiReader.js
View file

@ -23,18 +23,20 @@ export function parse(buf) {
case 'endsolid':
solids.push(solid);
break;
case 'facet':
var noramlParts = parts.slice(2);
case 'facet': {
const noramlParts = parts.slice(2);
if (noramlParts.length == 3) {
face.normal = noramlParts.map(Number);
} else {
console.warn('bad normal definition at line ' + lineNumber);
}
break;
case 'vertex':
var position = parts.slice(1).map(Number);
}
case 'vertex': {
const position = parts.slice(1).map(Number);
face.vertices.push(position);
break;
}
case 'endfacet':
if (face.normal != null && face.vertices.length == 3) {
solid.faces.push(face);

8
web/app/sketcher/constr/solver.js
View file

@ -224,8 +224,9 @@ let diagnose = function(sys) {
let prepare = function(constrs, locked) {
let simpleMode = true;
let lockingConstrs;
if (!simpleMode) {
var lockingConstrs = lock2Equals2(constrs, locked);
lockingConstrs = lock2Equals2(constrs, locked);
Array.prototype.push.apply( constrs, lockingConstrs );
}
@ -279,14 +280,15 @@ let prepare = function(constrs, locked) {
return systemSolver;
};
var solve_lm = function(sys, model, jacobian, rough) {
let solve_lm = function(sys, model, jacobian, rough) {
let opt = new LMOptimizer(sys.getParams(), newVector(sys.constraints.length), model, jacobian);
opt.evalMaximalCount = 100000; //100 * sys.params.length;
let eps = rough ? 0.001 : 0.00000001;
opt.init0(eps, eps, eps);
let returnCode = 1;
let res;
try {
var res = opt.doOptimize();
res = opt.doOptimize();
} catch (e) {
returnCode = 2;
}

7
web/app/sketcher/constr/solverConstraints.js
View file

@ -40,10 +40,11 @@ function createByConstraintName(name, params, values) {
return new CurveTangent(params, values[0]);
case "angle":
return new Angle(params);
case "angleConst":
var _ = true, x = false;
case "angleConst": {
const _ = true, x = false;
// Exclude angle value from parameters
return new ConstantWrapper(new Angle(params), [x,x,x,x,x,x,x,x,_]);
return new ConstantWrapper(new Angle(params), [x, x, x, x, x, x, x, x, _]);
}
case 'LockConvex':
return new LockConvex(params);
case 'GreaterThan':

3
web/app/utils/graph.js
View file

@ -59,7 +59,8 @@ Graph.findAllLoops = function(graph, hashCode, equals) {
function sameLoop(a, b) {
let first = a[0];
for (var bShift = 0; bShift < a.length; bShift++) {
let bShift;
for (bShift = 0; bShift < a.length; bShift++) {
if (equals(b[bShift], first)) {
break;
}