birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modified Color Swatch Fix (#6137)

Browse Source 
* Modified Color Swatch Fix

Signed-off-by: Benjamin Black <benblac@amazon.com>

* Updating Macbeth Colors to work with new material formatting

Signed-off-by: Benjamin Black <benblac@amazon.com>

* Tweaks to red color values

Signed-off-by: Benjamin Black <benblac@amazon.com>

* Tweaked red swatch color values provided by Ken

Signed-off-by: Benjamin Black <benblac@amazon.com>
This commit is contained in:
benblack75
2021-12-06 16:18:32 -08:00
committed by GitHub
parent 6e0ac97f13
commit 9698047340
47 changed files with 51 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/00_illuminant_tex.material
+1
View File
@@ -5,6 +5,7 @@
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureBlendMode": "Lerp",
"textureMap": "00_illuminant_sRGB.tif"
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/01_dark_skin.material
-1
View File
@@ -11,7 +11,6 @@
0.056122682988643646,
1.0
],
"textureMap": "01_dark_skin_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/01_dark_skin_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "01_dark_skin_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/02_light_skin.material
-1
View File
@@ -11,7 +11,6 @@
0.21953155100345612,
1.0
],
"textureMap": "02_light_skin_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/02_light_skin_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "02_light_skin_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/03_blue_sky.material
-1
View File
@@ -11,7 +11,6 @@
0.33716335892677307,
1.0
],
"textureMap": "03_blue_sky_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/03_blue_sky_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "03_blue_sky_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/04_foliage_tex.material
+1
View File
@@ -11,6 +11,7 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "04_foliage_sRGB.tif"
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/05_blue_flower_tex.material
+1
View File
@@ -11,6 +11,7 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "05_blue_flower_sRGB.tif"
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/06_bluish_green.material
-1
View File
@@ -11,7 +11,6 @@
0.40723279118537903,
1.0
],
"textureMap": "06_bluish_green_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/06_bluish_green_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "06_bluish_green_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/07_orange_tex.material
+1
View File
@@ -11,6 +11,7 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "07_orange_sRGB.tif"
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/08_purplish_blue.material
-1
View File
@@ -11,7 +11,6 @@
0.39157700538635254,
1.0
],
"textureMap": "08_purplish_blue_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/08_purplish_blue_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "08_purplish_blue_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/09_moderate_red.material
-1
View File
@@ -11,7 +11,6 @@
0.12213321030139923,
1.0
],
"textureMap": "09_moderate_red_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/09_moderate_red_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "09_moderate_red_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/10_purple.material
-1
View File
@@ -11,7 +11,6 @@
0.1412680298089981,
1.0
],
"textureMap": "10_purple_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/10_purple_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "10_purple_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/11_yellow_green.material
-1
View File
@@ -11,7 +11,6 @@
0.0481727309525013,
1.0
],
"textureMap": "11_yellow_green_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/11_yellow_green_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "11_yellow_green_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/12_orange_yellow.material
-1
View File
@@ -11,7 +11,6 @@
0.02217135950922966,
1.0
],
"textureMap": "12_orange_yellow_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/12_orange_yellow_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "12_orange_yellow_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/13_blue.material
-1
View File
@@ -11,7 +11,6 @@
0.29176774621009827,
1.0
],
"textureMap": "13_blue_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/13_blue_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "13_blue_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/14_green.material
-1
View File
@@ -11,7 +11,6 @@
0.06480506807565689,
1.0
],
"textureMap": "14_green_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/14_green_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "14_green_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red.material
+3 -4
View File
@@ -6,12 +6,11 @@
"properties": {
"baseColor": {
"color": [
0.43414968252182007,
0.029556725174188614,
0.03955138474702835,
0.43244872157,
0.0297351510059,
0.0399429307193,
1.0
],
"textureMap": "15_red_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_sRGB.tif
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:19e05a0f796d3a9de91ae56b4e802af8e6ad683b79275365c3220564f9eea05c
size 19460
oid sha256:b53b8ca6b7062239398820aef6fb4145a0b6c8c7e3aae90c17b6b87f806d3579
size 19426
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "15_red_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/16_yellow.material
-1
View File
@@ -11,7 +11,6 @@
0.00802624598145485,
1.0
],
"textureMap": "16_yellow_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/16_yellow_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "16_yellow_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/17_magenta.material
-1
View File
@@ -11,7 +11,6 @@
0.30498206615448,
1.0
],
"textureMap": "17_magenta_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/17_magenta_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "17_magenta_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/18_cyan.material
-1
View File
@@ -11,7 +11,6 @@
0.3813229501247406,
1.0
],
"textureMap": "18_cyan_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/18_cyan_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "18_cyan_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/19_white_9-5_0-05D.material
-1
View File
@@ -11,7 +11,6 @@
0.8713664412498474,
1.0
],
"textureMap": "19_white_9-5_0-05D_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/19_white_9-5_0-05D_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "19_white_9-5_0-05D_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/20_neutral_8-0_0-23D.material
-1
View File
@@ -11,7 +11,6 @@
0.5840848684310913,
1.0
],
"textureMap": "20_neutral_8-0_0-23D_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/20_neutral_8-0_0-23D_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "20_neutral_8-0_0-23D_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/21_neutral_6-5_0-44D.material
-1
View File
@@ -11,7 +11,6 @@
0.35640496015548706,
1.0
],
"textureMap": "21_neutral_6-5_0-44D_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/21_neutral_6-5_0-44D_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "21_neutral_6-5_0-44D_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/22_neutral_5-0_0-70D.material
-1
View File
@@ -11,7 +11,6 @@
0.191195547580719,
1.0
],
"textureMap": "22_neutral_5-0_0-70D_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/22_neutral_5-0_0-70D_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "22_neutral_5-0_0-70D_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/23_neutral_3-5_1-05D.material
-1
View File
@@ -11,7 +11,6 @@
0.09083695709705353,
1.0
],
"textureMap": "23_neutral_3-5_1-05D_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/23_neutral_3-5_1-05D_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "23_neutral_3-5_1-05D_sRGB.tif",
"useTexture": true
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/24_black_2-0_1-50D.material
-1
View File
@@ -11,7 +11,6 @@
0.0318913571536541,
1.0
],
"textureMap": "24_black_2-0_1-50D_sRGB.tif",
"useTexture": false
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/24_black_2-0_1-50D_tex.material
+2
View File
@@ -11,6 +11,8 @@
1.0,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "24_black_2-0_1-50D_sRGB.tif",
"useTexture": true
}
}