@vived/app 2.8.1 → 2.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -12,4 +12,4 @@ export interface MouseInput {
12
12
  registerController: (controller: MouseController) => void;
13
13
  removeController: (controller: MouseController) => void;
14
14
  }
15
- export declare function makeMouseSceneInput(): MouseInput;
15
+ export declare function makeMouseInput(): MouseInput;
@@ -1,11 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.makeMouseSceneInput = void 0;
3
+ exports.makeMouseInput = void 0;
4
4
  const _1 = require(".");
5
- function makeMouseSceneInput() {
5
+ function makeMouseInput() {
6
6
  return new MouseInputImp();
7
7
  }
8
- exports.makeMouseSceneInput = makeMouseSceneInput;
8
+ exports.makeMouseInput = makeMouseInput;
9
9
  class MouseInputImp {
10
10
  constructor() {
11
11
  this.controllers = [];
@@ -14,11 +14,11 @@ class MouseInputImp {
14
14
  this.setEventElement = (eventElement) => {
15
15
  if (this._eventElement)
16
16
  this.clearInputElement();
17
- eventElement.addEventListener("mousedown", this.onMouseDown);
18
- eventElement.addEventListener("mouseup", this.onMouseUp);
19
- eventElement.addEventListener("mousemove", this.onMouseMove);
20
- eventElement.addEventListener("mouseout", this.onMouseOut);
21
- eventElement.addEventListener("wheel", this.onWheel);
17
+ eventElement.addEventListener("mousedown", this.onMouseDown, false);
18
+ eventElement.addEventListener("mouseup", this.onMouseUp, false);
19
+ eventElement.addEventListener("mousemove", this.onMouseMove, false);
20
+ eventElement.addEventListener("mouseout", this.onMouseOut, false);
21
+ eventElement.addEventListener("wheel", this.onWheel, false);
22
22
  this._eventElement = eventElement;
23
23
  };
24
24
  this.clearInputElement = () => {
@@ -41,7 +41,7 @@ class MouseInputImp {
41
41
  }
42
42
  };
43
43
  this.onMouseDown = (e) => {
44
- const mousePos = new _1.Vector2(e.offsetX, e.offsetY);
44
+ e.preventDefault();
45
45
  this.controllers.forEach((c) => {
46
46
  if (c.onDown) {
47
47
  c.onDown(e);
@@ -50,6 +50,7 @@ class MouseInputImp {
50
50
  this.pressEvent = e;
51
51
  };
52
52
  this.onMouseUp = (e) => {
53
+ e.preventDefault();
53
54
  this.controllers.forEach((c) => {
54
55
  if (c.onUp) {
55
56
  c.onUp(e);
@@ -70,6 +71,7 @@ class MouseInputImp {
70
71
  this.pressEvent = undefined;
71
72
  };
72
73
  this.onMouseMove = (e) => {
74
+ e.preventDefault();
73
75
  this.controllers.forEach((c) => {
74
76
  if (c.onMove) {
75
77
  c.onMove(e);
@@ -85,9 +87,9 @@ class MouseInputImp {
85
87
  }
86
88
  };
87
89
  this.onMouseOut = (e) => {
90
+ e.preventDefault();
88
91
  if (!this.pressEvent)
89
92
  return;
90
- const mousePos = new _1.Vector2(e.offsetX, e.offsetY);
91
93
  this.controllers.forEach((c) => {
92
94
  if (c.onUp) {
93
95
  c.onUp(e);
@@ -96,6 +98,7 @@ class MouseInputImp {
96
98
  this.pressEvent = undefined;
97
99
  };
98
100
  this.onWheel = (e) => {
101
+ e.preventDefault();
99
102
  this.controllers.forEach((c) => {
100
103
  if (c.onWheel) {
101
104
  c.onWheel(e);
@@ -0,0 +1,14 @@
1
+ export interface TouchController {
2
+ onTouchStart?: (e: TouchEvent) => void;
3
+ onTouchMove?: (e: TouchEvent) => void;
4
+ onTouchEnd?: (e: TouchEvent) => void;
5
+ onTouchCancel?: (e: TouchEvent) => void;
6
+ }
7
+ export interface TouchInput {
8
+ eventElement: HTMLElement | undefined;
9
+ setEventElement: (eventElement: HTMLElement) => void;
10
+ clearInputElement: () => void;
11
+ registerController: (controller: TouchController) => void;
12
+ removeController: (controller: TouchController) => void;
13
+ }
14
+ export declare function makeTouchInput(): TouchInput;
@@ -0,0 +1,75 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.makeTouchInput = void 0;
4
+ function makeTouchInput() {
5
+ return new TouchInputImp();
6
+ }
7
+ exports.makeTouchInput = makeTouchInput;
8
+ class TouchInputImp {
9
+ constructor() {
10
+ this.controllers = [];
11
+ this._eventElement = undefined;
12
+ this.setEventElement = (eventElement) => {
13
+ if (this._eventElement)
14
+ this.clearInputElement();
15
+ eventElement.addEventListener("touchstart", this.onTouchStart, false);
16
+ eventElement.addEventListener("touchmove", this.onTouchMove, false);
17
+ eventElement.addEventListener("touchend", this.onTouchEnd, false);
18
+ eventElement.addEventListener("touchcancel", this.onTouchCancel, false);
19
+ this._eventElement = eventElement;
20
+ };
21
+ this.onTouchStart = (e) => {
22
+ e.preventDefault();
23
+ this.controllers.forEach((c) => {
24
+ if (c.onTouchStart) {
25
+ c.onTouchStart(e);
26
+ }
27
+ });
28
+ };
29
+ this.onTouchMove = (e) => {
30
+ e.preventDefault();
31
+ this.controllers.forEach((c) => {
32
+ if (c.onTouchMove) {
33
+ c.onTouchMove(e);
34
+ }
35
+ });
36
+ };
37
+ this.onTouchEnd = (e) => {
38
+ e.preventDefault();
39
+ this.controllers.forEach((c) => {
40
+ if (c.onTouchEnd) {
41
+ c.onTouchEnd(e);
42
+ }
43
+ });
44
+ };
45
+ this.onTouchCancel = (e) => {
46
+ e.preventDefault();
47
+ this.controllers.forEach((c) => {
48
+ if (c.onTouchCancel) {
49
+ c.onTouchCancel(e);
50
+ }
51
+ });
52
+ };
53
+ this.clearInputElement = () => {
54
+ if (!this._eventElement)
55
+ return;
56
+ this._eventElement.removeEventListener("touchstart", this.onTouchStart);
57
+ this._eventElement.removeEventListener("touchmove", this.onTouchMove);
58
+ this._eventElement.removeEventListener("touchend", this.onTouchEnd);
59
+ this._eventElement.removeEventListener("touchcancel", this.onTouchCancel);
60
+ this._eventElement = undefined;
61
+ };
62
+ this.registerController = (controller) => {
63
+ this.controllers.push(controller);
64
+ };
65
+ this.removeController = (controller) => {
66
+ const index = this.controllers.indexOf(controller);
67
+ if (index >= 0) {
68
+ this.controllers.splice(index, 1);
69
+ }
70
+ };
71
+ }
72
+ get eventElement() {
73
+ return this._eventElement;
74
+ }
75
+ }
@@ -18,3 +18,4 @@ export * from "./UndoRedo";
18
18
  export * from "./Vector2";
19
19
  export * from "./Vector3";
20
20
  export * from "./MouseInput";
21
+ export * from "./TouchInput";
@@ -30,3 +30,4 @@ __exportStar(require("./UndoRedo"), exports);
30
30
  __exportStar(require("./Vector2"), exports);
31
31
  __exportStar(require("./Vector3"), exports);
32
32
  __exportStar(require("./MouseInput"), exports);
33
+ __exportStar(require("./TouchInput"), exports);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vived/app",
3
- "version": "2.8.1",
3
+ "version": "2.9.0",
4
4
  "description": "Public package for the VIVED Learning App system",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",