Skip to content

Commit

Permalink
Remove deprecated code. (#27467)
Browse files Browse the repository at this point in the history
* Remove deprecated code.

* Clean up.

* Examples: Bump version of `web-ifc-three`.
  • Loading branch information
Mugen87 committed Jan 2, 2024
1 parent b3aa4c6 commit 5883c6c
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 59 deletions.
16 changes: 0 additions & 16 deletions examples/jsm/utils/BufferGeometryUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -1345,26 +1345,10 @@ function toCreasedNormals( geometry, creaseAngle = Math.PI / 3 /* 60 degrees */

}

function mergeBufferGeometries( geometries, useGroups = false ) {

console.warn( 'THREE.BufferGeometryUtils: mergeBufferGeometries() has been renamed to mergeGeometries().' ); // @deprecated, r151
return mergeGeometries( geometries, useGroups );

}

function mergeBufferAttributes( attributes ) {

console.warn( 'THREE.BufferGeometryUtils: mergeBufferAttributes() has been renamed to mergeAttributes().' ); // @deprecated, r151
return mergeAttributes( attributes );

}

export {
computeMikkTSpaceTangents,
mergeGeometries,
mergeBufferGeometries,
mergeAttributes,
mergeBufferAttributes,
interleaveAttributes,
estimateBytesUsed,
mergeVertices,
Expand Down
2 changes: 1 addition & 1 deletion examples/webgl_loader_ifc.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"three/examples/jsm/utils/BufferGeometryUtils": "./jsm/utils/BufferGeometryUtils.js",
"three-mesh-bvh": "https://unpkg.com/three-mesh-bvh@0.5.23/build/index.module.js",
"web-ifc": "https://unpkg.com/web-ifc@0.0.36/web-ifc-api.js",
"web-ifc-three": "https://unpkg.com/web-ifc-three@0.0.125/IFCLoader.js"
"web-ifc-three": "https://unpkg.com/web-ifc-three@0.0.126/IFCLoader.js"
}
}
</script>
Expand Down
30 changes: 0 additions & 30 deletions src/math/Triangle.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ const _vap = /*@__PURE__*/ new Vector3();
const _vbp = /*@__PURE__*/ new Vector3();
const _vcp = /*@__PURE__*/ new Vector3();

let warnedGetUV = false;

class Triangle {

constructor( a = new Vector3(), b = new Vector3(), c = new Vector3() ) {
Expand Down Expand Up @@ -87,20 +85,6 @@ class Triangle {

}

static getUV( point, p1, p2, p3, uv1, uv2, uv3, target ) { // @deprecated, r151

if ( warnedGetUV === false ) {

console.warn( 'THREE.Triangle.getUV() has been renamed to THREE.Triangle.getInterpolation().' );

warnedGetUV = true;

}

return this.getInterpolation( point, p1, p2, p3, uv1, uv2, uv3, target );

}

static getInterpolation( point, p1, p2, p3, v1, v2, v3, target ) {

if ( this.getBarycoord( point, p1, p2, p3, _v3 ) === null ) {
Expand Down Expand Up @@ -211,20 +195,6 @@ class Triangle {

}

getUV( point, uv1, uv2, uv3, target ) { // @deprecated, r151

if ( warnedGetUV === false ) {

console.warn( 'THREE.Triangle.getUV() has been renamed to THREE.Triangle.getInterpolation().' );

warnedGetUV = true;

}

return Triangle.getInterpolation( point, this.a, this.b, this.c, uv1, uv2, uv3, target );

}

getInterpolation( point, v1, v2, v3, target ) {

return Triangle.getInterpolation( point, this.a, this.b, this.c, v1, v2, v3, target );
Expand Down
8 changes: 0 additions & 8 deletions src/objects/SkinnedMesh.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,6 @@ class SkinnedMesh extends Mesh {

}

boneTransform( index, vector ) { // @deprecated, r151

console.warn( 'THREE.SkinnedMesh: .boneTransform() was renamed to .applyBoneTransform() in r151.' );
return this.applyBoneTransform( index, vector );

}


}

export { SkinnedMesh };
8 changes: 4 additions & 4 deletions test/unit/src/math/Triangle.tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ export default QUnit.module( 'Maths', () => {

} );

QUnit.todo( 'getUV', ( assert ) => {
QUnit.todo( 'getInterpolation', ( assert ) => {

// static version of class member below
// getUV( point, p1, p2, p3, uv1, uv2, uv3, target )
// getInterpolation( point, p1, p2, p3, uv1, uv2, uv3, target )
assert.ok( false, 'everything\'s gonna be alright' );

} );
Expand Down Expand Up @@ -244,10 +244,10 @@ export default QUnit.module( 'Maths', () => {

} );

QUnit.todo( 'getUV', ( assert ) => {
QUnit.todo( 'getInterpolation', ( assert ) => {

// class member version
// getUV( point, uv1, uv2, uv3, target )
// getInterpolation( point, uv1, uv2, uv3, target )
assert.ok( false, 'everything\'s gonna be alright' );

} );
Expand Down

0 comments on commit 5883c6c

Please sign in to comment.