|
@@ -6,6 +6,13 @@
|
|
|
|
|
|
var THREE = { REVISION: '68dev' };
|
|
|
|
|
|
+// browserify support
|
|
|
+if ( typeof module === 'object' ) {
|
|
|
+
|
|
|
+ module.exports = THREE;
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
self.console = self.console || {
|
|
|
|
|
|
info: function () {},
|
|
@@ -14845,7 +14852,7 @@ THREE.MorphAnimMesh.prototype.parseAnimations = function () {
|
|
|
|
|
|
var firstAnimation, animations = geometry.animations;
|
|
|
|
|
|
- var pattern = /([a-z]+)(\d+)/;
|
|
|
+ var pattern = /([a-z]+)_?(\d+)/;
|
|
|
|
|
|
for ( var i = 0, il = geometry.morphTargets.length; i < il; i ++ ) {
|
|
|
|
|
@@ -20571,10 +20578,10 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
var size = 1; // "f" and "i"
|
|
|
|
|
|
- if( attribute.type === "v2" ) size = 2;
|
|
|
- else if( attribute.type === "v3" ) size = 3;
|
|
|
- else if( attribute.type === "v4" ) size = 4;
|
|
|
- else if( attribute.type === "c" ) size = 3;
|
|
|
+ if ( attribute.type === "v2" ) size = 2;
|
|
|
+ else if ( attribute.type === "v3" ) size = 3;
|
|
|
+ else if ( attribute.type === "v4" ) size = 4;
|
|
|
+ else if ( attribute.type === "c" ) size = 3;
|
|
|
|
|
|
attribute.size = size;
|
|
|
|
|
@@ -22044,7 +22051,7 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
normalArray,
|
|
|
i, il = object.count * 3;
|
|
|
|
|
|
- for( i = 0; i < il; i += 9 ) {
|
|
|
+ for ( i = 0; i < il; i += 9 ) {
|
|
|
|
|
|
normalArray = object.normalArray;
|
|
|
|
|
@@ -22307,7 +22314,7 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
var type, size;
|
|
|
|
|
|
- if ( index.array instanceof Uint32Array ){
|
|
|
+ if ( index.array instanceof Uint32Array ) {
|
|
|
|
|
|
type = _gl.UNSIGNED_INT;
|
|
|
size = 4;
|
|
@@ -23472,7 +23479,7 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
// check all geometry groups
|
|
|
|
|
|
- for( var i = 0, il = geometry.geometryGroupsList.length; i < il; i ++ ) {
|
|
|
+ for ( var i = 0, il = geometry.geometryGroupsList.length; i < il; i ++ ) {
|
|
|
|
|
|
geometryGroup = geometry.geometryGroupsList[ i ];
|
|
|
|
|
@@ -24528,7 +24535,7 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
- for( i = 0, il = uniform.value.length; i < il; i ++ ) {
|
|
|
+ for ( i = 0, il = uniform.value.length; i < il; i ++ ) {
|
|
|
|
|
|
uniform._array[ i ] = getTextureUnit();
|
|
|
|
|
@@ -24536,7 +24543,7 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
_gl.uniform1iv( location, uniform._array );
|
|
|
|
|
|
- for( i = 0, il = uniform.value.length; i < il; i ++ ) {
|
|
|
+ for ( i = 0, il = uniform.value.length; i < il; i ++ ) {
|
|
|
|
|
|
texture = uniform.value[ i ];
|
|
|
textureUnit = uniform._array[ i ];
|
|
@@ -25135,10 +25142,10 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
} else if ( texture instanceof THREE.CompressedTexture ) {
|
|
|
|
|
|
- for( var i = 0, il = mipmaps.length; i < il; i ++ ) {
|
|
|
+ for ( var i = 0, il = mipmaps.length; i < il; i ++ ) {
|
|
|
|
|
|
mipmap = mipmaps[ i ];
|
|
|
- if ( texture.format!==THREE.RGBAFormat ) {
|
|
|
+ if ( texture.format !== THREE.RGBAFormat ) {
|
|
|
_gl.compressedTexImage2D( _gl.TEXTURE_2D, i, glFormat, mipmap.width, mipmap.height, 0, mipmap.data );
|
|
|
} else {
|
|
|
_gl.texImage2D( _gl.TEXTURE_2D, i, glFormat, mipmap.width, mipmap.height, 0, glFormat, glType, mipmap.data );
|
|
@@ -25260,7 +25267,7 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
for ( var i = 0; i < 6; i ++ ) {
|
|
|
|
|
|
- if( !isCompressed ) {
|
|
|
+ if ( !isCompressed ) {
|
|
|
|
|
|
_gl.texImage2D( _gl.TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, glFormat, glFormat, glType, cubeImage[ i ] );
|
|
|
|
|
@@ -25268,10 +25275,10 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
var mipmap, mipmaps = cubeImage[ i ].mipmaps;
|
|
|
|
|
|
- for( var j = 0, jl = mipmaps.length; j < jl; j ++ ) {
|
|
|
+ for ( var j = 0, jl = mipmaps.length; j < jl; j ++ ) {
|
|
|
|
|
|
mipmap = mipmaps[ j ];
|
|
|
- if ( texture.format!==THREE.RGBAFormat ) {
|
|
|
+ if ( texture.format !== THREE.RGBAFormat ) {
|
|
|
|
|
|
_gl.compressedTexImage2D( _gl.TEXTURE_CUBE_MAP_POSITIVE_X + i, j, glFormat, mipmap.width, mipmap.height, 0, mipmap.data );
|
|
|
|
|
@@ -25330,7 +25337,7 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
_gl.framebufferRenderbuffer( _gl.FRAMEBUFFER, _gl.DEPTH_ATTACHMENT, _gl.RENDERBUFFER, renderbuffer );
|
|
|
|
|
|
/* For some reason this is not working. Defaulting to RGBA4.
|
|
|
- } else if( ! renderTarget.depthBuffer && renderTarget.stencilBuffer ) {
|
|
|
+ } else if ( ! renderTarget.depthBuffer && renderTarget.stencilBuffer ) {
|
|
|
|
|
|
_gl.renderbufferStorage( _gl.RENDERBUFFER, _gl.STENCIL_INDEX8, renderTarget.width, renderTarget.height );
|
|
|
_gl.framebufferRenderbuffer( _gl.FRAMEBUFFER, _gl.STENCIL_ATTACHMENT, _gl.RENDERBUFFER, renderbuffer );
|
|
@@ -25662,7 +25669,7 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
var maxShadows = 0;
|
|
|
|
|
|
- for ( var l = 0, ll = lights.length; l < ll; l++ ) {
|
|
|
+ for ( var l = 0, ll = lights.length; l < ll; l ++ ) {
|
|
|
|
|
|
var light = lights[ l ];
|
|
|
|
|
@@ -26358,7 +26365,7 @@ THREE.RenderableFace = function () {
|
|
|
this.vertexNormalsModel = [ new THREE.Vector3(), new THREE.Vector3(), new THREE.Vector3() ];
|
|
|
this.vertexNormalsLength = 0;
|
|
|
|
|
|
- this.color = null;
|
|
|
+ this.color = new THREE.Color();
|
|
|
this.material = null;
|
|
|
this.uvs = [ new THREE.Vector2(), new THREE.Vector2(), new THREE.Vector2() ];
|
|
|
|
|
@@ -35412,7 +35419,7 @@ THREE.MorphBlendMesh.prototype.createAnimation = function ( name, start, end, fp
|
|
|
|
|
|
THREE.MorphBlendMesh.prototype.autoCreateAnimations = function ( fps ) {
|
|
|
|
|
|
- var pattern = /([a-z]+)(\d+)/;
|
|
|
+ var pattern = /([a-z]+)_?(\d+)/;
|
|
|
|
|
|
var firstAnimation, frameRanges = {};
|
|
|
|