Pārlūkot izejas kodu

Fixed bug in SceneLoader: inverseTarget => targetInverse

alteredq 12 gadi atpakaļ
vecāks
revīzija
da48350b6a
3 mainītis faili ar 3 papildinājumiem un 3 dzēšanām
  1. 1 1
      build/three.js
  2. 1 1
      build/three.min.js
  3. 1 1
      src/loaders/SceneLoader.js

+ 1 - 1
build/three.js

@@ -9609,7 +9609,7 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 			}
 
-			ta.object.target.properties.inverseTarget = ta.object;
+			ta.object.target.properties.targetInverse = ta.object;
 
 		}
 

+ 1 - 1
build/three.min.js

@@ -197,7 +197,7 @@ e.castShadow,g.receiveShadow=e.receiveShadow,a.add(g),P.objects[c]=g}else"Direct
 u[2])):"AmbientLight"===e.type&&(K=new THREE.AmbientLight(H)),a.add(K),K.name=c,P.lights[c]=K,P.objects[c]=K):"PerspectiveCamera"===e.type||"OrthographicCamera"===e.type?("PerspectiveCamera"===e.type?I=new THREE.PerspectiveCamera(e.fov,e.aspect,e.near,e.far):"OrthographicCamera"===e.type&&(I=new THREE.OrthographicCamera(w.left,w.right,w.top,w.bottom,w.near,w.far)),u=e.position,I.position.set(u[0],u[1],u[2]),a.add(I),I.name=c,P.cameras[c]=I,P.objects[c]=I):(u=e.position,t=e.rotation,F=e.quaternion,
 z=e.scale,F=0,g=new THREE.Object3D,g.name=c,g.position.set(u[0],u[1],u[2]),F?(g.quaternion.set(F[0],F[1],F[2],F[3]),g.useQuaternion=!0):g.rotation.set(t[0],t[1],t[2]),g.scale.set(z[0],z[1],z[2]),g.visible=void 0!==e.visible?e.visible:!1,a.add(g),P.objects[c]=g,P.empties[c]=g);if(g){if(void 0!==e.properties)for(var n in e.properties)g.properties[n]=e.properties[n];void 0!==e.children&&f(g,e.children)}}}function g(a){return function(b){P.geometries[a]=b;e();N-=1;m.onLoadComplete();j()}}function h(a,
 b,c,d){return function(f){var f=f.content?f.content:f.dae?f.scene:f,g=d.position,h=d.rotation,i=d.quaternion,l=d.scale;f.position.set(g[0],g[1],g[2]);i?(f.quaternion.set(i[0],i[1],i[2],i[3]),f.useQuaternion=!0):f.rotation.set(h[0],h[1],h[2]);f.scale.set(l[0],l[1],l[2]);c&&f.traverse(function(a){a.material=c});b.add(f);P.objects[a]=f;e();N-=1;m.onLoadComplete();j()}}function i(a){return function(b){P.geometries[a]=b}}function j(){m.callbackProgress({totalModels:R,totalTextures:aa,loadedModels:R-N,
-loadedTextures:aa-M},P);m.onLoadProgress();if(0===N&&0===M){for(var a=0;a<O.length;a++){var c=O[a],d=P.objects[c.targetName];d?c.object.target=d:(c.object.target=new THREE.Object3D,P.scene.add(c.object.target));c.object.target.properties.inverseTarget=c.object}b(P)}}var m=this,n=THREE.Loader.prototype.extractUrlBase(c),l,p,o,q,s,r,A,u,t,F,z,w,v,C,D,I,L,B,K,H,G,N,M,R,aa,P,O=[],Q=a,U;for(U in this.geometryHandlerMap)a=this.geometryHandlerMap[U].loaderClass,this.geometryHandlerMap[U].loaderObject=new a;
+loadedTextures:aa-M},P);m.onLoadProgress();if(0===N&&0===M){for(var a=0;a<O.length;a++){var c=O[a],d=P.objects[c.targetName];d?c.object.target=d:(c.object.target=new THREE.Object3D,P.scene.add(c.object.target));c.object.target.properties.targetInverse=c.object}b(P)}}var m=this,n=THREE.Loader.prototype.extractUrlBase(c),l,p,o,q,s,r,A,u,t,F,z,w,v,C,D,I,L,B,K,H,G,N,M,R,aa,P,O=[],Q=a,U;for(U in this.geometryHandlerMap)a=this.geometryHandlerMap[U].loaderClass,this.geometryHandlerMap[U].loaderObject=new a;
 for(U in this.hierarchyHandlerMap)a=this.hierarchyHandlerMap[U].loaderClass,this.hierarchyHandlerMap[U].loaderObject=new a;M=N=0;P={scene:new THREE.Scene,geometries:{},materials:{},textures:{},objects:{},cameras:{},lights:{},fogs:{},empties:{}};if(Q.transform&&(U=Q.transform.position,a=Q.transform.rotation,c=Q.transform.scale,U&&P.scene.position.set(U[0],U[1],U[2]),a&&P.scene.rotation.set(a[0],a[1],a[2]),c&&P.scene.scale.set(c[0],c[1],c[2]),U||a||c))P.scene.updateMatrix(),P.scene.updateMatrixWorld();
 U=function(a){return function(){M-=a;j();m.onLoadComplete()}};for(o in Q.fogs)a=Q.fogs[o],"linear"===a.type?L=new THREE.Fog(0,a.near,a.far):"exp2"===a.type&&(L=new THREE.FogExp2(0,a.density)),w=a.color,L.color.setRGB(w[0],w[1],w[2]),P.fogs[o]=L;for(l in Q.geometries)s=Q.geometries[l],s.type in this.geometryHandlerMap&&(N+=1,m.onLoadStart());for(var J in Q.objects)o=Q.objects[J],o.type&&o.type in this.hierarchyHandlerMap&&(N+=1,m.onLoadStart());R=N;for(l in Q.geometries)if(s=Q.geometries[l],"cube"===
 s.type)C=new THREE.CubeGeometry(s.width,s.height,s.depth,s.widthSegments,s.heightSegments,s.depthSegments,null,s.flipped,s.sides),P.geometries[l]=C;else if("plane"===s.type)C=new THREE.PlaneGeometry(s.width,s.height,s.widthSegments,s.heightSegments),P.geometries[l]=C;else if("sphere"===s.type)C=new THREE.SphereGeometry(s.radius,s.widthSegments,s.heightSegments),P.geometries[l]=C;else if("cylinder"===s.type)C=new THREE.CylinderGeometry(s.topRad,s.botRad,s.height,s.radSegs,s.heightSegs),P.geometries[l]=

+ 1 - 1
src/loaders/SceneLoader.js

@@ -642,7 +642,7 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 			}
 
-			ta.object.target.properties.inverseTarget = ta.object;
+			ta.object.target.properties.targetInverse = ta.object;
 
 		}