Loader: Improved loadTexture.

mrdoob · mrdoob · commit ca85e3a2c926 · 2015-10-14T13:58:48.000-04:00
diff --git a/src/loaders/Loader.js b/src/loaders/Loader.js
@@ -76,16 +76,16 @@ THREE.Loader.prototype = {
 
 				if ( repeat !== undefined ) {
 
-					texture.repeat.set( repeat[ 0 ], repeat[ 1 ] );
+					texture.repeat.fromArray( repeat );
 
-					if ( repeat[ 0 ] > 1 ) texture.wrapS = THREE.RepeatWrapping;
-					if ( repeat[ 1 ] > 1 ) texture.wrapT = THREE.RepeatWrapping;
+					if ( repeat[ 0 ] !== 1 ) texture.wrapS = THREE.RepeatWrapping;
+					if ( repeat[ 1 ] !== 1 ) texture.wrapT = THREE.RepeatWrapping;
 
 				}
 
 				if ( offset !== undefined ) {
 
-					texture.offset.set( offset[ 0 ], offset[ 1 ] );
+					texture.offset.fromArray( offset );
 
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -76,16 +76,16 @@ THREE.Loader.prototype = {`
`76`	`76`
`77`	`77`	`if ( repeat !== undefined ) {`
`78`	`78`
`79`		`- texture.repeat.set( repeat[ 0 ], repeat[ 1 ] );`
	`79`	`+ texture.repeat.fromArray( repeat );`
`80`	`80`
`81`		`- if ( repeat[ 0 ] > 1 ) texture.wrapS = THREE.RepeatWrapping;`
`82`		`- if ( repeat[ 1 ] > 1 ) texture.wrapT = THREE.RepeatWrapping;`
	`81`	`+ if ( repeat[ 0 ] !== 1 ) texture.wrapS = THREE.RepeatWrapping;`
	`82`	`+ if ( repeat[ 1 ] !== 1 ) texture.wrapT = THREE.RepeatWrapping;`
`83`	`83`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`if ( offset !== undefined ) {`
`87`	`87`
`88`		`- texture.offset.set( offset[ 0 ], offset[ 1 ] );`
	`88`	`+ texture.offset.fromArray( offset );`
`89`	`89`
`90`	`90`	`}`
`91`	`91`