From 7d2c0ff7d8843fa4b4cc1c500a2bc14c21fa62d7 Mon Sep 17 00:00:00 2001 From: Mugen87 Date: Mon, 15 Feb 2016 16:38:19 +0100 Subject: [PATCH] added references to base material class in docu --- docs/api/materials/LineBasicMaterial.html | 3 ++- docs/api/materials/LineDashedMaterial.html | 11 +++++------ docs/api/materials/MeshBasicMaterial.html | 1 + docs/api/materials/MeshDepthMaterial.html | 16 ++++++++-------- docs/api/materials/MeshLambertMaterial.html | 2 +- docs/api/materials/MeshNormalMaterial.html | 2 +- docs/api/materials/MeshPhongMaterial.html | 2 +- docs/api/materials/MeshStandardMaterial.html | 2 +- docs/api/materials/PointsMaterial.html | 17 +++++++++-------- docs/api/materials/ShaderMaterial.html | 1 + docs/api/materials/SpriteMaterial.html | 6 +++--- 11 files changed, 33 insertions(+), 30 deletions(-) diff --git a/docs/api/materials/LineBasicMaterial.html b/docs/api/materials/LineBasicMaterial.html index 0e2c5bae50..c1ff7c6603 100644 --- a/docs/api/materials/LineBasicMaterial.html +++ b/docs/api/materials/LineBasicMaterial.html @@ -31,6 +31,7 @@

Properties

+
See the base [page:Material] class for common properties.

[property:Integer color]

Sets the color of the line. Default is 0xffffff.
@@ -55,7 +56,7 @@
Define whether the material color is affected by global fog settings.
This setting might not have any effect when used with certain renderers. For example, it is ignored with the [page:CanvasRenderer Canvas] renderer, but does work with the [page:WebGLRenderer WebGL] renderer.
- +

Source

[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js] diff --git a/docs/api/materials/LineDashedMaterial.html b/docs/api/materials/LineDashedMaterial.html index e73ab85af8..a03cbdcafd 100644 --- a/docs/api/materials/LineDashedMaterial.html +++ b/docs/api/materials/LineDashedMaterial.html @@ -32,13 +32,12 @@

Properties

- - +
See the base [page:Material] class for common properties.

[property:Color color]

Sets the color of the line. Default is 0xffffff. -
+

[property:number linewidth]

Controls line thickness. Default is 1.
@@ -47,17 +46,17 @@

[property:number scale]

The scale of the dashed part of a line. -
+

[property:number dashSize]

The size of the dash. This is both the gap with the stroke. Default is 3. -
+

[property:number gapSize]

The size of the gap. Default is 1. -
+

[property:boolean vertexColors]

Define how the vertices gets colored. Possible values are THREE.NoColors, THREE.FaceColors and THREE.VertexColors. Default is THREE.NoColors.
diff --git a/docs/api/materials/MeshBasicMaterial.html b/docs/api/materials/MeshBasicMaterial.html index bbc497a912..bdb255b98c 100644 --- a/docs/api/materials/MeshBasicMaterial.html +++ b/docs/api/materials/MeshBasicMaterial.html @@ -46,6 +46,7 @@

Properties

+
See the base [page:Material] class for common properties.

[property:Integer color]

Sets the color of the geometry. Default is 0xffffff.
diff --git a/docs/api/materials/MeshDepthMaterial.html b/docs/api/materials/MeshDepthMaterial.html index eeac7a205f..1dc892f3e4 100644 --- a/docs/api/materials/MeshDepthMaterial.html +++ b/docs/api/materials/MeshDepthMaterial.html @@ -13,7 +13,7 @@

[name]

A material for drawing geometry by depth. Depth is based off of the camera near and far plane. White is nearest, black is farthest.
- +

Constructor

@@ -21,7 +21,7 @@

[name]([page:Object parameters])

- parameters is an object with one or more properties defining the material's appearance. + parameters is an object with one or more properties defining the material's appearance.
morphTargets -- Define whether the material uses morphTargets. Default is false.
@@ -31,20 +31,20 @@

Properties

- +
See the base [page:Material] class for common properties.

[property:boolean morphTargets]

-
Define whether the material uses morphTargets. Default is false.
+
Define whether the material uses morphTargets. Default is false.

[property:boolean wireframe]

-
Render geometry as wireframe. Default is false (i.e. render as smooth shaded).
- +
Render geometry as wireframe. Default is false (i.e. render as smooth shaded).
+

[property:number wireframeLinewidth]

Controls wireframe thickness. Default is 1.

Due to limitations in the ANGLE layer, on Windows platforms linewidth will always be 1 regardless of the set value. -
- +
+

Methods

diff --git a/docs/api/materials/MeshLambertMaterial.html b/docs/api/materials/MeshLambertMaterial.html index f433b6449f..03ab8cef58 100644 --- a/docs/api/materials/MeshLambertMaterial.html +++ b/docs/api/materials/MeshLambertMaterial.html @@ -52,7 +52,7 @@

Properties

-
See the base [page:Material] class for common parameters.
+
See the base [page:Material] class for common properties.

[property:Color color]

diff --git a/docs/api/materials/MeshNormalMaterial.html b/docs/api/materials/MeshNormalMaterial.html index c42a991ce0..03addef39b 100644 --- a/docs/api/materials/MeshNormalMaterial.html +++ b/docs/api/materials/MeshNormalMaterial.html @@ -32,7 +32,7 @@

Properties

- +
See the base [page:Material] class for common properties.

[property:boolean wireframe]

diff --git a/docs/api/materials/MeshPhongMaterial.html b/docs/api/materials/MeshPhongMaterial.html index 5e60ffd341..0bb8453eb1 100644 --- a/docs/api/materials/MeshPhongMaterial.html +++ b/docs/api/materials/MeshPhongMaterial.html @@ -67,7 +67,7 @@

Properties

-
See the base [page:Material] class for common parameters.
+
See the base [page:Material] class for common properties.

[property:Color color]

diff --git a/docs/api/materials/MeshStandardMaterial.html b/docs/api/materials/MeshStandardMaterial.html index cdd8601bee..f0988b9697 100644 --- a/docs/api/materials/MeshStandardMaterial.html +++ b/docs/api/materials/MeshStandardMaterial.html @@ -67,7 +67,7 @@

Properties

-
See the base [page:Material] class for common parameters.
+
See the base [page:Material] class for common properties.

[property:Color color]

diff --git a/docs/api/materials/PointsMaterial.html b/docs/api/materials/PointsMaterial.html index 614fd0dbd2..ca358ab557 100644 --- a/docs/api/materials/PointsMaterial.html +++ b/docs/api/materials/PointsMaterial.html @@ -20,7 +20,7 @@

[name]( [page:Object parameters] )

parameters is an object with one or more properties defining the material's appearance.
- +
color — Particle color in hexadecimal. Default is 0xffffff.
map — a [page:Texture texture].If defined, then a point has the data from texture as colors. Default is null.
@@ -31,27 +31,28 @@

Properties

+
See the base [page:Material] class for common properties.

[property:Number color]

- +
Sets the color of the particles. Default is 0xffffff.
- +

[property:Texture map]

- +
Sets the color of the particles using data from a texture.
- +

[property:Number size]

- +
Sets the size of the particles. Default is 1.0.

[property:Boolean sizeAttenuation]

- +
Specify whether particles' size will get smaller with the distance. Default is true.

[property:Boolean vertexColors]

Define how the vertices gets colored. Possible values are THREE.NoColors, THREE.FaceColors and THREE.VertexColors. Default is THREE.NoColors.
This setting might not have any effect when used with certain renderers. For example, it is ignored with the [page:CanvasRenderer Canvas] renderer, but does work with the [page:WebGLRenderer WebGL] renderer.
- +

[property:Boolean fog]

Define whether the material color is affected by global fog settings.
This setting might not have any effect when used with certain renderers. For example, it is ignored with the [page:CanvasRenderer Canvas] renderer, but does work with the [page:WebGLRenderer WebGL] renderer.
diff --git a/docs/api/materials/ShaderMaterial.html b/docs/api/materials/ShaderMaterial.html index 2e1dcbf22e..fb387a453e 100644 --- a/docs/api/materials/ShaderMaterial.html +++ b/docs/api/materials/ShaderMaterial.html @@ -211,6 +211,7 @@

Properties

+
See the base [page:Material] class for common properties.

[property:Object uniforms]

diff --git a/docs/api/materials/SpriteMaterial.html b/docs/api/materials/SpriteMaterial.html index 8a6e702585..69ae6db7f0 100644 --- a/docs/api/materials/SpriteMaterial.html +++ b/docs/api/materials/SpriteMaterial.html @@ -31,13 +31,13 @@

Properties

- +
See the base [page:Material] class for common properties.

[property:Color color]

-
The texture is multiplied by this color. The default is 0xffffff
+
The texture is multiplied by this color. The default is 0xffffff

[property:Texture map]

-
The texture map. Default is null.
+
The texture map. Default is null.

[property:Radians rotation]

The rotation of the sprite in radians. Default is 0.
-- GitLab