Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove loosely-typed event listener methods #1145

Merged
merged 7 commits into from
Aug 30, 2024
Merged

Remove loosely-typed event listener methods #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b844fe1
Remove loose event listeners
Methuselah96 Aug 12, 2024
e52e189
Add missing PointerLockControls event map
Methuselah96 Aug 12, 2024
815017d
Fix webxr_vr_handinput_cubes
Methuselah96 Aug 12, 2024
e52adaa
Update unit tests
Methuselah96 Aug 12, 2024
556404f
Simplify
Methuselah96 Aug 12, 2024
dfefb2b
Merge branch 'master' into remove-loose-event-listeners
Methuselah96 Aug 30, 2024
12e8594
Update three.js
Methuselah96 Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions types/three/src/core/EventDispatcher.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ export class EventDispatcher<TEventMap extends {} = {}> {
type: T,
listener: EventListener<TEventMap[T], T, this>,
): void;
addEventListener<T extends string>(type: T, listener: EventListener<{}, T, this>): void;

/**
* Checks if listener is added to an event type.
Expand All @@ -64,7 +63,6 @@ export class EventDispatcher<TEventMap extends {} = {}> {
type: T,
listener: EventListener<TEventMap[T], T, this>,
): boolean;
hasEventListener<T extends string>(type: T, listener: EventListener<{}, T, this>): boolean;

/**
* Removes a listener from an event type.
Expand All @@ -75,7 +73,6 @@ export class EventDispatcher<TEventMap extends {} = {}> {
type: T,
listener: EventListener<TEventMap[T], T, this>,
): void;
removeEventListener<T extends string>(type: T, listener: EventListener<{}, T, this>): void;

/**
* Fire an event type.
Expand Down
30 changes: 13 additions & 17 deletions types/three/test/integration/three-examples/webxr_vr_handinput_cubes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@ import { VRButton } from "three/addons/webxr/VRButton.js";
import { XRControllerModelFactory } from "three/addons/webxr/XRControllerModelFactory.js";
import { XRHandModelFactory } from "three/addons/webxr/XRHandModelFactory.js";

interface Hand extends THREE.Group {
joints: { [key: string]: any };
}

const container = document.createElement("div");
let camera: THREE.PerspectiveCamera;
let scene: THREE.Scene;
let renderer: THREE.WebGLRenderer;
let hand1: Hand;
let hand2: Hand;
let hand1: THREE.XRHandSpace;
let hand2: THREE.XRHandSpace;
let controller1: THREE.Group;
let controller2: THREE.Group;
let controllerGrip1: THREE.Group;
Expand Down Expand Up @@ -105,7 +101,7 @@ function init() {
controllerGrip1.add(controllerModelFactory.createControllerModel(controllerGrip1));
scene.add(controllerGrip1);

hand1 = renderer.xr.getHand(0) as Hand;
hand1 = renderer.xr.getHand(0);
hand1.addEventListener("pinchstart", onPinchStartLeft);
hand1.addEventListener("pinchend", () => {
scaling.active = false;
Expand All @@ -119,7 +115,7 @@ function init() {
controllerGrip2.add(controllerModelFactory.createControllerModel(controllerGrip2));
scene.add(controllerGrip2);

hand2 = renderer.xr.getHand(1) as Hand;
hand2 = renderer.xr.getHand(1);
hand2.addEventListener("pinchstart", onPinchStartRight);
hand2.addEventListener("pinchend", onPinchEndRight);
hand2.add(handModelFactory.createHandModel(hand2));
Expand Down Expand Up @@ -152,11 +148,11 @@ function onWindowResize() {
}

const SphereRadius = 0.05;
function onPinchStartLeft(event: THREE.Event<"pinchstart", Hand>) {
function onPinchStartLeft(event: THREE.Event<"pinchstart", THREE.XRHandSpace>) {
const controller = event.target;

if (grabbing) {
const indexTip = controller.joints["index-finger-tip"];
const indexTip = controller.joints["index-finger-tip"]!;
const sphere = collideObject(indexTip);

if (sphere) {
Expand All @@ -166,7 +162,7 @@ function onPinchStartLeft(event: THREE.Event<"pinchstart", Hand>) {
scaling.active = true;
scaling.object = sphere;
scaling.initialScale = sphere.scale.x;
scaling.initialDistance = indexTip.position.distanceTo(hand2.joints["index-finger-tip"].position);
scaling.initialDistance = indexTip.position.distanceTo(hand2.joints["index-finger-tip"]!.position);
return;
}
}
Expand All @@ -181,7 +177,7 @@ function onPinchStartLeft(event: THREE.Event<"pinchstart", Hand>) {
const spawn = new THREE.Mesh(geometry, material);
spawn.geometry.computeBoundingSphere();

const indexTip = controller.joints["index-finger-tip"];
const indexTip = controller.joints["index-finger-tip"]!;
spawn.position.copy(indexTip.position);
spawn.quaternion.copy(indexTip.quaternion);

Expand All @@ -202,9 +198,9 @@ function collideObject(indexTip: THREE.Group) {
return null;
}

function onPinchStartRight(event: THREE.Event<"pinchstart", Hand>) {
function onPinchStartRight(event: THREE.Event<"pinchstart", THREE.XRHandSpace>) {
const controller = event.target;
const indexTip = controller.joints["index-finger-tip"];
const indexTip = controller.joints["index-finger-tip"]!;
const object = collideObject(indexTip);
if (object) {
grabbing = true;
Expand All @@ -214,7 +210,7 @@ function onPinchStartRight(event: THREE.Event<"pinchstart", Hand>) {
}
}

function onPinchEndRight(event: THREE.Event<"pinchend", Hand>) {
function onPinchEndRight(event: THREE.Event<"pinchend", THREE.XRHandSpace>) {
const controller = event.target;

if (controller.userData.selected !== undefined) {
Expand All @@ -237,8 +233,8 @@ function animate() {

function render() {
if (scaling.active && scaling.object) {
const indexTip1Pos = hand1.joints["index-finger-tip"].position;
const indexTip2Pos = hand2.joints["index-finger-tip"].position;
const indexTip1Pos = hand1.joints["index-finger-tip"]!.position;
const indexTip2Pos = hand2.joints["index-finger-tip"]!.position;
const distance = indexTip1Pos.distanceTo(indexTip2Pos);
const newScale = scaling.initialScale + distance / scaling.initialDistance - 1;
scaling.object.scale.setScalar(newScale);
Expand Down
23 changes: 2 additions & 21 deletions types/three/test/unit/src/core/EventDispatcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,27 +42,8 @@ eveDisForTestEvent.addEventListener("bar", e => {
e.foo;
});

// call addEventListener with an unknown event. The typing should allow you listen any unknown event.
eveDisForTestEvent.addEventListener("baz", e => {
e.type; // $ExpectType "baz"
e.target; // $ExpectType EventDispatcher<TestEvent>
// @ts-expect-error
e.bar;
// @ts-expect-error
e.foo;
// @ts-expect-error
e.bar();
});
eveDisForTestEvent.addEventListener("NotRegistered", e => {
e.type; // $ExpectType "NotRegistered"
e.target; // $ExpectType EventDispatcher<TestEvent>
// @ts-expect-error
e.bar;
// @ts-expect-error
e.foo;
// @ts-expect-error
e.bar();
});
// @ts-expect-error
eveDisForTestEvent.addEventListener("baz", e => {});

eveDisForTestEvent.dispatchEvent({ type: "foo", foo: 42 });
eveDisForTestEvent.dispatchEvent({ type: "bar", bar: "42" });
Expand Down
Loading