Skip to content

Fix webxr types for TS 5.0 beta #64012

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
sandersn merged 6 commits into from
Jan 23, 2023
Merged

Fix webxr types for TS 5.0 beta #64012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
994290a
Fix webxr types for TS 5.0 beta
sandersn Jan 21, 2023
34c837c
Update minimum TS version for three
sandersn Jan 23, 2023
bda59f0
Update minimum TS version of other dependents
sandersn Jan 23, 2023
57c0142
Merge branch 'master' into fix-webxr-for-TS5.0
sandersn Jan 23, 2023
e71f7c6
Merge branch 'master' into fix-webxr-for-TS5.0
sandersn Jan 23, 2023
c2d52cf
Remove OVR_multiview2 instead of updating it
sandersn Jan 23, 2023
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
2 changes: 1 addition & 1 deletion types/aframe/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// Roberto Ritger <https://github.com/bertoritger>
// Trygve Wastvedt <https://github.com/twastvedt>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// TypeScript Version: 3.6
// TypeScript Version: 4.4

/**
* Extended tests and examples available at https://github.com/devpaul/aframe-experiments.git
Expand Down
2 changes: 1 addition & 1 deletion types/drag-controls/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Project: https://github.com/jbyte/three-dragcontrols#readme
// Definitions by: Matt Hawes <https://github.com/MGHawes>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// Minimum TypeScript Version: 3.6
// Minimum TypeScript Version: 4.4

import * as THREE from 'three';

Expand Down
2 changes: 1 addition & 1 deletion types/three-dat.gui/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Project: https://github.com/SolalDR/three-dat.gui#readme
// Definitions by: hkleungai <https://github.com/hkleungai>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// Minimum TypeScript Version: 3.7
// Minimum TypeScript Version: 4.4

import THREE from 'three';

Expand Down
1 change: 1 addition & 0 deletions types/three-gif-loader/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Project: https://github.com/movableink/three-gif-loader
// Definitions by: Lair Junior <https://github.com/lairjr>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// Minimum TypeScript Version: 4.4

import { LoadingManager } from 'three';
import { GifReader } from 'omggif';
Expand Down
2 changes: 1 addition & 1 deletion types/three-tds-loader/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Definitions by: Konstantin Lukaschenko <https://github.com/KonstantinLukaschenko>
// Stefan Schönsee <https://github.com/sschoensee>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// TypeScript Version: 3.6
// TypeScript Version: 4.4

import * as THREE from 'three';

Expand Down
2 changes: 1 addition & 1 deletion types/three/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Definitions by: Josh Ellis <https://github.com/joshuaellis>
// Nathan Bierema <https://github.com/Methuselah96>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// Minimum TypeScript Version: 4.0
// Minimum TypeScript Version: 4.4

// To update three.js type definition, please make changes to the repository at:
// https://github.com/three-types/three-ts-types.
Expand Down
18 changes: 1 addition & 17 deletions types/webxr/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// Raanan Weber <https://github.com/RaananW>
// Sean T. McBeth <https://github.com/capnmidnight>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// Minimum TypeScript Version: 3.7
// Minimum TypeScript Version: 4.4

// Most of this was hand written and... more or less copied from the following
// sites:
Expand Down Expand Up @@ -1030,22 +1030,6 @@ declare enum XOVR_multiview2 {
FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR = 0x9633,
}

interface OVR_multiview2 {
readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR: number;
readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR: number;
readonly MAX_VIEWS_OVR: number;
readonly FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR: number;

framebufferTextureMultiviewOVR(
target: GLenum,
attachment: GLenum,
texture: WebGLTexture,
level: number,
baseViewIndex: number,
numViews: number,
): WebGLRenderbuffer;
}

declare abstract class OVR_multiview2 implements OVR_multiview2 {}
Copy link
Copy Markdown
Contributor

@Methuselah96 Methuselah96 Jan 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might as well drop this as well since this is also provided by the DOM types:

Suggested change
declare abstract class OVR_multiview2 implements OVR_multiview2 {}

Copy link
Copy Markdown
Contributor

@Methuselah96 Methuselah96 Jan 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or not, not sure why I thought that. Still not sure what it would be used for, but it's not included in the DOM types.

Copy link
Copy Markdown
Contributor Author

@sandersn sandersn Jan 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, it lets you write class extends OVR_multiview2 { } whereas the DOM types don't. I don't know if that's correct but if the types aren't broken I'm going to let an expert fix it instead of me.


// Oculus extensions
Expand Down