From b7aea9e3b8f9e547b3c8c2a9a320dbab76387d09 Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Tue, 8 Dec 2020 12:08:54 +0100 Subject: [PATCH] Merge pull request #2298 from haslinghuis/color_ambient Remove colorAmbient from THREE.js as it's no longer supported --- resources/models/fallback.json | 1 - resources/models/hex_plus.json | 5 ----- resources/models/hex_x.json | 5 ----- resources/models/quad_atail.json | 5 ----- resources/models/quad_vtail.json | 5 ----- resources/models/quad_x.json | 5 ----- resources/models/tricopter.json | 5 ----- resources/models/y4.json | 5 ----- resources/models/y6.json | 5 ----- 9 files changed, 41 deletions(-) diff --git a/resources/models/fallback.json b/resources/models/fallback.json index afeec7c7..e996c814 100644 --- a/resources/models/fallback.json +++ b/resources/models/fallback.json @@ -17,7 +17,6 @@ "materials": [{ "depthTest": true, "colorDiffuse": [0.6400000190734865,0.6400000190734865,0.6400000190734865], - "colorAmbient": [0.6400000190734865,0.6400000190734865,0.6400000190734865], "DbgColor": 15658734, "mapDiffuseAnisotropy": 1.0, "visible": true, diff --git a/resources/models/hex_plus.json b/resources/models/hex_plus.json index 6c26f6c2..aa0e7f07 100644 --- a/resources/models/hex_plus.json +++ b/resources/models/hex_plus.json @@ -16,7 +16,6 @@ "DbgColor": 15658734, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.0,1.0,0.0], "colorDiffuse": [0.0,1.0,0.0], "transparent": false, "depthWrite": true, @@ -33,7 +32,6 @@ "DbgColor": 15597568, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.4000000059604645,0.4000000059604645,0.4000000059604645], "colorDiffuse": [0.4000000059604645,0.4000000059604645,0.4000000059604645], "transparent": false, "depthWrite": true, @@ -50,7 +48,6 @@ "DbgColor": 60928, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.0,0.4498299665723735,0.640000066757203], "colorDiffuse": [0.0,0.4498299665723735,0.640000066757203], "transparent": false, "depthWrite": true, @@ -67,7 +64,6 @@ "DbgColor": 238, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [1.0,0.0,0.0], "colorDiffuse": [1.0,0.0,0.0], "transparent": false, "depthWrite": true, @@ -84,7 +80,6 @@ "DbgColor": 15658496, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.1770558383622145,0.1770558383622145,0.1770558383622145], "colorDiffuse": [0.1770558383622145,0.1770558383622145,0.1770558383622145], "transparent": false, "depthWrite": true, diff --git a/resources/models/hex_x.json b/resources/models/hex_x.json index 75386400..19c3e5e7 100644 --- a/resources/models/hex_x.json +++ b/resources/models/hex_x.json @@ -16,7 +16,6 @@ "DbgColor": 15658734, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.0,0.4498299665723735,0.640000066757203], "colorDiffuse": [0.0,0.4498299665723735,0.640000066757203], "transparent": false, "depthWrite": true, @@ -33,7 +32,6 @@ "DbgColor": 15597568, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.4000000059604645,0.4000000059604645,0.4000000059604645], "colorDiffuse": [0.4000000059604645,0.4000000059604645,0.4000000059604645], "transparent": false, "depthWrite": true, @@ -50,7 +48,6 @@ "DbgColor": 60928, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.0,1.0,0.0], "colorDiffuse": [0.0,1.0,0.0], "transparent": false, "depthWrite": true, @@ -67,7 +64,6 @@ "DbgColor": 238, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.1770558383622145,0.1770558383622145,0.1770558383622145], "colorDiffuse": [0.1770558383622145,0.1770558383622145,0.1770558383622145], "transparent": false, "depthWrite": true, @@ -84,7 +80,6 @@ "DbgColor": 15658496, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [1.0,0.0,0.0], "colorDiffuse": [1.0,0.0,0.0], "transparent": false, "depthWrite": true, diff --git a/resources/models/quad_atail.json b/resources/models/quad_atail.json index 9c4a120a..8f2ad231 100644 --- a/resources/models/quad_atail.json +++ b/resources/models/quad_atail.json @@ -16,7 +16,6 @@ "DbgColor": 15658734, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [1.0,0.0,0.0], "colorDiffuse": [1.0,0.0,0.0], "transparent": false, "depthWrite": true, @@ -33,7 +32,6 @@ "DbgColor": 15597568, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.1770558383622145,0.1770558383622145,0.1770558383622145], "colorDiffuse": [0.1770558383622145,0.1770558383622145,0.1770558383622145], "transparent": false, "depthWrite": true, @@ -50,7 +48,6 @@ "DbgColor": 60928, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.4000000059604645,0.4000000059604645,0.4000000059604645], "colorDiffuse": [0.4000000059604645,0.4000000059604645,0.4000000059604645], "transparent": false, "depthWrite": true, @@ -67,7 +64,6 @@ "DbgColor": 238, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.0,0.4498299665723735,0.640000066757203], "colorDiffuse": [0.0,0.4498299665723735,0.640000066757203], "transparent": false, "depthWrite": true, @@ -84,7 +80,6 @@ "DbgColor": 15658496, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.0,1.0,0.0], "colorDiffuse": [0.0,1.0,0.0], "transparent": false, "depthWrite": true, diff --git a/resources/models/quad_vtail.json b/resources/models/quad_vtail.json index b699461a..128a2ee1 100644 --- a/resources/models/quad_vtail.json +++ b/resources/models/quad_vtail.json @@ -16,7 +16,6 @@ "DbgColor": 15658734, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.1770558383622145,0.1770558383622145,0.1770558383622145], "colorDiffuse": [0.1770558383622145,0.1770558383622145,0.1770558383622145], "transparent": false, "depthWrite": true, @@ -33,7 +32,6 @@ "DbgColor": 15597568, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.0,0.4498299665723735,0.640000066757203], "colorDiffuse": [0.0,0.4498299665723735,0.640000066757203], "transparent": false, "depthWrite": true, @@ -50,7 +48,6 @@ "DbgColor": 60928, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.0,1.0,0.0], "colorDiffuse": [0.0,1.0,0.0], "transparent": false, "depthWrite": true, @@ -67,7 +64,6 @@ "DbgColor": 238, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.4000000059604645,0.4000000059604645,0.4000000059604645], "colorDiffuse": [0.4000000059604645,0.4000000059604645,0.4000000059604645], "transparent": false, "depthWrite": true, @@ -84,7 +80,6 @@ "DbgColor": 15658496, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [1.0,0.0,0.0], "colorDiffuse": [1.0,0.0,0.0], "transparent": false, "depthWrite": true, diff --git a/resources/models/quad_x.json b/resources/models/quad_x.json index ca06786b..e8e4209b 100644 --- a/resources/models/quad_x.json +++ b/resources/models/quad_x.json @@ -16,7 +16,6 @@ "DbgColor": 15658734, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [1.0,0.0,0.0], "colorDiffuse": [1.0,0.0,0.0], "transparent": false, "depthWrite": true, @@ -33,7 +32,6 @@ "DbgColor": 15597568, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.0,0.4498299665723735,0.640000066757203], "colorDiffuse": [0.0,0.4498299665723735,0.640000066757203], "transparent": false, "depthWrite": true, @@ -50,7 +48,6 @@ "DbgColor": 60928, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.4000000059604645,0.4000000059604645,0.4000000059604645], "colorDiffuse": [0.4000000059604645,0.4000000059604645,0.4000000059604645], "transparent": false, "depthWrite": true, @@ -67,7 +64,6 @@ "DbgColor": 238, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.1770558383622145,0.1770558383622145,0.1770558383622145], "colorDiffuse": [0.1770558383622145,0.1770558383622145,0.1770558383622145], "transparent": false, "depthWrite": true, @@ -84,7 +80,6 @@ "DbgColor": 15658496, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.0,1.0,0.0], "colorDiffuse": [0.0,1.0,0.0], "transparent": false, "depthWrite": true, diff --git a/resources/models/tricopter.json b/resources/models/tricopter.json index 549c62c4..84c36bc3 100644 --- a/resources/models/tricopter.json +++ b/resources/models/tricopter.json @@ -16,7 +16,6 @@ "DbgColor": 15658734, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.4000000059604645,0.4000000059604645,0.4000000059604645], "colorDiffuse": [0.4000000059604645,0.4000000059604645,0.4000000059604645], "transparent": false, "depthWrite": true, @@ -33,7 +32,6 @@ "DbgColor": 15597568, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.0,0.4498299665723735,0.640000066757203], "colorDiffuse": [0.0,0.4498299665723735,0.640000066757203], "transparent": false, "depthWrite": true, @@ -50,7 +48,6 @@ "DbgColor": 60928, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.0,1.0,0.0], "colorDiffuse": [0.0,1.0,0.0], "transparent": false, "depthWrite": true, @@ -67,7 +64,6 @@ "DbgColor": 238, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [1.0,0.0,0.0], "colorDiffuse": [1.0,0.0,0.0], "transparent": false, "depthWrite": true, @@ -84,7 +80,6 @@ "DbgColor": 15658496, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.1770558383622145,0.1770558383622145,0.1770558383622145], "colorDiffuse": [0.1770558383622145,0.1770558383622145,0.1770558383622145], "transparent": false, "depthWrite": true, diff --git a/resources/models/y4.json b/resources/models/y4.json index 39f731ca..3a7c3275 100644 --- a/resources/models/y4.json +++ b/resources/models/y4.json @@ -16,7 +16,6 @@ "DbgColor": 15658734, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.0,1.0,0.0], "colorDiffuse": [0.0,1.0,0.0], "transparent": false, "depthWrite": true, @@ -33,7 +32,6 @@ "DbgColor": 15597568, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.0,0.4498299665723735,0.640000066757203], "colorDiffuse": [0.0,0.4498299665723735,0.640000066757203], "transparent": false, "depthWrite": true, @@ -50,7 +48,6 @@ "DbgColor": 60928, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [1.0,0.0,0.0], "colorDiffuse": [1.0,0.0,0.0], "transparent": false, "depthWrite": true, @@ -67,7 +64,6 @@ "DbgColor": 238, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.4000000059604645,0.4000000059604645,0.4000000059604645], "colorDiffuse": [0.4000000059604645,0.4000000059604645,0.4000000059604645], "transparent": false, "depthWrite": true, @@ -84,7 +80,6 @@ "DbgColor": 15658496, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.1770558383622145,0.1770558383622145,0.1770558383622145], "colorDiffuse": [0.1770558383622145,0.1770558383622145,0.1770558383622145], "transparent": false, "depthWrite": true, diff --git a/resources/models/y6.json b/resources/models/y6.json index d7c56525..bacd0141 100644 --- a/resources/models/y6.json +++ b/resources/models/y6.json @@ -16,7 +16,6 @@ "DbgColor": 15658734, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.4000000059604645,0.4000000059604645,0.4000000059604645], "colorDiffuse": [0.4000000059604645,0.4000000059604645,0.4000000059604645], "transparent": false, "depthWrite": true, @@ -33,7 +32,6 @@ "DbgColor": 15597568, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.0,0.4498299665723735,0.640000066757203], "colorDiffuse": [0.0,0.4498299665723735,0.640000066757203], "transparent": false, "depthWrite": true, @@ -50,7 +48,6 @@ "DbgColor": 60928, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.0,1.0,0.0], "colorDiffuse": [0.0,1.0,0.0], "transparent": false, "depthWrite": true, @@ -67,7 +64,6 @@ "DbgColor": 238, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [1.0,0.0,0.0], "colorDiffuse": [1.0,0.0,0.0], "transparent": false, "depthWrite": true, @@ -84,7 +80,6 @@ "DbgColor": 15658496, "specularCoef": 50, "colorEmissive": [0.0,0.0,0.0], - "colorAmbient": [0.1770558383622145,0.1770558383622145,0.1770558383622145], "colorDiffuse": [0.1770558383622145,0.1770558383622145,0.1770558383622145], "transparent": false, "depthWrite": true,