Merge pull request #15 from AltspaceVR/bug/fullspace-stateful

Fix fullspace flag
AltspaceVR · Nov 28, 2016 · 8331521 · 8331521
2 parents aca1524 + 69f0ab7
commit 8331521
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/dist/aframe-altspace-component.js b/dist/aframe-altspace-component.js
@@ -127,10 +127,13 @@
 	    {
 	      if(this.data.fullspace){
 	        e.requestFullspace();
+	        e.addEventListener('fullspacechange', function(){
+	          scene.scale.setScalar(e.pixelsPerMeter);
+	        });
 	      }
 
-	      if (!this.data.usePixelScale){
-	        scene.scale.multiplyScalar(e.pixelsPerMeter);
+	      if (!this.data.usePixelScale || this.data.fullspace){
+	        scene.scale.setScalar(e.pixelsPerMeter);
 	      }
 
 	      switch (this.data.verticalAlign) {

diff --git a/dist/aframe-altspace-component.min.js b/dist/aframe-altspace-component.min.js
diff --git a/index.js b/index.js
@@ -81,10 +81,13 @@ AFRAME.registerComponent('altspace', {
     {
       if(this.data.fullspace){
         e.requestFullspace();
+        e.addEventListener('fullspacechange', function(){
+          scene.scale.setScalar(e.pixelsPerMeter);
+        });
       }
 
-      if (!this.data.usePixelScale){
-        scene.scale.multiplyScalar(e.pixelsPerMeter);
+      if (!this.data.usePixelScale || this.data.fullspace){
+        scene.scale.setScalar(e.pixelsPerMeter);
       }
 
       switch (this.data.verticalAlign) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aframe-altspace-component",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "aframe-altspace-component makes A-frame apps compatible with AltspaceVR.",
   "main": "index.js",
   "scripts": {