|
@@ -1,15 +1,13 @@
|
|
/**
|
|
/**
|
|
* @author mr.doob / http://mrdoob.com/
|
|
* @author mr.doob / http://mrdoob.com/
|
|
* @author alteredq / http://alteredqualia.com/
|
|
* @author alteredq / http://alteredqualia.com/
|
|
- * }
|
|
|
|
*/
|
|
*/
|
|
|
|
|
|
THREE.Texture = function ( image, mapping, wrap_s, wrap_t ) {
|
|
THREE.Texture = function ( image, mapping, wrap_s, wrap_t ) {
|
|
|
|
|
|
this.image = image;
|
|
this.image = image;
|
|
- this.loaded = false;
|
|
|
|
|
|
|
|
- this.mapping = mapping !== undefined ? mapping : THREE.UVMapping;
|
|
|
|
|
|
+ this.mapping = mapping !== undefined ? mapping : new THREE.UVMapping();
|
|
|
|
|
|
this.wrap_s = wrap_s !== undefined ? wrap_s : THREE.ClampToEdge;
|
|
this.wrap_s = wrap_s !== undefined ? wrap_s : THREE.ClampToEdge;
|
|
this.wrap_t = wrap_t !== undefined ? wrap_t : THREE.ClampToEdge;
|
|
this.wrap_t = wrap_t !== undefined ? wrap_t : THREE.ClampToEdge;
|
|
@@ -26,13 +24,9 @@ THREE.Texture = function ( image, mapping, wrap_s, wrap_t ) {
|
|
|
|
|
|
};
|
|
};
|
|
|
|
|
|
-THREE.UVMapping = 0;
|
|
|
|
-THREE.ReflectionMapping = 1;
|
|
|
|
-THREE.RefractionMapping = 2;
|
|
|
|
|
|
+THREE.MultiplyOperation = 0;
|
|
|
|
+THREE.MixOperation = 1;
|
|
|
|
|
|
-THREE.Multiply = 0;
|
|
|
|
-THREE.Mix = 1;
|
|
|
|
-
|
|
|
|
-THREE.Repeat = 0; // TODO: Rename to *Wrapping
|
|
|
|
-THREE.ClampToEdge = 1;
|
|
|
|
-THREE.MirroredRepeat = 2;
|
|
|
|
|
|
+THREE.RepeatWrapping = 0;
|
|
|
|
+THREE.ClampToEdgeWrapping = 1;
|
|
|
|
+THREE.MirroredRepeatWrapping = 2;
|