Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct the default 6x6x6 palette entries #5999

Merged
3 commits merged into from
May 19, 2020
Merged

Correct the default 6x6x6 palette entries #5999

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1195ae7
Correct some of the values in the default 256-color palette.
j4james May 19, 2020
4c884ac
Remove some unnecessary whitespace.
j4james May 19, 2020
98c43b2
Remove some more unnecessary whitespace.
j4james May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
268 changes: 134 additions & 134 deletions src/types/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,22 +122,22 @@ void Utils::InitializeCampbellColorTable(const gsl::span<COLORREF> table)
THROW_HR_IF(E_INVALIDARG, table.size() < 16);

// clang-format off
table[0] = RGB( 12, 12, 12);
table[1] = RGB( 197, 15, 31);
table[2] = RGB( 19, 161, 14);
table[3] = RGB( 193, 156, 0);
table[4] = RGB( 0, 55, 218);
table[5] = RGB( 136, 23, 152);
table[6] = RGB( 58, 150, 221);
table[7] = RGB( 204, 204, 204);
table[8] = RGB( 118, 118, 118);
table[9] = RGB( 231, 72, 86);
table[10] = RGB( 22, 198, 12);
table[11] = RGB( 249, 241, 165);
table[12] = RGB( 59, 120, 255);
table[13] = RGB( 180, 0, 158);
table[14] = RGB( 97, 214, 214);
table[15] = RGB( 242, 242, 242);
table[0] = RGB(12, 12, 12);
table[1] = RGB(197, 15, 31);
table[2] = RGB(19, 161, 14);
table[3] = RGB(193, 156, 0);
table[4] = RGB(0, 55, 218);
table[5] = RGB(136, 23, 152);
table[6] = RGB(58, 150, 221);
table[7] = RGB(204, 204, 204);
table[8] = RGB(118, 118, 118);
table[9] = RGB(231, 72, 86);
table[10] = RGB(22, 198, 12);
table[11] = RGB(249, 241, 165);
table[12] = RGB(59, 120, 255);
table[13] = RGB(180, 0, 158);
table[14] = RGB(97, 214, 214);
table[15] = RGB(242, 242, 242);
// clang-format on
}

Expand Down Expand Up @@ -182,106 +182,106 @@ void Utils::Initialize256ColorTable(const gsl::span<COLORREF> table)
THROW_HR_IF(E_INVALIDARG, table.size() < 256);

// clang-format off
table[0] = RGB( 0x00, 0x00, 0x00);
table[1] = RGB( 0x80, 0x00, 0x00);
table[2] = RGB( 0x00, 0x80, 0x00);
table[3] = RGB( 0x80, 0x80, 0x00);
table[4] = RGB( 0x00, 0x00, 0x80);
table[5] = RGB( 0x80, 0x00, 0x80);
table[6] = RGB( 0x00, 0x80, 0x80);
table[7] = RGB( 0xc0, 0xc0, 0xc0);
table[8] = RGB( 0x80, 0x80, 0x80);
table[9] = RGB( 0xff, 0x00, 0x00);
table[10] = RGB( 0x00, 0xff, 0x00);
table[11] = RGB( 0xff, 0xff, 0x00);
table[12] = RGB( 0x00, 0x00, 0xff);
table[13] = RGB( 0xff, 0x00, 0xff);
table[14] = RGB( 0x00, 0xff, 0xff);
table[15] = RGB( 0xff, 0xff, 0xff);
table[16] = RGB( 0x00, 0x00, 0x00);
table[17] = RGB( 0x00, 0x00, 0x5f);
table[18] = RGB( 0x00, 0x00, 0x87);
table[19] = RGB( 0x00, 0x00, 0xaf);
table[20] = RGB( 0x00, 0x00, 0xd7);
table[21] = RGB( 0x00, 0x00, 0xff);
table[22] = RGB( 0x00, 0x5f, 0x00);
table[23] = RGB( 0x00, 0x5f, 0x5f);
table[24] = RGB( 0x00, 0x5f, 0x87);
table[25] = RGB( 0x00, 0x5f, 0xaf);
table[26] = RGB( 0x00, 0x5f, 0xd7);
table[27] = RGB( 0x00, 0x5f, 0xff);
table[28] = RGB( 0x00, 0x87, 0x00);
table[29] = RGB( 0x00, 0x87, 0x5f);
table[30] = RGB( 0x00, 0x87, 0x87);
table[31] = RGB( 0x00, 0x87, 0xaf);
table[32] = RGB( 0x00, 0x87, 0xd7);
table[33] = RGB( 0x00, 0x87, 0xff);
table[34] = RGB( 0x00, 0xaf, 0x00);
table[35] = RGB( 0x00, 0xaf, 0x5f);
table[36] = RGB( 0x00, 0xaf, 0x87);
table[37] = RGB( 0x00, 0xaf, 0xaf);
table[38] = RGB( 0x00, 0xaf, 0xd7);
table[39] = RGB( 0x00, 0xaf, 0xff);
table[40] = RGB( 0x00, 0xd7, 0x00);
table[41] = RGB( 0x00, 0xd7, 0x5f);
table[42] = RGB( 0x00, 0xd7, 0x87);
table[43] = RGB( 0x00, 0xd7, 0xaf);
table[44] = RGB( 0x00, 0xd7, 0xd7);
table[45] = RGB( 0x00, 0xd7, 0xff);
table[46] = RGB( 0x00, 0xff, 0x00);
table[47] = RGB( 0x00, 0xff, 0x5f);
table[48] = RGB( 0x00, 0xff, 0x87);
table[49] = RGB( 0x00, 0xff, 0xaf);
table[50] = RGB( 0x00, 0xff, 0xd7);
table[51] = RGB( 0x00, 0xff, 0xff);
table[52] = RGB( 0x5f, 0x00, 0x00);
table[53] = RGB( 0x5f, 0x00, 0x5f);
table[54] = RGB( 0x5f, 0x00, 0x87);
table[55] = RGB( 0x5f, 0x00, 0xaf);
table[56] = RGB( 0x5f, 0x00, 0xd7);
table[57] = RGB( 0x5f, 0x00, 0xff);
table[58] = RGB( 0x5f, 0x5f, 0x00);
table[59] = RGB( 0x5f, 0x5f, 0x5f);
table[60] = RGB( 0x5f, 0x5f, 0x87);
table[61] = RGB( 0x5f, 0x5f, 0xaf);
table[62] = RGB( 0x5f, 0x5f, 0xd7);
table[63] = RGB( 0x5f, 0x5f, 0xff);
table[64] = RGB( 0x5f, 0x87, 0x00);
table[65] = RGB( 0x5f, 0x87, 0x5f);
table[66] = RGB( 0x5f, 0x87, 0x87);
table[67] = RGB( 0x5f, 0x87, 0xaf);
table[68] = RGB( 0x5f, 0x87, 0xd7);
table[69] = RGB( 0x5f, 0x87, 0xff);
table[70] = RGB( 0x5f, 0xaf, 0x00);
table[71] = RGB( 0x5f, 0xaf, 0x5f);
table[72] = RGB( 0x5f, 0xaf, 0x87);
table[73] = RGB( 0x5f, 0xaf, 0xaf);
table[74] = RGB( 0x5f, 0xaf, 0xd7);
table[75] = RGB( 0x5f, 0xaf, 0xff);
table[76] = RGB( 0x5f, 0xd7, 0x00);
table[77] = RGB( 0x5f, 0xd7, 0x5f);
table[78] = RGB( 0x5f, 0xd7, 0x87);
table[79] = RGB( 0x5f, 0xd7, 0xaf);
table[80] = RGB( 0x5f, 0xd7, 0xd7);
table[81] = RGB( 0x5f, 0xd7, 0xff);
table[82] = RGB( 0x5f, 0xff, 0x00);
table[83] = RGB( 0x5f, 0xff, 0x5f);
table[84] = RGB( 0x5f, 0xff, 0x87);
table[85] = RGB( 0x5f, 0xff, 0xaf);
table[86] = RGB( 0x5f, 0xff, 0xd7);
table[87] = RGB( 0x5f, 0xff, 0xff);
table[88] = RGB( 0x87, 0x00, 0x00);
table[89] = RGB( 0x87, 0x00, 0x5f);
table[90] = RGB( 0x87, 0x00, 0x87);
table[91] = RGB( 0x87, 0x00, 0xaf);
table[92] = RGB( 0x87, 0x00, 0xd7);
table[93] = RGB( 0x87, 0x00, 0xff);
table[94] = RGB( 0x87, 0x5f, 0x00);
table[95] = RGB( 0x87, 0x5f, 0x5f);
table[96] = RGB( 0x87, 0x5f, 0x87);
table[97] = RGB( 0x87, 0x5f, 0xaf);
table[98] = RGB( 0x87, 0x5f, 0xd7);
table[99] = RGB( 0x87, 0x5f, 0xff);
table[0] = RGB(0x00, 0x00, 0x00);
table[1] = RGB(0x80, 0x00, 0x00);
table[2] = RGB(0x00, 0x80, 0x00);
table[3] = RGB(0x80, 0x80, 0x00);
table[4] = RGB(0x00, 0x00, 0x80);
table[5] = RGB(0x80, 0x00, 0x80);
table[6] = RGB(0x00, 0x80, 0x80);
table[7] = RGB(0xc0, 0xc0, 0xc0);
table[8] = RGB(0x80, 0x80, 0x80);
table[9] = RGB(0xff, 0x00, 0x00);
table[10] = RGB(0x00, 0xff, 0x00);
table[11] = RGB(0xff, 0xff, 0x00);
table[12] = RGB(0x00, 0x00, 0xff);
table[13] = RGB(0xff, 0x00, 0xff);
table[14] = RGB(0x00, 0xff, 0xff);
table[15] = RGB(0xff, 0xff, 0xff);
table[16] = RGB(0x00, 0x00, 0x00);
table[17] = RGB(0x00, 0x00, 0x5f);
table[18] = RGB(0x00, 0x00, 0x87);
table[19] = RGB(0x00, 0x00, 0xaf);
table[20] = RGB(0x00, 0x00, 0xd7);
table[21] = RGB(0x00, 0x00, 0xff);
table[22] = RGB(0x00, 0x5f, 0x00);
table[23] = RGB(0x00, 0x5f, 0x5f);
table[24] = RGB(0x00, 0x5f, 0x87);
table[25] = RGB(0x00, 0x5f, 0xaf);
table[26] = RGB(0x00, 0x5f, 0xd7);
table[27] = RGB(0x00, 0x5f, 0xff);
table[28] = RGB(0x00, 0x87, 0x00);
table[29] = RGB(0x00, 0x87, 0x5f);
table[30] = RGB(0x00, 0x87, 0x87);
table[31] = RGB(0x00, 0x87, 0xaf);
table[32] = RGB(0x00, 0x87, 0xd7);
table[33] = RGB(0x00, 0x87, 0xff);
table[34] = RGB(0x00, 0xaf, 0x00);
table[35] = RGB(0x00, 0xaf, 0x5f);
table[36] = RGB(0x00, 0xaf, 0x87);
table[37] = RGB(0x00, 0xaf, 0xaf);
table[38] = RGB(0x00, 0xaf, 0xd7);
table[39] = RGB(0x00, 0xaf, 0xff);
table[40] = RGB(0x00, 0xd7, 0x00);
table[41] = RGB(0x00, 0xd7, 0x5f);
table[42] = RGB(0x00, 0xd7, 0x87);
table[43] = RGB(0x00, 0xd7, 0xaf);
table[44] = RGB(0x00, 0xd7, 0xd7);
table[45] = RGB(0x00, 0xd7, 0xff);
table[46] = RGB(0x00, 0xff, 0x00);
table[47] = RGB(0x00, 0xff, 0x5f);
table[48] = RGB(0x00, 0xff, 0x87);
table[49] = RGB(0x00, 0xff, 0xaf);
table[50] = RGB(0x00, 0xff, 0xd7);
table[51] = RGB(0x00, 0xff, 0xff);
table[52] = RGB(0x5f, 0x00, 0x00);
table[53] = RGB(0x5f, 0x00, 0x5f);
table[54] = RGB(0x5f, 0x00, 0x87);
table[55] = RGB(0x5f, 0x00, 0xaf);
table[56] = RGB(0x5f, 0x00, 0xd7);
table[57] = RGB(0x5f, 0x00, 0xff);
table[58] = RGB(0x5f, 0x5f, 0x00);
table[59] = RGB(0x5f, 0x5f, 0x5f);
table[60] = RGB(0x5f, 0x5f, 0x87);
table[61] = RGB(0x5f, 0x5f, 0xaf);
table[62] = RGB(0x5f, 0x5f, 0xd7);
table[63] = RGB(0x5f, 0x5f, 0xff);
table[64] = RGB(0x5f, 0x87, 0x00);
table[65] = RGB(0x5f, 0x87, 0x5f);
table[66] = RGB(0x5f, 0x87, 0x87);
table[67] = RGB(0x5f, 0x87, 0xaf);
table[68] = RGB(0x5f, 0x87, 0xd7);
table[69] = RGB(0x5f, 0x87, 0xff);
table[70] = RGB(0x5f, 0xaf, 0x00);
table[71] = RGB(0x5f, 0xaf, 0x5f);
table[72] = RGB(0x5f, 0xaf, 0x87);
table[73] = RGB(0x5f, 0xaf, 0xaf);
table[74] = RGB(0x5f, 0xaf, 0xd7);
table[75] = RGB(0x5f, 0xaf, 0xff);
table[76] = RGB(0x5f, 0xd7, 0x00);
table[77] = RGB(0x5f, 0xd7, 0x5f);
table[78] = RGB(0x5f, 0xd7, 0x87);
table[79] = RGB(0x5f, 0xd7, 0xaf);
table[80] = RGB(0x5f, 0xd7, 0xd7);
table[81] = RGB(0x5f, 0xd7, 0xff);
table[82] = RGB(0x5f, 0xff, 0x00);
table[83] = RGB(0x5f, 0xff, 0x5f);
table[84] = RGB(0x5f, 0xff, 0x87);
table[85] = RGB(0x5f, 0xff, 0xaf);
table[86] = RGB(0x5f, 0xff, 0xd7);
table[87] = RGB(0x5f, 0xff, 0xff);
table[88] = RGB(0x87, 0x00, 0x00);
table[89] = RGB(0x87, 0x00, 0x5f);
table[90] = RGB(0x87, 0x00, 0x87);
table[91] = RGB(0x87, 0x00, 0xaf);
table[92] = RGB(0x87, 0x00, 0xd7);
table[93] = RGB(0x87, 0x00, 0xff);
table[94] = RGB(0x87, 0x5f, 0x00);
table[95] = RGB(0x87, 0x5f, 0x5f);
table[96] = RGB(0x87, 0x5f, 0x87);
table[97] = RGB(0x87, 0x5f, 0xaf);
table[98] = RGB(0x87, 0x5f, 0xd7);
table[99] = RGB(0x87, 0x5f, 0xff);
table[100] = RGB(0x87, 0x87, 0x00);
table[101] = RGB(0x87, 0x87, 0x5f);
table[102] = RGB(0x87, 0x87, 0x87);
Expand Down Expand Up @@ -360,24 +360,24 @@ void Utils::Initialize256ColorTable(const gsl::span<COLORREF> table)
table[175] = RGB(0xd7, 0x87, 0xaf);
table[176] = RGB(0xd7, 0x87, 0xd7);
table[177] = RGB(0xd7, 0x87, 0xff);
table[178] = RGB(0xdf, 0xaf, 0x00);
table[179] = RGB(0xdf, 0xaf, 0x5f);
table[180] = RGB(0xdf, 0xaf, 0x87);
table[181] = RGB(0xdf, 0xaf, 0xaf);
table[182] = RGB(0xdf, 0xaf, 0xd7);
table[183] = RGB(0xdf, 0xaf, 0xff);
table[184] = RGB(0xdf, 0xd7, 0x00);
table[185] = RGB(0xdf, 0xd7, 0x5f);
table[186] = RGB(0xdf, 0xd7, 0x87);
table[187] = RGB(0xdf, 0xd7, 0xaf);
table[188] = RGB(0xdf, 0xd7, 0xd7);
table[189] = RGB(0xdf, 0xd7, 0xff);
table[190] = RGB(0xdf, 0xff, 0x00);
table[191] = RGB(0xdf, 0xff, 0x5f);
table[192] = RGB(0xdf, 0xff, 0x87);
table[193] = RGB(0xdf, 0xff, 0xaf);
table[194] = RGB(0xdf, 0xff, 0xd7);
table[195] = RGB(0xdf, 0xff, 0xff);
table[178] = RGB(0xd7, 0xaf, 0x00);
table[179] = RGB(0xd7, 0xaf, 0x5f);
table[180] = RGB(0xd7, 0xaf, 0x87);
table[181] = RGB(0xd7, 0xaf, 0xaf);
table[182] = RGB(0xd7, 0xaf, 0xd7);
table[183] = RGB(0xd7, 0xaf, 0xff);
table[184] = RGB(0xd7, 0xd7, 0x00);
table[185] = RGB(0xd7, 0xd7, 0x5f);
table[186] = RGB(0xd7, 0xd7, 0x87);
table[187] = RGB(0xd7, 0xd7, 0xaf);
table[188] = RGB(0xd7, 0xd7, 0xd7);
table[189] = RGB(0xd7, 0xd7, 0xff);
table[190] = RGB(0xd7, 0xff, 0x00);
table[191] = RGB(0xd7, 0xff, 0x5f);
table[192] = RGB(0xd7, 0xff, 0x87);
table[193] = RGB(0xd7, 0xff, 0xaf);
table[194] = RGB(0xd7, 0xff, 0xd7);
table[195] = RGB(0xd7, 0xff, 0xff);
table[196] = RGB(0xff, 0x00, 0x00);
table[197] = RGB(0xff, 0x00, 0x5f);
table[198] = RGB(0xff, 0x00, 0x87);
Expand Down