prefer object spread

Gruntfile.js

@@ -166,9 +166,7 @@ module.exports = function(grunt) {
       });
     });
     const buildStuff = require('@gfxfundamentals/lesson-builder');
-    const settings = Object.assign({}, buildSettings, {
-      filenames,
-    });
+    const settings = {...buildSettings, filenames};
     const finish = this.async();
     buildStuff(settings).finally(finish);
   });

threejs/lessons/kr/threejs-optimize-lots-of-objects-animated.md

@@ -80,11 +80,7 @@ function makeDiffFile(baseFile, otherFile, compareFn) {
       return value;
   });
   // baseFile을 복사한 뒤 min, max, data를 새 값으로 교체합니다.
-  return Object.assign({}, baseFile, {
-    min,
-    max,
-    data,
-  });
+  return {...baseFile, min, max, data};
 }
 ```
 

threejs/lessons/kr/threejs-post-processing-3dlut.md

@@ -148,7 +148,7 @@ const lutShader = {
 };
 
 const lutNearestShader = {
-  uniforms: Object.assign( {}, lutShader.uniforms ),
+  uniforms: {...lutShader.uniforms},
   vertexShader: lutShader.vertexShader,
   fragmentShader: lutShader.fragmentShader.replace('#define FILTER_LUT', '//'),
 };

threejs/lessons/resources/threejs-materials.js

@@ -32,9 +32,10 @@ import {threejsLessonUtils} from './threejs-lesson-utils.js';
 
   function basicLambertPhongExample(MaterialCtor, lowPoly, params = {}) {
     const geometry = lowPoly ? lowPolySphereGeometry : highPolySphereGeometry;
-    const material = new MaterialCtor(Object.assign({
+    const material = new MaterialCtor({
       color: 'hsl(210,50%,50%)',
-    }, params));
+      ...params,
+    });
     return {
       obj3D: new THREE.Mesh(geometry, material),
       trackball: lowPoly,

threejs/lessons/resources/threejs-primitives.js

@@ -785,7 +785,7 @@ const geometry = new THREE.WireframeGeometry(
 
       addElem(base, 'pre', 'prettyprint showmods', trimmedLines.join('\n'));
 
-      createLiveImage(elem, Object.assign({}, info, {create: createFn}), name);
+      createLiveImage(elem, {...info, create: createFn}, name);
     }
 
     makeExample(elem, info.create, info.src);

threejs/lessons/ru/threejs-optimize-lots-of-objects-animated.md

@@ -97,11 +97,7 @@ function makeDiffFile(baseFile, otherFile, compareFn) {
   });
   // make a copy of baseFile and replace min, max, and data
   // with the new data
-  return Object.assign({}, baseFile, {
-    min,
-    max,
-    data,
-  });
+  return {...baseFile, min, max, data};
 }
 ```
 

threejs/lessons/threejs-optimize-lots-of-objects-animated.md

@@ -101,11 +101,7 @@ function makeDiffFile(baseFile, otherFile, compareFn) {
   });
   // make a copy of baseFile and replace min, max, and data
   // with the new data
-  return Object.assign({}, baseFile, {
-    min,
-    max,
-    data,
-  });
+  return {...baseFile, min, max, data};
 }
 ```
 

threejs/lessons/threejs-post-processing-3dlut.md

@@ -147,7 +147,7 @@ const lutShader = {
 };
 
 const lutNearestShader = {
-  uniforms: Object.assign( {}, lutShader.uniforms ),
+  uniforms: {...lutShader.uniforms},
   vertexShader: lutShader.vertexShader,
   fragmentShader: lutShader.fragmentShader.replace('#define FILTER_LUT', '//'),
 };

threejs/resources/lessons-helper.js

@@ -545,9 +545,10 @@
           setupLesson(this);
         }
         const args = [].slice.apply(arguments);
-        args[1] = Object.assign({
+        args[1] = {
           powerPreference: 'low-power',
-        }, args[1]);
+          ...args[1],
+        };
         const ctx = oldFn.apply(this, args);
         if (!ctx && isWebGL) {
           showNeedWebGL(this);

threejs/resources/lessons-worker-helper.js

@@ -119,9 +119,10 @@
           setupLesson(this);
         }
         const args = [].slice.apply(arguments);
-        args[1] = Object.assign({
+        args[1] = {
           powerPreference: 'low-power',
-        }, args[1]);
+          ...args[1],
+        };
         return oldFn.apply(this, args);
       };
     }(OffscreenCanvas.prototype.getContext));

threejs/resources/lut-reader.js

@@ -121,7 +121,7 @@ function lut1Dto3D(lut) {
   for (let i = 0; i < lut.size * lut.size; ++i) {
     data.push(...src);
   }
-  return Object.assign({}, lut, {data});
+  return {...lut, data};
 }
 
 export function lutTo2D3Drgb8(lut) {
@@ -140,5 +140,5 @@ export function lutTo2D3Drgb8(lut) {
     data[i + 1] = (src[i + 1] - min[1]) / range[1] * 255;
     data[i + 2] = (src[i + 2] - min[2]) / range[2] * 255;
   }
-  return Object.assign({}, lut, {data});
+  return {...lut, data};
 }

threejs/resources/webgl-debug-helper.js

@@ -517,7 +517,7 @@
           ext = wrapped.apply(ctx, arguments);
           if (ext) {
             const origExt = ext;
-            ext = makeDebugContext(ext, Object.assign({}, options, {errCtx: ctx}));
+            ext = makeDebugContext(ext, {...options, errCtx: ctx});
             sharedState.wrappers[extensionName] = { wrapper: ext, orig: origExt };
             addEnumsForContext(origExt, extensionName);
           }

threejs/threejs-lots-of-objects-animated.html

@@ -264,11 +264,7 @@ function main() {
       });
       // make a copy of baseFile and replace min, max, and data
       // with the new data
-      return Object.assign({}, baseFile, {
-        min,
-        max,
-        data,
-      });
+      return {...baseFile, min, max, data};
     }
 
     // generate a new set of data

threejs/threejs-lots-of-objects-morphtargets-w-colors.html

@@ -265,11 +265,7 @@ function main() {
       });
       // make a copy of baseFile and replace min, max, and data
       // with the new data
-      return Object.assign({}, baseFile, {
-        min,
-        max,
-        data,
-      });
+      return {...baseFile, min, max, data};
     }
 
     // generate a new set of data

threejs/threejs-lots-of-objects-morphtargets.html

@@ -265,11 +265,7 @@ function main() {
       });
       // make a copy of baseFile and replace min, max, and data
       // with the new data
-      return Object.assign({}, baseFile, {
-        min,
-        max,
-        data,
-      });
+      return {...baseFile, min, max, data};
     }
 
     // generate a new set of data

threejs/threejs-lots-of-objects-multiple-data-sets.html

@@ -229,11 +229,7 @@ function main() {
       });
       // make a copy of baseFile and replace min, max, and data
       // with the new data
-      return Object.assign({}, baseFile, {
-        min,
-        max,
-        data,
-      });
+      return {...baseFile, min, max, data};
     }
 
     // generate a new set of data

threejs/threejs-postprocessing-3dlut-identity.html

@@ -223,7 +223,7 @@ function main() {
   };
 
   const lutNearestShader = {
-    uniforms: Object.assign( {}, lutShader.uniforms ),
+    uniforms: {...lutShader.uniforms},
     vertexShader: lutShader.vertexShader,
     fragmentShader: lutShader.fragmentShader.replace('#define FILTER_LUT', '//'),
   };

threejs/threejs-postprocessing-3dlut-w-loader.html

@@ -311,7 +311,7 @@ function main() {
   };
 
   const lutNearestShader = {
-    uniforms: Object.assign( {}, lutShader.uniforms ),
+    uniforms: {...lutShader.uniforms},
     vertexShader: lutShader.vertexShader,
     fragmentShader: lutShader.fragmentShader.replace('#define FILTER_LUT', '//'),
   };

threejs/threejs-postprocessing-3dlut.html

@@ -294,7 +294,7 @@ function main() {
   };
 
   const lutNearestShader = {
-    uniforms: Object.assign( {}, lutShader.uniforms ),
+    uniforms: {...lutShader.uniforms},
     vertexShader: lutShader.vertexShader,
     fragmentShader: lutShader.fragmentShader.replace('#define FILTER_LUT', '//'),
   };