Set better defaults for DataTexture

gero3 · gero3 · commit d0148758941f · 2015-08-28T08:09:53.000Z
diff --git a/examples/js/Ocean.js b/examples/js/Ocean.js
@@ -248,8 +248,6 @@ THREE.Ocean.prototype.generateSeedPhaseTexture = function() {
 	}
 
 	this.pingPhaseTexture = new THREE.DataTexture( phaseArray, this.resolution, this.resolution, THREE.RGBAFormat );
-	this.pingPhaseTexture.minFilter = THREE.NearestFilter;
-	this.pingPhaseTexture.magFilter = THREE.NearestFilter;
 	this.pingPhaseTexture.wrapS = THREE.ClampToEdgeWrapping;
 	this.pingPhaseTexture.wrapT = THREE.ClampToEdgeWrapping;
 	this.pingPhaseTexture.type = THREE.FloatType;
diff --git a/examples/js/SimulationRenderer.js b/examples/js/SimulationRenderer.js
@@ -206,7 +206,6 @@ function SimulationRenderer( WIDTH, renderer ) {
 		texture.minFilter = THREE.NearestFilter;
 		texture.magFilter = THREE.NearestFilter;
 		texture.needsUpdate = true;
-		texture.flipY = false;
 
 		return texture;
 
@@ -232,7 +231,6 @@ function SimulationRenderer( WIDTH, renderer ) {
 		texture.minFilter = THREE.NearestFilter;
 		texture.magFilter = THREE.NearestFilter;
 		texture.needsUpdate = true;
-		texture.flipY = false;
 
 		return texture;
 
diff --git a/examples/js/postprocessing/GlitchPass.js b/examples/js/postprocessing/GlitchPass.js
@@ -113,7 +113,6 @@ THREE.GlitchPass.prototype = {
 		texture.minFilter = THREE.NearestFilter;
 		texture.magFilter = THREE.NearestFilter;
 		texture.needsUpdate = true;
-		texture.flipY = false;
 		return texture;
 
 	}
diff --git a/src/objects/Skeleton.js b/src/objects/Skeleton.js
@@ -38,10 +38,6 @@ THREE.Skeleton = function ( bones, boneInverses, useVertexTexture ) {
 
 		this.boneMatrices = new Float32Array( this.boneTextureWidth * this.boneTextureHeight * 4 ); // 4 floats per RGBA pixel
 		this.boneTexture = new THREE.DataTexture( this.boneMatrices, this.boneTextureWidth, this.boneTextureHeight, THREE.RGBAFormat, THREE.FloatType );
-		this.boneTexture.minFilter = THREE.NearestFilter;
-		this.boneTexture.magFilter = THREE.NearestFilter;
-		this.boneTexture.generateMipmaps = false;
-		this.boneTexture.flipY = false;
 
 	} else {
 
diff --git a/src/textures/DataTexture.js b/src/textures/DataTexture.js
@@ -3,10 +3,25 @@
  */
 
 THREE.DataTexture = function ( data, width, height, format, type, mapping, wrapS, wrapT, magFilter, minFilter, anisotropy ) {
+	
+	if ( magFilter === undefined ) {
+		
+		magFilter = THREE.NearestFilter;
+		
+	}
+	
+	if ( minFilter === undefined ) {
+		
+		minFilter = THREE.NearestFilter;
+		
+	}
 
 	THREE.Texture.call( this, null, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy );
 
 	this.image = { data: data, width: width, height: height };
+	
+	this.flipY = false;
+	this.generateMipmaps  = false;
 
 };
 

Original file line number	Diff line number	Diff line change
`@@ -248,8 +248,6 @@ THREE.Ocean.prototype.generateSeedPhaseTexture = function() {`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`this.pingPhaseTexture = new THREE.DataTexture( phaseArray, this.resolution, this.resolution, THREE.RGBAFormat );`
`251`		`- this.pingPhaseTexture.minFilter = THREE.NearestFilter;`
`252`		`- this.pingPhaseTexture.magFilter = THREE.NearestFilter;`
`253`	`251`	`this.pingPhaseTexture.wrapS = THREE.ClampToEdgeWrapping;`
`254`	`252`	`this.pingPhaseTexture.wrapT = THREE.ClampToEdgeWrapping;`
`255`	`253`	`this.pingPhaseTexture.type = THREE.FloatType;`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,6 @@ THREE.GlitchPass.prototype = {`
`113`	`113`	`texture.minFilter = THREE.NearestFilter;`
`114`	`114`	`texture.magFilter = THREE.NearestFilter;`
`115`	`115`	`texture.needsUpdate = true;`
`116`		`- texture.flipY = false;`
`117`	`116`	`return texture;`
`118`	`117`
`119`	`118`	`}`