remove some memory allocations from material code (#3789)

Author: ngokevin

src/components/material.js

@@ -70,28 +70,35 @@ module.exports.Component = registerComponent('material', {
   },
 
   updateBehavior: function () {
+    var key;
+    var sceneEl = this.el.sceneEl;
     var schema = this.schema;
     var self = this;
-    var sceneEl = this.el.sceneEl;
-    var tickProperties = {};
-    var tick = function (time, delta) {
-      Object.keys(tickProperties).forEach(function update (key) {
+    var tickProperties;
+
+    function tickTime (time, delta) {
+      var key;
+      for (key in tickProperties) {
         tickProperties[key] = time;
-      });
+      }
       self.shader.update(tickProperties);
-    };
+    }
+
     this.tick = undefined;
-    Object.keys(schema).forEach(function (key) {
+
+    tickProperties = {};
+    for (key in schema) {
       if (schema[key].type === 'time') {
-        self.tick = tick;
+        this.tick = tickTime;
         tickProperties[key] = true;
       }
-    });
+    }
+
     if (!sceneEl) { return; }
-    if (!this.tick) {
-      sceneEl.removeBehavior(this);
-    } else {
+    if (this.tick) {
       sceneEl.addBehavior(this);
+    } else {
+      sceneEl.removeBehavior(this);
     }
   },
 
@@ -117,6 +124,7 @@ module.exports.Component = registerComponent('material', {
   updateMaterial: function (oldData) {
     var data = this.data;
     var material = this.material;
+    var oldDataHasKeys;
 
     // Base material properties.
     material.alphaTest = data.alphaTest;
@@ -131,7 +139,8 @@ module.exports.Component = registerComponent('material', {
     material.blending = parseBlending(data.blending);
 
     // Check if material needs update.
-    if (Object.keys(oldData).length &&
+    for (oldDataHasKeys in oldData) { break; }
+    if (oldDataHasKeys &&
         (oldData.alphaTest !== data.alphaTest ||
          oldData.side !== data.side ||
          oldData.vertexColors !== data.vertexColors)) {

src/shaders/flat.js

@@ -23,8 +23,10 @@ module.exports.Shader = registerShader('flat', {
    * Adds a reference from the scene to this entity as the camera.
    */
   init: function (data) {
+    this.materialData = {color: new THREE.Color()};
     this.textureSrc = null;
-    this.material = new THREE.MeshBasicMaterial(getMaterialData(data));
+    getMaterialData(data, this.materialData);
+    this.material = new THREE.MeshBasicMaterial(this.materialData);
     utils.material.updateMap(this, data);
   },
 
@@ -39,25 +41,25 @@ module.exports.Shader = registerShader('flat', {
    * @param {object} data - Material component data.
    */
   updateMaterial: function (data) {
-    var material = this.material;
-    data = getMaterialData(data);
-    Object.keys(data).forEach(function (key) {
-      material[key] = data[key];
-    });
+    var key;
+    getMaterialData(data, this.materialData);
+    for (key in this.materialData) {
+      this.material[key] = this.materialData[key];
+    }
   }
 });
 
 /**
  * Builds and normalize material data, normalizing stuff along the way.
  *
  * @param {object} data - Material data.
- * @returns {object} data - Processed material data.
+ * @param {object} materialData - Object to reuse.
+ * @returns {object} Updated material data.
  */
-function getMaterialData (data) {
-  return {
-    fog: data.fog,
-    color: new THREE.Color(data.color),
-    wireframe: data.wireframe,
-    wireframeLinewidth: data.wireframeLinewidth
-  };
+function getMaterialData (data, materialData) {
+  materialData.color.set(data.color);
+  materialData.fog = data.fog;
+  materialData.wireframe = data.wireframe;
+  materialData.wireframeLinewidth = data.wireframeLinewidth;
+  return materialData;
 }

src/shaders/standard.js

@@ -59,7 +59,10 @@ module.exports.Shader = registerShader('standard', {
    * Adds a reference from the scene to this entity as the camera.
    */
   init: function (data) {
-    this.material = new THREE.MeshStandardMaterial(getMaterialData(data));
+    this.materialData = {color: new THREE.Color(), emissive: new THREE.Color()};
+    getMaterialData(data, this.materialData);
+    this.material = new THREE.MeshStandardMaterial(this.materialData);
+
     utils.material.updateMap(this, data);
     if (data.normalMap) { utils.material.updateDistortionMap('normal', this, data); }
     if (data.displacementMap) { utils.material.updateDistortionMap('displacement', this, data); }
@@ -87,11 +90,12 @@ module.exports.Shader = registerShader('standard', {
    * @returns {object} Material.
    */
   updateMaterial: function (data) {
+    var key;
     var material = this.material;
-    data = getMaterialData(data);
-    Object.keys(data).forEach(function (key) {
-      material[key] = data[key];
-    });
+    getMaterialData(data, this.materialData);
+    for (key in this.materialData) {
+      material[key] = this.materialData[key];
+    }
   },
 
   /**
@@ -153,28 +157,29 @@ module.exports.Shader = registerShader('standard', {
  * Builds and normalize material data, normalizing stuff along the way.
  *
  * @param {object} data - Material data.
- * @returns {object} data - Processed material data.
+ * @param {object} materialData - Object to use.
+ * @returns {object} Updated materialData.
  */
-function getMaterialData (data) {
-  var newData = {
-    color: new THREE.Color(data.color),
-    emissive: new THREE.Color(data.emissive),
-    emissiveIntensity: data.emissiveIntensity,
-    fog: data.fog,
-    metalness: data.metalness,
-    roughness: data.roughness,
-    wireframe: data.wireframe,
-    wireframeLinewidth: data.wireframeLinewidth
-  };
-
-  if (data.normalMap) { newData.normalScale = data.normalScale; }
-
-  if (data.ambientOcclusionMap) { newData.aoMapIntensity = data.ambientOcclusionMapIntensity; }
+function getMaterialData (data, materialData) {
+  materialData.color.set(data.color);
+  materialData.emissive.set(data.emissive);
+  materialData.emissiveIntensity = data.emissiveIntensity;
+  materialData.fog = data.fog;
+  materialData.metalness = data.metalness;
+  materialData.roughness = data.roughness;
+  materialData.wireframe = data.wireframe;
+  materialData.wireframeLinewidth = data.wireframeLinewidth;
+
+  if (data.normalMap) { materialData.normalScale = data.normalScale; }
+
+  if (data.ambientOcclusionMap) {
+    materialData.aoMapIntensity = data.ambientOcclusionMapIntensity;
+  }
 
   if (data.displacementMap) {
-    newData.displacementScale = data.displacementScale;
-    newData.displacementBias = data.displacementBias;
+    materialData.displacementScale = data.displacementScale;
+    materialData.displacementBias = data.displacementBias;
   }
 
-  return newData;
+  return materialData;
 }