remove contents prop from client

Author: bnjm

components/lib/parseMaterial.js

@@ -26,29 +26,26 @@ export function processColorInMaterial(material) {
 }
 
 export function processMaterialPropertyContents(material) {
-  const propsWithMaps = intersection(
+  const propsToUpdate = intersection(
     Object.keys(material),
     materialPropertiesWithMaps,
   );
-
-  return propsWithMaps.reduce((prev, curr) => {
-    const { contents } = curr;
-
-    if (!contents || (!contents.path && !contents.color)) {
-      return prev;
-    }
-
-    return {
+  // legacy support for old diffuse.color
+  const color =
+    typeof material.diffuse === 'string' || material.color
+      ? material.diffuse || material.color
+      : undefined;
+
+  return propsToUpdate.reduce(
+    (prev, curr) => ({
       ...prev,
       [curr]: {
         ...prev[curr],
-        contents: {
-          [contents.path ? 'path' : 'color']:
-            contents.path || processColor(contents.color),
-        },
+        color: color ? processColor(color) : processColor(prev[curr].color),
       },
-    };
-  }, material);
+    }),
+    material,
+  );
 }
 
 export { processColor };

components/lib/propTypes.js

@@ -62,10 +62,8 @@ export const colorBufferWriteMask = PropTypes.oneOf(
 export const opacity = PropTypes.number;
 
 export const materialProperty = PropTypes.shape({
-  contents: PropTypes.shape({
-    path: PropTypes.string,
-    color: PropTypes.string,
-  }),
+  path: PropTypes.string,
+  color: PropTypes.string,
   intensity: PropTypes.number,
 });