Skip to content

Commit 6d01c05

Browse files
author
zhaokai
committed
Merge branch '10.6.0.10_prerelease' into dev
2 parents 6a38286 + ffef09b commit 6d01c05

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

src/service/PlotBase/Animation/AnimationTypes/PlotBaseAnimation.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @Author: zk
44
* @Date: 2022-03-23 10:02:49
55
* @LastEditors: zk
6-
* @LastEditTime: 2022-06-30 15:52:51
6+
* @LastEditTime: 2022-07-07 10:43:16
77
*/
88
import { AnimationUtil } from '../utils/AnimationUtil';
99
import { easingFunc } from '../utils/Easing';
@@ -283,13 +283,12 @@ export default class PlotBaseAnimation {
283283
return false;
284284
}
285285
resetGeometryStatus() {
286-
this.render(0.000001);
286+
// this.render(0.000001);
287287
}
288288
updateGeometry() {
289289
if (this._updateGeometry) {
290290
this._updateGeometry = false;
291-
this.update();
292-
// this.render(0.00001);
291+
this.update()
293292
}
294293
}
295294
}

src/service/PlotBase/Animation/AnimationTypes/PlotExtendAnimation/PlotGrowAnimation/PlotGrowAnimation.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @Author: zk
44
* @Date: 2022-03-23 10:02:49
55
* @LastEditors: zk
6-
* @LastEditTime: 2022-06-30 12:09:04
6+
* @LastEditTime: 2022-07-07 10:53:14
77
*/
88
import Point from '../../../../../PlotUtilBase/Geometry/Point';
99
import Spline from '../../../../../PlotUtilBase/Geometry/Spline';
@@ -128,6 +128,11 @@ export default class PlotGrowAnimation extends PlotCoordsAnimation {
128128
this._centerAction(rate);
129129
}
130130
}
131+
132+
resetGeometryStatus() {
133+
this.render(0.001);
134+
}
135+
131136
render(rate) {
132137
this._render(rate);
133138
}

src/service/PlotBase/Animation/TimeLine/TimeLine.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @Author: zk
44
* @Date: 2022-03-23 11:53:45
55
* @LastEditors: zk
6-
* @LastEditTime: 2022-07-06 12:05:37
6+
* @LastEditTime: 2022-07-07 11:50:08
77
*/
88
import { Zondy } from '../../../common';
99
import { AnimationReg } from '../AnimationTypes';

0 commit comments

Comments
 (0)