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

nurbs curve support for unmanaged objects

Browse source
This commit is contained in:
Val Erastov 2018-05-01 02:46:10 -07:00
parent 1fb0c6f451
commit bfbde56b00
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
web/app/cad/scene/wrappers/unmanagedSceneObject.js
View file

@ -47,10 +47,12 @@ export class UnmanagedSceneSolid extends SceneSolid {
tr = tr[0];
}
tr.forEach(p => geom.vertices.push(vec(p)));
if (!normales && faceData.surface.TYPE === 'PLANE') {
normales = vec(faceData.surface.normal);
if (faceData.inverted) {
normales.negate();
if (!normales) {
if (faceData.surface.normal) {
normales = vec(faceData.surface.normal);
if (faceData.inverted) {
normales.negate();
}
}
} else {
if (faceData.inverted) {
@ -61,12 +63,19 @@ export class UnmanagedSceneSolid extends SceneSolid {
}
}
}
let testNormal = Array.isArray(normales) ? normalizedSumOfTHREE(normales) : normales;
let indices = [off, off + 1, off + 2];
let trNormal = normalOfCCWSeqTHREE(indices.map(i => geom.vertices[i]));
if (testNormal.dot(trNormal) < 0) {
indices.reverse();
if (normales) {
let testNormal = Array.isArray(normales) ? normalizedSumOfTHREE(normales) : normales;
if (testNormal.dot(trNormal) < 0) {
indices.reverse();
}
} else {
normales = trNormal;
if (faceData.inverted) {
normales.negate();
indices.reverse();
}
}
let [a, b, c] = indices;

2
web/app/cad/sketch/sketchModel.js
View file

@ -27,7 +27,7 @@ class SketchPrimitive {
}
isCurve() {
return this.constructor.name != 'Segment';
return this.constructor.name !== 'Segment';
}
toNurbs(plane) {