Merge pull request #48 from HippoAR/rename-shader-to-material

Rename shader to material

Author: qftgtr

README.md

@@ -151,7 +151,7 @@ AppRegistry.registerComponent('ReactNativeARKit', () => ReactNativeARKit);
 |---|---|
 | `pos` | `{ x, y, z }` |
 | `shape` | `{ width, height, length, chamfer }` |
-| `shader` | `{ color, metalness, roughness }` |
+| `material` | `{ color, metalness, roughness }` |
 
 #### [`<ARKit.Sphere />`](https://developer.apple.com/documentation/scenekit/scnsphere)
 
@@ -161,7 +161,7 @@ AppRegistry.registerComponent('ReactNativeARKit', () => ReactNativeARKit);
 |---|---|
 | `pos` | `{ x, y, z }` |
 | `shape` | `{ radius }` |
-| `shader` | `{ color, metalness, roughness }` |
+| `material` | `{ color, metalness, roughness }` |
 
 #### [`<ARKit.Cylinder />`](https://developer.apple.com/documentation/scenekit/scncylinder)
 
@@ -171,7 +171,7 @@ AppRegistry.registerComponent('ReactNativeARKit', () => ReactNativeARKit);
 |---|---|
 | `pos` | `{ x, y, z }` |
 | `shape` | `{ radius, height }` |
-| `shader` | `{ color, metalness, roughness }` |
+| `material` | `{ color, metalness, roughness }` |
 
 #### [`<ARKit.Cone />`](https://developer.apple.com/documentation/scenekit/scncone)
 
@@ -181,7 +181,7 @@ AppRegistry.registerComponent('ReactNativeARKit', () => ReactNativeARKit);
 |---|---|
 | `pos` | `{ x, y, z }` |
 | `shape` | `{ topR, bottomR, height }` |
-| `shader` | `{ color, metalness, roughness }` |
+| `material` | `{ color, metalness, roughness }` |
 
 #### [`<ARKit.Pyramid />`](https://developer.apple.com/documentation/scenekit/scnpyramid)
 
@@ -191,7 +191,7 @@ AppRegistry.registerComponent('ReactNativeARKit', () => ReactNativeARKit);
 |---|---|
 | `pos` | `{ x, y, z }` |
 | `shape` | `{ width, height, length }` |
-| `shader` | `{ color, metalness, roughness }` |
+| `material` | `{ color, metalness, roughness }` |
 
 #### [`<ARKit.Tube />`](https://developer.apple.com/documentation/scenekit/scntube)
 
@@ -201,7 +201,7 @@ AppRegistry.registerComponent('ReactNativeARKit', () => ReactNativeARKit);
 |---|---|
 | `pos` | `{ x, y, z }` |
 | `shape` | `{ innerR, outerR, height }` |
-| `shader` | `{ color, metalness, roughness }` |
+| `material` | `{ color, metalness, roughness }` |
 
 #### [`<ARKit.Torus />`](https://developer.apple.com/documentation/scenekit/scntorus)
 
@@ -211,7 +211,7 @@ AppRegistry.registerComponent('ReactNativeARKit', () => ReactNativeARKit);
 |---|---|
 | `pos` | `{ x, y, z }` |
 | `shape` | `{ ringR, pipeR }` |
-| `shader` | `{ color, metalness, roughness }` |
+| `material` | `{ color, metalness, roughness }` |
 
 #### [`<ARKit.Capsule />`](https://developer.apple.com/documentation/scenekit/scncapsule)
 
@@ -221,7 +221,7 @@ AppRegistry.registerComponent('ReactNativeARKit', () => ReactNativeARKit);
 |---|---|
 | `pos` | `{ x, y, z }` |
 | `shape` | `{ capR, height }` |
-| `shader` | `{ color, metalness, roughness }` |
+| `material` | `{ color, metalness, roughness }` |
 
 #### [`<ARKit.Plane />`](https://developer.apple.com/documentation/scenekit/scnplane)
 
@@ -231,7 +231,7 @@ AppRegistry.registerComponent('ReactNativeARKit', () => ReactNativeARKit);
 |---|---|
 | `pos` | `{ x, y, z }` |
 | `shape` | `{ width, length }` |
-| `shader` | `{ color, metalness, roughness }` |
+| `material` | `{ color, metalness, roughness }` |
 
 #### [`<ARKit.Text />`](https://developer.apple.com/documentation/scenekit/scntext)
 
@@ -242,7 +242,7 @@ AppRegistry.registerComponent('ReactNativeARKit', () => ReactNativeARKit);
 | `text` | `String` |
 | `pos` | `{ x, y, z, angle }` |
 | `font` | `{ name, size, depth, chamfer }` |
-| `shader` | `{ color, metalness, roughness }` |
+| `material` | `{ color, metalness, roughness }` |
 
 
 #### `<ARKit.Model />`

components/lib/createArComponent.js

@@ -57,7 +57,7 @@ export default (Manager, propTypes = {}) => {
       w: PropTypes.number,
     }),
 
-    shader: PropTypes.shape({
+    material: PropTypes.shape({
       color: PropTypes.string,
       metalness: PropTypes.number,
       roughness: PropTypes.number,

components/lib/parseColor.js

@@ -9,12 +9,12 @@ export const normalizeColor = colorRaw => {
 };
 
 export function parseColorInProps(props) {
-  if (props && props.shader && props.shader.color) {
+  if (props && props.material && props.material.color) {
     return {
       ...props,
-      shader: {
-        ...props.shader,
-        color: normalizeColor(props.shader.color),
+      material: {
+        ...props.material,
+        color: normalizeColor(props.material.color),
       },
     };
   }

ios/RCTARKitGeos.m

@@ -224,26 +224,26 @@ - (void)addImage:(NSDictionary *)property {}
 
 - (SCNMaterial *)materialFromProperty:(NSDictionary *)property {
     SCNMaterial *material = [SCNMaterial new];
-    NSDictionary* shader = property[@"shader"];
+    NSDictionary* material = property[@"material"];
 
-    if (shader[@"color"]) {
-        CGFloat r = [shader[@"color"][@"r"] floatValue];
-        CGFloat g = [shader[@"color"][@"g"] floatValue];
-        CGFloat b = [shader[@"color"][@"b"] floatValue];
-        CGFloat alpha = [shader[@"color"][@"alpha"] floatValue];
+    if (material[@"color"]) {
+        CGFloat r = [material[@"color"][@"r"] floatValue];
+        CGFloat g = [material[@"color"][@"g"] floatValue];
+        CGFloat b = [material[@"color"][@"b"] floatValue];
+        CGFloat alpha = [material[@"color"][@"alpha"] floatValue];
         UIColor *color = [[UIColor alloc] initWithRed:r green:g blue:b alpha:alpha];
         material.diffuse.contents = color;
     } else {
         material.diffuse.contents = [UIColor whiteColor];
     }
 
-    if (shader[@"metalness"]) {
+    if (material[@"metalness"]) {
         material.lightingModelName = SCNLightingModelPhysicallyBased;
-        material.metalness.contents = @([shader[@"metalness"] floatValue]);
+        material.metalness.contents = @([material[@"metalness"] floatValue]);
     }
-    if (shader[@"roughness"]) {
+    if (material[@"roughness"]) {
         material.lightingModelName = SCNLightingModelPhysicallyBased;
-        material.roughness.contents = @([shader[@"roughness"] floatValue]);
+        material.roughness.contents = @([material[@"roughness"] floatValue]);
     }
 
     return material;