Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuaellis committed Sep 18, 2021
2 parents 99754e4 + eebc29a commit 54da97d
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 8 deletions.
15 changes: 12 additions & 3 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@
]
},
{
"login": "FMS-Cat",
"name": "Yutaka \"FMS_Cat\" Obuchi",
"login": "0b5vr",
"name": "0b5vr",
"avatar_url": "https://avatars.githubusercontent.com/u/7824814?v=4",
"profile": "http://fms-cat.github.io/",
"profile": "http://0b5vr.github.io/",
"contributions": [
"code",
"test"
Expand Down Expand Up @@ -232,6 +232,15 @@
"contributions": [
"code"
]
},
{
"login": "schwyzl",
"name": "schwyzl",
"avatar_url": "https://avatars.githubusercontent.com/u/1556979?v=4",
"profile": "https://github.com/schwyzl",
"contributions": [
"code"
]
}
],
"skipCi": true,
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center"><a href="https://github.com/Methuselah96"><img src="https://avatars.githubusercontent.com/u/693755?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathan Bierema</b></sub></a><br /><a href="#question-Methuselah96" title="Answering Questions">💬</a> <a href="https://github.com/three-types/three-ts-types/issues?q=author%3AMethuselah96" title="Bug reports">🐛</a> <a href="https://github.com/three-types/three-ts-types/commits?author=Methuselah96" title="Code">💻</a> <a href="https://github.com/three-types/three-ts-types/commits?author=Methuselah96" title="Documentation">📖</a> <a href="#ideas-Methuselah96" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-Methuselah96" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-Methuselah96" title="Maintenance">🚧</a> <a href="https://github.com/three-types/three-ts-types/pulls?q=is%3Apr+reviewed-by%3AMethuselah96" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/three-types/three-ts-types/commits?author=Methuselah96" title="Tests">⚠️</a></td>
<td align="center"><a href="https://human-interactive.org"><img src="https://avatars.githubusercontent.com/u/12612165?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Herzog</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=Mugen87" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/CodyJasonBennett"><img src="https://avatars.githubusercontent.com/u/23324155?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cody Bennett</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=CodyJasonBennett" title="Code">💻</a></td>
<td align="center"><a href="http://fms-cat.github.io/"><img src="https://avatars.githubusercontent.com/u/7824814?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yutaka "FMS_Cat" Obuchi</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=FMS-Cat" title="Code">💻</a> <a href="https://github.com/three-types/three-ts-types/commits?author=FMS-Cat" title="Tests">⚠️</a></td>
<td align="center"><a href="http://0b5vr.github.io/"><img src="https://avatars.githubusercontent.com/u/7824814?v=4?s=100" width="100px;" alt=""/><br /><sub><b>0b5vr</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=0b5vr" title="Code">💻</a> <a href="https://github.com/three-types/three-ts-types/commits?author=0b5vr" title="Tests">⚠️</a></td>
<td align="center"><a href="https://stackoverflow.com/users/2608515/marquizzo"><img src="https://avatars.githubusercontent.com/u/7864858?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marquizzo</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=marquizzo" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/khum08"><img src="https://avatars.githubusercontent.com/u/32336026?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yuanzk</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=khum08" title="Code">💻</a></td>
</tr>
Expand All @@ -56,6 +56,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<tr>
<td align="center"><a href="https://benpigchu.com/"><img src="https://avatars.githubusercontent.com/u/9023067?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ben "Pig" Chu</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=benpigchu" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/woo-cie"><img src="https://avatars.githubusercontent.com/u/24642989?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Makoto Yamada</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=woo-cie" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/schwyzl"><img src="https://avatars.githubusercontent.com/u/1556979?v=4?s=100" width="100px;" alt=""/><br /><sub><b>schwyzl</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=schwyzl" title="Code">💻</a></td>
</tr>
</table>

Expand Down
7 changes: 6 additions & 1 deletion types/three/src/renderers/webgl/WebGLRenderLists.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ export class WebGLRenderList {
*/
transparent: RenderItem[];

/**
* @default []
*/
transmissive: RenderItem[];

init(): void;
push(
object: Object3D,
Expand All @@ -60,5 +65,5 @@ export class WebGLRenderLists {
constructor(properties: WebGLProperties);

dispose(): void;
get(scene: Scene, camera: Camera): WebGLRenderList;
get(scene: Scene, renderCallDepth: number): WebGLRenderList;
}
6 changes: 3 additions & 3 deletions types/three/src/textures/DataTexture.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ export class DataTexture extends Texture {
* @param [encoding=THREE.LinearEncoding]
*/
constructor(
data: BufferSource,
width: number,
height: number,
data?: BufferSource | null,
width?: number,
height?: number,
format?: PixelFormat,
type?: TextureDataType,
mapping?: Mapping,
Expand Down

0 comments on commit 54da97d

Please sign in to comment.