Explorar o código

fix font loading

Nikolay Suslov %!s(int64=4) %!d(string=hai) anos
pai
achega
0df1ebbddf

+ 14 - 1
public/vwf/model/aframe.js

@@ -310,6 +310,12 @@ define(["module", "vwf/model", "vwf/utility"], function (module, model, utility)
 
                 }
 
+                if(methodName == 'setFont') {
+
+                    node.aframeObj.setAttribute('font', methodParameters[0]);
+
+                }
+
             }
 
 
@@ -589,8 +595,15 @@ define(["module", "vwf/model", "vwf/utility"], function (module, model, utility)
                     value = propertyValue;
 
                     self.aframeDef['A-TEXT'].forEach(element => {
-                        element == propertyName ? aframeObject.setAttribute(element, propertyValue) :
+
+                        if(propertyName == 'font'){
+                            console.log('Loading font...', element);
+                        } else {
+                            element == propertyName ? aframeObject.setAttribute(element, propertyValue) :
                             value = undefined;
+                        }
+
+                        
                     })
 
                 }

+ 5 - 5
public/vwf/model/aframe/addon/aframe-components.js

@@ -527,13 +527,13 @@ AFRAME.registerComponent('wmrvrcontrol', {
     init: function () {
         var self = this;
         this.hand = this.data.hand;
-        var controllerID = 'wmrvr-' + this.hand + '-' + vwf_view.kernel.moniker();
+        this.controllerID = 'wmrvr-' + this.hand + '-' + vwf_view.kernel.moniker();
         //this.gearel = document.querySelector('#gearvrcontrol');
-        this.el.addEventListener('pointdown', function (event) { //pointdown 'triggerdown'
-            vwf_view.kernel.callMethod(controllerID, "triggerdown", []);
+        this.el.addEventListener('triggerdown', function (event) { //pointdown 'triggerdown'
+            vwf_view.kernel.callMethod(self.controllerID, "triggerdown", []);
         });
-        this.el.addEventListener('pointup', function (event) { //pointup 'triggerup'
-            vwf_view.kernel.callMethod(controllerID, "triggerup", []);
+        this.el.addEventListener('triggerup', function (event) { //pointup 'triggerup'
+            vwf_view.kernel.callMethod(self.controllerID, "triggerup", []);
         });
     },
 

+ 7 - 0
public/vwf/view/aframe.js

@@ -284,6 +284,13 @@ define(["module", "vwf/view"], function (module, view) {
             //     receiveModelTransformChanges( nodeId, propertyValue );
             // }
 
+            if (node.aframeObj.nodeName == "A-TEXT" && propertyName == 'font') {
+
+                //TODO: Temporary fix for font resource loading error
+                console.log('Set font from view');
+                self.kernel.callMethod(nodeId, "setFont", [propertyValue])
+
+            }
 
             if (node.aframeObj.nodeName == "AUDIO" && propertyName == 'itemSrc') {