From 65f5ed500c26edcaeed59d085dbe74f43d0fdf35 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Thu, 19 Dec 2013 23:01:25 +0700 Subject: [PATCH] Updated builds. --- build/three.js | 6 ++++++ build/three.min.js | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build/three.js b/build/three.js index 6b5d32dba5..cf166aea2a 100644 --- a/build/three.js +++ b/build/three.js @@ -15188,6 +15188,9 @@ THREE.Scene.prototype.__addObject = function ( object ) { } + this.dispatchEvent( { type: 'objectAdded', object: object } ); + object.dispatchEvent( { type: 'addedToScene', scene: this } ); + for ( var c = 0; c < object.children.length; c ++ ) { this.__addObject( object.children[ c ] ); @@ -15234,6 +15237,9 @@ THREE.Scene.prototype.__removeObject = function ( object ) { } + this.dispatchEvent( { type: 'objectRemoved', object: object } ); + object.dispatchEvent( { type: 'removedFromScene', scene: this } ); + for ( var c = 0; c < object.children.length; c ++ ) { this.__removeObject( object.children[ c ] ); diff --git a/build/three.min.js b/build/three.min.js index 45270c7fb0..65e93b6450 100644 --- a/build/three.min.js +++ b/build/three.min.js @@ -295,9 +295,9 @@ THREE.MorphAnimMesh.prototype.updateAnimation=function(a){var b=this.duration/th (this.morphTargetInfluences[this.lastKeyframe]=0,this.morphTargetInfluences[this.currentKeyframe]=1,this.morphTargetInfluences[a]=0,this.lastKeyframe=this.currentKeyframe,this.currentKeyframe=a);b=this.time%b/b;this.directionBackwards&&(b=1-b);this.morphTargetInfluences[this.currentKeyframe]=b;this.morphTargetInfluences[this.lastKeyframe]=1-b}; THREE.MorphAnimMesh.prototype.clone=function(a){void 0===a&&(a=new THREE.MorphAnimMesh(this.geometry,this.material));a.duration=this.duration;a.mirroredLoop=this.mirroredLoop;a.time=this.time;a.lastKeyframe=this.lastKeyframe;a.currentKeyframe=this.currentKeyframe;a.direction=this.direction;a.directionBackwards=this.directionBackwards;THREE.Mesh.prototype.clone.call(this,a);return a};THREE.LOD=function(){THREE.Object3D.call(this);this.objects=[]};THREE.LOD.prototype=Object.create(THREE.Object3D.prototype);THREE.LOD.prototype.addLevel=function(a,b){void 0===b&&(b=0);for(var b=Math.abs(b),c=0;c=this.objects[d].distance)this.objects[d-1].object.visible=!1,this.objects[d].object.visible=!0;else break;for(;d=g||(g*=f.intensity,c.add(Ka.multiplyScalar(g)))}else f instanceof THREE.PointLight&&(h=ta.setFromMatrixPosition(f.matrixWorld),g=b.dot(ta.subVectors(h,a).normalize()),0>=g||(g*=0==f.distance?1:1-Math.min(a.distanceTo(h)/f.distance,1),0!=g&&(g*=f.intensity,c.add(Ka.multiplyScalar(g)))))}} +THREE.Scene.prototype.__addObject=function(a){if(a instanceof THREE.Light)-1===this.__lights.indexOf(a)&&this.__lights.push(a),a.target&&void 0===a.target.parent&&this.add(a.target);else if(!(a instanceof THREE.Camera||a instanceof THREE.Bone)){this.__objectsAdded.push(a);var b=this.__objectsRemoved.indexOf(a);-1!==b&&this.__objectsRemoved.splice(b,1)}this.dispatchEvent({type:"objectAdded",object:a});a.dispatchEvent({type:"addedToScene",scene:this});for(b=0;b=g||(g*=f.intensity,c.add(Ka.multiplyScalar(g)))}else f instanceof THREE.PointLight&&(h=ta.setFromMatrixPosition(f.matrixWorld),g=b.dot(ta.subVectors(h,a).normalize()),0>=g||(g*=0==f.distance?1:1-Math.min(a.distanceTo(h)/f.distance,1),0!=g&&(g*=f.intensity,c.add(Ka.multiplyScalar(g)))))}} function c(a,b,c,d){l(b);p(c);m(d);s(a.getStyle());D.stroke();Ea.expandByScalar(2*b)}function d(a){t(a.getStyle());D.fill()}function e(a,b,c,e,f,h,g,j,i,k,l,p,m){if(!(m instanceof THREE.DataTexture||void 0===m.image||0===m.image.width)){if(!0===m.needsUpdate){var n=m.wrapS===THREE.RepeatWrapping,q=m.wrapT===THREE.RepeatWrapping;Ga[m.id]=D.createPattern(m.image,!0===n&&!0===q?"repeat":!0===n&&!1===q?"repeat-x":!1===n&&!0===q?"repeat-y":"no-repeat");m.needsUpdate=!1}void 0===Ga[m.id]?t("rgba(0,0,0,1)"): t(Ga[m.id]);var n=m.offset.x/m.repeat.x,q=m.offset.y/m.repeat.y,s=m.image.width*m.repeat.x,r=m.image.height*m.repeat.y,g=(g+n)*s,j=(1-j+q)*r,c=c-a,e=e-b,f=f-a,h=h-b,i=(i+n)*s-g,k=(1-k+q)*r-j,l=(l+n)*s-g,p=(1-p+q)*r-j,n=i*p-l*k;0===n?(void 0===ka[m.id]&&(b=document.createElement("canvas"),b.width=m.image.width,b.height=m.image.height,b=b.getContext("2d"),b.drawImage(m.image,0,0),ka[m.id]=b.getImageData(0,0,m.image.width,m.image.height).data),b=ka[m.id],g=4*(Math.floor(g)+Math.floor(j)*m.image.width), V.setRGB(b[g]/255,b[g+1]/255,b[g+2]/255),d(V)):(n=1/n,m=(p*c-k*f)*n,k=(p*e-k*h)*n,c=(i*f-l*c)*n,e=(i*h-l*e)*n,a=a-m*g-c*j,g=b-k*g-e*j,D.save(),D.transform(m,k,c,e,a,g),D.fill(),D.restore())}}function f(a,b,c,d,e,f,h,g,j,i,k,l,p){var m,n;m=p.width-1;n=p.height-1;h*=m;g*=n;c-=a;d-=b;e-=a;f-=b;j=j*m-h;i=i*n-g;k=k*m-h;l=l*n-g;n=1/(j*l-k*i);m=(l*c-i*e)*n;i=(l*d-i*f)*n;c=(j*e-k*c)*n;d=(j*f-k*d)*n;a=a-m*h-c*g;b=b-i*h-d*g;D.save();D.transform(m,i,c,d,a,b);D.clip();D.drawImage(p,0,0);D.restore()}function h(a, -- GitLab