Merge pull request #43 from panter/rotation

qftgtr · web-flow · commit d6c9070b5695 · 2017-09-26T22:14:11.000+08:00
add new rotation properties
diff --git a/components/ARBox.js b/components/ARBox.js
@@ -11,26 +11,13 @@ import { NativeModules } from 'react-native';
 
 import createArComponent from './lib/createArComponent';
 
-const ARBox = createArComponent(NativeModules.ARBoxManager);
-
-ARBox.propTypes = {
-  pos: PropTypes.shape({
-    x: PropTypes.number,
-    y: PropTypes.number,
-    z: PropTypes.number,
-    frame: PropTypes.string,
-  }),
+const ARBox = createArComponent(NativeModules.ARBoxManager, {
   shape: PropTypes.shape({
     width: PropTypes.number,
     height: PropTypes.number,
     length: PropTypes.number,
     chamfer: PropTypes.number,
   }),
-  shader: PropTypes.shape({
-    color: PropTypes.string,
-    metalness: PropTypes.number,
-    roughness: PropTypes.number,
-  }),
-};
+});
 
 module.exports = ARBox;
diff --git a/components/ARCapsule.js b/components/ARCapsule.js
@@ -11,24 +11,11 @@ import { NativeModules } from 'react-native';
 
 import createArComponent from './lib/createArComponent';
 
-const ARCapsule = createArComponent(NativeModules.ARCapsuleManager);
-
-ARCapsule.propTypes = {
-  pos: PropTypes.shape({
-    x: PropTypes.number,
-    y: PropTypes.number,
-    z: PropTypes.number,
-    frame: PropTypes.string,
-  }),
+const ARCapsule = createArComponent(NativeModules.ARCapsuleManager, {
   shape: PropTypes.shape({
     capR: PropTypes.number,
     height: PropTypes.number,
   }),
-  shader: PropTypes.shape({
-    color: PropTypes.string,
-    metalness: PropTypes.number,
-    roughness: PropTypes.number,
-  }),
-};
+});
 
 module.exports = ARCapsule;
diff --git a/components/ARCone.js b/components/ARCone.js
@@ -11,25 +11,12 @@ import { NativeModules } from 'react-native';
 
 import createArComponent from './lib/createArComponent';
 
-const ARCone = createArComponent(NativeModules.ARConeManager);
-
-ARCone.propTypes = {
-  pos: PropTypes.shape({
-    x: PropTypes.number,
-    y: PropTypes.number,
-    z: PropTypes.number,
-    frame: PropTypes.string,
-  }),
+const ARCone = createArComponent(NativeModules.ARConeManager, {
   shape: PropTypes.shape({
     topR: PropTypes.number,
     bottomR: PropTypes.number,
     height: PropTypes.number,
   }),
-  shader: PropTypes.shape({
-    color: PropTypes.string,
-    metalness: PropTypes.number,
-    roughness: PropTypes.number,
-  }),
-};
+});
 
 module.exports = ARCone;
diff --git a/components/ARCylinder.js b/components/ARCylinder.js
@@ -11,24 +11,11 @@ import { NativeModules } from 'react-native';
 
 import createArComponent from './lib/createArComponent';
 
-const ARCylinder = createArComponent(NativeModules.ARCylinderManager);
-
-ARCylinder.propTypes = {
-  pos: PropTypes.shape({
-    x: PropTypes.number,
-    y: PropTypes.number,
-    z: PropTypes.number,
-    frame: PropTypes.string,
-  }),
+const ARCylinder = createArComponent(NativeModules.ARCylinderManager, {
   shape: PropTypes.shape({
     radius: PropTypes.number,
     height: PropTypes.number,
   }),
-  shader: PropTypes.shape({
-    color: PropTypes.string,
-    metalness: PropTypes.number,
-    roughness: PropTypes.number,
-  }),
-};
+});
 
 module.exports = ARCylinder;
diff --git a/components/ARModel.js b/components/ARModel.js
@@ -11,26 +11,13 @@ import { NativeModules } from 'react-native';
 
 import createArComponent from './lib/createArComponent';
 
-const ARModel = createArComponent(NativeModules.ARModelManager);
-
-ARModel.propTypes = {
-  pos: PropTypes.shape({
-    x: PropTypes.number,
-    y: PropTypes.number,
-    z: PropTypes.number,
-    angle: PropTypes.number,
-    frame: PropTypes.string,
-  }),
-  shader: PropTypes.shape({
-    metalness: PropTypes.number,
-    roughness: PropTypes.number,
-  }),
+const ARModel = createArComponent(NativeModules.ARModelManager, {
   model: PropTypes.shape({
     file: PropTypes.string,
     node: PropTypes.string,
     scale: PropTypes.number,
     alpha: PropTypes.number,
   }),
-};
+});
 
 module.exports = ARModel;
diff --git a/components/ARPlane.js b/components/ARPlane.js
@@ -11,24 +11,11 @@ import { NativeModules } from 'react-native';
 
 import createArComponent from './lib/createArComponent';
 
-const ARPlane = createArComponent(NativeModules.ARPlaneManager);
-
-ARPlane.propTypes = {
-  pos: PropTypes.shape({
-    x: PropTypes.number,
-    y: PropTypes.number,
-    z: PropTypes.number,
-    frame: PropTypes.string,
-  }),
+const ARPlane = createArComponent(NativeModules.ARPlaneManager, {
   shape: PropTypes.shape({
     width: PropTypes.number,
     height: PropTypes.number,
   }),
-  shader: PropTypes.shape({
-    color: PropTypes.string,
-    metalness: PropTypes.number,
-    roughness: PropTypes.number,
-  }),
-};
+});
 
 module.exports = ARPlane;
diff --git a/components/ARPyramid.js b/components/ARPyramid.js
@@ -11,25 +11,12 @@ import { NativeModules } from 'react-native';
 
 import createArComponent from './lib/createArComponent';
 
-const ARPyramid = createArComponent(NativeModules.ARPyramidManager);
-
-ARPyramid.propTypes = {
-  pos: PropTypes.shape({
-    x: PropTypes.number,
-    y: PropTypes.number,
-    z: PropTypes.number,
-    frame: PropTypes.string,
-  }),
+const ARPyramid = createArComponent(NativeModules.ARPyramidManager, {
   shape: PropTypes.shape({
     width: PropTypes.number,
     length: PropTypes.number,
     height: PropTypes.number,
   }),
-  shader: PropTypes.shape({
-    color: PropTypes.string,
-    metalness: PropTypes.number,
-    roughness: PropTypes.number,
-  }),
-};
+});
 
 module.exports = ARPyramid;
diff --git a/components/ARSphere.js b/components/ARSphere.js
@@ -11,23 +11,10 @@ import { NativeModules } from 'react-native';
 
 import createArComponent from './lib/createArComponent';
 
-const ARSphere = createArComponent(NativeModules.ARSphereManager);
-
-ARSphere.propTypes = {
-  pos: PropTypes.shape({
-    x: PropTypes.number,
-    y: PropTypes.number,
-    z: PropTypes.number,
-    frame: PropTypes.string,
-  }),
+const ARSphere = createArComponent(NativeModules.ARSphereManager, {
   shape: PropTypes.shape({
     radius: PropTypes.number,
   }),
-  shader: PropTypes.shape({
-    color: PropTypes.string,
-    metalness: PropTypes.number,
-    roughness: PropTypes.number,
-  }),
-};
+});
 
 module.exports = ARSphere;
diff --git a/components/ARText.js b/components/ARText.js
@@ -11,29 +11,15 @@ import { NativeModules } from 'react-native';
 
 import createArComponent from './lib/createArComponent';
 
-const ARText = createArComponent(NativeModules.ARTextManager);
-
-ARText.propTypes = {
+const ARText = createArComponent(NativeModules.ARTextManager, {
   text: PropTypes.string,
-  pos: PropTypes.shape({
-    x: PropTypes.number,
-    y: PropTypes.number,
-    z: PropTypes.number,
-    angle: PropTypes.number,
-    frame: PropTypes.string,
-  }),
   font: PropTypes.shape({
     name: PropTypes.string,
     // weight: PropTypes.string,
     size: PropTypes.number,
     depth: PropTypes.number,
     chamfer: PropTypes.number,
   }),
-  shader: PropTypes.shape({
-    color: PropTypes.string,
-    metalness: PropTypes.number,
-    roughness: PropTypes.number,
-  }),
-};
+});
 
 module.exports = ARText;
diff --git a/components/ARTorus.js b/components/ARTorus.js
@@ -11,24 +11,11 @@ import { NativeModules } from 'react-native';
 
 import createArComponent from './lib/createArComponent';
 
-const ARTorus = createArComponent(NativeModules.ARTorusManager);
-
-ARTorus.propTypes = {
-  pos: PropTypes.shape({
-    x: PropTypes.number,
-    y: PropTypes.number,
-    z: PropTypes.number,
-    frame: PropTypes.string,
-  }),
+const ARTorus = createArComponent(NativeModules.ARTorusManager, {
   shape: PropTypes.shape({
     ringR: PropTypes.number,
     pipeR: PropTypes.number,
   }),
-  shader: PropTypes.shape({
-    color: PropTypes.string,
-    metalness: PropTypes.number,
-    roughness: PropTypes.number,
-  }),
-};
+});
 
 module.exports = ARTorus;
diff --git a/components/ARTube.js b/components/ARTube.js
@@ -11,25 +11,12 @@ import { NativeModules } from 'react-native';
 
 import createArComponent from './lib/createArComponent';
 
-const ARTube = createArComponent(NativeModules.ARTubeManager);
-
-ARTube.propTypes = {
-  pos: PropTypes.shape({
-    x: PropTypes.number,
-    y: PropTypes.number,
-    z: PropTypes.number,
-    frame: PropTypes.string,
-  }),
+const ARTube = createArComponent(NativeModules.ARTubeManager, {
   shape: PropTypes.shape({
     innerR: PropTypes.number,
     outerR: PropTypes.number,
     height: PropTypes.number,
   }),
-  shader: PropTypes.shape({
-    color: PropTypes.string,
-    metalness: PropTypes.number,
-    roughness: PropTypes.number,
-  }),
-};
+});
 
 module.exports = ARTube;
diff --git a/components/lib/createArComponent.js b/components/lib/createArComponent.js
@@ -2,9 +2,10 @@ import { Component } from 'react';
 
 import { parseColorInProps } from './parseColor';
 import generateId from './generateId';
+import PropTypes from 'prop-types';
 
-export default Manager =>
-  class extends Component {
+export default (Manager, propTypes = {}) => {
+  const ARComponent = class extends Component {
     identifier = null;
 
     componentWillMount() {
@@ -30,3 +31,39 @@ export default Manager =>
       return null;
     }
   };
+
+  ARComponent.propTypes = {
+    pos: PropTypes.shape({
+      x: PropTypes.number,
+      y: PropTypes.number,
+      z: PropTypes.number,
+      frame: PropTypes.string,
+    }),
+    eulerAngles: PropTypes.shape({
+      x: PropTypes.number,
+      y: PropTypes.number,
+      z: PropTypes.number,
+    }),
+    rotation: PropTypes.shape({
+      x: PropTypes.number,
+      y: PropTypes.number,
+      z: PropTypes.number,
+      w: PropTypes.number,
+    }),
+    orientation: PropTypes.shape({
+      x: PropTypes.number,
+      y: PropTypes.number,
+      z: PropTypes.number,
+      w: PropTypes.number,
+    }),
+
+    shader: PropTypes.shape({
+      color: PropTypes.string,
+      metalness: PropTypes.number,
+      roughness: PropTypes.number,
+    }),
+    ...propTypes,
+  };
+
+  return ARComponent;
+};
diff --git a/ios/RCTARKitNodes.m b/ios/RCTARKitNodes.m
