VSinerva/freesewing
1
0
Fork 0
Code Activity

fix(plugin-gore): goreNumber is now gores

Browse source
This commit is contained in:
Joost De Cock 2022-01-18 10:29:40 +01:00
parent 5cebae628d
commit d0d58298f2
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
packages/plugin-gore/src/index.js
View file

@ -1,5 +1,8 @@
import { name, version } from '../package.json' import { name, version } from '../package.json'
const deprecated = "The 'goreNumber' property for the gore macro is deprecated "
+ "and will be removed in a future version. Please use 'gores' instead"
export default { export default {
name: name, name: name,
version: version, version: version,
@ -9,17 +12,19 @@ export default {
macros: { macros: {
gore: function (so) { gore: function (so) {
let from = so.from let from = so.from
let goreNumber = so.goreNumber //number of gores for the complete sphere // TODO: Drop so.goreNumber in v3, it's deprecated
let gores = so.gores || so.goreNumber //number of gores for the complete sphere
if (so.goreNumber) console.log(deprecated)
let radius = so.radius //radius of the sphere let radius = so.radius //radius of the sphere
let prefix = so.prefix let prefix = so.prefix
let extraLength = so.extraLength //the length of the straight section after a complete semisphere let extraLength = so.extraLength //the length of the straight section after a complete semisphere
this.points[prefix + 'p1'] = from.shift(0, (radius * Math.PI) / 2 + extraLength) this.points[prefix + 'p1'] = from.shift(0, (radius * Math.PI) / 2 + extraLength)
this.points[prefix + 'Cp1'] = this.points[prefix + 'p1'].shift( this.points[prefix + 'Cp1'] = this.points[prefix + 'p1'].shift(
180 - 180 / goreNumber, 180 - 180 / gores,
radius / 2 / Math.cos(Math.PI / goreNumber) radius / 2 / Math.cos(Math.PI / gores)
) )
this.points[prefix + 'p3'] = from.shift(90, (radius * Math.PI) / goreNumber) this.points[prefix + 'p3'] = from.shift(90, (radius * Math.PI) / gores)
this.points[prefix + 'p2'] = this.points[prefix + 'p3'].shift(0, extraLength) this.points[prefix + 'p2'] = this.points[prefix + 'p3'].shift(0, extraLength)
this.points[prefix + 'Cp2'] = this.points[prefix + 'p2'].shift( this.points[prefix + 'Cp2'] = this.points[prefix + 'p2'].shift(
0, 0,