From 9c49abc7904db2d6680c20d96c4eaab34a4facff Mon Sep 17 00:00:00 2001 From: ybt <651708784@qq.com> Date: Tue, 11 Jul 2023 00:26:00 +0800 Subject: [PATCH 1/5] fix: ObjectLoader.d.ts --- types/three/src/loaders/ObjectLoader.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/types/three/src/loaders/ObjectLoader.d.ts b/types/three/src/loaders/ObjectLoader.d.ts index 646d12e25..f75cf4758 100644 --- a/types/three/src/loaders/ObjectLoader.d.ts +++ b/types/three/src/loaders/ObjectLoader.d.ts @@ -27,11 +27,11 @@ export class ObjectLoader extends Loader { // tslint:disable-next-line:no-unnecessary-generics parseAsync(json: any): Promise; parseGeometries(json: any): { [key: string]: InstancedBufferGeometry | BufferGeometry }; // Array of BufferGeometry or Geometry or Geometry2. - parseMaterials(json: any, textures: { [key: string]: Texture }): Material[]; // Array of Classes that inherits from Matrial. + parseMaterials(json: any, textures: { [key: string]: Texture }): { [key: string]: Material }; // Array of Classes that inherits from Matrial. parseAnimations(json: any): AnimationClip[]; parseImages(json: any, onLoad?: () => void): { [key: string]: Source }; parseImagesAsync(json: any): Promise<{ [key: string]: Source }>; - parseTextures(json: any, images: any): Texture[]; + parseTextures(json: any, images: { [key: string]: Source }): { [key: string]: Texture }; parseObject( data: any, geometries: any[], From 790d7dc37339d6c6f3e3b5a1035609d789a4b071 Mon Sep 17 00:00:00 2001 From: ybt <651708784@qq.com> Date: Tue, 11 Jul 2023 01:30:43 +0800 Subject: [PATCH 2/5] Remove @ts-expect-error comments --- .all-contributorsrc | 780 +----------------- README.md | 5 +- .../jsm/nodes/loaders/NodeObjectLoader.d.ts | 1 - 3 files changed, 4 insertions(+), 782 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 19c0251c4..417b7b537 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1,779 +1 @@ -{ - "projectName": "three-ts-types", - "projectOwner": "three-types", - "repoType": "github", - "repoHost": "https://github.com", - "files": [ - "README.md" - ], - "imageSize": 100, - "commit": false, - "commitConvention": "none", - "contributors": [ - { - "login": "joshuaellis", - "name": "Josh", - "avatar_url": "https://avatars.githubusercontent.com/u/37798644?v=4", - "profile": "https://github.com/joshuaellis", - "contributions": [ - "question", - "bug", - "code", - "doc", - "ideas", - "maintenance", - "review", - "test" - ] - }, - { - "login": "Methuselah96", - "name": "Nathan Bierema", - "avatar_url": "https://avatars.githubusercontent.com/u/693755?v=4", - "profile": "https://github.com/Methuselah96", - "contributions": [ - "question", - "bug", - "code", - "doc", - "ideas", - "infra", - "maintenance", - "review", - "test" - ] - }, - { - "login": "Mugen87", - "name": "Michael Herzog", - "avatar_url": "https://avatars.githubusercontent.com/u/12612165?v=4", - "profile": "https://human-interactive.org", - "contributions": [ - "code" - ] - }, - { - "login": "CodyJasonBennett", - "name": "Cody Bennett", - "avatar_url": "https://avatars.githubusercontent.com/u/23324155?v=4", - "profile": "https://github.com/CodyJasonBennett", - "contributions": [ - "code" - ] - }, - { - "login": "0b5vr", - "name": "0b5vr", - "avatar_url": "https://avatars.githubusercontent.com/u/7824814?v=4", - "profile": "http://0b5vr.github.io/", - "contributions": [ - "code", - "test", - "maintenance", - "review", - "bug" - ] - }, - { - "login": "marquizzo", - "name": "Marquizzo", - "avatar_url": "https://avatars.githubusercontent.com/u/7864858?v=4", - "profile": "https://stackoverflow.com/users/2608515/marquizzo", - "contributions": [ - "code" - ] - }, - { - "login": "khum08", - "name": "Yuanzk", - "avatar_url": "https://avatars.githubusercontent.com/u/32336026?v=4", - "profile": "https://github.com/khum08", - "contributions": [ - "code" - ] - }, - { - "login": "elisee", - "name": "Elisée Maurer", - "avatar_url": "https://avatars.githubusercontent.com/u/446986?v=4", - "profile": "http://sparklinlabs.com/", - "contributions": [ - "code" - ] - }, - { - "login": "soadzoor", - "name": "soadzoor", - "avatar_url": "https://avatars.githubusercontent.com/u/10392261?v=4", - "profile": "https://github.com/soadzoor", - "contributions": [ - "code" - ] - }, - { - "login": "rinsuki", - "name": "rinsuki", - "avatar_url": "https://avatars.githubusercontent.com/u/6533808?v=4", - "profile": "https://github.com/rinsuki", - "contributions": [ - "code" - ] - }, - { - "login": "efokschaner", - "name": "efokschaner", - "avatar_url": "https://avatars.githubusercontent.com/u/1409112?v=4", - "profile": "https://github.com/efokschaner", - "contributions": [ - "code" - ] - }, - { - "login": "Jhuni0123", - "name": "Jonghun Park", - "avatar_url": "https://avatars.githubusercontent.com/u/16764073?v=4", - "profile": "https://github.com/Jhuni0123", - "contributions": [ - "code" - ] - }, - { - "login": "sjpt", - "name": "sjpt", - "avatar_url": "https://avatars.githubusercontent.com/u/4954988?v=4", - "profile": "https://github.com/sjpt", - "contributions": [ - "code" - ] - }, - { - "login": "Michsior14", - "name": "Michał Mrozek", - "avatar_url": "https://avatars.githubusercontent.com/u/1410035?v=4", - "profile": "https://github.com/Michsior14", - "contributions": [ - "code" - ] - }, - { - "login": "puxiao", - "name": "puxiao", - "avatar_url": "https://avatars.githubusercontent.com/u/3401635?v=4", - "profile": "https://puxiao.com", - "contributions": [ - "code" - ] - }, - { - "login": "ycw", - "name": "ycw", - "avatar_url": "https://avatars.githubusercontent.com/u/1063018?v=4", - "profile": "https://github.com/ycw", - "contributions": [ - "code" - ] - }, - { - "login": "Jazcash", - "name": "Jazcash", - "avatar_url": "https://avatars.githubusercontent.com/u/1434248?v=4", - "profile": "https://github.com/Jazcash", - "contributions": [ - "code" - ] - }, - { - "login": "bjornstar", - "name": "Bjorn Stromberg", - "avatar_url": "https://avatars.githubusercontent.com/u/20630?v=4", - "profile": "https://bjornstar.com/", - "contributions": [ - "code" - ] - }, - { - "login": "happy-turtle", - "name": "HappyTurtle", - "avatar_url": "https://avatars.githubusercontent.com/u/18415215?v=4", - "profile": "https://github.com/happy-turtle", - "contributions": [ - "code" - ] - }, - { - "login": "shuta13", - "name": "Shuta Hirai", - "avatar_url": "https://avatars.githubusercontent.com/u/38882716?v=4", - "profile": "https://studio.did0es.me/", - "contributions": [ - "code" - ] - }, - { - "login": "servinlp", - "name": "Servin Nissen", - "avatar_url": "https://avatars.githubusercontent.com/u/7222029?v=4", - "profile": "https://github.com/servinlp", - "contributions": [ - "code" - ] - }, - { - "login": "benpigchu", - "name": "Ben \"Pig\" Chu", - "avatar_url": "https://avatars.githubusercontent.com/u/9023067?v=4", - "profile": "https://benpigchu.com/", - "contributions": [ - "code" - ] - }, - { - "login": "woo-cie", - "name": "Makoto Yamada", - "avatar_url": "https://avatars.githubusercontent.com/u/24642989?v=4", - "profile": "https://github.com/woo-cie", - "contributions": [ - "code" - ] - }, - { - "login": "schwyzl", - "name": "schwyzl", - "avatar_url": "https://avatars.githubusercontent.com/u/1556979?v=4", - "profile": "https://github.com/schwyzl", - "contributions": [ - "code" - ] - }, - { - "login": "Degubi", - "name": "Degubi", - "avatar_url": "https://avatars.githubusercontent.com/u/13366932?v=4", - "profile": "https://github.com/Degubi", - "contributions": [ - "code" - ] - }, - { - "login": "WCWedin", - "name": "Ibby Wedin", - "avatar_url": "https://avatars.githubusercontent.com/u/110730?v=4", - "profile": "https://github.com/WCWedin", - "contributions": [ - "code" - ] - }, - { - "login": "dbuck", - "name": "dbuck", - "avatar_url": "https://avatars.githubusercontent.com/u/983807?v=4", - "profile": "https://github.com/dbuck", - "contributions": [ - "code" - ] - }, - { - "login": "robertlong", - "name": "Robert Long", - "avatar_url": "https://avatars.githubusercontent.com/u/1753624?v=4", - "profile": "https://github.com/robertlong", - "contributions": [ - "code" - ] - }, - { - "login": "XertroV", - "name": "Max Kaye", - "avatar_url": "https://avatars.githubusercontent.com/u/1046448?v=4", - "profile": "https://xk.io/", - "contributions": [ - "doc" - ] - }, - { - "login": "LauferAlex", - "name": "Alejandro Laufer", - "avatar_url": "https://avatars.githubusercontent.com/u/86115165?v=4", - "profile": "https://github.com/LauferAlex", - "contributions": [ - "bug", - "code" - ] - }, - { - "login": "gsimone", - "name": "Gianmarco", - "avatar_url": "https://avatars.githubusercontent.com/u/1862172?v=4", - "profile": "https://twitter.com/ggsimm", - "contributions": [ - "code" - ] - }, - { - "login": "DavidPeicho", - "name": "David Peicho", - "avatar_url": "https://avatars.githubusercontent.com/u/8783766?v=4", - "profile": "https://davidpeicho.github.io/", - "contributions": [ - "code" - ] - }, - { - "login": "trusktr", - "name": "Joe Pea", - "avatar_url": "https://avatars.githubusercontent.com/u/297678?v=4", - "profile": "https://github.com/trusktr", - "contributions": [ - "code" - ] - }, - { - "login": "subhankar-trisetra", - "name": "Subhankar Pal", - "avatar_url": "https://avatars.githubusercontent.com/u/98544661?v=4", - "profile": "https://subho57.github.io", - "contributions": [ - "code" - ] - }, - { - "login": "capnmidnight", - "name": "Sean T. McBeth", - "avatar_url": "https://avatars.githubusercontent.com/u/298046?v=4", - "profile": "http://www.seanmcbeth.com/", - "contributions": [ - "code" - ] - }, - { - "login": "atulrnt", - "name": "Arthur LAURENT", - "avatar_url": "https://avatars.githubusercontent.com/u/894203?v=4", - "profile": "https://github.com/atulrnt", - "contributions": [ - "code" - ] - }, - { - "login": "serenayl", - "name": "Serena Li", - "avatar_url": "https://avatars.githubusercontent.com/u/12814119?v=4", - "profile": "https://github.com/serenayl", - "contributions": [ - "code" - ] - }, - { - "login": "cosformula", - "name": "cosformula", - "avatar_url": "https://avatars.githubusercontent.com/u/18232501?v=4", - "profile": "https://github.com/cosformula", - "contributions": [ - "code" - ] - }, - { - "login": "miko3k", - "name": "Peter Hanula", - "avatar_url": "https://avatars.githubusercontent.com/u/8658482?v=4", - "profile": "https://github.com/miko3k", - "contributions": [ - "code" - ] - }, - { - "login": "MysteryBlokHed", - "name": "Adam Thompson-Sharpe", - "avatar_url": "https://avatars.githubusercontent.com/u/13910387?v=4", - "profile": "https://github.com/MysteryBlokHed", - "contributions": [ - "code" - ] - }, - { - "login": "noname0310", - "name": "noname", - "avatar_url": "https://avatars.githubusercontent.com/u/48761044?v=4", - "profile": "https://www.youtube.com/c/noname0310", - "contributions": [ - "code" - ] - }, - { - "login": "grschafer", - "name": "Greg Schafer", - "avatar_url": "https://avatars.githubusercontent.com/u/694225?v=4", - "profile": "https://github.com/grschafer", - "contributions": [ - "code" - ] - }, - { - "login": "SuperSodaSea", - "name": "SuperSodaSea", - "avatar_url": "https://avatars.githubusercontent.com/u/8724868?v=4", - "profile": "https://github.com/SuperSodaSea", - "contributions": [ - "code" - ] - }, - { - "login": "mattrossman", - "name": "Matt Rossman", - "avatar_url": "https://avatars.githubusercontent.com/u/22670878?v=4", - "profile": "https://github.com/mattrossman", - "contributions": [ - "code" - ] - }, - { - "login": "alexpineda", - "name": "Alex Pineda", - "avatar_url": "https://avatars.githubusercontent.com/u/586716?v=4", - "profile": "https://github.com/imbateam-gg/titan-reactor", - "contributions": [ - "code" - ] - }, - { - "login": "Draichi", - "name": "Lucas", - "avatar_url": "https://avatars.githubusercontent.com/u/19378148?v=4", - "profile": "https://draichiboard.vercel.app/", - "contributions": [ - "doc" - ] - }, - { - "login": "mz8i", - "name": "Maciej Ziarkowski", - "avatar_url": "https://avatars.githubusercontent.com/u/36160844?v=4", - "profile": "https://github.com/mz8i", - "contributions": [ - "code" - ] - }, - { - "login": "Suprhimp", - "name": "Suprhimp", - "avatar_url": "https://avatars.githubusercontent.com/u/73486185?v=4", - "profile": "https://github.com/Suprhimp", - "contributions": [ - "code" - ] - }, - { - "login": "Trinovantes", - "name": "Stephen Li", - "avatar_url": "https://avatars.githubusercontent.com/u/458691?v=4", - "profile": "https://www.stephenli.ca/", - "contributions": [ - "code" - ] - }, - { - "login": "autonomobil", - "name": "Moritz Cremer", - "avatar_url": "https://avatars.githubusercontent.com/u/31781343?s=96&v=4", - "profile": "https://github.com/autonomobil", - "contributions": [ - "code" - ] - }, - { - "login": "LuchoTurtle", - "name": "LuchoTurtle", - "avatar_url": "https://avatars.githubusercontent.com/u/17494745?v=4", - "profile": "https://github.com/LuchoTurtle", - "contributions": [ - "code" - ] - }, - { - "login": "marwie", - "name": "Marcel Wiessler", - "avatar_url": "https://avatars.githubusercontent.com/u/5083203?v=4", - "profile": "https://www.needle.tools", - "contributions": [ - "code" - ] - }, - { - "login": "JoshStern", - "name": "Josh Stern", - "avatar_url": "https://avatars.githubusercontent.com/u/10948202?v=4", - "profile": "https://github.com/JoshStern", - "contributions": [ - "code" - ] - }, - { - "login": "rotu", - "name": "Dan Rose", - "avatar_url": "https://avatars.githubusercontent.com/u/119948?v=4", - "profile": "https://github.com/rotu", - "contributions": [ - "code" - ] - }, - { - "login": "gegoggigog", - "name": "Dan Dolonius", - "avatar_url": "https://avatars.githubusercontent.com/u/1716001?v=4", - "profile": "https://github.com/gegoggigog", - "contributions": [ - "code" - ] - }, - { - "login": "Hoodgail", - "name": "Benjamin", - "avatar_url": "https://avatars.githubusercontent.com/u/45743294?v=4", - "profile": "https://hoodgail.com/", - "contributions": [ - "code" - ] - }, - { - "login": "agviegas", - "name": "Antonio González Viegas", - "avatar_url": "https://avatars.githubusercontent.com/u/56475338?v=4", - "profile": "https://www.linkedin.com/in/antonio-gonz%C3%A1lez-viegas-8b2326151/", - "contributions": [ - "code" - ] - }, - { - "login": "donmccurdy", - "name": "Don McCurdy", - "avatar_url": "https://avatars.githubusercontent.com/u/1848368?v=4", - "profile": "https://www.donmccurdy.com/", - "contributions": [ - "code" - ] - }, - { - "login": "xawill", - "name": "Xavier Willemin", - "avatar_url": "https://avatars.githubusercontent.com/u/2658206?v=4", - "profile": "https://github.com/xawill", - "contributions": [ - "code" - ] - }, - { - "login": "r00ster91", - "name": "zooster", - "avatar_url": "https://avatars.githubusercontent.com/u/35064754?v=4", - "profile": "https://github.com/r00ster91", - "contributions": [ - "code" - ] - }, - { - "login": "andersonleite", - "name": "Anderson Leite", - "avatar_url": "https://avatars.githubusercontent.com/u/52427?v=4", - "profile": "https://github.com/andersonleite", - "contributions": [ - "code" - ] - }, - { - "login": "frading", - "name": "Guillaume Fradin", - "avatar_url": "https://avatars.githubusercontent.com/u/59701?v=4", - "profile": "https://polygonjs.com/", - "contributions": [ - "code" - ] - }, - { - "login": "Heaust-ops", - "name": "Heaust Azure", - "avatar_url": "https://avatars.githubusercontent.com/u/54670936?v=4", - "profile": "https://github.com/Heaust-ops", - "contributions": [ - "code" - ] - }, - { - "login": "Gallahron", - "name": "Joe Tipping", - "avatar_url": "https://avatars.githubusercontent.com/u/39060404?v=4", - "profile": "http://www.joemo.co.uk/", - "contributions": [ - "code" - ] - }, - { - "login": "lgarron", - "name": "Lucas Garron", - "avatar_url": "https://avatars.githubusercontent.com/u/248078?v=4", - "profile": "https://garron.net/", - "contributions": [ - "code" - ] - }, - { - "login": "maccesch", - "name": "Marc-Stefan Cassola", - "avatar_url": "https://avatars.githubusercontent.com/u/380881?v=4", - "profile": "https://github.com/maccesch", - "contributions": [ - "code" - ] - }, - { - "login": "peterblazejewicz", - "name": "Piotr Błażejewicz (Peter Blazejewicz)", - "avatar_url": "https://avatars.githubusercontent.com/u/14539?v=4", - "profile": "http://www.linkedin.com/in/peterblazejewicz", - "contributions": [ - "code" - ] - }, - { - "login": "Vikontte", - "name": "Victoria Shadrina", - "avatar_url": "https://avatars.githubusercontent.com/u/18411533?v=4", - "profile": "https://github.com/Vikontte", - "contributions": [ - "code" - ] - }, - { - "login": "willstott101", - "name": "Will Stott", - "avatar_url": "https://avatars.githubusercontent.com/u/335152?v=4", - "profile": "https://github.com/willstott101", - "contributions": [ - "code" - ] - }, - { - "login": "demike", - "name": "demike", - "avatar_url": "https://avatars.githubusercontent.com/u/1626922?v=4", - "profile": "https://github.com/demike", - "contributions": [ - "code" - ] - }, - { - "login": "saitonakamura", - "name": "Michael サイトー 中村 Bashurov", - "avatar_url": "https://avatars.githubusercontent.com/u/1552189?v=4", - "profile": "https://github.com/saitonakamura", - "contributions": [ - "code" - ] - }, - { - "login": "jackbonaguro", - "name": "Jack Bonaguro", - "avatar_url": "https://avatars.githubusercontent.com/u/15988128?v=4", - "profile": "https://github.com/jackbonaguro", - "contributions": [ - "code" - ] - }, - { - "login": "rafaelsc", - "name": "Rafael Sliveira Cordeiro", - "avatar_url": "https://avatars.githubusercontent.com/u/502282?v=4", - "profile": "https://github.com/rafaelsc", - "contributions": [ - "code", - "doc" - ] - }, - { - "login": "HEOJUNFO", - "name": "HEOJUNFO", - "avatar_url": "https://avatars.githubusercontent.com/u/100739943?v=4", - "profile": "https://github.com/HEOJUNFO", - "contributions": [ - "code" - ] - }, - { - "login": "Oletus", - "name": "Olli Etuaho", - "avatar_url": "https://avatars.githubusercontent.com/u/453050?v=4", - "profile": "http://www.oletus.fi/", - "contributions": [ - "code" - ] - }, - { - "login": "k2d222", - "name": "Mathis Brossier", - "avatar_url": "https://avatars.githubusercontent.com/u/16296136?v=4", - "profile": "https://github.com/k2d222", - "contributions": [ - "code" - ] - }, - { - "login": "oetherington", - "name": "Ollie Etherington", - "avatar_url": "https://avatars.githubusercontent.com/u/5075628?v=4", - "profile": "https://github.com/oetherington", - "contributions": [ - "code", - "bug" - ] - }, - { - "login": "Mik-pe", - "name": "Mikael Pettersson", - "avatar_url": "https://avatars.githubusercontent.com/u/5653426?v=4", - "profile": "https://github.com/Mik-pe", - "contributions": [ - "code" - ] - }, - { - "login": "magnostherobot", - "name": "Tom Harley", - "avatar_url": "https://avatars.githubusercontent.com/u/24718981?v=4", - "profile": "https://github.com/magnostherobot", - "contributions": [ - "code" - ] - }, - { - "login": "OndrejSpanel", - "name": "Ondřej Španěl", - "avatar_url": "https://avatars.githubusercontent.com/u/6927223?v=4", - "profile": "https://github.com/OndrejSpanel", - "contributions": [ - "bug", - "code", - "doc", - "maintenance" - ] - }, - { - "login": "Yonet", - "name": "Yönet", - "avatar_url": "https://avatars.githubusercontent.com/u/3523671?v=4", - "profile": "https://github.com/Yonet", - "contributions": [ - "code" - ] - }, - { - "login": "ericbroberic", - "name": "Eric Benn", - "avatar_url": "https://avatars.githubusercontent.com/u/9359928?v=4", - "profile": "https://github.com/ericbroberic", - "contributions": [ - "code" - ] - } - ], - "skipCi": true, - "contributorsPerLine": 7 -} +undefined diff --git a/README.md b/README.md index 51891df26..c7ca53647 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d Michał Mrozek
Michał Mrozek

💻 - puxiao
puxiao

💻 + puxiao
puxiao

💻 ycw
ycw

💻 Jazcash
Jazcash

💻 Bjorn Stromberg
Bjorn Stromberg

💻 @@ -140,10 +140,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d Mikael Pettersson
Mikael Pettersson

💻 - Tom Harley
Tom Harley

💻 + Tom Harley
Tom Harley

💻 Ondřej Španěl
Ondřej Španěl

🐛 💻 📖 🚧 Yönet
Yönet

💻 Eric Benn
Eric Benn

💻 + Botao Yang
Botao Yang

💻 diff --git a/types/three/examples/jsm/nodes/loaders/NodeObjectLoader.d.ts b/types/three/examples/jsm/nodes/loaders/NodeObjectLoader.d.ts index 9492861af..117be3dcf 100644 --- a/types/three/examples/jsm/nodes/loaders/NodeObjectLoader.d.ts +++ b/types/three/examples/jsm/nodes/loaders/NodeObjectLoader.d.ts @@ -6,6 +6,5 @@ export default class NodeObjectLoader extends ObjectLoader { parseNodes(json: AnyJson, textures: { [key: string]: Texture }): NodeLoaderResult; // tslint:disable-next-line:comment-format - //@ts-expect-error parseMaterials(json: AnyJson, textures: { [key: string]: Texture }): { [key: string]: Material }; } From 6263f17f6ca3f8119d8ec58b2aca27a0028493a6 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Wed, 12 Jul 2023 21:09:42 -0400 Subject: [PATCH 3/5] Remove comment --- types/three/examples/jsm/nodes/loaders/NodeObjectLoader.d.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/types/three/examples/jsm/nodes/loaders/NodeObjectLoader.d.ts b/types/three/examples/jsm/nodes/loaders/NodeObjectLoader.d.ts index 117be3dcf..807f14613 100644 --- a/types/three/examples/jsm/nodes/loaders/NodeObjectLoader.d.ts +++ b/types/three/examples/jsm/nodes/loaders/NodeObjectLoader.d.ts @@ -5,6 +5,5 @@ import { AnyJson } from '../core/constants.js'; export default class NodeObjectLoader extends ObjectLoader { parseNodes(json: AnyJson, textures: { [key: string]: Texture }): NodeLoaderResult; - // tslint:disable-next-line:comment-format parseMaterials(json: AnyJson, textures: { [key: string]: Texture }): { [key: string]: Material }; } From 83759b2c0fb86518f556f2b8df5db8c51502a4e6 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Wed, 12 Jul 2023 21:11:16 -0400 Subject: [PATCH 4/5] Update --- .all-contributorsrc | 789 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 788 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 417b7b537..e6056c4aa 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1 +1,788 @@ -undefined +{ + "projectName": "three-ts-types", + "projectOwner": "three-types", + "repoType": "github", + "repoHost": "https://github.com", + "files": [ + "README.md" + ], + "imageSize": 100, + "commit": false, + "commitConvention": "none", + "contributors": [ + { + "login": "joshuaellis", + "name": "Josh", + "avatar_url": "https://avatars.githubusercontent.com/u/37798644?v=4", + "profile": "https://github.com/joshuaellis", + "contributions": [ + "question", + "bug", + "code", + "doc", + "ideas", + "maintenance", + "review", + "test" + ] + }, + { + "login": "Methuselah96", + "name": "Nathan Bierema", + "avatar_url": "https://avatars.githubusercontent.com/u/693755?v=4", + "profile": "https://github.com/Methuselah96", + "contributions": [ + "question", + "bug", + "code", + "doc", + "ideas", + "infra", + "maintenance", + "review", + "test" + ] + }, + { + "login": "Mugen87", + "name": "Michael Herzog", + "avatar_url": "https://avatars.githubusercontent.com/u/12612165?v=4", + "profile": "https://human-interactive.org", + "contributions": [ + "code" + ] + }, + { + "login": "CodyJasonBennett", + "name": "Cody Bennett", + "avatar_url": "https://avatars.githubusercontent.com/u/23324155?v=4", + "profile": "https://github.com/CodyJasonBennett", + "contributions": [ + "code" + ] + }, + { + "login": "0b5vr", + "name": "0b5vr", + "avatar_url": "https://avatars.githubusercontent.com/u/7824814?v=4", + "profile": "http://0b5vr.github.io/", + "contributions": [ + "code", + "test", + "maintenance", + "review", + "bug" + ] + }, + { + "login": "marquizzo", + "name": "Marquizzo", + "avatar_url": "https://avatars.githubusercontent.com/u/7864858?v=4", + "profile": "https://stackoverflow.com/users/2608515/marquizzo", + "contributions": [ + "code" + ] + }, + { + "login": "khum08", + "name": "Yuanzk", + "avatar_url": "https://avatars.githubusercontent.com/u/32336026?v=4", + "profile": "https://github.com/khum08", + "contributions": [ + "code" + ] + }, + { + "login": "elisee", + "name": "Elisée Maurer", + "avatar_url": "https://avatars.githubusercontent.com/u/446986?v=4", + "profile": "http://sparklinlabs.com/", + "contributions": [ + "code" + ] + }, + { + "login": "soadzoor", + "name": "soadzoor", + "avatar_url": "https://avatars.githubusercontent.com/u/10392261?v=4", + "profile": "https://github.com/soadzoor", + "contributions": [ + "code" + ] + }, + { + "login": "rinsuki", + "name": "rinsuki", + "avatar_url": "https://avatars.githubusercontent.com/u/6533808?v=4", + "profile": "https://github.com/rinsuki", + "contributions": [ + "code" + ] + }, + { + "login": "efokschaner", + "name": "efokschaner", + "avatar_url": "https://avatars.githubusercontent.com/u/1409112?v=4", + "profile": "https://github.com/efokschaner", + "contributions": [ + "code" + ] + }, + { + "login": "Jhuni0123", + "name": "Jonghun Park", + "avatar_url": "https://avatars.githubusercontent.com/u/16764073?v=4", + "profile": "https://github.com/Jhuni0123", + "contributions": [ + "code" + ] + }, + { + "login": "sjpt", + "name": "sjpt", + "avatar_url": "https://avatars.githubusercontent.com/u/4954988?v=4", + "profile": "https://github.com/sjpt", + "contributions": [ + "code" + ] + }, + { + "login": "Michsior14", + "name": "Michał Mrozek", + "avatar_url": "https://avatars.githubusercontent.com/u/1410035?v=4", + "profile": "https://github.com/Michsior14", + "contributions": [ + "code" + ] + }, + { + "login": "puxiao", + "name": "puxiao", + "avatar_url": "https://avatars.githubusercontent.com/u/3401635?v=4", + "profile": "https://puxiao.com", + "contributions": [ + "code" + ] + }, + { + "login": "ycw", + "name": "ycw", + "avatar_url": "https://avatars.githubusercontent.com/u/1063018?v=4", + "profile": "https://github.com/ycw", + "contributions": [ + "code" + ] + }, + { + "login": "Jazcash", + "name": "Jazcash", + "avatar_url": "https://avatars.githubusercontent.com/u/1434248?v=4", + "profile": "https://github.com/Jazcash", + "contributions": [ + "code" + ] + }, + { + "login": "bjornstar", + "name": "Bjorn Stromberg", + "avatar_url": "https://avatars.githubusercontent.com/u/20630?v=4", + "profile": "https://bjornstar.com/", + "contributions": [ + "code" + ] + }, + { + "login": "happy-turtle", + "name": "HappyTurtle", + "avatar_url": "https://avatars.githubusercontent.com/u/18415215?v=4", + "profile": "https://github.com/happy-turtle", + "contributions": [ + "code" + ] + }, + { + "login": "shuta13", + "name": "Shuta Hirai", + "avatar_url": "https://avatars.githubusercontent.com/u/38882716?v=4", + "profile": "https://studio.did0es.me/", + "contributions": [ + "code" + ] + }, + { + "login": "servinlp", + "name": "Servin Nissen", + "avatar_url": "https://avatars.githubusercontent.com/u/7222029?v=4", + "profile": "https://github.com/servinlp", + "contributions": [ + "code" + ] + }, + { + "login": "benpigchu", + "name": "Ben \"Pig\" Chu", + "avatar_url": "https://avatars.githubusercontent.com/u/9023067?v=4", + "profile": "https://benpigchu.com/", + "contributions": [ + "code" + ] + }, + { + "login": "woo-cie", + "name": "Makoto Yamada", + "avatar_url": "https://avatars.githubusercontent.com/u/24642989?v=4", + "profile": "https://github.com/woo-cie", + "contributions": [ + "code" + ] + }, + { + "login": "schwyzl", + "name": "schwyzl", + "avatar_url": "https://avatars.githubusercontent.com/u/1556979?v=4", + "profile": "https://github.com/schwyzl", + "contributions": [ + "code" + ] + }, + { + "login": "Degubi", + "name": "Degubi", + "avatar_url": "https://avatars.githubusercontent.com/u/13366932?v=4", + "profile": "https://github.com/Degubi", + "contributions": [ + "code" + ] + }, + { + "login": "WCWedin", + "name": "Ibby Wedin", + "avatar_url": "https://avatars.githubusercontent.com/u/110730?v=4", + "profile": "https://github.com/WCWedin", + "contributions": [ + "code" + ] + }, + { + "login": "dbuck", + "name": "dbuck", + "avatar_url": "https://avatars.githubusercontent.com/u/983807?v=4", + "profile": "https://github.com/dbuck", + "contributions": [ + "code" + ] + }, + { + "login": "robertlong", + "name": "Robert Long", + "avatar_url": "https://avatars.githubusercontent.com/u/1753624?v=4", + "profile": "https://github.com/robertlong", + "contributions": [ + "code" + ] + }, + { + "login": "XertroV", + "name": "Max Kaye", + "avatar_url": "https://avatars.githubusercontent.com/u/1046448?v=4", + "profile": "https://xk.io/", + "contributions": [ + "doc" + ] + }, + { + "login": "LauferAlex", + "name": "Alejandro Laufer", + "avatar_url": "https://avatars.githubusercontent.com/u/86115165?v=4", + "profile": "https://github.com/LauferAlex", + "contributions": [ + "bug", + "code" + ] + }, + { + "login": "gsimone", + "name": "Gianmarco", + "avatar_url": "https://avatars.githubusercontent.com/u/1862172?v=4", + "profile": "https://twitter.com/ggsimm", + "contributions": [ + "code" + ] + }, + { + "login": "DavidPeicho", + "name": "David Peicho", + "avatar_url": "https://avatars.githubusercontent.com/u/8783766?v=4", + "profile": "https://davidpeicho.github.io/", + "contributions": [ + "code" + ] + }, + { + "login": "trusktr", + "name": "Joe Pea", + "avatar_url": "https://avatars.githubusercontent.com/u/297678?v=4", + "profile": "https://github.com/trusktr", + "contributions": [ + "code" + ] + }, + { + "login": "subhankar-trisetra", + "name": "Subhankar Pal", + "avatar_url": "https://avatars.githubusercontent.com/u/98544661?v=4", + "profile": "https://subho57.github.io", + "contributions": [ + "code" + ] + }, + { + "login": "capnmidnight", + "name": "Sean T. McBeth", + "avatar_url": "https://avatars.githubusercontent.com/u/298046?v=4", + "profile": "http://www.seanmcbeth.com/", + "contributions": [ + "code" + ] + }, + { + "login": "atulrnt", + "name": "Arthur LAURENT", + "avatar_url": "https://avatars.githubusercontent.com/u/894203?v=4", + "profile": "https://github.com/atulrnt", + "contributions": [ + "code" + ] + }, + { + "login": "serenayl", + "name": "Serena Li", + "avatar_url": "https://avatars.githubusercontent.com/u/12814119?v=4", + "profile": "https://github.com/serenayl", + "contributions": [ + "code" + ] + }, + { + "login": "cosformula", + "name": "cosformula", + "avatar_url": "https://avatars.githubusercontent.com/u/18232501?v=4", + "profile": "https://github.com/cosformula", + "contributions": [ + "code" + ] + }, + { + "login": "miko3k", + "name": "Peter Hanula", + "avatar_url": "https://avatars.githubusercontent.com/u/8658482?v=4", + "profile": "https://github.com/miko3k", + "contributions": [ + "code" + ] + }, + { + "login": "MysteryBlokHed", + "name": "Adam Thompson-Sharpe", + "avatar_url": "https://avatars.githubusercontent.com/u/13910387?v=4", + "profile": "https://github.com/MysteryBlokHed", + "contributions": [ + "code" + ] + }, + { + "login": "noname0310", + "name": "noname", + "avatar_url": "https://avatars.githubusercontent.com/u/48761044?v=4", + "profile": "https://www.youtube.com/c/noname0310", + "contributions": [ + "code" + ] + }, + { + "login": "grschafer", + "name": "Greg Schafer", + "avatar_url": "https://avatars.githubusercontent.com/u/694225?v=4", + "profile": "https://github.com/grschafer", + "contributions": [ + "code" + ] + }, + { + "login": "SuperSodaSea", + "name": "SuperSodaSea", + "avatar_url": "https://avatars.githubusercontent.com/u/8724868?v=4", + "profile": "https://github.com/SuperSodaSea", + "contributions": [ + "code" + ] + }, + { + "login": "mattrossman", + "name": "Matt Rossman", + "avatar_url": "https://avatars.githubusercontent.com/u/22670878?v=4", + "profile": "https://github.com/mattrossman", + "contributions": [ + "code" + ] + }, + { + "login": "alexpineda", + "name": "Alex Pineda", + "avatar_url": "https://avatars.githubusercontent.com/u/586716?v=4", + "profile": "https://github.com/imbateam-gg/titan-reactor", + "contributions": [ + "code" + ] + }, + { + "login": "Draichi", + "name": "Lucas", + "avatar_url": "https://avatars.githubusercontent.com/u/19378148?v=4", + "profile": "https://draichiboard.vercel.app/", + "contributions": [ + "doc" + ] + }, + { + "login": "mz8i", + "name": "Maciej Ziarkowski", + "avatar_url": "https://avatars.githubusercontent.com/u/36160844?v=4", + "profile": "https://github.com/mz8i", + "contributions": [ + "code" + ] + }, + { + "login": "Suprhimp", + "name": "Suprhimp", + "avatar_url": "https://avatars.githubusercontent.com/u/73486185?v=4", + "profile": "https://github.com/Suprhimp", + "contributions": [ + "code" + ] + }, + { + "login": "Trinovantes", + "name": "Stephen Li", + "avatar_url": "https://avatars.githubusercontent.com/u/458691?v=4", + "profile": "https://www.stephenli.ca/", + "contributions": [ + "code" + ] + }, + { + "login": "autonomobil", + "name": "Moritz Cremer", + "avatar_url": "https://avatars.githubusercontent.com/u/31781343?s=96&v=4", + "profile": "https://github.com/autonomobil", + "contributions": [ + "code" + ] + }, + { + "login": "LuchoTurtle", + "name": "LuchoTurtle", + "avatar_url": "https://avatars.githubusercontent.com/u/17494745?v=4", + "profile": "https://github.com/LuchoTurtle", + "contributions": [ + "code" + ] + }, + { + "login": "marwie", + "name": "Marcel Wiessler", + "avatar_url": "https://avatars.githubusercontent.com/u/5083203?v=4", + "profile": "https://www.needle.tools", + "contributions": [ + "code" + ] + }, + { + "login": "JoshStern", + "name": "Josh Stern", + "avatar_url": "https://avatars.githubusercontent.com/u/10948202?v=4", + "profile": "https://github.com/JoshStern", + "contributions": [ + "code" + ] + }, + { + "login": "rotu", + "name": "Dan Rose", + "avatar_url": "https://avatars.githubusercontent.com/u/119948?v=4", + "profile": "https://github.com/rotu", + "contributions": [ + "code" + ] + }, + { + "login": "gegoggigog", + "name": "Dan Dolonius", + "avatar_url": "https://avatars.githubusercontent.com/u/1716001?v=4", + "profile": "https://github.com/gegoggigog", + "contributions": [ + "code" + ] + }, + { + "login": "Hoodgail", + "name": "Benjamin", + "avatar_url": "https://avatars.githubusercontent.com/u/45743294?v=4", + "profile": "https://hoodgail.com/", + "contributions": [ + "code" + ] + }, + { + "login": "agviegas", + "name": "Antonio González Viegas", + "avatar_url": "https://avatars.githubusercontent.com/u/56475338?v=4", + "profile": "https://www.linkedin.com/in/antonio-gonz%C3%A1lez-viegas-8b2326151/", + "contributions": [ + "code" + ] + }, + { + "login": "donmccurdy", + "name": "Don McCurdy", + "avatar_url": "https://avatars.githubusercontent.com/u/1848368?v=4", + "profile": "https://www.donmccurdy.com/", + "contributions": [ + "code" + ] + }, + { + "login": "xawill", + "name": "Xavier Willemin", + "avatar_url": "https://avatars.githubusercontent.com/u/2658206?v=4", + "profile": "https://github.com/xawill", + "contributions": [ + "code" + ] + }, + { + "login": "r00ster91", + "name": "zooster", + "avatar_url": "https://avatars.githubusercontent.com/u/35064754?v=4", + "profile": "https://github.com/r00ster91", + "contributions": [ + "code" + ] + }, + { + "login": "andersonleite", + "name": "Anderson Leite", + "avatar_url": "https://avatars.githubusercontent.com/u/52427?v=4", + "profile": "https://github.com/andersonleite", + "contributions": [ + "code" + ] + }, + { + "login": "frading", + "name": "Guillaume Fradin", + "avatar_url": "https://avatars.githubusercontent.com/u/59701?v=4", + "profile": "https://polygonjs.com/", + "contributions": [ + "code" + ] + }, + { + "login": "Heaust-ops", + "name": "Heaust Azure", + "avatar_url": "https://avatars.githubusercontent.com/u/54670936?v=4", + "profile": "https://github.com/Heaust-ops", + "contributions": [ + "code" + ] + }, + { + "login": "Gallahron", + "name": "Joe Tipping", + "avatar_url": "https://avatars.githubusercontent.com/u/39060404?v=4", + "profile": "http://www.joemo.co.uk/", + "contributions": [ + "code" + ] + }, + { + "login": "lgarron", + "name": "Lucas Garron", + "avatar_url": "https://avatars.githubusercontent.com/u/248078?v=4", + "profile": "https://garron.net/", + "contributions": [ + "code" + ] + }, + { + "login": "maccesch", + "name": "Marc-Stefan Cassola", + "avatar_url": "https://avatars.githubusercontent.com/u/380881?v=4", + "profile": "https://github.com/maccesch", + "contributions": [ + "code" + ] + }, + { + "login": "peterblazejewicz", + "name": "Piotr Błażejewicz (Peter Blazejewicz)", + "avatar_url": "https://avatars.githubusercontent.com/u/14539?v=4", + "profile": "http://www.linkedin.com/in/peterblazejewicz", + "contributions": [ + "code" + ] + }, + { + "login": "Vikontte", + "name": "Victoria Shadrina", + "avatar_url": "https://avatars.githubusercontent.com/u/18411533?v=4", + "profile": "https://github.com/Vikontte", + "contributions": [ + "code" + ] + }, + { + "login": "willstott101", + "name": "Will Stott", + "avatar_url": "https://avatars.githubusercontent.com/u/335152?v=4", + "profile": "https://github.com/willstott101", + "contributions": [ + "code" + ] + }, + { + "login": "demike", + "name": "demike", + "avatar_url": "https://avatars.githubusercontent.com/u/1626922?v=4", + "profile": "https://github.com/demike", + "contributions": [ + "code" + ] + }, + { + "login": "saitonakamura", + "name": "Michael サイトー 中村 Bashurov", + "avatar_url": "https://avatars.githubusercontent.com/u/1552189?v=4", + "profile": "https://github.com/saitonakamura", + "contributions": [ + "code" + ] + }, + { + "login": "jackbonaguro", + "name": "Jack Bonaguro", + "avatar_url": "https://avatars.githubusercontent.com/u/15988128?v=4", + "profile": "https://github.com/jackbonaguro", + "contributions": [ + "code" + ] + }, + { + "login": "rafaelsc", + "name": "Rafael Sliveira Cordeiro", + "avatar_url": "https://avatars.githubusercontent.com/u/502282?v=4", + "profile": "https://github.com/rafaelsc", + "contributions": [ + "code", + "doc" + ] + }, + { + "login": "HEOJUNFO", + "name": "HEOJUNFO", + "avatar_url": "https://avatars.githubusercontent.com/u/100739943?v=4", + "profile": "https://github.com/HEOJUNFO", + "contributions": [ + "code" + ] + }, + { + "login": "Oletus", + "name": "Olli Etuaho", + "avatar_url": "https://avatars.githubusercontent.com/u/453050?v=4", + "profile": "http://www.oletus.fi/", + "contributions": [ + "code" + ] + }, + { + "login": "k2d222", + "name": "Mathis Brossier", + "avatar_url": "https://avatars.githubusercontent.com/u/16296136?v=4", + "profile": "https://github.com/k2d222", + "contributions": [ + "code" + ] + }, + { + "login": "oetherington", + "name": "Ollie Etherington", + "avatar_url": "https://avatars.githubusercontent.com/u/5075628?v=4", + "profile": "https://github.com/oetherington", + "contributions": [ + "code", + "bug" + ] + }, + { + "login": "Mik-pe", + "name": "Mikael Pettersson", + "avatar_url": "https://avatars.githubusercontent.com/u/5653426?v=4", + "profile": "https://github.com/Mik-pe", + "contributions": [ + "code" + ] + }, + { + "login": "magnostherobot", + "name": "Tom Harley", + "avatar_url": "https://avatars.githubusercontent.com/u/24718981?v=4", + "profile": "https://github.com/magnostherobot", + "contributions": [ + "code" + ] + }, + { + "login": "OndrejSpanel", + "name": "Ondřej Španěl", + "avatar_url": "https://avatars.githubusercontent.com/u/6927223?v=4", + "profile": "https://github.com/OndrejSpanel", + "contributions": [ + "bug", + "code", + "doc", + "maintenance" + ] + }, + { + "login": "Yonet", + "name": "Yönet", + "avatar_url": "https://avatars.githubusercontent.com/u/3523671?v=4", + "profile": "https://github.com/Yonet", + "contributions": [ + "code" + ] + }, + { + "login": "ericbroberic", + "name": "Eric Benn", + "avatar_url": "https://avatars.githubusercontent.com/u/9359928?v=4", + "profile": "https://github.com/ericbroberic", + "contributions": [ + "code" + ] + }, + { + "login": "ybt-new", + "name": "Botao Yang", + "avatar_url": "https://avatars.githubusercontent.com/u/131513278?v=4", + "profile": "https://github.com/ybt-new", + "contributions": [ + "code" + ] + } + ], + "skipCi": true, + "contributorsPerLine": 7 +} From 580582c2b060afdcc949c628d131dfce345f49ac Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Wed, 12 Jul 2023 21:12:22 -0400 Subject: [PATCH 5/5] Cleanup --- types/three/src/loaders/ObjectLoader.d.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/types/three/src/loaders/ObjectLoader.d.ts b/types/three/src/loaders/ObjectLoader.d.ts index f75cf4758..b2b4ac784 100644 --- a/types/three/src/loaders/ObjectLoader.d.ts +++ b/types/three/src/loaders/ObjectLoader.d.ts @@ -1,9 +1,9 @@ import { Loader } from './Loader.js'; import { LoadingManager } from './LoadingManager.js'; -import { Object3D } from './../core/Object3D.js'; -import { Texture } from './../textures/Texture.js'; -import { Material } from './../materials/Material.js'; -import { AnimationClip } from './../animation/AnimationClip.js'; +import { Object3D } from '../core/Object3D.js'; +import { Texture } from '../textures/Texture.js'; +import { Material } from '../materials/Material.js'; +import { AnimationClip } from '../animation/AnimationClip.js'; import { InstancedBufferGeometry } from '../core/InstancedBufferGeometry.js'; import { BufferGeometry } from '../core/BufferGeometry.js'; import { Source } from '../textures/Source.js'; @@ -26,8 +26,8 @@ export class ObjectLoader extends Loader { parse(json: any, onLoad?: (object: Object3D) => void): T; // tslint:disable-next-line:no-unnecessary-generics parseAsync(json: any): Promise; - parseGeometries(json: any): { [key: string]: InstancedBufferGeometry | BufferGeometry }; // Array of BufferGeometry or Geometry or Geometry2. - parseMaterials(json: any, textures: { [key: string]: Texture }): { [key: string]: Material }; // Array of Classes that inherits from Matrial. + parseGeometries(json: any): { [key: string]: InstancedBufferGeometry | BufferGeometry }; + parseMaterials(json: any, textures: { [key: string]: Texture }): { [key: string]: Material }; parseAnimations(json: any): AnimationClip[]; parseImages(json: any, onLoad?: () => void): { [key: string]: Source }; parseImagesAsync(json: any): Promise<{ [key: string]: Source }>;