[descriptors] Move vertexColors up to Material

Fixes #132
firtoz · Jan 3, 2017 · 300f1d4 · 300f1d4
1 parent 04f54e1
commit 300f1d4
Show file tree

Hide file tree

Showing 16 changed files with 70 additions and 45 deletions.
diff --git a/src/lib/descriptors/Material/LineBasicMaterialDescriptor.js b/src/lib/descriptors/Material/LineBasicMaterialDescriptor.js
@@ -30,16 +30,6 @@ class LineBasicMaterialDescriptor extends MaterialDescriptorBase {
       });
     });
 
-    this.hasProp('vertexColors', {
-      type: PropTypes.oneOf([
-        THREE.NoColors,
-        THREE.FaceColors,
-        THREE.VertexColors,
-      ]),
-      simple: true,
-      default: THREE.NoColors,
-    });
-
     this.hasProp('fog', {
       type: PropTypes.bool,
       update(threeObject, fog, existsInProps) {

diff --git a/src/lib/descriptors/Material/LineDashedMaterialDescriptor.js b/src/lib/descriptors/Material/LineDashedMaterialDescriptor.js
@@ -42,16 +42,6 @@ class LineDashedMaterialDescriptor extends MaterialDescriptorBase {
       });
     });
 
-    this.hasProp('vertexColors', {
-      type: PropTypes.oneOf([
-        THREE.NoColors,
-        THREE.FaceColors,
-        THREE.VertexColors,
-      ]),
-      simple: true,
-      default: THREE.NoColors,
-    });
-
     this.hasProp('fog', {
       type: PropTypes.bool,
       update(threeObject, fog, existsInProps) {

diff --git a/src/lib/descriptors/Material/MaterialDescriptorBase.js b/src/lib/descriptors/Material/MaterialDescriptorBase.js
@@ -121,6 +121,16 @@ class MaterialDescriptorBase extends THREEElementDescriptor {
       default: undefined,
     });
 
+    this.hasProp('vertexColors', {
+      type: PropTypes.oneOf([
+        THREE.NoColors,
+        THREE.FaceColors,
+        THREE.VertexColors,
+      ]),
+      simple: true,
+      default: THREE.NoColors,
+    });
+
     this._colors = [];
   }
 

diff --git a/src/lib/descriptors/Material/PointsMaterialDescriptor.js b/src/lib/descriptors/Material/PointsMaterialDescriptor.js
@@ -39,16 +39,6 @@ class PointsMaterialDescriptor extends MaterialDescriptorBase {
       updateInitial: true,
       default: true,
     });
-
-    this.hasProp('vertexColors', {
-      type: PropTypes.oneOf([
-        THREE.NoColors,
-        THREE.FaceColors,
-        THREE.VertexColors,
-      ]),
-      simple: true,
-      default: THREE.NoColors,
-    });
   }
 
   construct(props) {

diff --git a/wiki/lineBasicMaterial.md b/wiki/lineBasicMaterial.md
@@ -60,6 +60,11 @@ Defaults to `material`. Other example values:
 ### map
 ``` THREE.Texture ```
 
+### vertexColors
+``` one of [THREE.NoColors, THREE.FaceColors, THREE.VertexColors] ```
+
+**Default**: `THREE.NoColors`
+
 ### color
 ``` one of types [THREE.Color, number, string] ```
 
@@ -80,11 +85,6 @@ Defaults to `material`. Other example values:
 
 **Default**: `'round'`
 
-### vertexColors
-``` one of [THREE.NoColors, THREE.FaceColors, THREE.VertexColors] ```
-
-**Default**: `THREE.NoColors`
-
 ### fog
 ``` bool ```
 

diff --git a/wiki/lineDashedMaterial.md b/wiki/lineDashedMaterial.md
@@ -60,6 +60,11 @@ Defaults to `material`. Other example values:
 ### map
 ``` THREE.Texture ```
 
+### vertexColors
+``` one of [THREE.NoColors, THREE.FaceColors, THREE.VertexColors] ```
+
+**Default**: `THREE.NoColors`
+
 ### color
 ``` one of types [THREE.Color, number, string] ```
 
@@ -95,11 +100,6 @@ Defaults to `material`. Other example values:
 
 **Default**: `'round'`
 
-### vertexColors
-``` one of [THREE.NoColors, THREE.FaceColors, THREE.VertexColors] ```
-
-**Default**: `THREE.NoColors`
-
 ### fog
 ``` bool ```
 

diff --git a/wiki/meshBasicMaterial.md b/wiki/meshBasicMaterial.md
@@ -60,6 +60,11 @@ Defaults to `material`. Other example values:
 ### map
 ``` THREE.Texture ```
 
+### vertexColors
+``` one of [THREE.NoColors, THREE.FaceColors, THREE.VertexColors] ```
+
+**Default**: `THREE.NoColors`
+
 ### color
 ``` one of types [THREE.Color, number, string] ```
 

diff --git a/wiki/meshDepthMaterial.md b/wiki/meshDepthMaterial.md
@@ -60,6 +60,11 @@ Defaults to `material`. Other example values:
 ### map
 ``` THREE.Texture ```
 
+### vertexColors
+``` one of [THREE.NoColors, THREE.FaceColors, THREE.VertexColors] ```
+
+**Default**: `THREE.NoColors`
+
 ### wireframe
 ``` bool ```
 

diff --git a/wiki/meshLambertMaterial.md b/wiki/meshLambertMaterial.md
@@ -60,6 +60,11 @@ Defaults to `material`. Other example values:
 ### map
 ``` THREE.Texture ```
 
+### vertexColors
+``` one of [THREE.NoColors, THREE.FaceColors, THREE.VertexColors] ```
+
+**Default**: `THREE.NoColors`
+
 ### color
 ``` one of types [THREE.Color, number, string] ```
 

diff --git a/wiki/meshNormalMaterial.md b/wiki/meshNormalMaterial.md
@@ -60,6 +60,11 @@ Defaults to `material`. Other example values:
 ### map
 ``` THREE.Texture ```
 
+### vertexColors
+``` one of [THREE.NoColors, THREE.FaceColors, THREE.VertexColors] ```
+
+**Default**: `THREE.NoColors`
+
 ### wireframe
 ``` bool ```
 

diff --git a/wiki/meshPhongMaterial.md b/wiki/meshPhongMaterial.md
@@ -60,6 +60,11 @@ Defaults to `material`. Other example values:
 ### map
 ``` THREE.Texture ```
 
+### vertexColors
+``` one of [THREE.NoColors, THREE.FaceColors, THREE.VertexColors] ```
+
+**Default**: `THREE.NoColors`
+
 ### color
 ``` one of types [THREE.Color, number, string] ```
 

diff --git a/wiki/meshStandardMaterial.md b/wiki/meshStandardMaterial.md
@@ -60,6 +60,11 @@ Defaults to `material`. Other example values:
 ### map
 ``` THREE.Texture ```
 
+### vertexColors
+``` one of [THREE.NoColors, THREE.FaceColors, THREE.VertexColors] ```
+
+**Default**: `THREE.NoColors`
+
 ### color
 ``` one of types [THREE.Color, number, string] ```: Geometry color
 

diff --git a/wiki/pointsMaterial.md b/wiki/pointsMaterial.md
@@ -60,6 +60,11 @@ Defaults to `material`. Other example values:
 ### map
 ``` THREE.Texture ```
 
+### vertexColors
+``` one of [THREE.NoColors, THREE.FaceColors, THREE.VertexColors] ```
+
+**Default**: `THREE.NoColors`
+
 ### color
 ``` one of types [THREE.Color, number, string] ```
 
@@ -80,11 +85,6 @@ Defaults to `material`. Other example values:
 
 **Default**: `true`
 
-### vertexColors
-``` one of [THREE.NoColors, THREE.FaceColors, THREE.VertexColors] ```
-
-**Default**: `THREE.NoColors`
-
 ### resourceId
 ``` string ```: The resource id of this object, only used if it is placed into [[resources]].
 

diff --git a/wiki/rawShaderMaterial.md b/wiki/rawShaderMaterial.md
@@ -64,6 +64,11 @@ Defaults to `material`. Other example values:
 ### map
 ``` THREE.Texture ```
 
+### vertexColors
+``` one of [THREE.NoColors, THREE.FaceColors, THREE.VertexColors] ```
+
+**Default**: `THREE.NoColors`
+
 ### uniforms
 ``` any ```: The uniforms to be used for the shader.
 

diff --git a/wiki/shaderMaterial.md b/wiki/shaderMaterial.md
@@ -66,6 +66,11 @@ Defaults to `material`. Other example values:
 ### map
 ``` THREE.Texture ```
 
+### vertexColors
+``` one of [THREE.NoColors, THREE.FaceColors, THREE.VertexColors] ```
+
+**Default**: `THREE.NoColors`
+
 ### uniforms
 ``` any ```: The uniforms to be used for the shader.
 

diff --git a/wiki/spriteMaterial.md b/wiki/spriteMaterial.md
@@ -60,6 +60,11 @@ Defaults to `material`. Other example values:
 ### map
 ``` THREE.Texture ```
 
+### vertexColors
+``` one of [THREE.NoColors, THREE.FaceColors, THREE.VertexColors] ```
+
+**Default**: `THREE.NoColors`
+
 ### color
 ``` one of types [THREE.Color, number, string] ```