- Over Under video is now OK (top=left eye, bottom=right eye)

c-frame · Nov 5, 2016 · 6db3472 · 6db3472
1 parent a47cb74
commit 6db3472
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 14 deletions.
diff --git a/dist/aframe-stereo-component.js b/dist/aframe-stereo-component.js
@@ -144,7 +144,13 @@
 	                var axis = this.data.split === "vertical" ? "y" : "x";
 	                for (var i = 0; i < uvs.length; i++) {
 	                    for (var j = 0; j < 3; j++) {
-	                        uvs[ i ][ j ][ axis ] *= 0.5;
+	                        if (axis == "x") {
+	                            uvs[ i ][ j ][ axis ] *= 0.5;
+	                        }
+	                        else {
+	                            uvs[ i ][ j ][ axis ] *= 0.5;
+	                            uvs[ i ][ j ][ axis ] += 0.5;
+	                        }
 	                    }
 	                }
 	              }
@@ -157,9 +163,13 @@
 	                var axis = this.data.split === "vertical" ? "y" : "x";
 	                for (var i = 0; i < uvs.length; i++) {
 	                    for (var j = 0; j < 3; j++) {
-	                        uvs[ i ][ j ][ axis ] *= 0.5;
-	                        uvs[ i ][ j ][ axis ] += 0.5;
-
+	                        if (axis == "x") {
+	                            uvs[ i ][ j ][ axis ] *= 0.5;
+	                            uvs[ i ][ j ][ axis ] += 0.5;
+	                        }
+	                        else {
+	                            uvs[ i ][ j ][ axis ] *= 0.5;
+	                        }
 	                    }
 	                }
 	              }

diff --git a/dist/aframe-stereo-component.min.js b/dist/aframe-stereo-component.min.js
diff --git a/examples/build.js b/examples/build.js
@@ -81,7 +81,13 @@ module.exports = {
                 var axis = this.data.split === "vertical" ? "y" : "x";
                 for (var i = 0; i < uvs.length; i++) {
                     for (var j = 0; j < 3; j++) {
-                        uvs[ i ][ j ][ axis ] *= 0.5;
+                        if (axis == "x") {
+                            uvs[ i ][ j ][ axis ] *= 0.5;
+                        }
+                        else {
+                            uvs[ i ][ j ][ axis ] *= 0.5;
+                            uvs[ i ][ j ][ axis ] += 0.5;
+                        }
                     }
                 }
               }
@@ -94,9 +100,13 @@ module.exports = {
                 var axis = this.data.split === "vertical" ? "y" : "x";
                 for (var i = 0; i < uvs.length; i++) {
                     for (var j = 0; j < 3; j++) {
-                        uvs[ i ][ j ][ axis ] *= 0.5;
-                        uvs[ i ][ j ][ axis ] += 0.5;
-
+                        if (axis == "x") {
+                            uvs[ i ][ j ][ axis ] *= 0.5;
+                            uvs[ i ][ j ][ axis ] += 0.5;
+                        }
+                        else {
+                            uvs[ i ][ j ][ axis ] *= 0.5;
+                        }
                     }
                 }
               }

diff --git a/index.js b/index.js
@@ -70,7 +70,13 @@ module.exports = {
                 var axis = this.data.split === "vertical" ? "y" : "x";
                 for (var i = 0; i < uvs.length; i++) {
                     for (var j = 0; j < 3; j++) {
-                        uvs[ i ][ j ][ axis ] *= 0.5;
+                        if (axis == "x") {
+                            uvs[ i ][ j ][ axis ] *= 0.5;
+                        }
+                        else {
+                            uvs[ i ][ j ][ axis ] *= 0.5;
+                            uvs[ i ][ j ][ axis ] += 0.5;
+                        }
                     }
                 }
               }
@@ -83,9 +89,13 @@ module.exports = {
                 var axis = this.data.split === "vertical" ? "y" : "x";
                 for (var i = 0; i < uvs.length; i++) {
                     for (var j = 0; j < 3; j++) {
-                        uvs[ i ][ j ][ axis ] *= 0.5;
-                        uvs[ i ][ j ][ axis ] += 0.5;
-
+                        if (axis == "x") {
+                            uvs[ i ][ j ][ axis ] *= 0.5;
+                            uvs[ i ][ j ][ axis ] += 0.5;
+                        }
+                        else {
+                            uvs[ i ][ j ][ axis ] *= 0.5;
+                        }
                     }
                 }
               }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aframe-stereo-component",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Stereoscopic component for A-Frame VR.",
   "main": "index.js",
   "scripts": {