Removed THREE.BlendingMode, THREE.TextureMapping, THREE.TextureWrapping and...

Removed THREE.BlendingMode, THREE.TextureMapping, THREE.TextureWrapping and THREE.TextureFilter. I was not aware these got added.

docs/api/constants/Materials.html

@@ -61,19 +61,6 @@
 		THREE.CustomBlending
 		</code>
 
-		<div>
-			These can also be accessed using:
-		</div>
-		
-		<code>
-		THREE.BlendingMode.NoBlending
-		THREE.BlendingMode.NormalBlending
-		THREE.BlendingMode.AdditiveBlending
-		THREE.BlendingMode.SubtractiveBlending
-		THREE.BlendingMode.MultiplyBlending
-		THREE.BlendingMode.CustomBlending
-		</code>
-
 
 		<div>
 		These control the source and destination blending equations for the material's RGB and Alpha sent to the WebGLRenderer for use by WebGL.<br />

docs/api/constants/Textures.html

@@ -21,19 +21,6 @@
 		THREE.CubeUVReflectionMapping
 		THREE.CubeUVRefractionMapping
 		</code>
-		<div>
-			These can also be accessed using:
-		</div>
-		<code>
-		THREE.TextureMappingUVMapping
-		THREE.TextureMapping.CubeReflectionMapping
-		THREE.TextureMapping.CubeRefractionMapping
-		THREE.TextureMapping.EquirectangularReflectionMapping
-		THREE.TextureMapping.EquirectangularRefractionMapping
-		THREE.TextureMapping.SphericalReflectionMapping
-		THREE.TextureMapping.CubeUVReflectionMapping
-		THREE.TextureMapping.CubeUVRefractionMapping
-		</code>
 
 		<div>
 		These define the texture's mapping mode.<br />
@@ -60,14 +47,6 @@
 		THREE.ClampToEdgeWrapping
 		THREE.MirroredRepeatWrapping
 		</code>
-		<div>
-			These can also be accessed using:
-		</div>
-		<code>
-		THREE.TextureWrapping.RepeatWrapping
-		THREE.TextureWrapping.ClampToEdgeWrapping
-		THREE.TextureWrapping.MirroredRepeatWrapping
-		</code>
 		<div>
 		These define the texture's [page:Texture.wrapS wrapS] and [page:Texture.wrapT wrapT] properties,
 		which define horizontal and vertical texture wrapping.<br /><br />
@@ -85,13 +64,6 @@
 		THREE.NearestFilter
 		THREE.LinearFilter
 		</code>
-		<div>
-			These can also be accessed using:
-		</div>
-		<code>
-		THREE.TextureFilter.NearestFilter
-		THREE.TextureFilter.LinearFilter
-		</code>
 
 		<div>
 		For use with a texture's [page:Texture.magFilter magFilter]	property,
@@ -116,17 +88,6 @@
 		THREE.LinearMipMapNearestFilter
 		THREE.LinearMipMapLinearFilter
 		</code>
-		<div>
-			These can also be accessed using:
-		</div>
-		<code>
-		THREE.TextureFilter.NearestFilter
-		THREE.TextureFilter.NearestMipMapNearestFilter
-		THREE.TextureFilter.NearestMipMapLinearFilter
-		THREE.TextureFilter.LinearFilter
-		THREE.TextureFilter.LinearMipMapNearestFilter
-		THREE.TextureFilter.LinearMipMapLinearFilter
-		</code>
 
 		<div>
 		For use with a texture's [page:Texture.minFilter minFilter]	property, these define

src/constants.js

@@ -23,14 +23,6 @@ export var AdditiveBlending = 2;
 export var SubtractiveBlending = 3;
 export var MultiplyBlending = 4;
 export var CustomBlending = 5;
-export var BlendingMode = {
-	NoBlending: NoBlending,
-	NormalBlending: NormalBlending,
-	AdditiveBlending: AdditiveBlending,
-	SubtractiveBlending: SubtractiveBlending,
-	MultiplyBlending: MultiplyBlending,
-	CustomBlending: CustomBlending
-};
 export var AddEquation = 100;
 export var SubtractEquation = 101;
 export var ReverseSubtractEquation = 102;
@@ -71,38 +63,15 @@ export var EquirectangularRefractionMapping = 304;
 export var SphericalReflectionMapping = 305;
 export var CubeUVReflectionMapping = 306;
 export var CubeUVRefractionMapping = 307;
-export var TextureMapping = {
-	UVMapping: UVMapping,
-	CubeReflectionMapping: CubeReflectionMapping,
-	CubeRefractionMapping: CubeRefractionMapping,
-	EquirectangularReflectionMapping: EquirectangularReflectionMapping,
-	EquirectangularRefractionMapping: EquirectangularRefractionMapping,
-	SphericalReflectionMapping: SphericalReflectionMapping,
-	CubeUVReflectionMapping: CubeUVReflectionMapping,
-	CubeUVRefractionMapping: CubeUVRefractionMapping
-};
 export var RepeatWrapping = 1000;
 export var ClampToEdgeWrapping = 1001;
 export var MirroredRepeatWrapping = 1002;
-export var TextureWrapping = {
-	RepeatWrapping: RepeatWrapping,
-	ClampToEdgeWrapping: ClampToEdgeWrapping,
-	MirroredRepeatWrapping: MirroredRepeatWrapping
-};
 export var NearestFilter = 1003;
 export var NearestMipMapNearestFilter = 1004;
 export var NearestMipMapLinearFilter = 1005;
 export var LinearFilter = 1006;
 export var LinearMipMapNearestFilter = 1007;
 export var LinearMipMapLinearFilter = 1008;
-export var TextureFilter = {
-	NearestFilter: NearestFilter,
-	NearestMipMapNearestFilter: NearestMipMapNearestFilter,
-	NearestMipMapLinearFilter: NearestMipMapLinearFilter,
-	LinearFilter: LinearFilter,
-	LinearMipMapNearestFilter: LinearMipMapNearestFilter,
-	LinearMipMapLinearFilter: LinearMipMapLinearFilter
-};
 export var UnsignedByteType = 1009;
 export var ByteType = 1010;
 export var ShortType = 1011;

src/loaders/Loader.js

-import { FaceColors, VertexColors, DoubleSide, BackSide, MirroredRepeatWrapping, RepeatWrapping, BlendingMode } from '../constants';
+import {
+	NoBlending,
+	NormalBlending,
+	AdditiveBlending,
+	SubtractiveBlending,
+	MultiplyBlending,
+	CustomBlending,
+
+	FaceColors,
+	VertexColors,
+
+	DoubleSide,
+	BackSide,
+
+	MirroredRepeatWrapping,
+	RepeatWrapping
+} from '../constants';
 import { _Math } from '../math/Math';
 import { MaterialLoader } from './MaterialLoader';
 import { TextureLoader } from './TextureLoader';
@@ -50,6 +66,15 @@ Loader.prototype = {
 
 	createMaterial: ( function () {
 
+		var BlendingMode = {
+			NoBlending: NoBlending,
+			NormalBlending: NormalBlending,
+			AdditiveBlending: AdditiveBlending,
+			SubtractiveBlending: SubtractiveBlending,
+			MultiplyBlending: MultiplyBlending,
+			CustomBlending: CustomBlending
+		};
+
 		var color, textureLoader, materialLoader;
 
 		return function createMaterial( m, texturePath, crossOrigin ) {
@@ -131,6 +156,7 @@ Loader.prototype = {
 				var value = m[ name ];
 
 				switch ( name ) {
+
 					case 'DbgColor':
 					case 'DbgIndex':
 					case 'opticalDensity':
@@ -276,6 +302,7 @@ Loader.prototype = {
 					default:
 						console.error( 'THREE.Loader.createMaterial: Unsupported', name, value );
 						break;
+
 				}
 
 			}
@@ -312,7 +339,7 @@ Loader.Handlers = {
 		for ( var i = 0, l = handlers.length; i < l; i += 2 ) {
 
 			var regex = handlers[ i ];
-			var loader  = handlers[ i + 1 ];
+			var loader = handlers[ i + 1 ];
 
 			if ( regex.test( file ) ) {
 

src/loaders/ObjectLoader.js

-import { TextureMapping, TextureWrapping, TextureFilter } from '../constants';
+import {
+	UVMapping,
+	CubeReflectionMapping,
+	CubeRefractionMapping,
+	EquirectangularReflectionMapping,
+	EquirectangularRefractionMapping,
+	SphericalReflectionMapping,
+	CubeUVReflectionMapping,
+	CubeUVRefractionMapping,
+
+	RepeatWrapping,
+	ClampToEdgeWrapping,
+	MirroredRepeatWrapping,
+
+	NearestFilter,
+	NearestMipMapNearestFilter,
+	NearestMipMapLinearFilter,
+	LinearFilter,
+	LinearMipMapNearestFilter,
+	LinearMipMapLinearFilter
+} from '../constants';
 import { Color } from '../math/Color';
 import { Matrix4 } from '../math/Matrix4';
 import { Object3D } from '../core/Object3D';
@@ -410,6 +430,32 @@ Object.assign( ObjectLoader.prototype, {
 
 	parseTextures: function ( json, images ) {
 
+		var TextureMapping = {
+			UVMapping: UVMapping,
+			CubeReflectionMapping: CubeReflectionMapping,
+			CubeRefractionMapping: CubeRefractionMapping,
+			EquirectangularReflectionMapping: EquirectangularReflectionMapping,
+			EquirectangularRefractionMapping: EquirectangularRefractionMapping,
+			SphericalReflectionMapping: SphericalReflectionMapping,
+			CubeUVReflectionMapping: CubeUVReflectionMapping,
+			CubeUVRefractionMapping: CubeUVRefractionMapping
+		};
+
+		var TextureWrapping = {
+			RepeatWrapping: RepeatWrapping,
+			ClampToEdgeWrapping: ClampToEdgeWrapping,
+			MirroredRepeatWrapping: MirroredRepeatWrapping
+		};
+
+		var TextureFilter = {
+			NearestFilter: NearestFilter,
+			NearestMipMapNearestFilter: NearestMipMapNearestFilter,
+			NearestMipMapLinearFilter: NearestMipMapLinearFilter,
+			LinearFilter: LinearFilter,
+			LinearMipMapNearestFilter: LinearMipMapNearestFilter,
+			LinearMipMapLinearFilter: LinearMipMapLinearFilter
+		};
+
 		function parseConstant( value, type ) {
 
 			if ( typeof( value ) === 'number' ) return value;