diagonals working except for start/end times
This commit is contained in:
@@ -87,7 +87,7 @@ watchEffect(()=>{
|
||||
|
||||
|
||||
function setEndpoints(a, b) {
|
||||
console.log('rb setting endpoints', devectorize(a), devectorize(b))
|
||||
// console.log('rb setting endpoints', devectorize(a), devectorize(b))
|
||||
endpoints.value = [devectorize(a), devectorize(b)]
|
||||
}
|
||||
|
||||
@@ -107,13 +107,13 @@ const rungs = computed({
|
||||
r = Number(r)
|
||||
const prevR = Number(props.builder.rungs)
|
||||
props.builder.rungs = r
|
||||
console.log('set rungs', prevR, r, a, b)
|
||||
// console.log('set rungs', prevR, r, a, b)
|
||||
if ( r > 0 && vectorIsNull(b) ) {
|
||||
// convert single shape to a range
|
||||
if (props.mode===0) {
|
||||
const width = vectorize(props.stdWidth)
|
||||
const mid = vectorize(a)
|
||||
console.log('stdWidth', width)
|
||||
// console.log('stdWidth', width)
|
||||
const halfWidth = vectorDiv(width,2);
|
||||
a = vectorAdd(mid, vectorNeg(halfWidth) )
|
||||
b = vectorAdd(mid, halfWidth)
|
||||
@@ -149,7 +149,6 @@ const values = computed(()=>{
|
||||
let [a, b] = endpoints.value
|
||||
a = vectorize(a)
|
||||
b = vectorize(b)
|
||||
console.log('computing values', a, b)
|
||||
const r = props.builder.rungs
|
||||
let result
|
||||
if ( !r || vectorIsNull(a) )
|
||||
@@ -170,14 +169,20 @@ const values = computed(()=>{
|
||||
}
|
||||
}
|
||||
props.setValues(result)
|
||||
console.log('values', result)
|
||||
// console.log('values', result)
|
||||
return result;
|
||||
})
|
||||
|
||||
|
||||
const weights = computed(() => {
|
||||
// const skew = props.flip ? -props.builder.skew : props.builder.skew
|
||||
const ws = linearWeights(props.builder.rungs, -props.builder.skew)
|
||||
const most = 0.998
|
||||
let skew = -props.builder.skew
|
||||
if (skew <= -1)
|
||||
skew = -most
|
||||
else if (skew >= 1)
|
||||
skew = most
|
||||
const ws = linearWeights(props.builder.rungs, skew)
|
||||
if (props.setWeights)
|
||||
props.setWeights(ws)
|
||||
return ws
|
||||
@@ -239,7 +244,7 @@ function translateOnModel(shape) {
|
||||
const prev = getModelValue(oldModel)
|
||||
const cur = vectorize(getModelValue(this.model))
|
||||
const delta = vectorSub(cur, prev)
|
||||
console.log('delta', shape.id, prev, cur, delta)
|
||||
// console.log('delta', shape.id, prev, cur, delta)
|
||||
let [a, b] = endpoints.value
|
||||
a = vectorize(a)
|
||||
if (!vectorIsZero(delta)) {
|
||||
@@ -252,7 +257,6 @@ function translateOnModel(shape) {
|
||||
}
|
||||
|
||||
function setModelColor(model) {
|
||||
console.log('setmc', color.value, model.color)
|
||||
if (model.color !== undefined && model.color !== color.value)
|
||||
color.value = model.color
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user