use latest aframe master

remove deprecated url() syntax since we're using new aframe master

fix more deprecated url(...) usage

remove deprecated url() syntax since we're using new aframe master

replace deprecated getComputedAttribute

use https://aframe.io/releases/0.4.0/aframe.min.js

bump build.js

src/components/look-controls-alt.js

@@ -82,7 +82,7 @@ AFRAME.registerComponent('look-controls-alt', {
     var deltaHMDPosition = new THREE.Vector3();
     return function () {
       var el = this.el;
-      var currentPosition = el.getComputedAttribute('position');
+      var currentPosition = el.getAttribute('position');
       var currentHMDPosition;
       var previousHMDPosition = this.previousHMDPosition;
       var sceneEl = this.el.sceneEl;

src/components/orbit-controls.js

@@ -47,7 +47,7 @@ AFRAME.registerComponent('orbit-controls', {
     var renderer = this.el.sceneEl.renderer;
     var camera = this.el.getObject3D('camera');
     var controls = this.controls = new THREE.OrbitControls(camera, renderer.domElement);
-    var position = this.el.getComputedAttribute('position');
+    var position = this.el.getAttribute('position');
     controls.target.setX(-position.x);
     controls.target.setZ(-position.z);
     controls.enableDamping = true;

src/components/paint-controls.js

@@ -9,9 +9,9 @@ AFRAME.registerComponent('paint-controls', {
   init: function () {
     var el = this.el;
     var self = this;
-    var highLightTextureUrl = 'url(https://cdn.aframe.io/a-painter/images/controller-pressed.png)';
+    var highLightTextureUrl = 'https://cdn.aframe.io/a-painter/images/controller-pressed.png';
     el.sceneEl.systems.material.loadTexture(highLightTextureUrl, {src: highLightTextureUrl}, createTexture);
-    el.setAttribute('json-model', {src: 'url(https://cdn.aframe.io/a-painter/models/controller.json)'});
+    el.setAttribute('json-model', {src: 'https://cdn.aframe.io/a-painter/models/controller.json'});
     this.onButtonChanged = this.onButtonChanged.bind(this);
     this.onButtonDown = function (evt) { self.onButtonEvent(evt.detail.id, 'down'); };
     this.onButtonUp = function (evt) { self.onButtonEvent(evt.detail.id, 'up'); };

src/components/ui.js

@@ -197,7 +197,7 @@ AFRAME.registerComponent('ui', {
   },
 
   copyBrush: function () {
-    var brush = this.el.getComputedAttribute('brush');
+    var brush = this.el.getAttribute('brush');
     this.handEl.setAttribute('brush', 'brush', brush.brush);
     this.handEl.setAttribute('brush', 'color', brush.color);
     this.handEl.setAttribute('brush', 'size', brush.size);
@@ -482,7 +482,7 @@ AFRAME.registerComponent('ui', {
     this.objects.messageError.visible = false;
     this.objects.messageError.material = this.messagesMaterial;
 
-    var messagesImageUrl = 'url(https://cdn.aframe.io/a-painter/images/messages.png)';
+    var messagesImageUrl = 'https://cdn.aframe.io/a-painter/images/messages.png';
 
     this.el.sceneEl.systems.material.loadTexture(messagesImageUrl, {src: messagesImageUrl}, function (texture) {
       var material = self.messagesMaterial;
@@ -524,8 +524,8 @@ AFRAME.registerComponent('ui', {
     this.initColorHistory();
     this.initBrushesMenu();
     this.setCursorTransparency();
-    this.updateColorUI(this.el.getComputedAttribute('brush').color);
-    this.updateSizeSlider(this.el.getComputedAttribute('brush').size);
+    this.updateColorUI(this.el.getAttribute('brush').color);
+    this.updateSizeSlider(this.el.getAttribute('brush').size);
   },
 
   initBrushesMenu: function () {
@@ -589,7 +589,6 @@ AFRAME.registerComponent('ui', {
       function loadBrush (name, id, thumbnailUrl) {
         var brushName = !name ? undefined : (name.charAt(0).toUpperCase() + name.slice(1)).toLowerCase();
         if (thumbnailUrl && !brushesMaterials[brushName]) {
-          thumbnailUrl = 'url(' + thumbnailUrl + ')';
           self.el.sceneEl.systems.material.loadTexture(thumbnailUrl, {src: thumbnailUrl}, onLoadThumbnail);
           return;
         }
@@ -733,7 +732,7 @@ AFRAME.registerComponent('ui', {
   syncUI: function () {
     var brush;
     if (!this.handEl || !this.objects) { return; }
-    brush = this.handEl.getComputedAttribute('brush');
+    brush = this.handEl.getAttribute('brush');
     this.updateSizeSlider(brush.size);
     this.updateColorUI(brush.color);
     this.updateColorHistory();
@@ -754,7 +753,7 @@ AFRAME.registerComponent('ui', {
   },
 
   updateColorHistory: function () {
-    var color = this.handEl && this.handEl.getComputedAttribute('brush').color;
+    var color = this.handEl && this.handEl.getAttribute('brush').color;
     var colorStack = this.colorStack;
     if (!color) { color = this.el.components.brush.schema.color.default; }
     this.objects.currentColor.material.color.set(color);
@@ -818,7 +817,7 @@ AFRAME.registerComponent('ui', {
     var color;
     var colorStack = this.colorStack;
     if (!this.colorHasChanged) { return; }
-    color = this.handEl.getComputedAttribute('brush').color;
+    color = this.handEl.getAttribute('brush').color;
     this.colorHasChanged = false;
     if (colorStack.length === 7) { colorStack.shift(); }
     colorStack.push(color);

src/systems/ui.js

@@ -6,8 +6,8 @@ AFRAME.registerSystem('ui', {
 
   initTextures: function () {
     var self = this;
-    var hoverTextureUrl = 'url(https://cdn.aframe.io/a-painter/images/ui-hover.png)';
-    var pressedTextureUrl = 'url(https://cdn.aframe.io/a-painter/images/ui-pressed.png)';
+    var hoverTextureUrl = 'https://cdn.aframe.io/a-painter/images/ui-hover.png';
+    var pressedTextureUrl = 'https://cdn.aframe.io/a-painter/images/ui-pressed.png';
     this.sceneEl.systems.material.loadTexture(hoverTextureUrl, {src: hoverTextureUrl}, onLoadedHoverTexture);
     this.sceneEl.systems.material.loadTexture(pressedTextureUrl, {src: pressedTextureUrl}, onLoadedPressedTexture);
     function onLoadedHoverTexture (texture) {