diff --git a/examples/files.json b/examples/files.json index fdc1630818f358..b121161f9e2964 100644 --- a/examples/files.json +++ b/examples/files.json @@ -185,7 +185,6 @@ "webgl_modifier_curve_instanced", "webgl_modifier_edgesplit", "webgl_modifier_simplifier", - "webgl_modifier_subdivision", "webgl_modifier_tessellation", "webgl_morphtargets", "webgl_morphtargets_horse", diff --git a/examples/js/modifiers/SubdivisionModifier.js b/examples/js/modifiers/SubdivisionModifier.js deleted file mode 100644 index 3e4472d5d60ca6..00000000000000 --- a/examples/js/modifiers/SubdivisionModifier.js +++ /dev/null @@ -1,421 +0,0 @@ -/** - * Subdivision Geometry Modifier - * using Loop Subdivision Scheme - * - * References: - * http://graphics.stanford.edu/~mdfisher/subdivision.html - * http://www.holmes3d.net/graphics/subdivision/ - * http://www.cs.rutgers.edu/~decarlo/readings/subdiv-sg00c.pdf - * - * Known Issues: - * - currently doesn't handle "Sharp Edges" - */ - -THREE.SubdivisionModifier = function ( subdivisions ) { - - this.subdivisions = ( subdivisions === undefined ) ? 1 : subdivisions; - -}; - -// Applies the "modify" pattern -THREE.SubdivisionModifier.prototype.modify = function ( geometry ) { - - var isBufferGeometry = geometry.isBufferGeometry; - - if ( isBufferGeometry ) { - - geometry = new THREE.Geometry().fromBufferGeometry( geometry ); - - } else { - - geometry = geometry.clone(); - - } - - geometry.mergeVertices( 6 ); - - var repeats = this.subdivisions; - - while ( repeats -- > 0 ) { - - this.smooth( geometry ); - - } - - geometry.computeFaceNormals(); - geometry.computeVertexNormals(); - - if ( isBufferGeometry ) { - - return new THREE.BufferGeometry().fromGeometry( geometry ); - - } else { - - return geometry; - - } - -}; - -( function () { - - // Some constants - var ABC = [ 'a', 'b', 'c' ]; - - - function getEdge( a, b, map ) { - - var vertexIndexA = Math.min( a, b ); - var vertexIndexB = Math.max( a, b ); - - var key = vertexIndexA + '_' + vertexIndexB; - - return map[ key ]; - - } - - - function processEdge( a, b, vertices, map, face, metaVertices ) { - - var vertexIndexA = Math.min( a, b ); - var vertexIndexB = Math.max( a, b ); - - var key = vertexIndexA + '_' + vertexIndexB; - - var edge; - - if ( key in map ) { - - edge = map[ key ]; - - } else { - - var vertexA = vertices[ vertexIndexA ]; - var vertexB = vertices[ vertexIndexB ]; - - edge = { - - a: vertexA, // pointer reference - b: vertexB, - newEdge: null, - // aIndex: a, // numbered reference - // bIndex: b, - faces: [] // pointers to face - - }; - - map[ key ] = edge; - - } - - edge.faces.push( face ); - - metaVertices[ a ].edges.push( edge ); - metaVertices[ b ].edges.push( edge ); - - - } - - function generateLookups( vertices, faces, metaVertices, edges ) { - - var i, il, face; - - for ( i = 0, il = vertices.length; i < il; i ++ ) { - - metaVertices[ i ] = { edges: [] }; - - } - - for ( i = 0, il = faces.length; i < il; i ++ ) { - - face = faces[ i ]; - - processEdge( face.a, face.b, vertices, edges, face, metaVertices ); - processEdge( face.b, face.c, vertices, edges, face, metaVertices ); - processEdge( face.c, face.a, vertices, edges, face, metaVertices ); - - } - - } - - function newFace( newFaces, a, b, c, materialIndex ) { - - newFaces.push( new THREE.Face3( a, b, c, undefined, undefined, materialIndex ) ); - - } - - function midpoint( a, b ) { - - return ( Math.abs( b - a ) / 2 ) + Math.min( a, b ); - - } - - function newUv( newUvs, a, b, c ) { - - newUvs.push( [ a.clone(), b.clone(), c.clone() ] ); - - } - - ///////////////////////////// - - // Performs one iteration of Subdivision - THREE.SubdivisionModifier.prototype.smooth = function ( geometry ) { - - var tmp = new THREE.Vector3(); - - var oldVertices, oldFaces, oldUvs; - var newVertices, newFaces, newUVs = []; - - var n, i, il, j, k; - var metaVertices, sourceEdges; - - // new stuff. - var sourceEdges, newEdgeVertices, newSourceVertices; - - oldVertices = geometry.vertices; // { x, y, z} - oldFaces = geometry.faces; // { a: oldVertex1, b: oldVertex2, c: oldVertex3 } - oldUvs = geometry.faceVertexUvs; - - var hasUvs = oldUvs[ 0 ] !== undefined && oldUvs[ 0 ].length > 0; - - if ( hasUvs ) { - - for ( var j = 0; j < oldUvs.length; j ++ ) { - - newUVs.push( [] ); - - } - - } - - /****************************************************** - * - * Step 0: Preprocess Geometry to Generate edges Lookup - * - *******************************************************/ - - metaVertices = new Array( oldVertices.length ); - sourceEdges = {}; // Edge => { oldVertex1, oldVertex2, faces[] } - - generateLookups( oldVertices, oldFaces, metaVertices, sourceEdges ); - - - /****************************************************** - * - * Step 1. - * For each edge, create a new Edge Vertex, - * then position it. - * - *******************************************************/ - - newEdgeVertices = []; - var other, currentEdge, newEdge, face; - var edgeVertexWeight, adjacentVertexWeight, connectedFaces; - - for ( i in sourceEdges ) { - - currentEdge = sourceEdges[ i ]; - newEdge = new THREE.Vector3(); - - edgeVertexWeight = 3 / 8; - adjacentVertexWeight = 1 / 8; - - connectedFaces = currentEdge.faces.length; - - // check how many linked faces. 2 should be correct. - if ( connectedFaces != 2 ) { - - // if length is not 2, handle condition - edgeVertexWeight = 0.5; - adjacentVertexWeight = 0; - - if ( connectedFaces != 1 ) { - - // console.warn( 'Subdivision Modifier: Number of connected faces != 2, is: ', connectedFaces, currentEdge ); - - } - - } - - newEdge.addVectors( currentEdge.a, currentEdge.b ).multiplyScalar( edgeVertexWeight ); - - tmp.set( 0, 0, 0 ); - - for ( j = 0; j < connectedFaces; j ++ ) { - - face = currentEdge.faces[ j ]; - - for ( k = 0; k < 3; k ++ ) { - - other = oldVertices[ face[ ABC[ k ] ] ]; - if ( other !== currentEdge.a && other !== currentEdge.b ) break; - - } - - tmp.add( other ); - - } - - tmp.multiplyScalar( adjacentVertexWeight ); - newEdge.add( tmp ); - - currentEdge.newEdge = newEdgeVertices.length; - newEdgeVertices.push( newEdge ); - - // console.log(currentEdge, newEdge); - - } - - /****************************************************** - * - * Step 2. - * Reposition each source vertices. - * - *******************************************************/ - - var beta, sourceVertexWeight, connectingVertexWeight; - var connectingEdge, connectingEdges, oldVertex, newSourceVertex; - newSourceVertices = []; - - for ( i = 0, il = oldVertices.length; i < il; i ++ ) { - - oldVertex = oldVertices[ i ]; - - // find all connecting edges (using lookupTable) - connectingEdges = metaVertices[ i ].edges; - n = connectingEdges.length; - - if ( n == 3 ) { - - beta = 3 / 16; - - } else if ( n > 3 ) { - - beta = 3 / ( 8 * n ); // Warren's modified formula - - } - - // Loop's original beta formula - // beta = 1 / n * ( 5/8 - Math.pow( 3/8 + 1/4 * Math.cos( 2 * Math. PI / n ), 2) ); - - sourceVertexWeight = 1 - n * beta; - connectingVertexWeight = beta; - - if ( n <= 2 ) { - - // crease and boundary rules - // console.warn('crease and boundary rules'); - - if ( n == 2 ) { - - // console.warn( '2 connecting edges', connectingEdges ); - sourceVertexWeight = 3 / 4; - connectingVertexWeight = 1 / 8; - - // sourceVertexWeight = 1; - // connectingVertexWeight = 0; - - } else if ( n == 1 ) { - - // console.warn( 'only 1 connecting edge' ); - - } else if ( n == 0 ) { - - // console.warn( '0 connecting edges' ); - - } - - } - - newSourceVertex = oldVertex.clone().multiplyScalar( sourceVertexWeight ); - - tmp.set( 0, 0, 0 ); - - for ( j = 0; j < n; j ++ ) { - - connectingEdge = connectingEdges[ j ]; - other = connectingEdge.a !== oldVertex ? connectingEdge.a : connectingEdge.b; - tmp.add( other ); - - } - - tmp.multiplyScalar( connectingVertexWeight ); - newSourceVertex.add( tmp ); - - newSourceVertices.push( newSourceVertex ); - - } - - - /****************************************************** - * - * Step 3. - * Generate Faces between source vertices - * and edge vertices. - * - *******************************************************/ - - newVertices = newSourceVertices.concat( newEdgeVertices ); - var sl = newSourceVertices.length, edge1, edge2, edge3; - newFaces = []; - - var uv, x0, x1, x2; - var x3 = new THREE.Vector2(); - var x4 = new THREE.Vector2(); - var x5 = new THREE.Vector2(); - - for ( i = 0, il = oldFaces.length; i < il; i ++ ) { - - face = oldFaces[ i ]; - - // find the 3 new edges vertex of each old face - - edge1 = getEdge( face.a, face.b, sourceEdges ).newEdge + sl; - edge2 = getEdge( face.b, face.c, sourceEdges ).newEdge + sl; - edge3 = getEdge( face.c, face.a, sourceEdges ).newEdge + sl; - - // create 4 faces. - - newFace( newFaces, edge1, edge2, edge3, face.materialIndex ); - newFace( newFaces, face.a, edge1, edge3, face.materialIndex ); - newFace( newFaces, face.b, edge2, edge1, face.materialIndex ); - newFace( newFaces, face.c, edge3, edge2, face.materialIndex ); - - // create 4 new uv's - - if ( hasUvs ) { - - for ( var j = 0; j < oldUvs.length; j ++ ) { - - uv = oldUvs[ j ][ i ]; - - x0 = uv[ 0 ]; - x1 = uv[ 1 ]; - x2 = uv[ 2 ]; - - x3.set( midpoint( x0.x, x1.x ), midpoint( x0.y, x1.y ) ); - x4.set( midpoint( x1.x, x2.x ), midpoint( x1.y, x2.y ) ); - x5.set( midpoint( x0.x, x2.x ), midpoint( x0.y, x2.y ) ); - - newUv( newUVs[ j ], x3, x4, x5 ); - newUv( newUVs[ j ], x0, x3, x5 ); - - newUv( newUVs[ j ], x1, x4, x3 ); - newUv( newUVs[ j ], x2, x5, x4 ); - - } - - } - - } - - // Overwrite old arrays - geometry.vertices = newVertices; - geometry.faces = newFaces; - if ( hasUvs ) geometry.faceVertexUvs = newUVs; - - // console.log('done'); - - }; - -} )(); diff --git a/examples/jsm/modifiers/SubdivisionModifier.d.ts b/examples/jsm/modifiers/SubdivisionModifier.d.ts deleted file mode 100644 index 74a1512e49f228..00000000000000 --- a/examples/jsm/modifiers/SubdivisionModifier.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { - BufferGeometry, - Geometry -} from '../../../src/Three'; - -export class SubdivisionModifier { - - constructor( subdivisions?: number ); - subdivisions: number; - - modify( geometry: Geometry | BufferGeometry ): Geometry | BufferGeometry; - smooth( geometry: Geometry ): void; - -} diff --git a/examples/jsm/modifiers/SubdivisionModifier.js b/examples/jsm/modifiers/SubdivisionModifier.js deleted file mode 100644 index bdaa1e3f2dc928..00000000000000 --- a/examples/jsm/modifiers/SubdivisionModifier.js +++ /dev/null @@ -1,431 +0,0 @@ -import { - BufferGeometry, - Face3, - Geometry, - Vector2, - Vector3 -} from '../../../build/three.module.js'; - -/** - * Subdivision Geometry Modifier - * using Loop Subdivision Scheme - * - * References: - * http://graphics.stanford.edu/~mdfisher/subdivision.html - * http://www.holmes3d.net/graphics/subdivision/ - * http://www.cs.rutgers.edu/~decarlo/readings/subdiv-sg00c.pdf - * - * Known Issues: - * - currently doesn't handle "Sharp Edges" - */ - -var SubdivisionModifier = function ( subdivisions ) { - - this.subdivisions = ( subdivisions === undefined ) ? 1 : subdivisions; - -}; - -// Applies the "modify" pattern -SubdivisionModifier.prototype.modify = function ( geometry ) { - - var isBufferGeometry = geometry.isBufferGeometry; - - if ( isBufferGeometry ) { - - geometry = new Geometry().fromBufferGeometry( geometry ); - - } else { - - geometry = geometry.clone(); - - } - - geometry.mergeVertices( 6 ); - - var repeats = this.subdivisions; - - while ( repeats -- > 0 ) { - - this.smooth( geometry ); - - } - - geometry.computeFaceNormals(); - geometry.computeVertexNormals(); - - if ( isBufferGeometry ) { - - return new BufferGeometry().fromGeometry( geometry ); - - } else { - - return geometry; - - } - -}; - -( function () { - - // Some constants - var ABC = [ 'a', 'b', 'c' ]; - - - function getEdge( a, b, map ) { - - var vertexIndexA = Math.min( a, b ); - var vertexIndexB = Math.max( a, b ); - - var key = vertexIndexA + '_' + vertexIndexB; - - return map[ key ]; - - } - - - function processEdge( a, b, vertices, map, face, metaVertices ) { - - var vertexIndexA = Math.min( a, b ); - var vertexIndexB = Math.max( a, b ); - - var key = vertexIndexA + '_' + vertexIndexB; - - var edge; - - if ( key in map ) { - - edge = map[ key ]; - - } else { - - var vertexA = vertices[ vertexIndexA ]; - var vertexB = vertices[ vertexIndexB ]; - - edge = { - - a: vertexA, // pointer reference - b: vertexB, - newEdge: null, - // aIndex: a, // numbered reference - // bIndex: b, - faces: [] // pointers to face - - }; - - map[ key ] = edge; - - } - - edge.faces.push( face ); - - metaVertices[ a ].edges.push( edge ); - metaVertices[ b ].edges.push( edge ); - - - } - - function generateLookups( vertices, faces, metaVertices, edges ) { - - var i, il, face; - - for ( i = 0, il = vertices.length; i < il; i ++ ) { - - metaVertices[ i ] = { edges: [] }; - - } - - for ( i = 0, il = faces.length; i < il; i ++ ) { - - face = faces[ i ]; - - processEdge( face.a, face.b, vertices, edges, face, metaVertices ); - processEdge( face.b, face.c, vertices, edges, face, metaVertices ); - processEdge( face.c, face.a, vertices, edges, face, metaVertices ); - - } - - } - - function newFace( newFaces, a, b, c, materialIndex ) { - - newFaces.push( new Face3( a, b, c, undefined, undefined, materialIndex ) ); - - } - - function midpoint( a, b ) { - - return ( Math.abs( b - a ) / 2 ) + Math.min( a, b ); - - } - - function newUv( newUvs, a, b, c ) { - - newUvs.push( [ a.clone(), b.clone(), c.clone() ] ); - - } - - ///////////////////////////// - - // Performs one iteration of Subdivision - SubdivisionModifier.prototype.smooth = function ( geometry ) { - - var tmp = new Vector3(); - - var oldVertices, oldFaces, oldUvs; - var newVertices, newFaces, newUVs = []; - - var n, i, il, j, k; - var metaVertices, sourceEdges; - - // new stuff. - var sourceEdges, newEdgeVertices, newSourceVertices; - - oldVertices = geometry.vertices; // { x, y, z} - oldFaces = geometry.faces; // { a: oldVertex1, b: oldVertex2, c: oldVertex3 } - oldUvs = geometry.faceVertexUvs; - - var hasUvs = oldUvs[ 0 ] !== undefined && oldUvs[ 0 ].length > 0; - - if ( hasUvs ) { - - for ( var j = 0; j < oldUvs.length; j ++ ) { - - newUVs.push( [] ); - - } - - } - - /****************************************************** - * - * Step 0: Preprocess Geometry to Generate edges Lookup - * - *******************************************************/ - - metaVertices = new Array( oldVertices.length ); - sourceEdges = {}; // Edge => { oldVertex1, oldVertex2, faces[] } - - generateLookups( oldVertices, oldFaces, metaVertices, sourceEdges ); - - - /****************************************************** - * - * Step 1. - * For each edge, create a new Edge Vertex, - * then position it. - * - *******************************************************/ - - newEdgeVertices = []; - var other, currentEdge, newEdge, face; - var edgeVertexWeight, adjacentVertexWeight, connectedFaces; - - for ( i in sourceEdges ) { - - currentEdge = sourceEdges[ i ]; - newEdge = new Vector3(); - - edgeVertexWeight = 3 / 8; - adjacentVertexWeight = 1 / 8; - - connectedFaces = currentEdge.faces.length; - - // check how many linked faces. 2 should be correct. - if ( connectedFaces != 2 ) { - - // if length is not 2, handle condition - edgeVertexWeight = 0.5; - adjacentVertexWeight = 0; - - if ( connectedFaces != 1 ) { - - // console.warn( 'Subdivision Modifier: Number of connected faces != 2, is: ', connectedFaces, currentEdge ); - - } - - } - - newEdge.addVectors( currentEdge.a, currentEdge.b ).multiplyScalar( edgeVertexWeight ); - - tmp.set( 0, 0, 0 ); - - for ( j = 0; j < connectedFaces; j ++ ) { - - face = currentEdge.faces[ j ]; - - for ( k = 0; k < 3; k ++ ) { - - other = oldVertices[ face[ ABC[ k ] ] ]; - if ( other !== currentEdge.a && other !== currentEdge.b ) break; - - } - - tmp.add( other ); - - } - - tmp.multiplyScalar( adjacentVertexWeight ); - newEdge.add( tmp ); - - currentEdge.newEdge = newEdgeVertices.length; - newEdgeVertices.push( newEdge ); - - // console.log(currentEdge, newEdge); - - } - - /****************************************************** - * - * Step 2. - * Reposition each source vertices. - * - *******************************************************/ - - var beta, sourceVertexWeight, connectingVertexWeight; - var connectingEdge, connectingEdges, oldVertex, newSourceVertex; - newSourceVertices = []; - - for ( i = 0, il = oldVertices.length; i < il; i ++ ) { - - oldVertex = oldVertices[ i ]; - - // find all connecting edges (using lookupTable) - connectingEdges = metaVertices[ i ].edges; - n = connectingEdges.length; - - if ( n == 3 ) { - - beta = 3 / 16; - - } else if ( n > 3 ) { - - beta = 3 / ( 8 * n ); // Warren's modified formula - - } - - // Loop's original beta formula - // beta = 1 / n * ( 5/8 - Math.pow( 3/8 + 1/4 * Math.cos( 2 * Math. PI / n ), 2) ); - - sourceVertexWeight = 1 - n * beta; - connectingVertexWeight = beta; - - if ( n <= 2 ) { - - // crease and boundary rules - // console.warn('crease and boundary rules'); - - if ( n == 2 ) { - - // console.warn( '2 connecting edges', connectingEdges ); - sourceVertexWeight = 3 / 4; - connectingVertexWeight = 1 / 8; - - // sourceVertexWeight = 1; - // connectingVertexWeight = 0; - - } else if ( n == 1 ) { - - // console.warn( 'only 1 connecting edge' ); - - } else if ( n == 0 ) { - - // console.warn( '0 connecting edges' ); - - } - - } - - newSourceVertex = oldVertex.clone().multiplyScalar( sourceVertexWeight ); - - tmp.set( 0, 0, 0 ); - - for ( j = 0; j < n; j ++ ) { - - connectingEdge = connectingEdges[ j ]; - other = connectingEdge.a !== oldVertex ? connectingEdge.a : connectingEdge.b; - tmp.add( other ); - - } - - tmp.multiplyScalar( connectingVertexWeight ); - newSourceVertex.add( tmp ); - - newSourceVertices.push( newSourceVertex ); - - } - - - /****************************************************** - * - * Step 3. - * Generate Faces between source vertices - * and edge vertices. - * - *******************************************************/ - - newVertices = newSourceVertices.concat( newEdgeVertices ); - var sl = newSourceVertices.length, edge1, edge2, edge3; - newFaces = []; - - var uv, x0, x1, x2; - var x3 = new Vector2(); - var x4 = new Vector2(); - var x5 = new Vector2(); - - for ( i = 0, il = oldFaces.length; i < il; i ++ ) { - - face = oldFaces[ i ]; - - // find the 3 new edges vertex of each old face - - edge1 = getEdge( face.a, face.b, sourceEdges ).newEdge + sl; - edge2 = getEdge( face.b, face.c, sourceEdges ).newEdge + sl; - edge3 = getEdge( face.c, face.a, sourceEdges ).newEdge + sl; - - // create 4 faces. - - newFace( newFaces, edge1, edge2, edge3, face.materialIndex ); - newFace( newFaces, face.a, edge1, edge3, face.materialIndex ); - newFace( newFaces, face.b, edge2, edge1, face.materialIndex ); - newFace( newFaces, face.c, edge3, edge2, face.materialIndex ); - - // create 4 new uv's - - if ( hasUvs ) { - - for ( var j = 0; j < oldUvs.length; j ++ ) { - - uv = oldUvs[ j ][ i ]; - - x0 = uv[ 0 ]; - x1 = uv[ 1 ]; - x2 = uv[ 2 ]; - - x3.set( midpoint( x0.x, x1.x ), midpoint( x0.y, x1.y ) ); - x4.set( midpoint( x1.x, x2.x ), midpoint( x1.y, x2.y ) ); - x5.set( midpoint( x0.x, x2.x ), midpoint( x0.y, x2.y ) ); - - newUv( newUVs[ j ], x3, x4, x5 ); - newUv( newUVs[ j ], x0, x3, x5 ); - - newUv( newUVs[ j ], x1, x4, x3 ); - newUv( newUVs[ j ], x2, x5, x4 ); - - } - - } - - } - - // Overwrite old arrays - geometry.vertices = newVertices; - geometry.faces = newFaces; - if ( hasUvs ) geometry.faceVertexUvs = newUVs; - - // console.log('done'); - - }; - -} )(); - -export { SubdivisionModifier }; diff --git a/examples/screenshots/webgl_modifier_subdivision.jpg b/examples/screenshots/webgl_modifier_subdivision.jpg deleted file mode 100644 index d2a25f4dfc64c6..00000000000000 Binary files a/examples/screenshots/webgl_modifier_subdivision.jpg and /dev/null differ diff --git a/examples/webgl_modifier_subdivision.html b/examples/webgl_modifier_subdivision.html deleted file mode 100644 index 49aa9b43591acd..00000000000000 --- a/examples/webgl_modifier_subdivision.html +++ /dev/null @@ -1,136 +0,0 @@ - - - - three.js webgl - modifier - Subdivisions using Loop Subdivision Scheme - - - - - -
- three.js - subdivision modifier -
- - - - - diff --git a/utils/modularize.js b/utils/modularize.js index 05df5b3fa096c3..da6c82e484dc1e 100644 --- a/utils/modularize.js +++ b/utils/modularize.js @@ -120,7 +120,6 @@ var files = [ { path: 'modifiers/EdgeSplitModifier.js', dependencies: [ { name: 'BufferGeometryUtils', path: 'utils/BufferGeometryUtils.js' } ], ignoreList: [ 'Geometry' ] }, { path: 'modifiers/SimplifyModifier.js', dependencies: [ { name: 'BufferGeometryUtils', path: 'utils/BufferGeometryUtils.js' } ], ignoreList: [] }, - { path: 'modifiers/SubdivisionModifier.js', dependencies: [], ignoreList: [] }, { path: 'modifiers/TessellateModifier.js', dependencies: [], ignoreList: [] }, { path: 'objects/Lensflare.js', dependencies: [], ignoreList: [] },