hw 2 done
This commit is contained in:
@@ -57,10 +57,15 @@ const animRouter = (dataForm) => {
|
||||
let path = drawPath(Number(dataForm.pathSelect.value));
|
||||
const svg = d3.select("svg")
|
||||
let pict = drawSmile(svg);
|
||||
const parameters = {
|
||||
sx:[Number(dataForm.sx.value),Number(dataForm.sx_finish.value)],
|
||||
sy:[Number(dataForm.sy.value),Number(dataForm.sy_finish.value)],
|
||||
r:[Number(dataForm.r.value),Number(dataForm.r_finish.value)],
|
||||
};
|
||||
pict.transition()
|
||||
.ease([d3.easeLinear, d3.easeElastic, d3.easeBounce][Number(animTypeSelect.value)])
|
||||
.duration(6000)
|
||||
.attrTween('transform', translateAlong(path.node()));
|
||||
.duration(Number(duration.value))
|
||||
.attrTween('transform', translateAlong(path.node(),parameters));
|
||||
}
|
||||
else {
|
||||
runAnimation(dataForm)
|
||||
@@ -77,7 +82,7 @@ const runAnimation = (dataForm) => {
|
||||
${dataForm.sy.value})
|
||||
rotate(${dataForm.r.value})`)
|
||||
.transition()
|
||||
.duration(6000)
|
||||
.duration(Number(duration.value))
|
||||
.ease([d3.easeLinear, d3.easeElastic, d3.easeBounce][Number(animTypeSelect.value)])
|
||||
.attr("transform", `
|
||||
translate(${dataForm.cx_finish.value},
|
||||
|
||||
Reference in New Issue
Block a user