three-base 1.0.79 → 1.0.80

package/lib/ThreeBase.d.ts

@@ -42,7 +42,7 @@ export default class ThreeBase extends EventDispatcher {
     needRender: boolean;
     stopRender(): void;
     render(): void;
-    renderBindThis: any;
+    private renderBindThis;
     download(fileName?: string): void;
     private _preMesh;
     private _preRT;

package/lib/ThreeBase.ts

@@ -309,7 +309,7 @@ export default class ThreeBase extends EventDispatcher {
         this.dispatchEvent({ type: "afterRender" });
     }
 
-    renderBindThis = this.render.bind(this);
+    private renderBindThis = this.render.bind(this);
 
     // 下载渲染图
     download(fileName: string = "download") {

package/lib/Transition.d.ts

@@ -23,9 +23,7 @@ export default class Transition {
     _: {
         [key: string]: number;
     };
-    onChangeCall?: (josn: {
-        [key: string]: number;
-    }) => void;
+    private onChangeCall;
     run({ timeTemp }: any): this;
     runbindThis: any;
     onChange(onChangeCall: (josn: {

package/lib/Transition.js

@@ -23,7 +23,7 @@ export default class Transition {
     constructor(param = {}, bezier = [0.8, 0, 0.2, 1], duration = 500) {
         this.setDuration(duration);
         this.setBezier(bezier);
-        this.set(param);
+        this.reset(param);
     }
     // 所有的 key 的枚举
     _keys = [];
@@ -57,7 +57,7 @@ export default class Transition {
     }
     // 存储 每个参数的 起始位置 起始时间 终止位置  终止时间
     _ = {};
-    onChangeCall;
+    onChangeCall = (josn) => { };
     // 执行过度动画
     run({ timeTemp }) {
         this.timeTemp = timeTemp;
@@ -133,9 +133,9 @@ export default class Transition {
             // // 执行状态未完成
             // this._isDone = false;
         }
-        threeUtils.removeEventListener("requestAnimationFrame", this.runbindThis);
-        threeUtils.addEventListener("requestAnimationFrame", this.runbindThis);
         if (!this._isDone) {
+            threeUtils.removeEventListener("requestAnimationFrame", this.runbindThis);
+            threeUtils.addEventListener("requestAnimationFrame", this.runbindThis);
             await new Promise(resolve => setTimeout(resolve, this._duration + 50));
         }
         return this;
@@ -143,6 +143,9 @@ export default class Transition {
     // 重置起始和终止位置
     reset(param) {
         for (let key in param) {
+            if (!this._keys.includes(key)) {
+                this._keys.push(key);
+            }
             this._[key + "_start"] = param[key];
             this._[key + "_end"] = param[key];
             this._[key + "_startTime"] = -this._duration;

package/lib/Transition.ts

@@ -36,7 +36,7 @@ export default class Transition {
 
         this.setBezier(bezier);
 
-        this.set(param);
+        this.reset(param);
     }
 
     // 所有的 key 的枚举
@@ -82,7 +82,7 @@ export default class Transition {
     // 存储 每个参数的 起始位置 起始时间 终止位置  终止时间
     _: { [key: string]: number } = {};
 
-    onChangeCall?: (josn: { [key: string]: number }) => void;
+    private onChangeCall = (josn: { [key: string]: number }) => { };
 
     // 执行过度动画
     run({ timeTemp }: any) {
@@ -185,10 +185,9 @@ export default class Transition {
 
         }
 
-        threeUtils.removeEventListener("requestAnimationFrame", this.runbindThis);
-        threeUtils.addEventListener("requestAnimationFrame", this.runbindThis);
-
         if (!this._isDone) {
+            threeUtils.removeEventListener("requestAnimationFrame", this.runbindThis);
+            threeUtils.addEventListener("requestAnimationFrame", this.runbindThis);
             await new Promise(resolve => setTimeout(resolve, this._duration + 50));
         }
 
@@ -198,6 +197,11 @@ export default class Transition {
     reset(param: TParam): this {
 
         for (let key in param) {
+
+            if (!this._keys.includes(key)) {
+                this._keys.push(key);
+            }
+
             this._[key + "_start"] = param[key];
             this._[key + "_end"] = param[key];
             this._[key + "_startTime"] = -this._duration;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "three-base",
-    "version": "1.0.79",
+    "version": "1.0.80",
     "description": "three 3d three-base",
     "repository": {
         "type": "git",