From 35443367f3b177ff077bc94fffe7219bd501d927 Mon Sep 17 00:00:00 2001 From: ChenX Date: Thu, 31 May 2018 10:35:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=8C=E5=87=BB=E4=B8=AD?= =?UTF-8?q?=E9=94=AE=E7=BC=A9=E6=94=BE=E5=88=B0=E5=85=A8=E9=83=A8=E7=9A=84?= =?UTF-8?q?=E7=89=B9=E6=80=A7.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/CameraControls.d.ts | 1 + dist/CameraControls.js | 9 +++++++++ dist/CameraControls.js.map | 2 +- dist/RotateUV.d.ts | 4 ++-- dist/RotateUV.js | 4 ++-- dist/RotateUV.js.map | 2 +- dist/Text.js.map | 2 +- src/CameraControls.ts | 11 +++++++++++ 8 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dist/CameraControls.d.ts b/dist/CameraControls.d.ts index bbb8ebe..82731d1 100644 --- a/dist/CameraControls.d.ts +++ b/dist/CameraControls.d.ts @@ -31,6 +31,7 @@ export declare class CameraControls { onTouchEnd: (event: TouchEvent) => void; onTouchMove: (event: TouchEvent) => void; beginRotate(): void; + lastMiddleClickTime: number; onMouseDown: (event: MouseEvent) => void; onMouseUp: (event: MouseEvent) => void; onMouseMove: (event: MouseEvent) => void; diff --git a/dist/CameraControls.js b/dist/CameraControls.js index 1d031f4..a281b13 100644 --- a/dist/CameraControls.js +++ b/dist/CameraControls.js @@ -93,6 +93,8 @@ class CameraControls { this.m_StartClickPoint.copy(this.m_EndClickPoint); this.m_Viewer.m_bNeedUpdate = true; }; + //最后一次按中键的时间 + this.lastMiddleClickTime = 0; //鼠标 this.onMouseDown = (event) => { event.preventDefault(); @@ -109,6 +111,13 @@ class CameraControls { } case KeyEnum_1.MouseKey.Middle: { + let curTime = Date.now(); + let t = curTime - this.lastMiddleClickTime; + this.lastMiddleClickTime = curTime; + if (t < 350) { + this.m_Viewer.ZoomAll(); + return; + } if (this.m_KeyDown.get(KeyEnum_1.KeyBoard.Control)) { this.beginRotate(); } diff --git a/dist/CameraControls.js.map b/dist/CameraControls.js.map index 2c64f2b..e568524 100644 --- a/dist/CameraControls.js.map +++ b/dist/CameraControls.js.map @@ -1 +1 @@ -{"version":3,"file":"CameraControls.js","sourceRoot":"","sources":["../src/CameraControls.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"CameraControls.js","sourceRoot":"","sources":["../src/CameraControls.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/RotateUV.d.ts b/dist/RotateUV.d.ts index 84a6adb..f56ed4e 100644 --- a/dist/RotateUV.d.ts +++ b/dist/RotateUV.d.ts @@ -1,2 +1,2 @@ -import * as THREE from 'three'; -export declare function RotateUVs(geo: THREE.Geometry): void; +import { Geometry } from 'three'; +export declare function RotateUVs(geo: Geometry): void; diff --git a/dist/RotateUV.js b/dist/RotateUV.js index 4783ecc..0c7c996 100644 --- a/dist/RotateUV.js +++ b/dist/RotateUV.js @@ -1,11 +1,11 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const Matrix2_1 = require("./Matrix2"); -const THREE = require("three"); +const three_1 = require("three"); function RotateUVs(geo) { let roMat = new Matrix2_1.Matrix2(); roMat.set(0, -1, 1, 0); - let addV = new THREE.Vector2(1, 0); + let addV = new three_1.Vector2(1, 0); for (let uvs of geo.faceVertexUvs) { for (let uv of uvs) { for (let v of uv) { diff --git a/dist/RotateUV.js.map b/dist/RotateUV.js.map index cc0cfa2..8e331ff 100644 --- a/dist/RotateUV.js.map +++ b/dist/RotateUV.js.map @@ -1 +1 @@ -{"version":3,"file":"RotateUV.js","sourceRoot":"","sources":["../src/RotateUV.ts"],"names":[],"mappings":";;AAAA,uCAAoC;AACpC,+BAA+B;AAG/B,mBAA0B,GAAmB;IAEzC,IAAI,KAAK,GAAG,IAAI,iBAAO,EAAE,CAAC;IAC1B,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EACX,CAAC,EAAE,CAAC,CAAC,CAAC;IAEV,IAAI,IAAI,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAEnC,KAAK,IAAI,GAAG,IAAI,GAAG,CAAC,aAAa,EACjC;QACI,KAAK,IAAI,EAAE,IAAI,GAAG,EAClB;YACI,KAAK,IAAI,CAAC,IAAI,EAAE,EAChB;gBACI,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACrB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aACf;SACJ;KACJ;IACD,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC;AAC7B,CAAC;AApBD,8BAoBC"} \ No newline at end of file +{"version":3,"file":"RotateUV.js","sourceRoot":"","sources":["../src/RotateUV.ts"],"names":[],"mappings":";;AAAA,uCAAoC;AACpC,iCAA0C;AAG1C,mBAA0B,GAAa;IAEnC,IAAI,KAAK,GAAG,IAAI,iBAAO,EAAE,CAAC;IAC1B,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EACX,CAAC,EAAE,CAAC,CAAC,CAAC;IAEV,IAAI,IAAI,GAAG,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAE7B,KAAK,IAAI,GAAG,IAAI,GAAG,CAAC,aAAa,EACjC;QACI,KAAK,IAAI,EAAE,IAAI,GAAG,EAClB;YACI,KAAK,IAAI,CAAC,IAAI,EAAE,EAChB;gBACI,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACrB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aACf;SACJ;KACJ;IACD,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC;AAC7B,CAAC;AApBD,8BAoBC"} \ No newline at end of file diff --git a/dist/Text.js.map b/dist/Text.js.map index d83676d..fafae58 100644 --- a/dist/Text.js.map +++ b/dist/Text.js.map @@ -1 +1 @@ -{"version":3,"file":"Text.js","sourceRoot":"","sources":["../src/Text.ts"],"names":[],"mappings":";;AAAA,iCAAuE;AACvE,iDAA+C;AAC/C,uCAAuC;AAEvC;IAEE,MAAM,CAAC,IAAI;QACT,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,MAAM,CAAC,GAAG,OAAO,CAAC,qDAAqD,CAAC,CAAC;YACzE,IAAI,MAAM,GAAG,IAAI,kBAAU,EAAE,CAAC;YAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAChC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF;AAED,YAAoB,SAAQ,YAAI;IAC9B;;;;;;OAMG;IACH,YAAY,GAAW,EAAE,SAAiB,CAAC;QACzC,IAAI,IAAI,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC;QAEjC,IAAI,MAAM,GAAkB,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAClE,IAAI,QAAQ,GAAG,IAAI,qBAAa,CAAC,MAAM,CAAC,CAAC;QAEzC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QAE9B,KAAK,CAAC,QAAQ,EAAE,4BAAa,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;QAElD,IAAI,MAAM,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,eAAO,EAAE,CAAC,CAAC;QAC3D,IAAI,CAAC,WAAW,CAAC,oBAAU,CAAC,IAAI,eAAO,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;CACF;AArBD,wBAqBC"} \ No newline at end of file +{"version":3,"file":"Text.js","sourceRoot":"","sources":["../src/Text.ts"],"names":[],"mappings":";;AAAA,iCAAuE;AACvE,iDAA+C;AAC/C,uCAAuC;AAEvC;IAGE,MAAM,CAAC,IAAI;QAET,IAAI,CAAC,IAAI,CAAC,OAAO,EACjB;YACE,MAAM,CAAC,GAAG,OAAO,CAAC,qDAAqD,CAAC,CAAC;YACzE,IAAI,MAAM,GAAG,IAAI,kBAAU,EAAE,CAAC;YAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAChC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF;AAED,YAAoB,SAAQ,YAAI;IAE9B;;;;;;OAMG;IACH,YAAY,GAAW,EAAE,SAAiB,CAAC;QAEzC,IAAI,IAAI,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC;QAEjC,IAAI,MAAM,GAAkB,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAClE,IAAI,QAAQ,GAAG,IAAI,qBAAa,CAAC,MAAM,CAAC,CAAC;QAEzC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QAE9B,KAAK,CAAC,QAAQ,EAAE,4BAAa,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;QAElD,IAAI,MAAM,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,eAAO,EAAE,CAAC,CAAC;QAC3D,IAAI,CAAC,WAAW,CAAC,oBAAU,CAAC,IAAI,eAAO,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;CACF;AAvBD,wBAuBC"} \ No newline at end of file diff --git a/src/CameraControls.ts b/src/CameraControls.ts index fc2d455..e01612c 100644 --- a/src/CameraControls.ts +++ b/src/CameraControls.ts @@ -141,6 +141,9 @@ export class CameraControls this.m_State = CameraControlState.Rotate; this.m_Viewer.UpdateLockTarget(); } + + //最后一次按中键的时间 + lastMiddleClickTime = 0; //鼠标 onMouseDown = (event: MouseEvent) => { @@ -161,6 +164,14 @@ export class CameraControls } case MouseKey.Middle: { + let curTime = Date.now(); + let t = curTime - this.lastMiddleClickTime; + this.lastMiddleClickTime = curTime; + if (t < 350) + { + this.m_Viewer.ZoomAll(); + return; + } if (this.m_KeyDown.get(KeyBoard.Control)) { this.beginRotate();