diff --git a/.all-contributorsrc b/.all-contributorsrc index 3deb1c914..9d751f380 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -715,6 +715,15 @@ "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" + ] } ], "skipCi": true, diff --git a/README.md b/README.md index 548c1d250..10d2dcd4f 100644 --- a/README.md +++ b/README.md @@ -124,6 +124,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d HEOJUNFO
HEOJUNFO

💻 Olli Etuaho
Olli Etuaho

💻 Ollie Etherington
Ollie Etherington

💻 🐛 + Mikael Pettersson
Mikael Pettersson

💻 diff --git a/types/three/examples/jsm/utils/BufferGeometryUtils.d.ts b/types/three/examples/jsm/utils/BufferGeometryUtils.d.ts index 3bbaa4aa9..e61bfdfb5 100644 --- a/types/three/examples/jsm/utils/BufferGeometryUtils.d.ts +++ b/types/three/examples/jsm/utils/BufferGeometryUtils.d.ts @@ -11,8 +11,8 @@ import { } from '../../../src/Three'; export function deepCloneAttribute(attribute: BufferAttribute): BufferAttribute; -export function mergeBufferGeometries(geometries: BufferGeometry[], useGroups?: boolean): BufferGeometry; -export function mergeBufferAttributes(attributes: BufferAttribute[]): BufferAttribute; +export function mergeGeometries(geometries: BufferGeometry[], useGroups?: boolean): BufferGeometry; +export function mergeAttributes(attributes: BufferAttribute[]): BufferAttribute; export function interleaveAttributes(attributes: BufferAttribute[]): InterleavedBufferAttribute; export function estimateBytesUsed(geometry: BufferGeometry): number; export function mergeVertices(geometry: BufferGeometry, tolerance?: number): BufferGeometry; @@ -34,3 +34,13 @@ export function deinterleaveGeometry(geometry: BufferGeometry): void; * @param creaseAngle The crease angle. */ export function toCreasedNormals(geometry: BufferGeometry, creaseAngle?: number): BufferGeometry; + +/** + * @deprecated Use mergeGeometries instead. + */ +export function mergeBufferGeometries(geometries: BufferGeometry[], useGroups?: boolean): BufferGeometry; + +/** + * @deprecated Use mergeAttributes instead. + */ +export function mergeBufferAttributes(attributes: BufferAttribute[]): BufferAttribute;