Skip to content

#292 型エラーに対応 #294

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

Merged
ienaga merged 1 commit into from
Jun 17, 2026
Merged

#292 型エラーに対応 #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/core/src/Player/service/PlayerGamepadConnectService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { execute } from "./PlayerGamepadConnectService";
import { $gamepadButtonStates, $gamepadAxisStates } from "../../GamepadState";
import { stage } from "@next2d/display";
import { GamepadEvent } from "@next2d/events";
import { GamepadEvent as Next2DGamepadEvent } from "@next2d/events";
import { describe, expect, it, vi, beforeEach } from "vitest";

describe("PlayerGamepadConnectService.js test", () =>
Expand Down Expand Up @@ -51,7 +51,7 @@ describe("PlayerGamepadConnectService.js test", () =>
let result = "";
let gamepadIndex = -1;
stage.hasEventListener = vi.fn().mockReturnValue(true);
stage.dispatchEvent = vi.fn((event: GamepadEvent) =>
stage.dispatchEvent = vi.fn((event: Next2DGamepadEvent) =>
{
result = event.type;
gamepadIndex = event.gamepadIndex;
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/Player/service/PlayerGamepadConnectService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { $gamepadButtonStates, $gamepadAxisStates } from "../../GamepadState";
import { stage } from "@next2d/display";
import { GamepadEvent } from "@next2d/events";
import { GamepadEvent as Next2DGamepadEvent } from "@next2d/events";

/**
* @description ゲームパッド接続イベントを実行する
Expand All @@ -27,11 +27,11 @@ export const execute = (event: GamepadEvent): void =>
Array.from({ "length": gamepad.axes.length }, () => 0)
);

if (!stage.hasEventListener(GamepadEvent.GAMEPAD_CONNECTED)) {
if (!stage.hasEventListener(Next2DGamepadEvent.GAMEPAD_CONNECTED)) {
return ;
}

const gamepadEvent = new GamepadEvent(GamepadEvent.GAMEPAD_CONNECTED);
const gamepadEvent = new Next2DGamepadEvent(Next2DGamepadEvent.GAMEPAD_CONNECTED);
gamepadEvent.gamepadIndex = gamepad.index;
stage.dispatchEvent(gamepadEvent);
};
4 changes: 2 additions & 2 deletions packages/core/src/Player/service/PlayerGamepadDisconnectService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { execute } from "./PlayerGamepadDisconnectService";
import { $gamepadButtonStates, $gamepadAxisStates } from "../../GamepadState";
import { stage } from "@next2d/display";
import { GamepadEvent } from "@next2d/events";
import { GamepadEvent as Next2DGamepadEvent } from "@next2d/events";
import { describe, expect, it, vi, beforeEach } from "vitest";

describe("PlayerGamepadDisconnectService.js test", () =>
Expand Down Expand Up @@ -57,7 +57,7 @@ describe("PlayerGamepadDisconnectService.js test", () =>
let result = "";
let gamepadIndex = -1;
stage.hasEventListener = vi.fn().mockReturnValue(true);
stage.dispatchEvent = vi.fn((event: GamepadEvent) =>
stage.dispatchEvent = vi.fn((event: Next2DGamepadEvent) =>
{
result = event.type;
gamepadIndex = event.gamepadIndex;
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/Player/service/PlayerGamepadDisconnectService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { $gamepadButtonStates, $gamepadAxisStates } from "../../GamepadState";
import { stage } from "@next2d/display";
import { GamepadEvent } from "@next2d/events";
import { GamepadEvent as Next2DGamepadEvent } from "@next2d/events";

/**
* @description ゲームパッド切断イベントを実行する
Expand All @@ -21,11 +21,11 @@ export const execute = (event: GamepadEvent): void =>
$gamepadButtonStates.delete(gamepad.index);
$gamepadAxisStates.delete(gamepad.index);

if (!stage.hasEventListener(GamepadEvent.GAMEPAD_DISCONNECTED)) {
if (!stage.hasEventListener(Next2DGamepadEvent.GAMEPAD_DISCONNECTED)) {
return ;
}

const gamepadEvent = new GamepadEvent(GamepadEvent.GAMEPAD_DISCONNECTED);
const gamepadEvent = new Next2DGamepadEvent(Next2DGamepadEvent.GAMEPAD_DISCONNECTED);
gamepadEvent.gamepadIndex = gamepad.index;
stage.dispatchEvent(gamepadEvent);
};
Loading