some more upgrades of dev to match the premultiplied multiple blend modes.

bhouston · bhouston · commit 22c1e2ec22cb · 2016-03-02T09:34:55.000-05:00
diff --git a/src/materials/LineBasicMaterial.js b/src/materials/LineBasicMaterial.js
@@ -10,7 +10,7 @@
  *  linecap: "round",
  *  linejoin: "round",
  *
- *  blending: THREE.PremultipliedAlphaBlending,
+ *  blending: THREE.PremultipliedAlphaNormalBlending,
  *  depthTest: <bool>,
  *  depthWrite: <bool>,
  *
@@ -32,7 +32,7 @@ THREE.LineBasicMaterial = function ( parameters ) {
 	this.linecap = 'round';
 	this.linejoin = 'round';
 
-	this.blending = THREE.PremultipliedAlphaBlending;
+	this.blending = THREE.PremultipliedAlphaNormalBlending;
 
 	this.vertexColors = THREE.NoColors;
 
diff --git a/src/materials/LineDashedMaterial.js b/src/materials/LineDashedMaterial.js
@@ -11,7 +11,7 @@
  *  dashSize: <float>,
  *  gapSize: <float>,
  *
- *  blending: THREE.PremultipliedAlphaBlending,
+ *  blending: THREE.PremultipliedAlphaNormalBlending,
  *  depthTest: <bool>,
  *  depthWrite: <bool>,
  *
@@ -35,7 +35,7 @@ THREE.LineDashedMaterial = function ( parameters ) {
 	this.dashSize = 3;
 	this.gapSize = 1;
 
-	this.blending = THREE.PremultipliedAlphaBlending;
+	this.blending = THREE.PremultipliedAlphaNormalBlending;
 
 	this.vertexColors = THREE.NoColors;
 
diff --git a/src/materials/MeshBasicMaterial.js b/src/materials/MeshBasicMaterial.js
@@ -20,7 +20,7 @@
  *  refractionRatio: <float>,
  *
  *  shading: THREE.SmoothShading,
- *  blending: THREE.PremultipliedAlphaBlending,
+ *  blending: THREE.PremultipliedAlphaNormalBlending,
  *  depthTest: <bool>,
  *  depthWrite: <bool>,
  *
@@ -61,7 +61,7 @@ THREE.MeshBasicMaterial = function ( parameters ) {
 	this.fog = true;
 
 	this.shading = THREE.SmoothShading;
-	this.blending = THREE.PremultipliedAlphaBlending;
+	this.blending = THREE.PremultipliedAlphaNormalBlending;
 
 	this.wireframe = false;
 	this.wireframeLinewidth = 1;
diff --git a/src/materials/MeshLambertMaterial.js b/src/materials/MeshLambertMaterial.js
@@ -27,7 +27,7 @@
  *  reflectivity: <float>,
  *  refractionRatio: <float>,
  *
- *  blending: THREE.PremultipliedAlphaBlending,
+ *  blending: THREE.PremultipliedAlphaNormalBlending,
  *  depthTest: <bool>,
  *  depthWrite: <bool>,
  *
@@ -75,7 +75,7 @@ THREE.MeshLambertMaterial = function ( parameters ) {
 
 	this.fog = true;
 
-	this.blending = THREE.PremultipliedAlphaBlending;
+	this.blending = THREE.PremultipliedAlphaNormalBlending;
 
 	this.wireframe = false;
 	this.wireframeLinewidth = 1;
diff --git a/src/materials/MeshPhongMaterial.js b/src/materials/MeshPhongMaterial.js
@@ -40,7 +40,7 @@
  *  refractionRatio: <float>,
  *
  *  shading: THREE.SmoothShading,
- *  blending: THREE.PremultipliedAlphaBlending,
+ *  blending: THREE.PremultipliedAlphaNormalBlending,
  *  depthTest: <bool>,
  *  depthWrite: <bool>,
  *
@@ -101,7 +101,7 @@ THREE.MeshPhongMaterial = function ( parameters ) {
 	this.fog = true;
 
 	this.shading = THREE.SmoothShading;
-	this.blending = THREE.PremultipliedAlphaBlending;
+	this.blending = THREE.PremultipliedAlphaNormalBlending;
 
 	this.wireframe = false;
 	this.wireframeLinewidth = 1;
diff --git a/src/materials/MeshStandardMaterial.js b/src/materials/MeshStandardMaterial.js
@@ -41,7 +41,7 @@
  *  refractionRatio: <float>,
  *
  *  shading: THREE.SmoothShading,
- *  blending: THREE.PremultipliedAlphaBlending,
+ *  blending: THREE.PremultipliedAlphaNormalBlending,
  *  depthTest: <bool>,
  *  depthWrite: <bool>,
  *
@@ -104,7 +104,7 @@ THREE.MeshStandardMaterial = function ( parameters ) {
 	this.fog = true;
 
 	this.shading = THREE.SmoothShading;
-	this.blending = THREE.PremultipliedAlphaBlending;
+	this.blending = THREE.PremultipliedAlphaNormalBlending;
 
 	this.wireframe = false;
 	this.wireframeLinewidth = 1;
diff --git a/src/materials/PointsMaterial.js b/src/materials/PointsMaterial.js
@@ -10,7 +10,7 @@
  *  size: <float>,
  *  sizeAttenuation: <bool>,
  *
- *  blending: THREE.PremultipliedAlphaBlending,
+ *  blending: THREE.PremultipliedAlphaNormalBlending,
  *  depthTest: <bool>,
  *  depthWrite: <bool>,
  *
@@ -33,7 +33,7 @@ THREE.PointsMaterial = function ( parameters ) {
 	this.size = 1;
 	this.sizeAttenuation = true;
 
-	this.blending = THREE.PremultipliedAlphaBlending;
+	this.blending = THREE.PremultipliedAlphaNormalBlending;
 
 	this.vertexColors = THREE.NoColors;
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* linecap: "round",`
`11`	`11`	`* linejoin: "round",`
`12`	`12`	`*`
`13`		`- * blending: THREE.PremultipliedAlphaBlending,`
	`13`	`+ * blending: THREE.PremultipliedAlphaNormalBlending,`
`14`	`14`	`* depthTest: <bool>,`
`15`	`15`	`* depthWrite: <bool>,`
`16`	`16`	`*`
`@@ -32,7 +32,7 @@ THREE.LineBasicMaterial = function ( parameters ) {`
`32`	`32`	`this.linecap = 'round';`
`33`	`33`	`this.linejoin = 'round';`
`34`	`34`
`35`		`- this.blending = THREE.PremultipliedAlphaBlending;`
	`35`	`+ this.blending = THREE.PremultipliedAlphaNormalBlending;`
`36`	`36`
`37`	`37`	`this.vertexColors = THREE.NoColors;`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* dashSize: <float>,`
`12`	`12`	`* gapSize: <float>,`
`13`	`13`	`*`
`14`		`- * blending: THREE.PremultipliedAlphaBlending,`
	`14`	`+ * blending: THREE.PremultipliedAlphaNormalBlending,`
`15`	`15`	`* depthTest: <bool>,`
`16`	`16`	`* depthWrite: <bool>,`
`17`	`17`	`*`
`@@ -35,7 +35,7 @@ THREE.LineDashedMaterial = function ( parameters ) {`
`35`	`35`	`this.dashSize = 3;`
`36`	`36`	`this.gapSize = 1;`
`37`	`37`
`38`		`- this.blending = THREE.PremultipliedAlphaBlending;`
	`38`	`+ this.blending = THREE.PremultipliedAlphaNormalBlending;`
`39`	`39`
`40`	`40`	`this.vertexColors = THREE.NoColors;`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`* reflectivity: <float>,`
`28`	`28`	`* refractionRatio: <float>,`
`29`	`29`	`*`
`30`		`- * blending: THREE.PremultipliedAlphaBlending,`
	`30`	`+ * blending: THREE.PremultipliedAlphaNormalBlending,`
`31`	`31`	`* depthTest: <bool>,`
`32`	`32`	`* depthWrite: <bool>,`
`33`	`33`	`*`
`@@ -75,7 +75,7 @@ THREE.MeshLambertMaterial = function ( parameters ) {`
`75`	`75`
`76`	`76`	`this.fog = true;`
`77`	`77`
`78`		`- this.blending = THREE.PremultipliedAlphaBlending;`
	`78`	`+ this.blending = THREE.PremultipliedAlphaNormalBlending;`
`79`	`79`
`80`	`80`	`this.wireframe = false;`
`81`	`81`	`this.wireframeLinewidth = 1;`