Change *IdCount functions back to variables

src/Three.js

@@ -45,7 +45,7 @@ export { CompressedTexture } from './textures/CompressedTexture.js';
 export { CubeTexture } from './textures/CubeTexture.js';
 export { CanvasTexture } from './textures/CanvasTexture.js';
 export { DepthTexture } from './textures/DepthTexture.js';
-export { TextureIdCount, Texture } from './textures/Texture.js';
+export { Texture } from './textures/Texture.js';
 export { ShadowMaterial } from './materials/ShadowMaterial.js';
 export { SpriteMaterial } from './materials/SpriteMaterial.js';
 export { RawShaderMaterial } from './materials/RawShaderMaterial.js';
@@ -61,7 +61,7 @@ export { MeshDepthMaterial } from './materials/MeshDepthMaterial.js';
 export { MeshBasicMaterial } from './materials/MeshBasicMaterial.js';
 export { LineDashedMaterial } from './materials/LineDashedMaterial.js';
 export { LineBasicMaterial } from './materials/LineBasicMaterial.js';
-export { MaterialIdCount, Material } from './materials/Material.js';
+export { Material } from './materials/Material.js';
 export { CompressedTextureLoader } from './loaders/CompressedTextureLoader.js';
 export { BinaryTextureLoader, DataTextureLoader } from './loaders/BinaryTextureLoader.js';
 export { CubeTextureLoader } from './loaders/CubeTextureLoader.js';
@@ -113,7 +113,7 @@ export { Uniform } from './core/Uniform.js';
 export { InstancedBufferGeometry } from './core/InstancedBufferGeometry.js';
 export { BufferGeometry } from './core/BufferGeometry.js';
 export { DirectGeometry } from './core/DirectGeometry.js';
-export { GeometryIdCount, Geometry } from './core/Geometry.js';
+export { Geometry } from './core/Geometry.js';
 export { InterleavedBufferAttribute } from './core/InterleavedBufferAttribute.js';
 export { InstancedInterleavedBuffer } from './core/InstancedInterleavedBuffer.js';
 export { InterleavedBuffer } from './core/InterleavedBuffer.js';
@@ -132,7 +132,7 @@ export {
   BufferAttribute
 } from './core/BufferAttribute.js';
 export { Face3 } from './core/Face3.js';
-export { Object3DIdCount, Object3D } from './core/Object3D.js';
+export { Object3D } from './core/Object3D.js';
 export { Raycaster } from './core/Raycaster.js';
 export { Layers } from './core/Layers.js';
 export { EventDispatcher } from './core/EventDispatcher.js';

src/core/BufferGeometry.js

@@ -8,7 +8,7 @@ import { Object3D } from './Object3D';
 import { Matrix4 } from '../math/Matrix4';
 import { Matrix3 } from '../math/Matrix3';
 import { _Math } from '../math/Math';
-import { GeometryIdCount } from './Geometry';
+import { Geometry } from './Geometry';
 
 /**
  * @author alteredq / http://alteredqualia.com/
@@ -17,7 +17,7 @@ import { GeometryIdCount } from './Geometry';
 
 function BufferGeometry() {
 
-	Object.defineProperty( this, 'id', { value: GeometryIdCount() } );
+	Object.defineProperty( this, 'id', { value: Geometry.IdCount ++ } );
 
 	this.uuid = _Math.generateUUID();
 

src/core/DirectGeometry.js

@@ -2,15 +2,15 @@ import { Geometry } from './Geometry';
 import { EventDispatcher } from './EventDispatcher';
 import { Vector2 } from '../math/Vector2';
 import { _Math } from '../math/Math';
-import { GeometryIdCount } from './Geometry';
+import { Geometry } from './Geometry';
 
 /**
  * @author mrdoob / http://mrdoob.com/
  */
 
 function DirectGeometry() {
 
-	Object.defineProperty( this, 'id', { value: GeometryIdCount() } );
+	Object.defineProperty( this, 'id', { value: Geometry.IdCount ++ } );
 
 	this.uuid = _Math.generateUUID();
 

src/core/Geometry.js

@@ -21,7 +21,7 @@ import { _Math } from '../math/Math';
 
 function Geometry() {
 
-	Object.defineProperty( this, 'id', { value: GeometryIdCount() } );
+	Object.defineProperty( this, 'id', { value: Geometry.IdCount ++ } );
 
 	this.uuid = _Math.generateUUID();
 
@@ -1216,8 +1216,7 @@ Object.assign( Geometry.prototype, EventDispatcher.prototype, {
 
 } );
 
-var count = 0;
-function GeometryIdCount() { return count++; };
+Geometry.IdCount = 0;
 
 
-export { GeometryIdCount, Geometry };
+export { Geometry };

src/core/Object3D.js

@@ -17,7 +17,7 @@ import { _Math } from '../math/Math';
 
 function Object3D() {
 
-	Object.defineProperty( this, 'id', { value: Object3DIdCount() } );
+	Object.defineProperty( this, 'id', { value: Object3D.IdCount ++ } );
 
 	this.uuid = _Math.generateUUID();
 
@@ -724,8 +724,7 @@ Object.assign( Object3D.prototype, EventDispatcher.prototype, {
 
 } );
 
-var count = 0;
-function Object3DIdCount() { return count++; };
+Object3D.IdCount = 0;
 
 
-export { Object3DIdCount, Object3D };
+export { Object3D };

src/materials/Material.js

@@ -9,7 +9,7 @@ import { _Math } from '../math/Math';
 
 function Material() {
 
-	Object.defineProperty( this, 'id', { value: MaterialIdCount() } );
+	Object.defineProperty( this, 'id', { value: Material.IdCount ++ } );
 
 	this.uuid = _Math.generateUUID();
 
@@ -338,8 +338,7 @@ Material.prototype = {
 
 Object.assign( Material.prototype, EventDispatcher.prototype );
 
-var count = 0;
-function MaterialIdCount() { return count++; };
+Material.IdCount = 0;
 
 
-export { MaterialIdCount, Material };
+export { Material };

src/textures/Texture.js

@@ -12,7 +12,7 @@ import { Vector2 } from '../math/Vector2';
 
 function Texture( image, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy, encoding ) {
 
-	Object.defineProperty( this, 'id', { value: TextureIdCount() } );
+	Object.defineProperty( this, 'id', { value: Texture.IdCount ++ } );
 
 	this.uuid = _Math.generateUUID();
 
@@ -286,8 +286,7 @@ Texture.prototype = {
 
 Object.assign( Texture.prototype, EventDispatcher.prototype );
 
-var count = 0;
-function TextureIdCount() { return count++; };
+Texture.IdCount = 0;
 
 
-export { TextureIdCount, Texture };
+export { Texture };