diff --git a/CMakeLists.txt b/CMakeLists.txt index 88b9a6e4e..9661f97f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -241,6 +241,8 @@ set(ES_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/frame_png.cpp ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/textbox_png.cpp ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/textbox_glow_png.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/star_filled_png.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/star_unfilled_png.cpp ) SOURCE_GROUP(resources FILES ResourceUtil.cpp) diff --git a/data/ResourceUtil.cpp b/data/ResourceUtil.cpp index 444074814..2364250b1 100644 --- a/data/ResourceUtil.cpp +++ b/data/ResourceUtil.cpp @@ -2,12 +2,14 @@ #include "Resources.h" -const size_t res2hNrOfFiles = 6; +const size_t res2hNrOfFiles = 8; const Res2hEntry res2hFiles[res2hNrOfFiles] = { {":/button.png", button_png_size, button_png_data}, {":/ES_logo_16.png", ES_logo_16_png_size, ES_logo_16_png_data}, {":/ES_logo_32.png", ES_logo_32_png_size, ES_logo_32_png_data}, {":/frame.png", frame_png_size, frame_png_data}, + {":/star_filled.png", star_filled_png_size, star_filled_png_data}, + {":/star_unfilled.png", star_unfilled_png_size, star_unfilled_png_data}, {":/textbox.png", textbox_png_size, textbox_png_data}, {":/textbox_glow.png", textbox_glow_png_size, textbox_glow_png_data} }; @@ -17,8 +19,10 @@ res2hMapType::value_type mapTemp[] = { std::make_pair(":/ES_logo_16.png", res2hFiles[1]), std::make_pair(":/ES_logo_32.png", res2hFiles[2]), std::make_pair(":/frame.png", res2hFiles[3]), - std::make_pair(":/textbox.png", res2hFiles[4]), - std::make_pair(":/textbox_glow.png", res2hFiles[5]) + std::make_pair(":/star_filled.png", res2hFiles[4]), + std::make_pair(":/star_unfilled.png", res2hFiles[5]), + std::make_pair(":/textbox.png", res2hFiles[6]), + std::make_pair(":/textbox_glow.png", res2hFiles[7]) }; res2hMapType res2hMap(mapTemp, mapTemp + sizeof mapTemp / sizeof mapTemp[0]); diff --git a/data/Resources.h b/data/Resources.h index 000c14895..efc90b41b 100644 --- a/data/Resources.h +++ b/data/Resources.h @@ -17,6 +17,12 @@ extern const unsigned char ES_logo_32_png_data[]; extern const size_t frame_png_size; extern const unsigned char frame_png_data[]; +extern const size_t star_filled_png_size; +extern const unsigned char star_filled_png_data[]; + +extern const size_t star_unfilled_png_size; +extern const unsigned char star_unfilled_png_data[]; + extern const size_t textbox_png_size; extern const unsigned char textbox_png_data[]; diff --git a/data/converted/star_filled_png.cpp b/data/converted/star_filled_png.cpp new file mode 100644 index 000000000..38462b66f --- /dev/null +++ b/data/converted/star_filled_png.cpp @@ -0,0 +1,320 @@ +//this file was auto-generated from "star_filled.png" by res2h + +#include "../Resources.h" + +const size_t star_filled_png_size = 3128; +const unsigned char star_filled_png_data[3128] = { + 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00, + 0x00,0x0d,0x49,0x48,0x44,0x52,0x00,0x00,0x00,0x40, + 0x00,0x00,0x00,0x40,0x08,0x06,0x00,0x00,0x00,0xaa, + 0x69,0x71,0xde,0x00,0x00,0x00,0x09,0x70,0x48,0x59, + 0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b,0x13,0x01, + 0x00,0x9a,0x9c,0x18,0x00,0x00,0x0a,0x4f,0x69,0x43, + 0x43,0x50,0x50,0x68,0x6f,0x74,0x6f,0x73,0x68,0x6f, + 0x70,0x20,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66, + 0x69,0x6c,0x65,0x00,0x00,0x78,0xda,0x9d,0x53,0x67, + 0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b, + 0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x08,0x20,0x52, + 0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x09,0x10, + 0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45, + 0x45,0x04,0x1b,0xc8,0xa0,0x88,0x03,0x8e,0x8e,0x80, + 0x8c,0x15,0x51,0x2c,0x0c,0x8a,0x0a,0xd8,0x07,0xe4, + 0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1, + 0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5, + 0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x07,0xc0, + 0x08,0x0c,0x96,0x48,0x33,0x51,0x35,0x80,0x0c,0xa9, + 0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4, + 0x2e,0x40,0x81,0x0a,0x24,0x70,0x00,0x10,0x08,0xb3, + 0x64,0x21,0x73,0xfd,0x23,0x01,0x00,0xf8,0x7e,0x3c, + 0x3c,0x2b,0x22,0xc0,0x07,0xbe,0x00,0x01,0x78,0xd3, + 0x0b,0x08,0x00,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87, + 0xff,0x0f,0xea,0x42,0x99,0x5c,0x01,0x80,0x84,0x01, + 0xc0,0x74,0x91,0x38,0x4b,0x08,0x80,0x14,0x00,0x40, + 0x7a,0x8e,0x42,0xa6,0x00,0x40,0x46,0x01,0x80,0x9d, + 0x98,0x26,0x53,0x00,0xa0,0x04,0x00,0x60,0xcb,0x63, + 0x62,0xe3,0x00,0x50,0x2d,0x00,0x60,0x27,0x7f,0xe6, + 0xd3,0x00,0x80,0x9d,0xf8,0x99,0x7b,0x01,0x00,0x5b, + 0x94,0x21,0x15,0x01,0xa0,0x91,0x00,0x20,0x13,0x65, + 0x88,0x44,0x00,0x68,0x3b,0x00,0xac,0xcf,0x56,0x8a, + 0x45,0x00,0x58,0x30,0x00,0x14,0x66,0x4b,0xc4,0x39, + 0x00,0xd8,0x2d,0x00,0x30,0x49,0x57,0x66,0x48,0x00, + 0xb0,0xb7,0x00,0xc0,0xce,0x10,0x0b,0xb2,0x00,0x08, + 0x0c,0x00,0x30,0x51,0x88,0x85,0x29,0x00,0x04,0x7b, + 0x00,0x60,0xc8,0x23,0x23,0x78,0x00,0x84,0x99,0x00, + 0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7, + 0x2a,0x00,0x00,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39, + 0x45,0x81,0x5b,0x08,0x2d,0x71,0x07,0x57,0x57,0x2e, + 0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x02, + 0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81, + 0x34,0x0f,0xe0,0xf3,0xcc,0x00,0x00,0xa0,0x91,0x15, + 0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0x0e,0xae,0xce, + 0xce,0x36,0x8e,0xb6,0x0e,0x5f,0x2d,0xea,0xbf,0x06, + 0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70, + 0x40,0x00,0x00,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f, + 0xb3,0x1a,0x80,0x3b,0x06,0x80,0x6d,0xfe,0xa2,0x25, + 0xee,0x04,0x68,0x5e,0x0b,0xa0,0x75,0xf7,0x8b,0x66, + 0xb2,0x0f,0x40,0xb5,0x00,0xa0,0xe9,0xda,0x57,0xf3, + 0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9, + 0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61, + 0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd, + 0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2, + 0x24,0x81,0x32,0x5d,0x81,0x47,0x04,0xf8,0xe0,0xc2, + 0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x09,0x84,0x62, + 0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0x0b,0xff,0xfc,0x1d, + 0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3, + 0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5, + 0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64, + 0xe2,0xdf,0x2c,0xfb,0x03,0x3e,0xdf,0x35,0x00,0xb0, + 0x6a,0x3e,0x01,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x03, + 0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x00, + 0x00,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x08,0x03,0x80, + 0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47, + 0xa0,0x25,0x00,0x80,0x66,0x49,0x92,0x71,0x00,0x00, + 0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x08, + 0x00,0x00,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4, + 0xc1,0x18,0x2c,0xc0,0x06,0x1c,0xc1,0x05,0xdc,0xc1, + 0x0b,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42, + 0x10,0x42,0x0a,0x64,0x80,0x1c,0x72,0x60,0x29,0xac, + 0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f, + 0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70, + 0x0e,0x2e,0xc2,0x55,0xb8,0x0e,0x3d,0x70,0x0f,0xfa, + 0x61,0x08,0x9e,0xc1,0x28,0xbc,0x81,0x09,0x04,0x41, + 0xc8,0x08,0x13,0x61,0x21,0xda,0x88,0x01,0x62,0x8a, + 0x58,0x23,0x8e,0x08,0x17,0x99,0x85,0xf8,0x21,0xc1, + 0x48,0x04,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51, + 0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20, + 0x55,0x48,0x1d,0xf2,0x3d,0x72,0x02,0x39,0x87,0x5c, + 0x46,0xba,0x91,0x3b,0xc8,0x00,0x32,0x82,0xfc,0x86, + 0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0x0c, + 0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0x0b, + 0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0, + 0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab, + 0x68,0x0f,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8, + 0x18,0x07,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42, + 0xb1,0x38,0x2c,0x09,0x93,0x63,0xcb,0xb1,0x22,0xac, + 0x0c,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x03,0xbb,0x89, + 0xf5,0x63,0xcf,0xb1,0x77,0x04,0x12,0x81,0x45,0xc0, + 0x09,0x36,0x04,0x77,0x42,0x20,0x61,0x1e,0x41,0x48, + 0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24, + 0x34,0x11,0xda,0x09,0x37,0x09,0x03,0x84,0x51,0xc2, + 0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9, + 0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23, + 0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4, + 0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x02, + 0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e, + 0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23, + 0x93,0xc9,0xda,0x64,0x6b,0xb2,0x07,0x39,0x94,0x2c, + 0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33, + 0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0x0a,0x9d,0x62,0x40, + 0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a, + 0x19,0xe5,0x10,0xe5,0x34,0xe5,0x06,0x65,0x98,0x32, + 0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11, + 0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51, + 0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16, + 0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17, + 0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95, + 0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8, + 0x97,0xe8,0x03,0xf4,0x77,0x0c,0x0d,0x86,0x15,0x83, + 0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x07,0x18,0x67, + 0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b, + 0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99, + 0x0f,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15, + 0x91,0xca,0x0a,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a, + 0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0x0b,0x55, + 0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae, + 0x46,0x55,0x33,0x53,0xe3,0xa9,0x09,0xd4,0x96,0xab, + 0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9, + 0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4, + 0x7e,0x59,0xfd,0x89,0x06,0x59,0xc3,0x4c,0xc3,0x4f, + 0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20, + 0x0b,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0x0d,0xab, + 0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c, + 0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa, + 0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52, + 0xf3,0x94,0x66,0x3f,0x07,0xe3,0x98,0x71,0xf8,0x9c, + 0x74,0x4e,0x09,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a, + 0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c, + 0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58, + 0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae, + 0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81, + 0x0e,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f, + 0xce,0x05,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0x0a, + 0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b, + 0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee, + 0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde, + 0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd, + 0x6d,0xfa,0xa7,0xf5,0x47,0x0c,0x58,0x06,0xb3,0x0c, + 0x24,0x06,0xdb,0x0c,0xce,0x18,0x3c,0xc5,0x35,0x71, + 0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d, + 0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84, + 0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0x0f, + 0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d, + 0xc6,0xa3,0x26,0x06,0x26,0x21,0x26,0x4b,0x4d,0xea, + 0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b, + 0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6, + 0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7, + 0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c, + 0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6, + 0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5, + 0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25, + 0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93, + 0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9, + 0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x06,0xdb,0xae, + 0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7, + 0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d, + 0x8d,0xfd,0x3d,0x07,0x0d,0x87,0xd9,0x0e,0xab,0x1d, + 0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a, + 0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96, + 0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3, + 0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3, + 0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b, + 0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b, + 0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d, + 0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed, + 0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc, + 0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0, + 0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0x0b,0x9f, + 0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81, + 0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad, + 0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17, + 0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37, + 0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8, + 0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43, + 0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x00,0xa7, + 0x80,0x25,0x01,0x67,0x03,0x89,0x81,0x41,0x81,0x5b, + 0x02,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a, + 0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9, + 0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad, + 0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98, + 0xce,0x91,0xce,0x69,0x0e,0x85,0x50,0x7e,0xe8,0xd6, + 0xd0,0x07,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0x0c,0x27, + 0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58, + 0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73, + 0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31, + 0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e, + 0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e, + 0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b, + 0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf, + 0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0x0b,0xe3,0x7b, + 0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2, + 0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96, + 0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a, + 0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0x0a, + 0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1, + 0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a, + 0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5, + 0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc, + 0x4c,0x0d,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76, + 0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91, + 0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea, + 0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe, + 0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x07,0xc9,0x6b, + 0xb3,0x90,0xac,0x05,0x59,0x2d,0x0a,0xb6,0x42,0xa6, + 0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x07,0xb2,0x67,0x65, + 0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e, + 0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c, + 0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6, + 0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac, + 0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0x0a,0xe3,0x15, + 0x05,0x2b,0x86,0x56,0x06,0xac,0x3c,0xb8,0x8a,0xb6, + 0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e, + 0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82, + 0xc1,0xb5,0x01,0x6b,0xeb,0x0b,0x55,0x0a,0xe5,0x85, + 0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59, + 0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89, + 0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28, + 0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc, + 0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2, + 0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0x0e,0x96,0xaa, + 0x97,0xe6,0x97,0x0e,0x6e,0x0d,0xd9,0xda,0xb4,0x0d, + 0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97, + 0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf, + 0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f, + 0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2, + 0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b, + 0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd, + 0x3e,0xc9,0xbe,0xdb,0x55,0x01,0x55,0x4d,0xd5,0x66, + 0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89, + 0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d, + 0x71,0xed,0xc7,0x03,0xd2,0x03,0xfd,0x07,0x23,0x0e, + 0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52, + 0x8f,0xd6,0x2b,0xeb,0x47,0x0e,0xc7,0x1f,0xbe,0xfe, + 0x9d,0xef,0x77,0x2d,0x0d,0x36,0x0d,0x55,0x8d,0x9c, + 0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x09, + 0xdf,0xf7,0x1e,0x0d,0x3a,0xda,0x76,0x8c,0x7b,0xac, + 0xe1,0x07,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a, + 0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b, + 0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde, + 0x7a,0xfc,0x47,0xdb,0x1f,0x0f,0x9c,0x34,0x3c,0x59, + 0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3, + 0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e, + 0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63, + 0xce,0xdf,0x6a,0x0f,0x6f,0xef,0xba,0x10,0x74,0xe1, + 0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c, + 0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8, + 0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c, + 0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae, + 0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66, + 0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79, + 0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd, + 0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd, + 0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27, + 0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41, + 0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8, + 0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc, + 0x47,0xf7,0x06,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f, + 0x0f,0x43,0x05,0x8f,0x99,0x8f,0xcb,0x86,0x0d,0x86, + 0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd, + 0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17, + 0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8, + 0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2, + 0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb, + 0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78, + 0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc, + 0x77,0x1d,0xef,0xa3,0xdf,0x0f,0x4f,0xe4,0x7c,0x20, + 0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7, + 0xfb,0x93,0x19,0x93,0x93,0xff,0x04,0x03,0x98,0xf3, + 0xfc,0x63,0x33,0x2d,0xdb,0x00,0x00,0x00,0x04,0x67, + 0x41,0x4d,0x41,0x00,0x00,0xb1,0x8e,0x7c,0xfb,0x51, + 0x93,0x00,0x00,0x00,0x20,0x63,0x48,0x52,0x4d,0x00, + 0x00,0x7a,0x25,0x00,0x00,0x80,0x83,0x00,0x00,0xf9, + 0xff,0x00,0x00,0x80,0xe9,0x00,0x00,0x75,0x30,0x00, + 0x00,0xea,0x60,0x00,0x00,0x3a,0x98,0x00,0x00,0x17, + 0x6f,0x92,0x5f,0xc5,0x46,0x00,0x00,0x01,0x53,0x49, + 0x44,0x41,0x54,0x78,0xda,0xec,0x9a,0x49,0x0e,0xc3, + 0x30,0x0c,0x03,0x45,0x21,0xff,0x7f,0x65,0xff,0xc1, + 0xde,0x03,0x14,0xcd,0x62,0x6d,0x96,0x7c,0x6e,0x11, + 0x6b,0x48,0xaa,0xb2,0x53,0xf0,0x23,0x91,0x8b,0x22, + 0x82,0xc8,0x0d,0xa8,0xc4,0x2f,0x76,0x07,0x10,0x0a, + 0x41,0x13,0x15,0xcd,0xce,0x0e,0x68,0x1f,0x81,0x76, + 0x00,0x98,0xa5,0x17,0x8c,0x03,0x06,0x40,0xb3,0xdf, + 0xfd,0x0a,0x0e,0xe0,0xce,0x00,0x38,0x11,0x18,0x00, + 0xb9,0x9c,0xa2,0x9d,0xed,0x3f,0x11,0x18,0x00,0x7e, + 0x00,0x98,0x35,0x32,0xed,0x1d,0x70,0x9c,0x48,0xa3, + 0x23,0x80,0x27,0xb6,0x83,0x93,0x95,0xcd,0xef,0x0c, + 0x0f,0xe3,0x4c,0xa7,0x77,0x94,0x75,0x0f,0x60,0xb5, + 0x08,0x54,0x98,0x0a,0xb1,0x1a,0x00,0xaa,0xa8,0x65, + 0x11,0xbf,0xe3,0xf4,0x85,0x2a,0x10,0x96,0x81,0xd2, + 0x6a,0x4d,0xcb,0xa3,0x09,0xa2,0x3b,0x80,0x2e,0x10, + 0x20,0x22,0xd0,0x7f,0x1f,0xd8,0xb8,0xf8,0xcb,0x73, + 0x00,0x76,0x2d,0xfe,0xce,0x20,0x84,0x5d,0x2c,0xff, + 0x66,0x12,0xc4,0x2e,0xaa,0xbf,0x19,0x85,0xb1,0x83, + 0xea,0x6f,0xcf,0x02,0x55,0x9a,0xe3,0xa5,0x3d,0xaa, + 0xf5,0x03,0x32,0xaa,0xbe,0xf2,0x34,0x88,0x8a,0xaa, + 0xaf,0x3e,0x0e,0xa3,0x6a,0xf1,0x2b,0xef,0x03,0x50, + 0xc5,0xf2,0x56,0x00,0x4a,0xa9,0x6e,0x01,0x80,0x15, + 0x8b,0xdf,0xc1,0x01,0x03,0x20,0x03,0x00,0x8e,0x03, + 0x62,0x16,0x27,0x02,0x09,0x00,0x70,0x7a,0x40,0xf1, + 0x18,0x68,0x67,0xf5,0xa7,0x07,0x24,0x00,0x10,0x7e, + 0xb7,0xa0,0x81,0xf6,0xc7,0xa2,0xb1,0x96,0xd5,0x1c, + 0xf0,0x4b,0x75,0x74,0x88,0x00,0xb2,0x45,0x42,0x9d, + 0x2c,0x77,0xb7,0x30,0x78,0xc5,0x40,0x13,0xa8,0x6e, + 0x7a,0xdc,0x8d,0x04,0xb0,0xc2,0xce,0xc8,0x06,0x20, + 0xe2,0xbf,0x41,0x57,0x41,0x32,0x8b,0x03,0x90,0x2c, + 0x4a,0x6e,0x00,0x3c,0x3a,0x38,0x22,0x01,0x30,0xba, + 0x61,0x59,0x3c,0x4b,0x0b,0xa8,0x7e,0x07,0x02,0x3d, + 0x01,0x44,0xbf,0x10,0x59,0x02,0x5f,0x1f,0xd8,0x3f, + 0xdb,0xcb,0xd1,0x57,0x7b,0xf9,0x0e,0x00,0xad,0xa2, + 0x2a,0x96,0x54,0x26,0x5d,0xab,0x00,0x00,0x00,0x00, + 0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82 +}; diff --git a/data/converted/star_unfilled_png.cpp b/data/converted/star_unfilled_png.cpp new file mode 100644 index 000000000..301d26cb9 --- /dev/null +++ b/data/converted/star_unfilled_png.cpp @@ -0,0 +1,320 @@ +//this file was auto-generated from "star_unfilled.png" by res2h + +#include "../Resources.h" + +const size_t star_unfilled_png_size = 3130; +const unsigned char star_unfilled_png_data[3130] = { + 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00, + 0x00,0x0d,0x49,0x48,0x44,0x52,0x00,0x00,0x00,0x40, + 0x00,0x00,0x00,0x40,0x08,0x06,0x00,0x00,0x00,0xaa, + 0x69,0x71,0xde,0x00,0x00,0x00,0x09,0x70,0x48,0x59, + 0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b,0x13,0x01, + 0x00,0x9a,0x9c,0x18,0x00,0x00,0x0a,0x4f,0x69,0x43, + 0x43,0x50,0x50,0x68,0x6f,0x74,0x6f,0x73,0x68,0x6f, + 0x70,0x20,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66, + 0x69,0x6c,0x65,0x00,0x00,0x78,0xda,0x9d,0x53,0x67, + 0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b, + 0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x08,0x20,0x52, + 0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x09,0x10, + 0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45, + 0x45,0x04,0x1b,0xc8,0xa0,0x88,0x03,0x8e,0x8e,0x80, + 0x8c,0x15,0x51,0x2c,0x0c,0x8a,0x0a,0xd8,0x07,0xe4, + 0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1, + 0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5, + 0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x07,0xc0, + 0x08,0x0c,0x96,0x48,0x33,0x51,0x35,0x80,0x0c,0xa9, + 0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4, + 0x2e,0x40,0x81,0x0a,0x24,0x70,0x00,0x10,0x08,0xb3, + 0x64,0x21,0x73,0xfd,0x23,0x01,0x00,0xf8,0x7e,0x3c, + 0x3c,0x2b,0x22,0xc0,0x07,0xbe,0x00,0x01,0x78,0xd3, + 0x0b,0x08,0x00,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87, + 0xff,0x0f,0xea,0x42,0x99,0x5c,0x01,0x80,0x84,0x01, + 0xc0,0x74,0x91,0x38,0x4b,0x08,0x80,0x14,0x00,0x40, + 0x7a,0x8e,0x42,0xa6,0x00,0x40,0x46,0x01,0x80,0x9d, + 0x98,0x26,0x53,0x00,0xa0,0x04,0x00,0x60,0xcb,0x63, + 0x62,0xe3,0x00,0x50,0x2d,0x00,0x60,0x27,0x7f,0xe6, + 0xd3,0x00,0x80,0x9d,0xf8,0x99,0x7b,0x01,0x00,0x5b, + 0x94,0x21,0x15,0x01,0xa0,0x91,0x00,0x20,0x13,0x65, + 0x88,0x44,0x00,0x68,0x3b,0x00,0xac,0xcf,0x56,0x8a, + 0x45,0x00,0x58,0x30,0x00,0x14,0x66,0x4b,0xc4,0x39, + 0x00,0xd8,0x2d,0x00,0x30,0x49,0x57,0x66,0x48,0x00, + 0xb0,0xb7,0x00,0xc0,0xce,0x10,0x0b,0xb2,0x00,0x08, + 0x0c,0x00,0x30,0x51,0x88,0x85,0x29,0x00,0x04,0x7b, + 0x00,0x60,0xc8,0x23,0x23,0x78,0x00,0x84,0x99,0x00, + 0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7, + 0x2a,0x00,0x00,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39, + 0x45,0x81,0x5b,0x08,0x2d,0x71,0x07,0x57,0x57,0x2e, + 0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x02, + 0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81, + 0x34,0x0f,0xe0,0xf3,0xcc,0x00,0x00,0xa0,0x91,0x15, + 0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0x0e,0xae,0xce, + 0xce,0x36,0x8e,0xb6,0x0e,0x5f,0x2d,0xea,0xbf,0x06, + 0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70, + 0x40,0x00,0x00,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f, + 0xb3,0x1a,0x80,0x3b,0x06,0x80,0x6d,0xfe,0xa2,0x25, + 0xee,0x04,0x68,0x5e,0x0b,0xa0,0x75,0xf7,0x8b,0x66, + 0xb2,0x0f,0x40,0xb5,0x00,0xa0,0xe9,0xda,0x57,0xf3, + 0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9, + 0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61, + 0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd, + 0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2, + 0x24,0x81,0x32,0x5d,0x81,0x47,0x04,0xf8,0xe0,0xc2, + 0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x09,0x84,0x62, + 0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0x0b,0xff,0xfc,0x1d, + 0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3, + 0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5, + 0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64, + 0xe2,0xdf,0x2c,0xfb,0x03,0x3e,0xdf,0x35,0x00,0xb0, + 0x6a,0x3e,0x01,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x03, + 0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x00, + 0x00,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x08,0x03,0x80, + 0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47, + 0xa0,0x25,0x00,0x80,0x66,0x49,0x92,0x71,0x00,0x00, + 0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x08, + 0x00,0x00,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4, + 0xc1,0x18,0x2c,0xc0,0x06,0x1c,0xc1,0x05,0xdc,0xc1, + 0x0b,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42, + 0x10,0x42,0x0a,0x64,0x80,0x1c,0x72,0x60,0x29,0xac, + 0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f, + 0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70, + 0x0e,0x2e,0xc2,0x55,0xb8,0x0e,0x3d,0x70,0x0f,0xfa, + 0x61,0x08,0x9e,0xc1,0x28,0xbc,0x81,0x09,0x04,0x41, + 0xc8,0x08,0x13,0x61,0x21,0xda,0x88,0x01,0x62,0x8a, + 0x58,0x23,0x8e,0x08,0x17,0x99,0x85,0xf8,0x21,0xc1, + 0x48,0x04,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51, + 0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20, + 0x55,0x48,0x1d,0xf2,0x3d,0x72,0x02,0x39,0x87,0x5c, + 0x46,0xba,0x91,0x3b,0xc8,0x00,0x32,0x82,0xfc,0x86, + 0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0x0c, + 0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0x0b, + 0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0, + 0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab, + 0x68,0x0f,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8, + 0x18,0x07,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42, + 0xb1,0x38,0x2c,0x09,0x93,0x63,0xcb,0xb1,0x22,0xac, + 0x0c,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x03,0xbb,0x89, + 0xf5,0x63,0xcf,0xb1,0x77,0x04,0x12,0x81,0x45,0xc0, + 0x09,0x36,0x04,0x77,0x42,0x20,0x61,0x1e,0x41,0x48, + 0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24, + 0x34,0x11,0xda,0x09,0x37,0x09,0x03,0x84,0x51,0xc2, + 0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9, + 0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23, + 0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4, + 0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x02, + 0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e, + 0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23, + 0x93,0xc9,0xda,0x64,0x6b,0xb2,0x07,0x39,0x94,0x2c, + 0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33, + 0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0x0a,0x9d,0x62,0x40, + 0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a, + 0x19,0xe5,0x10,0xe5,0x34,0xe5,0x06,0x65,0x98,0x32, + 0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11, + 0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51, + 0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16, + 0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17, + 0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95, + 0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8, + 0x97,0xe8,0x03,0xf4,0x77,0x0c,0x0d,0x86,0x15,0x83, + 0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x07,0x18,0x67, + 0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b, + 0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99, + 0x0f,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15, + 0x91,0xca,0x0a,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a, + 0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0x0b,0x55, + 0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae, + 0x46,0x55,0x33,0x53,0xe3,0xa9,0x09,0xd4,0x96,0xab, + 0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9, + 0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4, + 0x7e,0x59,0xfd,0x89,0x06,0x59,0xc3,0x4c,0xc3,0x4f, + 0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20, + 0x0b,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0x0d,0xab, + 0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c, + 0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa, + 0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52, + 0xf3,0x94,0x66,0x3f,0x07,0xe3,0x98,0x71,0xf8,0x9c, + 0x74,0x4e,0x09,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a, + 0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c, + 0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58, + 0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae, + 0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81, + 0x0e,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f, + 0xce,0x05,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0x0a, + 0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b, + 0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee, + 0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde, + 0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd, + 0x6d,0xfa,0xa7,0xf5,0x47,0x0c,0x58,0x06,0xb3,0x0c, + 0x24,0x06,0xdb,0x0c,0xce,0x18,0x3c,0xc5,0x35,0x71, + 0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d, + 0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84, + 0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0x0f, + 0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d, + 0xc6,0xa3,0x26,0x06,0x26,0x21,0x26,0x4b,0x4d,0xea, + 0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b, + 0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6, + 0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7, + 0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c, + 0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6, + 0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5, + 0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25, + 0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93, + 0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9, + 0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x06,0xdb,0xae, + 0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7, + 0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d, + 0x8d,0xfd,0x3d,0x07,0x0d,0x87,0xd9,0x0e,0xab,0x1d, + 0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a, + 0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96, + 0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3, + 0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3, + 0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b, + 0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b, + 0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d, + 0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed, + 0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc, + 0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0, + 0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0x0b,0x9f, + 0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81, + 0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad, + 0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17, + 0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37, + 0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8, + 0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43, + 0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x00,0xa7, + 0x80,0x25,0x01,0x67,0x03,0x89,0x81,0x41,0x81,0x5b, + 0x02,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a, + 0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9, + 0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad, + 0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98, + 0xce,0x91,0xce,0x69,0x0e,0x85,0x50,0x7e,0xe8,0xd6, + 0xd0,0x07,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0x0c,0x27, + 0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58, + 0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73, + 0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31, + 0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e, + 0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e, + 0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b, + 0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf, + 0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0x0b,0xe3,0x7b, + 0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2, + 0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96, + 0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a, + 0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0x0a, + 0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1, + 0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a, + 0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5, + 0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc, + 0x4c,0x0d,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76, + 0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91, + 0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea, + 0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe, + 0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x07,0xc9,0x6b, + 0xb3,0x90,0xac,0x05,0x59,0x2d,0x0a,0xb6,0x42,0xa6, + 0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x07,0xb2,0x67,0x65, + 0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e, + 0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c, + 0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6, + 0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac, + 0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0x0a,0xe3,0x15, + 0x05,0x2b,0x86,0x56,0x06,0xac,0x3c,0xb8,0x8a,0xb6, + 0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e, + 0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82, + 0xc1,0xb5,0x01,0x6b,0xeb,0x0b,0x55,0x0a,0xe5,0x85, + 0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59, + 0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89, + 0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28, + 0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc, + 0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2, + 0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0x0e,0x96,0xaa, + 0x97,0xe6,0x97,0x0e,0x6e,0x0d,0xd9,0xda,0xb4,0x0d, + 0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97, + 0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf, + 0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f, + 0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2, + 0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b, + 0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd, + 0x3e,0xc9,0xbe,0xdb,0x55,0x01,0x55,0x4d,0xd5,0x66, + 0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89, + 0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d, + 0x71,0xed,0xc7,0x03,0xd2,0x03,0xfd,0x07,0x23,0x0e, + 0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52, + 0x8f,0xd6,0x2b,0xeb,0x47,0x0e,0xc7,0x1f,0xbe,0xfe, + 0x9d,0xef,0x77,0x2d,0x0d,0x36,0x0d,0x55,0x8d,0x9c, + 0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x09, + 0xdf,0xf7,0x1e,0x0d,0x3a,0xda,0x76,0x8c,0x7b,0xac, + 0xe1,0x07,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a, + 0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b, + 0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde, + 0x7a,0xfc,0x47,0xdb,0x1f,0x0f,0x9c,0x34,0x3c,0x59, + 0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3, + 0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e, + 0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63, + 0xce,0xdf,0x6a,0x0f,0x6f,0xef,0xba,0x10,0x74,0xe1, + 0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c, + 0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8, + 0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c, + 0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae, + 0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66, + 0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79, + 0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd, + 0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd, + 0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27, + 0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41, + 0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8, + 0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc, + 0x47,0xf7,0x06,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f, + 0x0f,0x43,0x05,0x8f,0x99,0x8f,0xcb,0x86,0x0d,0x86, + 0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd, + 0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17, + 0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8, + 0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2, + 0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb, + 0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78, + 0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc, + 0x77,0x1d,0xef,0xa3,0xdf,0x0f,0x4f,0xe4,0x7c,0x20, + 0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7, + 0xfb,0x93,0x19,0x93,0x93,0xff,0x04,0x03,0x98,0xf3, + 0xfc,0x63,0x33,0x2d,0xdb,0x00,0x00,0x00,0x04,0x67, + 0x41,0x4d,0x41,0x00,0x00,0xb1,0x8e,0x7c,0xfb,0x51, + 0x93,0x00,0x00,0x00,0x20,0x63,0x48,0x52,0x4d,0x00, + 0x00,0x7a,0x25,0x00,0x00,0x80,0x83,0x00,0x00,0xf9, + 0xff,0x00,0x00,0x80,0xe9,0x00,0x00,0x75,0x30,0x00, + 0x00,0xea,0x60,0x00,0x00,0x3a,0x98,0x00,0x00,0x17, + 0x6f,0x92,0x5f,0xc5,0x46,0x00,0x00,0x01,0x55,0x49, + 0x44,0x41,0x54,0x78,0xda,0xec,0x9a,0x51,0x0e,0xc3, + 0x30,0x08,0x43,0x31,0xea,0x11,0x77,0xb3,0x1d,0xd8, + 0xfb,0xaf,0x34,0xad,0x5d,0x21,0x40,0x20,0xdf,0x9b, + 0x1a,0x9e,0x6d,0x46,0xd2,0x41,0x5e,0x6f,0x09,0x5c, + 0x14,0x11,0x44,0x6e,0x40,0x25,0x7e,0xb1,0x3b,0x80, + 0x50,0x08,0x9a,0xa8,0x68,0x76,0x76,0x40,0xfb,0x08, + 0xb4,0x03,0xc0,0x2c,0xbd,0x60,0x1c,0x30,0x00,0x9a, + 0xfd,0xee,0x57,0x70,0x00,0x77,0x06,0xc0,0x89,0xc0, + 0x00,0xc8,0xe5,0x14,0xed,0x6c,0xff,0x89,0xc0,0x00, + 0x58,0x07,0x80,0x59,0x23,0xd3,0xde,0x01,0xc7,0x89, + 0x34,0x3a,0x02,0xf8,0xc7,0x76,0x58,0x64,0x65,0xf7, + 0x3b,0xc3,0xc3,0x39,0xd3,0xe9,0x1d,0xe5,0xdd,0x03, + 0x58,0x2d,0x02,0x15,0xa6,0x42,0x58,0x03,0x40,0x15, + 0xb5,0x3c,0xe2,0x77,0x9c,0xbe,0x50,0x05,0x82,0x19, + 0x28,0xad,0xd6,0xb4,0x56,0x34,0x41,0x74,0x07,0xd0, + 0x05,0x02,0x44,0x04,0xfa,0xeb,0x03,0x1b,0x17,0x7f, + 0x79,0x0e,0xc0,0xae,0xc5,0xdf,0x19,0x84,0xb0,0x8b, + 0xe5,0x9f,0x4c,0x82,0xd8,0x45,0xf5,0x27,0xa3,0x30, + 0x76,0x50,0xfd,0xe9,0x59,0xa0,0x4a,0x73,0xbc,0xb4, + 0x47,0xf5,0x7e,0x40,0x46,0xd5,0x2d,0x4f,0x83,0xa8, + 0xa8,0xba,0xf5,0x71,0x18,0x55,0x8b,0xb7,0xbc,0x0f, + 0x40,0x15,0xcb,0x7b,0x01,0x28,0xa5,0xba,0x07,0x00, + 0x56,0x2c,0x7e,0x07,0x07,0x0c,0x80,0x0c,0x00,0x38, + 0x0e,0x88,0x59,0x9c,0x08,0x24,0x00,0xc0,0xe9,0x01, + 0xc5,0x63,0xa0,0x9d,0xd5,0x9f,0x1e,0x90,0x00,0x40, + 0xf8,0xdd,0x82,0x06,0xda,0x1f,0x46,0x63,0x2d,0xab, + 0x39,0xe0,0x9b,0xea,0xe8,0x10,0x01,0x64,0x8b,0x84, + 0x2e,0xb2,0xdc,0xdd,0xc2,0xb0,0x2a,0x06,0x9a,0x40, + 0x75,0xd7,0xe3,0x6e,0x24,0x00,0x0b,0x3b,0x23,0x1b, + 0x80,0x88,0xff,0x06,0x5d,0x05,0xc9,0x2c,0x0e,0x40, + 0xb2,0x28,0x2d,0x03,0xb0,0xa2,0x83,0x23,0x12,0x00, + 0xa3,0x1b,0x96,0xc7,0xb3,0xb4,0x80,0xea,0x77,0x20, + 0x70,0x25,0x80,0xe8,0x17,0x22,0x26,0xf0,0xf5,0x0f, + 0xfb,0x67,0x7b,0x39,0xfa,0x68,0x2f,0x9f,0x01,0x00, + 0x6b,0x57,0x29,0x9a,0x56,0xe3,0x24,0xcd,0x00,0x00, + 0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82 +}; diff --git a/data/resources/star_filled.png b/data/resources/star_filled.png index 2859a54c2..c26576948 100644 Binary files a/data/resources/star_filled.png and b/data/resources/star_filled.png differ diff --git a/data/resources/star_unfilled.png b/data/resources/star_unfilled.png new file mode 100644 index 000000000..2859a54c2 Binary files /dev/null and b/data/resources/star_unfilled.png differ diff --git a/src/FolderData.cpp b/src/FolderData.cpp index 72b093405..f6caea59a 100644 --- a/src/FolderData.cpp +++ b/src/FolderData.cpp @@ -20,7 +20,6 @@ FolderData::FolderData(SystemData* system, std::string path, std::string name) if (sortStateNameMap.empty()) { sortStateNameMap[compareFileName] = "file name"; sortStateNameMap[compareRating] = "rating"; - sortStateNameMap[compareUserRating] = "user rating"; sortStateNameMap[compareTimesPlayed] = "times played"; sortStateNameMap[compareLastPlayed] = "last time played"; } @@ -87,17 +86,6 @@ bool FolderData::compareRating(const FileData* file1, const FileData* file2) return false; } -bool FolderData::compareUserRating(const FileData* file1, const FileData* file2) -{ - //we need game data. try to cast - const GameData * game1 = dynamic_cast(file1); - const GameData * game2 = dynamic_cast(file2); - if (game1 != nullptr && game2 != nullptr) { - return const_cast(game1)->metadata()->getFloat("userrating") < const_cast(game2)->metadata()->getFloat("userrating"); - } - return false; -} - bool FolderData::compareTimesPlayed(const FileData* file1, const FileData* file2) { //we need game data. try to cast diff --git a/src/FolderData.h b/src/FolderData.h index 202ea8211..2d073b074 100644 --- a/src/FolderData.h +++ b/src/FolderData.h @@ -46,7 +46,6 @@ public: void sort(ComparisonFunction & comparisonFunction = compareFileName, bool ascending = true); static bool compareFileName(const FileData* file1, const FileData* file2); static bool compareRating(const FileData* file1, const FileData* file2); - static bool compareUserRating(const FileData* file1, const FileData* file2); static bool compareTimesPlayed(const FileData* file1, const FileData* file2); static bool compareLastPlayed(const FileData* file1, const FileData* file2); static std::string getSortStateName(ComparisonFunction & comparisonFunction = compareFileName, bool ascending = true); diff --git a/src/MetaData.cpp b/src/MetaData.cpp index 0eba49ae3..161fc9bea 100644 --- a/src/MetaData.cpp +++ b/src/MetaData.cpp @@ -21,7 +21,6 @@ std::vector MetaDataList::getDefaultGameMDD() {"image", MD_IMAGE_PATH, ""}, {"thumbnail", MD_IMAGE_PATH, ""}, {"rating", MD_RATING, "0"}, - {"userrating", MD_RATING, "0"}, {"playcount", MD_INT, "0"}, {"lastplayed", MD_TIME, "0"} }; diff --git a/src/components/GuiGameList.cpp b/src/components/GuiGameList.cpp index 43da12d63..a6746c571 100644 --- a/src/components/GuiGameList.cpp +++ b/src/components/GuiGameList.cpp @@ -40,10 +40,8 @@ GuiGameList::GuiGameList(Window* window) : GuiComponent(window), if (sortStates.empty()) { sortStates.push_back(FolderData::SortState(FolderData::compareFileName, true, "file name, ascending")); sortStates.push_back(FolderData::SortState(FolderData::compareFileName, false, "file name, descending")); - sortStates.push_back(FolderData::SortState(FolderData::compareRating, true, "database rating, ascending")); - sortStates.push_back(FolderData::SortState(FolderData::compareRating, false, "database rating, descending")); - sortStates.push_back(FolderData::SortState(FolderData::compareUserRating, true, "your rating, ascending")); - sortStates.push_back(FolderData::SortState(FolderData::compareUserRating, false, "your rating, descending")); + sortStates.push_back(FolderData::SortState(FolderData::compareRating, true, "rating, ascending")); + sortStates.push_back(FolderData::SortState(FolderData::compareRating, false, "rating, descending")); sortStates.push_back(FolderData::SortState(FolderData::compareTimesPlayed, true, "played least often")); sortStates.push_back(FolderData::SortState(FolderData::compareTimesPlayed, false, "played most often")); sortStates.push_back(FolderData::SortState(FolderData::compareLastPlayed, true, "played least recently")); @@ -52,7 +50,7 @@ GuiGameList::GuiGameList(Window* window) : GuiComponent(window), mImageAnimation.addChild(&mScreenshot); mDescContainer.addChild(&mRating); - //mDescContainer.addChild(&mDescription); + mDescContainer.addChild(&mDescription); //scale delay with screen width (higher width = more text per line) //the scroll speed is automatically scaled by component size @@ -232,7 +230,7 @@ bool GuiGameList::input(InputConfig* config, Input input) if(input.value == 0) updateDetailData(); else - clearDetailData(); + hideDetailData(); } return true; } @@ -364,49 +362,50 @@ void GuiGameList::updateTheme() void GuiGameList::updateDetailData() { - if(!isDetailed()) + if(!isDetailed() || !mList.getSelectedObject() || mList.getSelectedObject()->isFolder()) { - mScreenshot.setImage(""); - mDescription.setText(""); + hideDetailData(); }else{ - //if we've selected a game - if(mList.getSelectedObject() && !mList.getSelectedObject()->isFolder()) - { - GameData* game = (GameData*)mList.getSelectedObject(); - //set image to either "not found" image or metadata image - if(game->metadata()->get("image").empty()) - mScreenshot.setImage(mTheme->getString("imageNotFoundPath")); - else - mScreenshot.setImage(game->metadata()->get("image")); + if(mDescContainer.getParent() != this) + addChild(&mDescContainer); - Eigen::Vector3f imgOffset = Eigen::Vector3f(Renderer::getScreenWidth() * 0.10f, 0, 0); - mScreenshot.setPosition(getImagePos() - imgOffset); + GameData* game = (GameData*)mList.getSelectedObject(); + //set image to either "not found" image or metadata image + if(game->metadata()->get("image").empty()) + mScreenshot.setImage(mTheme->getString("imageNotFoundPath")); + else + mScreenshot.setImage(game->metadata()->get("image")); - mImageAnimation.fadeIn(35); - mImageAnimation.move(imgOffset.x(), imgOffset.y(), 20); + Eigen::Vector3f imgOffset = Eigen::Vector3f(Renderer::getScreenWidth() * 0.10f, 0, 0); + mScreenshot.setPosition(getImagePos() - imgOffset); - mDescContainer.setPosition(Eigen::Vector3f(Renderer::getScreenWidth() * 0.03f, getImagePos().y() + mScreenshot.getSize().y() + 12, 0)); - mDescContainer.setSize(Eigen::Vector2f(Renderer::getScreenWidth() * (mTheme->getFloat("listOffsetX") - 0.03f), Renderer::getScreenHeight() - mDescContainer.getPosition().y())); - mDescContainer.setScrollPos(Eigen::Vector2d(0, 0)); - mDescContainer.resetAutoScrollTimer(); + mImageAnimation.fadeIn(35); + mImageAnimation.move(imgOffset.x(), imgOffset.y(), 20); - mDescription.setPosition(0, 0); - mDescription.setSize(Eigen::Vector2f(Renderer::getScreenWidth() * (mTheme->getFloat("listOffsetX") - 0.03f), 0)); - mDescription.setText(game->metadata()->get("desc")); - }else{ - mScreenshot.setImage(""); - mDescription.setText(""); - } + mDescContainer.setPosition(Eigen::Vector3f(Renderer::getScreenWidth() * 0.03f, getImagePos().y() + mScreenshot.getSize().y() + 12, 0)); + mDescContainer.setSize(Eigen::Vector2f(Renderer::getScreenWidth() * (mTheme->getFloat("listOffsetX") - 0.03f), Renderer::getScreenHeight() - mDescContainer.getPosition().y())); + mDescContainer.setScrollPos(Eigen::Vector2d(0, 0)); + mDescContainer.resetAutoScrollTimer(); + + const float colwidth = mDescContainer.getSize().x(); + float ratingHeight = colwidth * 0.3f / 5.0f; + mRating.setSize(ratingHeight * 5.0f, ratingHeight); + + mRating.setPosition(colwidth - mRating.getSize().x() - 12, 0); + mRating.setValue(game->metadata()->get("rating")); + + mDescription.setPosition(0, mRating.getSize().y()); + mDescription.setSize(Eigen::Vector2f(Renderer::getScreenWidth() * (mTheme->getFloat("listOffsetX") - 0.03f), 0)); + mDescription.setText(game->metadata()->get("desc")); } } -void GuiGameList::clearDetailData() +void GuiGameList::hideDetailData() { - if(isDetailed()) - { - mImageAnimation.fadeOut(35); - mDescription.setText(""); - } + if(mDescContainer.getParent() == this) + removeChild(&mDescContainer); + + mImageAnimation.fadeOut(35); } GuiGameList* GuiGameList::create(Window* window) diff --git a/src/components/GuiGameList.h b/src/components/GuiGameList.h index 1e03e532d..77539e6af 100644 --- a/src/components/GuiGameList.h +++ b/src/components/GuiGameList.h @@ -48,7 +48,7 @@ public: private: void updateList(); void updateTheme(); - void clearDetailData(); + void hideDetailData(); void doTransition(int dir); std::string getThemeFile(); diff --git a/src/components/RatingComponent.cpp b/src/components/RatingComponent.cpp index 1db3ec1cf..01dd40b03 100644 --- a/src/components/RatingComponent.cpp +++ b/src/components/RatingComponent.cpp @@ -4,8 +4,8 @@ RatingComponent::RatingComponent(Window* window) : GuiComponent(window) { - mFilledTexture = TextureResource::get(*window->getResourceManager(), ":/button.png"); - mUnfilledTexture = TextureResource::get(*window->getResourceManager(), ":/button.png"); + mFilledTexture = TextureResource::get(*window->getResourceManager(), ":/star_filled.png"); + mUnfilledTexture = TextureResource::get(*window->getResourceManager(), ":/star_unfilled.png"); mValue = 0.5f; mSize << 64 * 5.0f, 64; updateVertices(); @@ -14,12 +14,16 @@ RatingComponent::RatingComponent(Window* window) : GuiComponent(window) void RatingComponent::setValue(const std::string& value) { mValue = stof(value); + if(mValue > 1.0f) + mValue = 1.0f; + else if(mValue < 0.0f) + mValue = 0.0f; updateVertices(); } std::string RatingComponent::getValue() const { - return std::to_string(mValue); + return std::to_string((long double)mValue); } void RatingComponent::onSizeChanged() @@ -31,30 +35,30 @@ void RatingComponent::updateVertices() { const float numStars = 5.0f; - float h = getSize().y(); - float w = h * mValue * numStars; - float fw = h * numStars; + const float h = getSize().y(); + const float w = h * mValue * numStars; + const float fw = h * numStars; - mVertices[0].pos << 0, 0; - mVertices[0].tex << 0, 0; + mVertices[0].pos << 0.0f, 0.0f; + mVertices[0].tex << 0.0f, 1.0f; mVertices[1].pos << w, h; - mVertices[1].tex << mValue * numStars, 1.0f; - mVertices[2].pos << 0, h; - mVertices[2].tex << 0, 1.0f; + mVertices[1].tex << mValue * numStars, 0.0f; + mVertices[2].pos << 0.0f, h; + mVertices[2].tex << 0.0f, 0.0f; mVertices[3] = mVertices[0]; - mVertices[4].pos << w, 0; - mVertices[5].tex << mValue * numStars, 0; + mVertices[4].pos << w, 0.0f; + mVertices[4].tex << mValue * numStars, 1.0f; mVertices[5] = mVertices[1]; mVertices[6] = mVertices[4]; mVertices[7].pos << fw, h; - mVertices[7].tex << numStars, 1.0f; + mVertices[7].tex << numStars, 0.0f; mVertices[8] = mVertices[1]; mVertices[9] = mVertices[6]; - mVertices[10].pos << fw, 0; - mVertices[10].tex << numStars, 0; + mVertices[10].pos << fw, 0.0f; + mVertices[10].tex << numStars, 1.0f; mVertices[11] = mVertices[7]; } @@ -69,12 +73,10 @@ void RatingComponent::render(const Eigen::Affine3f& parentTrans) glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY); - //glEnableClientState(GL_COLOR_ARRAY); - + glVertexPointer(2, GL_FLOAT, sizeof(Vertex), &mVertices[0].pos); glTexCoordPointer(2, GL_FLOAT, sizeof(Vertex), &mVertices[0].tex); - //glColorPointer(4, GL_UNSIGNED_BYTE, 0, mColors); - + mFilledTexture->bind(); glDrawArrays(GL_TRIANGLES, 0, 6); @@ -83,8 +85,7 @@ void RatingComponent::render(const Eigen::Affine3f& parentTrans) glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_TEXTURE_COORD_ARRAY); - //glDisableClientState(GL_COLOR_ARRAY); - + glDisable(GL_TEXTURE_2D); glDisable(GL_BLEND); diff --git a/src/scrapers/GamesDBScraper.cpp b/src/scrapers/GamesDBScraper.cpp index 08e5d03be..d44b4d390 100644 --- a/src/scrapers/GamesDBScraper.cpp +++ b/src/scrapers/GamesDBScraper.cpp @@ -54,6 +54,7 @@ std::vector GamesDBScraper::parseReq(ScraperSearchParams params, s mdl.push_back(MetaDataList(params.system->getGameMDD())); mdl.back().set("name", game.child("GameTitle").text().get()); mdl.back().set("desc", game.child("Overview").text().get()); + mdl.back().set("releasedate", game.child("ReleaseDate").text().get()); pugi::xml_node images = game.child("Images"); if(images)