Fixing the U business, day 1.

Tomorrow Geometries and CanvasRenderer.

examples/js/loaders/ColladaLoader.js

@@ -2414,7 +2414,7 @@ THREE.ColladaLoader = function () {
 								ts = ts || { };
 								if ( ts[ input.set ] === undefined ) ts[ input.set ] = [];
 								// invert the V
-								ts[ input.set ].push( new THREE.UV( source.data[ idx32 ], 1.0 - source.data[ idx32 + 1 ] ) );
+								ts[ input.set ].push( new THREE.UV( source.data[ idx32 ], source.data[ idx32 + 1 ] ) );
 
 								break;
 

examples/js/loaders/OBJLoader.js

@@ -50,7 +50,7 @@ THREE.OBJLoader.prototype = {
 
 		function uv( u, v ) {
 
-			return new THREE.UV( u, 1.0 - v );
+			return new THREE.UV( u, v );
 
 		}
 

examples/js/loaders/UTF8Loader.js

@@ -239,7 +239,7 @@ THREE.UTF8Loader.prototype.createModel = function ( data, callback, scale, offse
 				u /= 1023;
 				v /= 1023;
 
-				uvs.push( u, 1 - v );
+				uvs.push( u, v );
 
 			}
 

examples/js/loaders/ctm/CTMLoader.js

@@ -494,14 +494,6 @@ THREE.CTMLoader.prototype.createModelBuffers = function ( file, callback ) {
 
 		if ( vertexUvArray !== undefined ) {
 
-			// "fix" flipping
-
-			for ( var i = 0; i < vertexUvArray.length; i += 2 ) {
-
-				vertexUvArray[ i + 1 ] = 1 - vertexUvArray[ i + 1 ];
-
-			}
-
 			scope.vertexUvBuffer = gl.createBuffer();
 			gl.bindBuffer( gl.ARRAY_BUFFER, scope.vertexUvBuffer );
 			gl.bufferData( gl.ARRAY_BUFFER, vertexUvArray, gl.STATIC_DRAW );

examples/webgl_kinect.html

@@ -61,7 +61,7 @@
 
 			void main() {
 
-				vUv = vec2( position.x / width, 1.0 - ( position.y / height ) );
+				vUv = vec2( position.x / width, position.y / height );
 
 				vec4 color = texture2D( map, vUv );
 				float depth = ( color.r + color.g + color.b ) / 3.0;

src/renderers/WebGLRenderer.js

@@ -5844,6 +5844,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 			_gl.activeTexture( _gl.TEXTURE0 + slot );
 			_gl.bindTexture( _gl.TEXTURE_2D, texture.__webglTexture );
 
+			_gl.pixelStorei( _gl.UNPACK_FLIP_Y_WEBGL, true );
 			_gl.pixelStorei( _gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, texture.premultiplyAlpha );
 
 			var image = texture.image,
@@ -5919,6 +5920,8 @@ THREE.WebGLRenderer = function ( parameters ) {
 				_gl.activeTexture( _gl.TEXTURE0 + slot );
 				_gl.bindTexture( _gl.TEXTURE_CUBE_MAP, texture.image.__webglTextureCube );
 
+				_gl.pixelStorei( _gl.UNPACK_FLIP_Y_WEBGL, true );
+
 				var cubeImage = [];
 
 				for ( var i = 0; i < 6; i ++ ) {
@@ -5948,7 +5951,11 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 				}
 
-				if ( texture.generateMipmaps && isImagePowerOfTwo )	_gl.generateMipmap( _gl.TEXTURE_CUBE_MAP );
+				if ( texture.generateMipmaps && isImagePowerOfTwo ) {
+
+					_gl.generateMipmap( _gl.TEXTURE_CUBE_MAP );
+
+				}
 
 				texture.needsUpdate = false;
 
@@ -6015,8 +6022,8 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 		if ( renderTarget && ! renderTarget.__webglFramebuffer ) {
 
-			if( renderTarget.depthBuffer === undefined ) renderTarget.depthBuffer = true;
-			if( renderTarget.stencilBuffer === undefined ) renderTarget.stencilBuffer = true;
+			if ( renderTarget.depthBuffer === undefined ) renderTarget.depthBuffer = true;
+			if ( renderTarget.stencilBuffer === undefined ) renderTarget.stencilBuffer = true;
 
 			renderTarget.__webglTexture = _gl.createTexture();
 

utils/exporters/blender/2.62/scripts/addons/io_mesh_threejs/export_threejs.py

@@ -221,7 +221,7 @@ TEMPLATE_FILE_ASCII = """\
 
     "metadata" :
     {
-        "formatVersion" : 3,
+        "formatVersion" : 3.1,
         "generatedBy"   : "Blender 2.62 Exporter",
         "vertices"      : %(nvertex)d,
         "faces"         : %(nface)d,
@@ -439,7 +439,7 @@ def generate_vertex_color(c):
     return TEMPLATE_C % c
 
 def generate_uv(uv):
-    return TEMPLATE_UV % (uv[0], 1.0 - uv[1])
+    return TEMPLATE_UV % (uv[0], uv[1])
 
 # #####################################################
 # Model exporter - faces

utils/exporters/blender/2.62/scripts/addons/io_mesh_threejs/import_threejs.py

@@ -248,7 +248,7 @@ def create_mesh_object(name, vertices, materials, face_data, flipYZ, recalculate
                         v = layer[fi][vi][1]
 
                         face_uvs[vi].x = u
-                        face_uvs[vi].y = 1.0 - v
+                        face_uvs[vi].y = v
 
                     active_texture = materials[faceMaterials[fi]].active_texture
 

utils/exporters/blender/2.63/scripts/addons/io_mesh_threejs/export_threejs.py

@@ -221,7 +221,7 @@ TEMPLATE_FILE_ASCII = """\
 
     "metadata" :
     {
-        "formatVersion" : 3,
+        "formatVersion" : 3.1,
         "generatedBy"   : "Blender 2.63 Exporter",
         "vertices"      : %(nvertex)d,
         "faces"         : %(nface)d,
@@ -445,7 +445,7 @@ def generate_vertex_color(c):
     return TEMPLATE_C % c
 
 def generate_uv(uv):
-    return TEMPLATE_UV % (uv[0], 1.0 - uv[1])
+    return TEMPLATE_UV % (uv[0], uv[1])
 
 # #####################################################
 # Model exporter - faces

utils/exporters/blender/2.63/scripts/addons/io_mesh_threejs/import_threejs.py

@@ -248,7 +248,7 @@ def create_mesh_object(name, vertices, materials, face_data, flipYZ, recalculate
                         v = layer[fi][vi][1]
 
                         face_uvs[vi].x = u
-                        face_uvs[vi].y = 1.0 - v
+                        face_uvs[vi].y = v
 
                     active_texture = materials[faceMaterials[fi]].active_texture
 

utils/exporters/obj/convert_obj_three.py

@@ -159,7 +159,7 @@ TEMPLATE_FILE_ASCII = u"""\
 
     "metadata" :
     {
-        "formatVersion" : 3,
+        "formatVersion" : 3.1,
         "sourceFile"    : "%(fname)s",
         "generatedBy"   : "OBJConverter",
         "vertices"      : %(nvertex)d,
@@ -699,7 +699,7 @@ def generate_normal(n):
     return TEMPLATE_N % (n[0], n[1], n[2])
 
 def generate_uv(uv):
-    return TEMPLATE_UV % (uv[0], 1.0 - uv[1])
+    return TEMPLATE_UV % (uv[0], uv[1])
 
 def generate_color_rgb(c):
     return TEMPLATE_COLOR % (c[0], c[1], c[2])