|
@@ -180,6 +180,86 @@ Object.defineProperties( THREE.WebGLRenderer.prototype, {
|
|
|
|
|
|
//
|
|
|
|
|
|
+THREE.GeometryUtils = {
|
|
|
+
|
|
|
+ merge: function ( geometry1, geometry2, materialIndexOffset ) {
|
|
|
+
|
|
|
+ console.warn( 'THREE.GeometryUtils: .merge() has been moved to Geometry. Use geometry.merge( geometry2, matrix, materialIndexOffset ) instead.' );
|
|
|
+
|
|
|
+ var matrix;
|
|
|
+
|
|
|
+ if ( geometry2 instanceof THREE.Mesh ) {
|
|
|
+
|
|
|
+ geometry2.matrixAutoUpdate && geometry2.updateMatrix();
|
|
|
+
|
|
|
+ matrix = geometry2.matrix;
|
|
|
+ geometry2 = geometry2.geometry;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ geometry1.merge( geometry2, matrix, materialIndexOffset );
|
|
|
+
|
|
|
+ },
|
|
|
+
|
|
|
+ center: function ( geometry ) {
|
|
|
+
|
|
|
+ console.warn( 'THREE.GeometryUtils: .center() has been moved to Geometry. Use geometry.center() instead.' );
|
|
|
+ return geometry.center();
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+};
|
|
|
+
|
|
|
+THREE.ImageUtils = {
|
|
|
+
|
|
|
+ crossOrigin: undefined,
|
|
|
+
|
|
|
+ loadTexture: function ( url, mapping, onLoad, onError ) {
|
|
|
+
|
|
|
+ console.warn( 'THREE.ImageUtils.loadTexture has been deprecated. Use THREE.TextureLoader() instead.' );
|
|
|
+
|
|
|
+ var loader = new THREE.TextureLoader();
|
|
|
+ loader.setCrossOrigin( this.crossOrigin );
|
|
|
+
|
|
|
+ var texture = loader.load( url, onLoad, undefined, onError );
|
|
|
+
|
|
|
+ if ( mapping ) texture.mapping = mapping;
|
|
|
+
|
|
|
+ return texture;
|
|
|
+
|
|
|
+ },
|
|
|
+
|
|
|
+ loadTextureCube: function ( urls, mapping, onLoad, onError ) {
|
|
|
+
|
|
|
+ console.warn( 'THREE.ImageUtils.loadTextureCube has been deprecated. Use THREE.CubeTextureLoader() instead.' );
|
|
|
+
|
|
|
+ var loader = new THREE.CubeTextureLoader();
|
|
|
+ loader.setCrossOrigin( this.crossOrigin );
|
|
|
+
|
|
|
+ var texture = loader.load( urls, onLoad, undefined, onError );
|
|
|
+
|
|
|
+ if ( mapping ) texture.mapping = mapping;
|
|
|
+
|
|
|
+ return texture;
|
|
|
+
|
|
|
+ },
|
|
|
+
|
|
|
+ loadCompressedTexture: function () {
|
|
|
+
|
|
|
+ console.error( 'THREE.ImageUtils.loadCompressedTexture has been removed. Use THREE.DDSLoader instead.' )
|
|
|
+
|
|
|
+ },
|
|
|
+
|
|
|
+ loadCompressedTextureCube: function () {
|
|
|
+
|
|
|
+ console.error( 'THREE.ImageUtils.loadCompressedTextureCube has been removed. Use THREE.DDSLoader instead.' )
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+};
|
|
|
+
|
|
|
+//
|
|
|
+
|
|
|
THREE.Projector = function () {
|
|
|
|
|
|
console.error( 'THREE.Projector has been moved to /examples/js/renderers/Projector.js.' );
|