Browse Source

Merge remote-tracking branch 'alteredq/unflip' into dev

Mr.doob 13 years ago
parent
commit
2c732242a8
2 changed files with 42 additions and 30 deletions
  1. 22 22
      examples/js/ShaderExtras.js
  2. 20 8
      examples/obj/leeperrysmith/LeePerrySmith.js

+ 22 - 22
examples/js/ShaderExtras.js

@@ -50,7 +50,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 			"}"
@@ -180,7 +180,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 			"}"
@@ -267,7 +267,7 @@ THREE.ShaderExtras = {
 
 	"void main() {",
 
-		"vUv = vec2( uv.x, 1.0 - uv.y );",
+		"vUv = uv;",
 		"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 	"}"
@@ -380,7 +380,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 			"}"
@@ -435,7 +435,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 			"}"
@@ -491,7 +491,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 			"}"
@@ -556,7 +556,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 			"}"
@@ -617,7 +617,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 			"}"
@@ -683,7 +683,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 			"}"
@@ -775,7 +775,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 			"}"
@@ -882,7 +882,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 			"}"
@@ -934,7 +934,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 			"}"
@@ -996,7 +996,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 			"}"
@@ -1052,7 +1052,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 			"}"
@@ -1113,7 +1113,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 			"}"
@@ -1164,7 +1164,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
@@ -1259,7 +1259,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
@@ -1309,7 +1309,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
@@ -1358,7 +1358,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
@@ -1425,7 +1425,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
@@ -1666,7 +1666,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 			"}"
@@ -1715,7 +1715,7 @@ THREE.ShaderExtras = {
 
 			"void main() {",
 
-				"vUv = vec2( uv.x, 1.0 - uv.y );",
+				"vUv = uv;",
 				"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
 
 			"}"

File diff suppressed because it is too large
+ 20 - 8
examples/obj/leeperrysmith/LeePerrySmith.js


Some files were not shown because too many files changed in this diff