diff --git a/GRRLIB/GRRLIB/GRRLIB_3D.c b/GRRLIB/GRRLIB/GRRLIB_3D.c index c227e49..8c002cd 100644 --- a/GRRLIB/GRRLIB/GRRLIB_3D.c +++ b/GRRLIB/GRRLIB/GRRLIB_3D.c @@ -150,8 +150,8 @@ void GRRLIB_2dMode() { /** * Init the object matrix to draw object. */ -void GRRLIB_ObjectViewBegin(void){ - guMtxIdentity(_ObjTransformationMtx); +void GRRLIB_ObjectViewBegin(void) { + guMtxIdentity(_ObjTransformationMtx); } /** @@ -161,11 +161,12 @@ void GRRLIB_ObjectViewBegin(void){ * @param scalz z scale of the object. */ void GRRLIB_ObjectViewScale(f32 scalx, f32 scaly, f32 scalz) { - Mtx m; - guMtxIdentity(m); - guMtxScaleApply(m, m, scalx, scaly, scalz); + Mtx m; - guMtxConcat(m, _ObjTransformationMtx, _ObjTransformationMtx); + guMtxIdentity(m); + guMtxScaleApply(m, m, scalx, scaly, scalz); + + guMtxConcat(m, _ObjTransformationMtx, _ObjTransformationMtx); } /** @@ -175,16 +176,16 @@ void GRRLIB_ObjectViewScale(f32 scalx, f32 scaly, f32 scalz) { * @param angz z rotation angle of the object. */ void GRRLIB_ObjectViewRotate(f32 angx, f32 angy, f32 angz) { - Mtx m, rx,ry,rz; + Mtx m, rx,ry,rz; - guMtxIdentity(m); - guMtxRotAxisDeg(rx, &_GRRaxisx, angx); - guMtxRotAxisDeg(ry, &_GRRaxisy, angy); - guMtxRotAxisDeg(rz, &_GRRaxisz, angz); - guMtxConcat(ry, rx, m); - guMtxConcat(m, rz, m); + guMtxIdentity(m); + guMtxRotAxisDeg(rx, &_GRRaxisx, angx); + guMtxRotAxisDeg(ry, &_GRRaxisy, angy); + guMtxRotAxisDeg(rz, &_GRRaxisz, angz); + guMtxConcat(ry, rx, m); + guMtxConcat(m, rz, m); - guMtxConcat(m, _ObjTransformationMtx, _ObjTransformationMtx); + guMtxConcat(m, _ObjTransformationMtx, _ObjTransformationMtx); } /** @@ -193,30 +194,29 @@ void GRRLIB_ObjectViewRotate(f32 angx, f32 angy, f32 angz) { * @param posy y position of the object. * @param posz z position of the object. */ -void GRRLIB_ObjectViewTrans(f32 posx, f32 posy, f32 posz){ - Mtx m; +void GRRLIB_ObjectViewTrans(f32 posx, f32 posy, f32 posz) { + Mtx m; - guMtxIdentity(m); - guMtxTransApply(m, m, posx, posy, posz); + guMtxIdentity(m); + guMtxTransApply(m, m, posx, posy, posz); - guMtxConcat(m, _ObjTransformationMtx, _ObjTransformationMtx); + guMtxConcat(m, _ObjTransformationMtx, _ObjTransformationMtx); } /** * Concat the object and the view matrix and calculate the inverse normal matrix. */ -void GRRLIB_ObjectViewEnd(void){ - Mtx mv, mvi; +void GRRLIB_ObjectViewEnd(void) { + Mtx mv, mvi; - guMtxConcat(_GRR_view, _ObjTransformationMtx, mv); - GX_LoadPosMtxImm(mv, GX_PNMTX0); + guMtxConcat(_GRR_view, _ObjTransformationMtx, mv); + GX_LoadPosMtxImm(mv, GX_PNMTX0); - guMtxInverse(mv, mvi); - guMtxTranspose(mvi, mv); - GX_LoadNrmMtxImm(mv, GX_PNMTX0); + guMtxInverse(mv, mvi); + guMtxTranspose(mvi, mv); + GX_LoadNrmMtxImm(mv, GX_PNMTX0); } - /** * Set the view matrix to draw object (in this order scale, rotate AND trans). * @param posx x position of the object. @@ -291,7 +291,7 @@ void GRRLIB_ObjectViewInv(f32 posx, f32 posy, f32 posz, f32 angx, f32 angy, f32 if((scalx !=1.0f) || (scaly !=1.0f) || (scalz !=1.0f)) { guMtxIdentity(m); guMtxScaleApply(m, m, scalx, scaly, scalz); - + guMtxConcat(m, ObjTransformationMtx, ObjTransformationMtx); } diff --git a/examples/3D_Light2/source/gfx/Rockwell_Condensed_12_Bold.c b/examples/3D_Light2/source/gfx/Rockwell_Condensed_12_Bold.c new file mode 100644 index 0000000..87e6840 --- /dev/null +++ b/examples/3D_Light2/source/gfx/Rockwell_Condensed_12_Bold.c @@ -0,0 +1,274 @@ +/** + * This file was autogenerated from Rockwell_Condensed_12_Bold.png by WiiBuilder. + */ + +const unsigned char Rockwell_Condensed_12_Bold[] = { + 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x01, 0x20, 0x00, 0x00, 0x00, 0x4C, 0x08, 0x06, 0x00, 0x00, 0x00, 0xCD, 0xC2, 0x6A, + 0x15, 0x00, 0x00, 0x10, 0x74, 0x49, 0x44, 0x41, 0x54, 0x78, 0xDA, 0xED, 0x5D, 0xBD, 0x8E, 0x24, + 0xC7, 0x0D, 0xE6, 0xBE, 0xC9, 0x08, 0x4A, 0x1C, 0xF8, 0x21, 0xD6, 0xB8, 0x44, 0xC6, 0xA5, 0x7E, + 0x03, 0x5F, 0x62, 0x28, 0xB5, 0x71, 0xCF, 0x60, 0x58, 0xA9, 0x70, 0x89, 0xF4, 0x06, 0x4A, 0x0D, + 0x5D, 0x22, 0xA8, 0x1F, 0xC2, 0x81, 0x92, 0xC3, 0xF5, 0x9B, 0xAC, 0xA7, 0xEE, 0x86, 0x18, 0x0E, + 0x97, 0xBF, 0x35, 0xD5, 0xD3, 0xDD, 0x33, 0xFC, 0x80, 0xC1, 0xEE, 0xCE, 0x56, 0x57, 0x17, 0x59, + 0xAC, 0xAF, 0xEB, 0x87, 0x64, 0x3F, 0xBD, 0xBC, 0xBC, 0x40, 0xA1, 0x50, 0x28, 0xAC, 0x81, 0xA7, + 0x22, 0xA0, 0x42, 0xA1, 0xB0, 0x16, 0x8A, 0x80, 0x0A, 0x85, 0xC2, 0x6A, 0x28, 0x02, 0x2A, 0x14, + 0x0A, 0xAB, 0x61, 0x04, 0x01, 0x61, 0x05, 0x3F, 0x1F, 0x3F, 0xEF, 0x8C, 0x72, 0x3F, 0x1D, 0x3F, + 0x7F, 0x3F, 0x7E, 0xE6, 0xE3, 0xE7, 0x1B, 0xE1, 0x6F, 0x09, 0xBF, 0x1F, 0x3F, 0x07, 0xF2, 0xFF, + 0x7F, 0x1E, 0x3F, 0xFF, 0x39, 0x7E, 0xFE, 0x75, 0xFC, 0xFC, 0x20, 0x94, 0xFF, 0xEE, 0xF8, 0xF9, + 0x95, 0xFC, 0x3D, 0x1D, 0x3F, 0x7F, 0x31, 0xDA, 0xF2, 0x45, 0x07, 0xE4, 0xFB, 0xCF, 0xA7, 0xF6, + 0x48, 0xD7, 0xD0, 0xFB, 0x23, 0xFE, 0x7A, 0xFC, 0x7C, 0x74, 0xF4, 0x13, 0x91, 0x53, 0xC3, 0xE7, + 0xC0, 0x35, 0x91, 0x32, 0x92, 0x8E, 0xA2, 0xED, 0x69, 0x7D, 0xF0, 0xCC, 0xF4, 0xB4, 0x47, 0x44, + 0xE5, 0x46, 0x7B, 0xD6, 0x6C, 0x8C, 0xC3, 0xB3, 0x49, 0x0A, 0xD4, 0x65, 0xC3, 0x04, 0xBA, 0x9D, + 0x49, 0xE5, 0x1B, 0xA2, 0x7D, 0x10, 0x91, 0x81, 0xDB, 0x72, 0x43, 0x74, 0x0C, 0x37, 0xCC, 0x10, + 0xD3, 0x23, 0xC5, 0xAB, 0x6B, 0xB6, 0x4E, 0x40, 0x6D, 0x70, 0xFD, 0x46, 0xEA, 0xC5, 0x6B, 0xB4, + 0x8E, 0x90, 0x84, 0x91, 0xDA, 0x85, 0xF5, 0xBE, 0x21, 0xF5, 0x63, 0x87, 0x68, 0x75, 0x73, 0x72, + 0x13, 0x15, 0x1A, 0x90, 0x3B, 0x0A, 0x2E, 0xBB, 0x06, 0xAF, 0xDD, 0x9A, 0x1C, 0xD1, 0xF6, 0xDC, + 0x0B, 0x01, 0x79, 0x72, 0x48, 0xFD, 0xEB, 0xD9, 0x74, 0xEB, 0xA3, 0xC3, 0xE9, 0x77, 0x8F, 0x80, + 0xE8, 0xE0, 0x45, 0x4C, 0xA0, 0x93, 0x90, 0x54, 0x7E, 0x06, 0xBF, 0xCF, 0x28, 0xB1, 0x8C, 0x24, + 0x20, 0x49, 0x3F, 0x56, 0xFB, 0x37, 0x47, 0x40, 0x28, 0x30, 0x36, 0x9A, 0xFF, 0xAD, 0x09, 0x4C, + 0x95, 0x68, 0xCD, 0x50, 0x68, 0x7D, 0x0D, 0xFF, 0x3D, 0xFD, 0xFD, 0x4A, 0xE8, 0x53, 0x9B, 0x5B, + 0x7B, 0xDF, 0x90, 0xFA, 0x9A, 0x81, 0x7E, 0x32, 0x64, 0xC0, 0xFA, 0x51, 0x4E, 0x34, 0x3E, 0x6F, + 0x60, 0x7A, 0x72, 0x5A, 0xD7, 0x44, 0x9F, 0xC2, 0x2F, 0x81, 0xFA, 0xB1, 0xCE, 0x36, 0x6B, 0x7B, + 0x7F, 0x92, 0xF5, 0x0F, 0xF0, 0xC9, 0xEB, 0x1E, 0x08, 0x08, 0x6D, 0xC9, 0xB2, 0x51, 0x1C, 0xF0, + 0xAD, 0xCC, 0x2F, 0x10, 0x23, 0xE9, 0x0C, 0x01, 0x61, 0xD9, 0xA6, 0xFF, 0xBF, 0x81, 0x3C, 0x03, + 0xA7, 0x40, 0xBD, 0xB7, 0xF2, 0x7F, 0x86, 0x33, 0x59, 0x78, 0xFD, 0x10, 0x6D, 0x13, 0xB5, 0x07, + 0x6F, 0x16, 0x4F, 0xF5, 0x33, 0x1D, 0x3F, 0xFF, 0x86, 0x33, 0x19, 0x59, 0x93, 0x81, 0x56, 0x96, + 0x8E, 0xF5, 0x57, 0xFA, 0xBF, 0x25, 0x01, 0x71, 0x42, 0xD1, 0x8C, 0x82, 0x4F, 0x3B, 0x35, 0x3C, + 0x29, 0xF5, 0x03, 0x51, 0xD2, 0xC7, 0xD3, 0xF7, 0x5C, 0xC1, 0x9C, 0x80, 0x50, 0xA1, 0x56, 0x67, + 0x48, 0x4F, 0x0C, 0x54, 0x70, 0x44, 0x47, 0x9E, 0x7E, 0x28, 0xA8, 0xB1, 0x46, 0x8C, 0x83, 0x1A, + 0xEB, 0x47, 0xA7, 0x8C, 0x04, 0xAB, 0x6D, 0xF7, 0x40, 0x40, 0x11, 0x19, 0xB0, 0x4C, 0xB3, 0xCF, + 0xFF, 0x81, 0x3F, 0xC0, 0x10, 0xD1, 0x25, 0x1B, 0x96, 0x6B, 0xF5, 0x65, 0x67, 0xC5, 0x68, 0x7B, + 0x5E, 0x79, 0xFA, 0xB0, 0x43, 0x59, 0xB4, 0x36, 0x61, 0x1B, 0xB2, 0x36, 0x96, 0xB1, 0x63, 0x2E, + 0xFB, 0xAB, 0x7B, 0x8D, 0x20, 0x20, 0x1C, 0x2C, 0x91, 0xA7, 0x75, 0x2B, 0xFB, 0x0F, 0xD2, 0x08, + 0xFE, 0xB7, 0xA4, 0x20, 0x34, 0x00, 0x69, 0x46, 0xA4, 0xB5, 0xA5, 0x61, 0x02, 0x9D, 0x1C, 0xF8, + 0x12, 0xAC, 0xE1, 0x5B, 0xF0, 0xC9, 0x44, 0xAA, 0x3F, 0x42, 0x16, 0x96, 0x9C, 0x1C, 0x94, 0x48, + 0xA3, 0x83, 0x3E, 0x63, 0x1C, 0xAD, 0xFE, 0xF7, 0x70, 0xB9, 0xB7, 0x46, 0x21, 0x11, 0x2D, 0x47, + 0x8F, 0x11, 0xAE, 0x85, 0xC8, 0xEC, 0xA7, 0x61, 0x69, 0x02, 0xA2, 0x40, 0x9B, 0x89, 0xE8, 0x91, + 0xCE, 0x3C, 0x22, 0xF6, 0x39, 0x9F, 0x7E, 0x47, 0x59, 0x3C, 0x02, 0x9A, 0xE1, 0x6C, 0xD3, 0x11, + 0x82, 0xFE, 0x19, 0xFC, 0xD9, 0x1B, 0x85, 0x49, 0x9E, 0x23, 0x08, 0x28, 0xF2, 0xF4, 0xED, 0x01, + 0x5F, 0x6E, 0x45, 0xF7, 0x3A, 0x28, 0x49, 0x88, 0x42, 0xC3, 0xEB, 0x4D, 0xE8, 0xA6, 0x84, 0xD6, + 0x59, 0x6F, 0x4F, 0xB2, 0x48, 0xD7, 0xF1, 0x19, 0x04, 0x9D, 0xAA, 0xC3, 0x40, 0xF9, 0x29, 0x01, + 0x44, 0x09, 0x28, 0x6A, 0xA4, 0xF4, 0x61, 0x81, 0xB2, 0xF2, 0x6B, 0xEE, 0x8D, 0x80, 0xA2, 0x33, + 0x38, 0x8D, 0x80, 0xBC, 0x7E, 0xCD, 0x12, 0x10, 0xDE, 0x67, 0x86, 0xD8, 0xEC, 0x87, 0xDA, 0xEA, + 0x04, 0x7A, 0xFF, 0xD2, 0x07, 0x34, 0xF6, 0x6D, 0x84, 0x80, 0x28, 0xAC, 0xFA, 0xA5, 0x19, 0x74, + 0x44, 0x06, 0xF3, 0xE1, 0x38, 0x82, 0x80, 0xBC, 0x8D, 0xE1, 0x5E, 0xF0, 0x65, 0x0B, 0x3F, 0x11, + 0x8B, 0x08, 0xDD, 0x30, 0x81, 0xBF, 0x37, 0xF2, 0x3D, 0x7C, 0x9D, 0xA1, 0x60, 0x07, 0xF2, 0xFD, + 0x17, 0x3A, 0xC0, 0x3F, 0xC1, 0xE5, 0x49, 0xC0, 0x01, 0xC6, 0x0E, 0x48, 0xED, 0x84, 0x2E, 0x72, + 0xCD, 0xEC, 0xE8, 0x07, 0x8D, 0xF4, 0x89, 0xFD, 0x1E, 0xD1, 0xE5, 0x12, 0x4B, 0x30, 0x6E, 0xD4, + 0xA3, 0x1F, 0x62, 0xD1, 0xD9, 0x0F, 0x6D, 0xCB, 0x92, 0x33, 0xA0, 0xDE, 0x03, 0x89, 0xC8, 0x43, + 0x89, 0x8E, 0x0F, 0x2A, 0x8B, 0xD6, 0x26, 0xBA, 0x35, 0x11, 0x3D, 0x91, 0x7E, 0x86, 0xFC, 0x83, + 0xD7, 0xD4, 0xCF, 0x28, 0x02, 0x7A, 0x93, 0x54, 0xA8, 0x85, 0xDE, 0x3D, 0x20, 0x5E, 0x07, 0x6E, + 0x42, 0x7B, 0x65, 0x71, 0x39, 0x86, 0x4A, 0x45, 0x02, 0xA2, 0x46, 0xCB, 0xA7, 0xCC, 0x91, 0x59, + 0x56, 0x2F, 0x96, 0x24, 0xA0, 0x1E, 0xEC, 0x99, 0x80, 0xA2, 0x07, 0x05, 0xB4, 0x2D, 0x4B, 0x11, + 0x10, 0x92, 0xE1, 0x04, 0xF1, 0xC3, 0x08, 0x04, 0x25, 0x20, 0x4D, 0x47, 0xDA, 0x40, 0xCE, 0xB8, + 0x8A, 0x58, 0xF2, 0xF6, 0x10, 0xD0, 0x77, 0x5E, 0xB9, 0xAD, 0x3A, 0x22, 0x4A, 0xCB, 0x2D, 0x6F, + 0x23, 0x97, 0x1A, 0x50, 0x9B, 0x82, 0x46, 0x76, 0xEA, 0xA5, 0x19, 0x81, 0x45, 0x40, 0xC0, 0xCA, + 0x02, 0x8C, 0x5F, 0x8E, 0x3C, 0x12, 0x01, 0x2D, 0x09, 0xF5, 0xE4, 0x45, 0x41, 0xCF, 0x29, 0x58, + 0x43, 0x94, 0x80, 0xB8, 0x1E, 0x3D, 0xBD, 0xD2, 0xBD, 0xC5, 0xCC, 0x29, 0x18, 0xAD, 0xDB, 0x6A, + 0x13, 0xDD, 0x18, 0xC6, 0x53, 0x39, 0x4B, 0x5E, 0x49, 0x3F, 0x5E, 0x7B, 0x6E, 0x42, 0x40, 0xD1, + 0x53, 0xB0, 0x0C, 0x34, 0x07, 0xC4, 0xEC, 0x29, 0x55, 0xC3, 0x04, 0xB6, 0xAF, 0x05, 0x6E, 0x3E, + 0x73, 0x02, 0xA2, 0x9D, 0x17, 0xD9, 0x17, 0xD9, 0xC3, 0x1E, 0x50, 0x0F, 0xB2, 0x04, 0xB4, 0x84, + 0x3D, 0xF4, 0xD4, 0x9F, 0x99, 0xFD, 0xF0, 0xBA, 0x11, 0x19, 0x3F, 0xA0, 0x06, 0xEF, 0x20, 0xE2, + 0x20, 0x7C, 0xEF, 0xCD, 0x38, 0x28, 0x26, 0xC8, 0x3B, 0x2F, 0x6A, 0x6D, 0x92, 0xEA, 0xCF, 0xFA, + 0x01, 0xCD, 0xA0, 0x13, 0x96, 0x54, 0xFE, 0x95, 0xAC, 0x5B, 0x25, 0x20, 0xEE, 0xD7, 0x12, 0x1D, + 0x04, 0x7C, 0x63, 0x8D, 0xD6, 0xA1, 0x29, 0x88, 0x76, 0x90, 0xB5, 0x41, 0xC8, 0x49, 0x88, 0x6E, + 0xF6, 0x01, 0x8C, 0x23, 0xA0, 0xA5, 0x4F, 0xC1, 0x96, 0xC6, 0x16, 0x08, 0x88, 0x3E, 0xAD, 0x7B, + 0x8F, 0x8C, 0xA3, 0xA7, 0xBA, 0x07, 0xF2, 0xB7, 0x65, 0x03, 0xDA, 0x40, 0xF3, 0xB6, 0x07, 0xB0, + 0xFE, 0x19, 0xF2, 0xFB, 0x9F, 0x5E, 0x9B, 0xA2, 0xA7, 0xC6, 0x08, 0x3E, 0xBE, 0xA2, 0xB3, 0x1F, + 0xB5, 0xFC, 0x56, 0x97, 0x60, 0xD7, 0xA2, 0x75, 0x02, 0xFA, 0x01, 0xED, 0x11, 0x4B, 0xF8, 0x01, + 0xDD, 0xBA, 0xFD, 0x11, 0x2F, 0xEE, 0xC2, 0x83, 0xE3, 0x5E, 0x09, 0x68, 0xEF, 0xC8, 0x3A, 0x89, + 0x45, 0x3C, 0xA1, 0x6F, 0x85, 0x88, 0xBF, 0x56, 0xA1, 0xF0, 0x05, 0x45, 0x40, 0xDB, 0xC5, 0x52, + 0xB1, 0x60, 0x4B, 0x23, 0xEB, 0xF5, 0x5D, 0x78, 0x60, 0x14, 0x01, 0x6D, 0x1B, 0x4B, 0x44, 0xC3, + 0x17, 0x0A, 0x9B, 0x41, 0x11, 0x50, 0xA1, 0x50, 0x58, 0x0D, 0x45, 0x40, 0x85, 0x42, 0x61, 0x35, + 0x14, 0x01, 0x15, 0x0A, 0x85, 0xD5, 0x50, 0x04, 0x54, 0x28, 0x14, 0x56, 0x03, 0x27, 0xA0, 0x6C, + 0x0A, 0xC8, 0x4C, 0x8A, 0xC6, 0x47, 0x45, 0xC6, 0x99, 0x2C, 0x13, 0xA1, 0xAC, 0x3D, 0x39, 0xA4, + 0xE3, 0x6F, 0xCD, 0x0B, 0x57, 0xAB, 0x5B, 0xBA, 0xCF, 0x74, 0xAA, 0xA3, 0x7D, 0xB8, 0x5D, 0x48, + 0xF5, 0x7B, 0xB2, 0x6A, 0x6D, 0x42, 0xF0, 0x7B, 0x78, 0x31, 0x82, 0x9A, 0xCB, 0x02, 0xBD, 0x0F, + 0xA6, 0x92, 0xE0, 0xA7, 0x74, 0x92, 0x43, 0xE1, 0x07, 0xF0, 0x9D, 0x0C, 0xA5, 0x36, 0x65, 0x9C, + 0x11, 0x35, 0x57, 0x05, 0x5E, 0xAE, 0xD5, 0xF9, 0xAB, 0x73, 0x1D, 0xBF, 0x66, 0x06, 0x59, 0xFF, + 0x5C, 0x56, 0x29, 0xBE, 0x91, 0xCB, 0x42, 0xE5, 0xC4, 0x7A, 0x5F, 0x84, 0x72, 0x1C, 0x2E, 0x9F, + 0x50, 0x02, 0xCA, 0xC6, 0xC2, 0x5C, 0x93, 0xA0, 0xEB, 0x96, 0xA0, 0xE1, 0x16, 0x3D, 0xC0, 0x68, + 0xF9, 0x1E, 0x72, 0x8D, 0xA6, 0x30, 0xB0, 0xD2, 0xA4, 0x6A, 0x4E, 0x89, 0x23, 0x08, 0xA8, 0x61, + 0x02, 0x3B, 0x6F, 0x92, 0x74, 0x5D, 0x84, 0x80, 0xB4, 0xB2, 0x91, 0x6B, 0xA4, 0xEB, 0x7A, 0x08, + 0x48, 0xBB, 0x47, 0x11, 0xD0, 0x19, 0x13, 0x7C, 0xED, 0x7F, 0xC9, 0x9E, 0x24, 0x02, 0x92, 0xDA, + 0x13, 0xD5, 0x4D, 0xC3, 0x45, 0xBF, 0x52, 0x02, 0xE2, 0x01, 0x6C, 0x2F, 0xD2, 0x05, 0xC2, 0x0D, + 0xB2, 0xC1, 0x7B, 0xB7, 0x02, 0x55, 0xE8, 0x04, 0xD7, 0x11, 0x10, 0x0F, 0xC1, 0x88, 0x3A, 0xD8, + 0x51, 0xB7, 0x7E, 0x00, 0x3D, 0xC6, 0xCB, 0xF3, 0x9D, 0x91, 0x32, 0x0E, 0xD0, 0x44, 0x4F, 0xCD, + 0x5F, 0xC8, 0x8B, 0x05, 0xA3, 0x33, 0x19, 0x6A, 0x70, 0x33, 0xF8, 0x89, 0xC9, 0x22, 0x11, 0xE2, + 0xB4, 0x7E, 0x9A, 0x89, 0xC0, 0x92, 0x4B, 0x6A, 0x83, 0x65, 0x77, 0x38, 0x78, 0x68, 0x79, 0x8D, + 0xA0, 0xA5, 0x80, 0x61, 0x2B, 0x11, 0x18, 0xD7, 0x0F, 0x9D, 0x8D, 0x5A, 0x7D, 0x4E, 0x07, 0x9A, + 0xB7, 0x62, 0x88, 0x06, 0x31, 0xF3, 0xEC, 0x9E, 0x98, 0x32, 0xF8, 0x19, 0x62, 0x01, 0xA6, 0x78, + 0x0D, 0x18, 0xE5, 0x26, 0x38, 0x87, 0x1D, 0x61, 0x2A, 0x1A, 0xFC, 0x4E, 0x92, 0x99, 0x8E, 0xA7, + 0xD6, 0x76, 0x4C, 0xE7, 0x2B, 0xC9, 0xC1, 0xE5, 0xFC, 0x05, 0x14, 0xB9, 0x29, 0x01, 0xD1, 0xE8, + 0xE1, 0x08, 0xA1, 0xD0, 0xCE, 0x8C, 0x46, 0xC7, 0x52, 0x41, 0xA2, 0xCE, 0x6A, 0x99, 0xF2, 0xD2, + 0xAC, 0xEC, 0x29, 0x50, 0x86, 0x63, 0x82, 0xD7, 0x1D, 0xC8, 0x19, 0x5D, 0x2A, 0x63, 0x41, 0x8B, + 0xF1, 0xA2, 0x81, 0xB7, 0xDC, 0xF0, 0x0E, 0xA7, 0xDF, 0x71, 0xCA, 0xEB, 0xE5, 0x28, 0x9A, 0x41, + 0xEF, 0x2F, 0x6E, 0x9C, 0xD8, 0x7F, 0x9A, 0x1C, 0xD2, 0x00, 0xB4, 0xC8, 0x21, 0x4B, 0x70, 0x00, + 0xCB, 0x12, 0x90, 0xD4, 0x7E, 0x2B, 0x46, 0x6C, 0xCB, 0x04, 0x84, 0x99, 0x1D, 0x2C, 0x5D, 0x4A, + 0x32, 0x58, 0xE5, 0x30, 0x25, 0xF1, 0x01, 0x2E, 0x03, 0xB0, 0xB5, 0x84, 0xF6, 0x2F, 0x70, 0xCE, + 0x7F, 0xD5, 0x7E, 0xFE, 0x08, 0x3A, 0x01, 0x59, 0xB6, 0x73, 0x21, 0x03, 0xDF, 0x03, 0xCA, 0xA4, + 0x99, 0xB8, 0x36, 0x41, 0xD1, 0x48, 0x02, 0x92, 0xB2, 0x15, 0x7A, 0xC9, 0xE5, 0x2D, 0x4C, 0xE0, + 0x07, 0xB1, 0x52, 0x44, 0x42, 0x26, 0xB4, 0x28, 0x77, 0x24, 0x16, 0x9C, 0x61, 0x60, 0xDB, 0x79, + 0x84, 0xFB, 0xEF, 0xA7, 0xF2, 0x3C, 0x40, 0xB7, 0xFD, 0x3F, 0x92, 0xFB, 0x48, 0x9A, 0x62, 0x47, + 0x07, 0x56, 0x44, 0x3E, 0x8D, 0xE0, 0x32, 0x6D, 0x1A, 0x19, 0x7D, 0x4E, 0xDB, 0x1F, 0x99, 0xB5, + 0x5A, 0xA7, 0x31, 0x6B, 0x13, 0x10, 0x40, 0x2C, 0xD6, 0x2F, 0x4B, 0x40, 0xDF, 0xC2, 0xD9, 0x86, + 0x0E, 0x70, 0x26, 0x15, 0x49, 0x66, 0x3A, 0x6B, 0xC2, 0xFF, 0x6B, 0x04, 0x24, 0xD9, 0x8E, 0x68, + 0x0F, 0xD2, 0x0C, 0x88, 0xC2, 0x12, 0x44, 0xDA, 0x30, 0xA5, 0x37, 0xBC, 0x15, 0x7A, 0xD2, 0x57, + 0x8C, 0x02, 0x25, 0x81, 0x48, 0x2A, 0xD4, 0x06, 0xDA, 0xB1, 0x34, 0x1F, 0x11, 0x8F, 0xF8, 0xE7, + 0xF9, 0x6C, 0xF8, 0x5E, 0x16, 0x25, 0xE6, 0xC8, 0x03, 0x40, 0x1B, 0x60, 0xDA, 0x40, 0x28, 0x02, + 0x3A, 0x63, 0x4D, 0x02, 0x9A, 0x89, 0xCC, 0x13, 0xF8, 0xC4, 0x12, 0x2D, 0xF7, 0xF3, 0xE9, 0x77, + 0x9A, 0xEE, 0x95, 0x3E, 0xC8, 0x34, 0x02, 0x02, 0x38, 0xDB, 0xFC, 0x33, 0x0C, 0x24, 0x20, 0x6D, + 0x49, 0x15, 0xE9, 0x64, 0x9A, 0xA8, 0x7A, 0x8D, 0x88, 0xEC, 0xB5, 0x67, 0x40, 0x91, 0xB4, 0xA6, + 0x07, 0x90, 0x53, 0x7C, 0xE0, 0x06, 0x37, 0x0F, 0x28, 0xE5, 0xAF, 0xE6, 0x91, 0x72, 0x17, 0x49, + 0xF0, 0x36, 0x36, 0xF1, 0x1E, 0x1E, 0x41, 0xDC, 0x92, 0x80, 0x66, 0x88, 0xED, 0x1D, 0x4A, 0x4B, + 0x30, 0x4B, 0xE7, 0xD8, 0x7E, 0xBE, 0x87, 0x25, 0xC9, 0xB4, 0xE5, 0x25, 0x18, 0x04, 0xEF, 0xC1, + 0x65, 0xD0, 0xF6, 0x8D, 0x90, 0x80, 0xF8, 0xDE, 0x0C, 0xEE, 0xEB, 0x00, 0xE8, 0x4B, 0x30, 0x9C, + 0x25, 0xB5, 0xDF, 0x0F, 0xB0, 0x00, 0x01, 0xF1, 0x35, 0x5B, 0xC4, 0xF8, 0x7A, 0x72, 0xD8, 0x2C, + 0x81, 0xAD, 0xEE, 0x01, 0xF1, 0xE5, 0x13, 0x6D, 0x0B, 0xCD, 0x47, 0x4D, 0x3B, 0x93, 0x47, 0xC4, + 0xB7, 0x3A, 0xF0, 0xBD, 0x65, 0x96, 0x0C, 0x5A, 0xBB, 0x34, 0xE3, 0x94, 0x74, 0x44, 0xEF, 0xDF, + 0x80, 0x36, 0xF1, 0xF9, 0xF4, 0xB7, 0xF4, 0x86, 0x8F, 0xB5, 0xF6, 0x80, 0x34, 0xF0, 0xF6, 0xEF, + 0x99, 0x80, 0x68, 0x76, 0xCF, 0xCC, 0x26, 0xB4, 0x47, 0x40, 0xEF, 0x40, 0x3F, 0x28, 0xD1, 0x08, + 0x88, 0x1F, 0xC1, 0x0F, 0xDB, 0x03, 0xCA, 0x12, 0x90, 0xB4, 0x07, 0x71, 0x51, 0xF9, 0xCA, 0xD8, + 0xC2, 0x29, 0x58, 0xB4, 0x6E, 0x3C, 0xD6, 0x94, 0xD2, 0xC0, 0xD2, 0x14, 0xB0, 0xD8, 0x17, 0x52, + 0xDA, 0x56, 0x2B, 0x99, 0x1A, 0xD5, 0x07, 0xEA, 0xC2, 0x1B, 0xCC, 0xD6, 0x49, 0xC6, 0x96, 0x4E, + 0xC1, 0x34, 0x58, 0x27, 0x49, 0x52, 0xFD, 0x5B, 0x26, 0xA0, 0x48, 0x7F, 0x49, 0x32, 0x44, 0x08, + 0x88, 0xDA, 0x99, 0xF5, 0x56, 0x55, 0x4A, 0x40, 0x54, 0x37, 0xC3, 0x4E, 0xC1, 0x6E, 0xE5, 0x07, + 0xB4, 0xE4, 0x29, 0x98, 0x84, 0x35, 0xFD, 0x80, 0x1A, 0x2C, 0xA3, 0xA3, 0xC4, 0xF2, 0xE1, 0xF4, + 0xDD, 0x37, 0xF0, 0xFA, 0x5D, 0x4A, 0x34, 0x35, 0x07, 0xD7, 0xFB, 0x04, 0x97, 0x03, 0x1E, 0xBF, + 0xA3, 0xF2, 0x5A, 0x3E, 0x37, 0x99, 0xCD, 0x7D, 0xA9, 0x6E, 0xAF, 0xFE, 0x25, 0xFD, 0x80, 0x22, + 0x4B, 0xDF, 0x67, 0xE1, 0xFB, 0xB5, 0xFC, 0x80, 0xA2, 0x04, 0x24, 0xF9, 0x0B, 0x59, 0xFD, 0x2B, + 0x5D, 0xC3, 0xAF, 0xA7, 0x6F, 0x17, 0x46, 0xB9, 0x30, 0x1F, 0x34, 0xBA, 0x78, 0x48, 0xFE, 0x47, + 0xDC, 0x0F, 0x88, 0xCF, 0x26, 0x23, 0x7B, 0x88, 0x14, 0xAA, 0x1F, 0x90, 0x74, 0xD1, 0x12, 0x9E, + 0xD0, 0xB7, 0x26, 0xA0, 0xB5, 0xE1, 0x19, 0x1D, 0x5D, 0x9E, 0xF1, 0xA9, 0xAD, 0xB4, 0xAF, 0x36, + 0x92, 0x80, 0x22, 0xB3, 0x39, 0x6A, 0x13, 0xBC, 0x5E, 0xAF, 0xFE, 0x68, 0xBA, 0x51, 0x08, 0x5C, + 0xDB, 0x43, 0x40, 0x0D, 0xFC, 0xB0, 0x44, 0xEA, 0x83, 0x47, 0x26, 0xA0, 0x96, 0xF0, 0xFE, 0x2D, + 0xC8, 0xCE, 0x88, 0x1A, 0x01, 0xFD, 0x00, 0xB6, 0x4F, 0x95, 0xA6, 0x9F, 0xDD, 0xA6, 0x64, 0xBD, + 0xE7, 0x14, 0x9F, 0x91, 0x0C, 0x82, 0x3D, 0xEF, 0x97, 0x2F, 0x6C, 0x0F, 0x4B, 0xBE, 0x4D, 0x65, + 0x97, 0xD8, 0x03, 0x01, 0x3D, 0x42, 0x8A, 0xCF, 0x48, 0x28, 0xC6, 0x3D, 0xCB, 0xFF, 0x28, 0xA0, + 0xB3, 0xD7, 0x22, 0x20, 0xD8, 0x07, 0x01, 0x3D, 0x52, 0x8A, 0x4F, 0xC9, 0xB7, 0xEA, 0x51, 0x64, + 0xBF, 0x77, 0xF0, 0xBE, 0xDD, 0xCA, 0x0B, 0x04, 0x56, 0xC5, 0x1E, 0x08, 0xA8, 0x50, 0xB8, 0x07, + 0x44, 0x4F, 0xD5, 0x1E, 0x0A, 0x45, 0x40, 0x85, 0x42, 0x61, 0x35, 0x14, 0x01, 0x15, 0x0A, 0x85, + 0xD5, 0x50, 0x04, 0x54, 0x28, 0x14, 0x56, 0x43, 0x11, 0x50, 0xA1, 0x50, 0x58, 0x0D, 0x48, 0x40, + 0xBD, 0x8E, 0x6A, 0x51, 0xC7, 0x45, 0xCD, 0x2B, 0x72, 0x82, 0x58, 0x74, 0x2F, 0x3A, 0xE5, 0xCD, + 0xE0, 0xBB, 0xA1, 0x6B, 0xB0, 0x12, 0x2C, 0x01, 0x5C, 0x46, 0x1D, 0xD3, 0x93, 0x27, 0x29, 0xF0, + 0x53, 0x73, 0x0C, 0xE3, 0x65, 0x69, 0xCE, 0x15, 0xBC, 0xEE, 0x7B, 0xF6, 0x37, 0x0D, 0x7B, 0xA1, + 0xF5, 0x51, 0x7D, 0x49, 0x11, 0xF4, 0x14, 0x3C, 0x43, 0x9D, 0x17, 0x9F, 0x03, 0xC2, 0xF5, 0x91, + 0x2C, 0x7E, 0x5A, 0xB9, 0xDE, 0x77, 0xB1, 0x7B, 0x31, 0x45, 0xD6, 0x35, 0xA3, 0x37, 0x72, 0x97, + 0x4E, 0x2F, 0x1C, 0xD1, 0xE3, 0x28, 0x64, 0x33, 0x01, 0xAC, 0x26, 0x8B, 0x47, 0x40, 0x0D, 0x57, + 0xB9, 0x5A, 0x3B, 0x65, 0x1B, 0x26, 0x90, 0x49, 0x28, 0x9A, 0xCE, 0x54, 0x52, 0x8A, 0x84, 0x22, + 0xA0, 0xEB, 0x08, 0xC8, 0x33, 0x64, 0x1A, 0x53, 0x94, 0x41, 0x6F, 0xC2, 0xB9, 0x19, 0x96, 0x89, + 0x3B, 0x5C, 0x8A, 0xE0, 0xEE, 0x85, 0x80, 0xAC, 0xDC, 0xD1, 0x69, 0xD0, 0x25, 0x98, 0x16, 0xCD, + 0xFC, 0xA5, 0x1C, 0xBB, 0x2E, 0x1C, 0x6C, 0x46, 0x90, 0x8D, 0xC6, 0xE6, 0x19, 0xFB, 0x68, 0x30, + 0x1C, 0x28, 0xF5, 0xB7, 0xFF, 0x63, 0x64, 0x39, 0xB6, 0xA5, 0xA1, 0x0D, 0x3C, 0xDE, 0x11, 0x5C, + 0x86, 0x68, 0x8A, 0x49, 0x1E, 0x10, 0x8A, 0xED, 0x43, 0xF0, 0x40, 0x51, 0x1E, 0xD7, 0xA5, 0x79, + 0x35, 0xF3, 0xC0, 0x4C, 0xD4, 0x8F, 0xD4, 0xB9, 0xB4, 0x3D, 0x28, 0x17, 0xCF, 0x1F, 0xC4, 0x81, + 0xED, 0x92, 0x22, 0xC3, 0x23, 0x29, 0x1E, 0x3C, 0x43, 0xF6, 0xEE, 0xEF, 0xD5, 0x1F, 0xB9, 0x8E, + 0x06, 0x64, 0x1E, 0x02, 0x6D, 0xEA, 0x45, 0x2F, 0x99, 0x5A, 0x90, 0x6C, 0x68, 0x49, 0x2C, 0xE5, + 0xC0, 0x3A, 0x34, 0x34, 0xCA, 0x22, 0x20, 0x1E, 0x33, 0xE2, 0xA5, 0xBB, 0xF4, 0xD2, 0x2F, 0x64, + 0x09, 0xA8, 0x27, 0x1F, 0x4D, 0xBB, 0xF7, 0x12, 0x04, 0x24, 0x29, 0x5E, 0xEB, 0x60, 0xFA, 0x94, + 0xC6, 0x60, 0x3F, 0x4A, 0x48, 0x34, 0x87, 0x12, 0xBD, 0x0F, 0x5F, 0x02, 0x1C, 0x20, 0x16, 0x67, + 0x83, 0xFA, 0xF6, 0x06, 0x0D, 0x25, 0xA0, 0xB7, 0x10, 0x7F, 0x42, 0x66, 0x66, 0x04, 0x3D, 0x03, + 0x37, 0x6A, 0xD0, 0x94, 0xC8, 0x69, 0x4E, 0x9A, 0x35, 0xB3, 0x2F, 0xF0, 0x59, 0xE5, 0x04, 0xB1, + 0x3C, 0x52, 0x34, 0xCE, 0xCF, 0xD2, 0x15, 0xAD, 0xBF, 0xD5, 0xFD, 0xEC, 0x94, 0xA7, 0xB6, 0x45, + 0xD3, 0xAD, 0x7A, 0x21, 0x3E, 0x88, 0x6C, 0x70, 0x6F, 0x74, 0x8B, 0x46, 0x5A, 0x09, 0x7C, 0xB9, + 0xAE, 0x77, 0x06, 0x64, 0x05, 0xA7, 0x69, 0x82, 0x68, 0x4B, 0x24, 0xBC, 0x1F, 0x07, 0x5F, 0x6A, + 0x44, 0x9F, 0x1A, 0x3D, 0x29, 0x0F, 0x22, 0x04, 0xC4, 0x07, 0xBC, 0x95, 0xAE, 0x84, 0x0E, 0x2A, + 0x4C, 0x7B, 0x89, 0xBA, 0xC2, 0x25, 0x58, 0xE4, 0x2D, 0x0E, 0x96, 0x41, 0xF0, 0x94, 0x0D, 0xCF, + 0xB0, 0xCC, 0x32, 0x26, 0x43, 0x40, 0x3D, 0xB3, 0xA0, 0x28, 0x01, 0x71, 0xC2, 0x5F, 0x3B, 0x44, + 0x45, 0x5B, 0xD2, 0x6A, 0xED, 0xD1, 0x92, 0xC8, 0x4D, 0x20, 0xDB, 0xBF, 0x96, 0xF3, 0x49, 0xB3, + 0x09, 0x5E, 0x7E, 0x76, 0xF4, 0x23, 0xD5, 0xDF, 0xAE, 0xB1, 0xEC, 0x21, 0x43, 0x40, 0x56, 0xCE, + 0x2A, 0x93, 0x80, 0x22, 0x0A, 0x0A, 0x67, 0x3C, 0x23, 0xD0, 0xEA, 0xB7, 0x06, 0x19, 0x17, 0x22, + 0x9B, 0x1C, 0x6D, 0x24, 0x01, 0xF1, 0x5C, 0x29, 0xD6, 0x13, 0x98, 0x2E, 0x1F, 0x9F, 0xC9, 0xF7, + 0xDE, 0x93, 0x8F, 0xDE, 0xA3, 0x5D, 0xEB, 0x05, 0x9E, 0x72, 0x83, 0x88, 0xE8, 0xC7, 0x9A, 0xD9, + 0x4A, 0xC8, 0xEE, 0x89, 0xF0, 0xD4, 0xB2, 0x1E, 0x22, 0x04, 0x24, 0xE5, 0x3F, 0x92, 0xBE, 0x5B, + 0x13, 0x5E, 0x74, 0x38, 0x5F, 0x82, 0xF1, 0x99, 0x31, 0x47, 0x76, 0x86, 0xAB, 0x3D, 0x20, 0xB5, + 0x7E, 0xA3, 0xF9, 0xBC, 0x68, 0xC2, 0xB3, 0x51, 0x39, 0xDD, 0xB5, 0xF6, 0xA8, 0xF9, 0x80, 0x32, + 0x49, 0xCB, 0xAF, 0x99, 0x01, 0x35, 0x81, 0xAD, 0xDC, 0xB3, 0x1C, 0xD9, 0x27, 0xF6, 0x52, 0x04, + 0x44, 0x65, 0x98, 0xC1, 0x36, 0x36, 0xFE, 0x74, 0xC4, 0xF2, 0xF4, 0x6F, 0x49, 0x8E, 0x2C, 0xA1, + 0x64, 0x09, 0x8B, 0x4F, 0xE9, 0x23, 0x91, 0xF5, 0x59, 0x02, 0x42, 0xBD, 0x3E, 0x42, 0xBA, 0x15, + 0x69, 0x43, 0x36, 0x4A, 0x40, 0x2D, 0x0D, 0x86, 0x95, 0xCB, 0x9C, 0xEF, 0x81, 0x7A, 0xD0, 0x08, + 0x2B, 0x32, 0x86, 0x29, 0x46, 0x13, 0x10, 0xB6, 0x5F, 0x24, 0x68, 0x6B, 0x09, 0x66, 0x61, 0xC4, + 0x1E, 0x90, 0x27, 0x08, 0xDD, 0x84, 0xF5, 0x9E, 0x16, 0x14, 0x4B, 0x12, 0x50, 0x34, 0x29, 0x3A, + 0x9F, 0xB9, 0xD1, 0x99, 0x8F, 0xD6, 0x2E, 0xBA, 0xC7, 0x81, 0xF7, 0xD0, 0x74, 0x99, 0x95, 0x15, + 0xC1, 0x97, 0xD5, 0xD6, 0x46, 0x37, 0xBF, 0x26, 0xB3, 0xD4, 0xC9, 0xCC, 0x82, 0xF6, 0x4A, 0x40, + 0xDA, 0x12, 0x6C, 0x14, 0x01, 0xF1, 0x01, 0xEC, 0xA1, 0x97, 0x80, 0xA2, 0xF5, 0x23, 0x36, 0x41, + 0x40, 0x23, 0x4E, 0xC1, 0xBC, 0x14, 0x93, 0x34, 0x9D, 0x64, 0x03, 0xDD, 0xD8, 0xB5, 0x18, 0x7A, + 0x49, 0x02, 0xE2, 0x46, 0x17, 0x39, 0x3D, 0xC2, 0x36, 0x47, 0xDF, 0x6C, 0xF9, 0x04, 0xF1, 0xC0, + 0xC5, 0x9E, 0xD7, 0x28, 0xD1, 0xB2, 0x4B, 0x11, 0x50, 0x66, 0x16, 0xB4, 0x57, 0x02, 0x0A, 0x0D, + 0x30, 0x41, 0x27, 0x0D, 0xF4, 0xA1, 0x3A, 0x83, 0x6D, 0xFF, 0xF8, 0x7F, 0xAC, 0xDF, 0xF3, 0xC5, + 0xC2, 0xF2, 0x5E, 0xBF, 0xF1, 0x53, 0x5C, 0x9A, 0xA8, 0xFE, 0xE6, 0x4B, 0x30, 0xFE, 0x64, 0x8F, + 0x18, 0xC3, 0x35, 0x7E, 0x40, 0x4D, 0x29, 0x7F, 0x02, 0x7B, 0x90, 0x65, 0xFD, 0x80, 0xB8, 0x82, + 0x22, 0xB2, 0x64, 0x96, 0x9D, 0x0D, 0x52, 0xAE, 0x5E, 0x0D, 0x9C, 0x60, 0xAD, 0x53, 0x3D, 0x2D, + 0x13, 0xA2, 0xD7, 0xA6, 0x97, 0x60, 0x39, 0xDA, 0x1E, 0x09, 0xA3, 0x09, 0x08, 0x20, 0x3E, 0x0B, + 0xDA, 0x3B, 0x01, 0x49, 0x88, 0xBC, 0x3A, 0x19, 0x31, 0x41, 0xEC, 0x10, 0xA6, 0x61, 0x86, 0x5C, + 0x8A, 0x64, 0x84, 0xD4, 0xBF, 0x6B, 0x6D, 0x42, 0x0F, 0x23, 0x20, 0xA9, 0x41, 0x51, 0x4F, 0x68, + 0xEE, 0x8B, 0x62, 0x11, 0xD0, 0x04, 0xF9, 0xE3, 0x78, 0x55, 0x60, 0x06, 0xC9, 0x71, 0x30, 0xEA, + 0x8B, 0xE2, 0x0D, 0x48, 0xFE, 0x84, 0xE1, 0x4F, 0x28, 0xAD, 0xCD, 0xF7, 0x42, 0x40, 0x56, 0x92, + 0x35, 0xA9, 0xFE, 0xBD, 0x11, 0x50, 0x03, 0x9D, 0xF5, 0x88, 0xC7, 0xCC, 0x82, 0x9C, 0x28, 0x6B, + 0x64, 0x4B, 0xA1, 0xF7, 0x98, 0x9C, 0xB7, 0xC7, 0x9B, 0x35, 0x35, 0xCC, 0x90, 0x7B, 0xD5, 0x91, + 0x26, 0xA7, 0xA7, 0x1F, 0x75, 0x09, 0x96, 0x05, 0x1F, 0xBC, 0x11, 0x01, 0x0A, 0xFB, 0xC3, 0x52, + 0x9E, 0xC1, 0xBC, 0xFE, 0x3D, 0x12, 0x50, 0x21, 0x0E, 0x77, 0x0F, 0xE8, 0x1A, 0x64, 0x4F, 0x63, + 0x0A, 0xFB, 0xC1, 0x1E, 0x09, 0xC8, 0x0A, 0x3B, 0x69, 0x98, 0xA1, 0x1E, 0x96, 0xB7, 0x40, 0x23, + 0x1D, 0xEA, 0xFD, 0xDF, 0x70, 0x61, 0x47, 0x23, 0xA3, 0xE1, 0x7B, 0x5D, 0xF1, 0x0B, 0xDB, 0xC6, + 0x1E, 0x09, 0xA8, 0xB0, 0x3E, 0xA4, 0x87, 0xC0, 0x0C, 0x8C, 0xF8, 0x2B, 0x1D, 0x47, 0xC1, 0xC3, + 0x92, 0x41, 0x94, 0x3D, 0xD1, 0xF0, 0x85, 0x7D, 0xA0, 0x6D, 0xD1, 0x50, 0xF7, 0x19, 0xB1, 0x7F, + 0x8B, 0x80, 0x0A, 0x85, 0xC2, 0x6A, 0x28, 0x02, 0x2A, 0x14, 0x0A, 0xAB, 0xA1, 0x08, 0xA8, 0x50, + 0x28, 0xAC, 0x86, 0x22, 0xA0, 0x42, 0xA1, 0x30, 0x0A, 0x96, 0x33, 0xA4, 0x84, 0x09, 0x09, 0x88, + 0xFB, 0xF4, 0x2C, 0x91, 0xCF, 0x05, 0x11, 0x79, 0xA7, 0x34, 0x2D, 0xD7, 0x90, 0xD9, 0xFC, 0xA4, + 0xD7, 0xD5, 0xFB, 0x97, 0x0A, 0xF7, 0x00, 0x2D, 0xF9, 0x9D, 0x84, 0x4C, 0x1C, 0xDE, 0xE8, 0x57, + 0x7E, 0xB7, 0xFA, 0xF0, 0x3D, 0xF3, 0xA1, 0xB2, 0xD7, 0x12, 0x50, 0x26, 0x34, 0x01, 0x11, 0x8D, + 0x39, 0x2B, 0x02, 0xDA, 0x2F, 0x5A, 0x1F, 0xD7, 0x9B, 0x3F, 0xC7, 0x21, 0x13, 0xA7, 0xD9, 0x43, + 0x40, 0x0D, 0x23, 0xC6, 0x4A, 0x37, 0x01, 0xF1, 0xC6, 0x6C, 0x21, 0xBF, 0x4A, 0x83, 0x95, 0xF4, + 0x2B, 0x72, 0x5D, 0x11, 0xD0, 0x6D, 0x71, 0xEB, 0xB4, 0xA3, 0x8F, 0x80, 0x68, 0x48, 0x0B, 0x22, + 0x9B, 0x8F, 0xA9, 0xF7, 0x85, 0x02, 0x12, 0x86, 0x11, 0x10, 0x4D, 0xBA, 0x1E, 0x49, 0x01, 0x09, + 0x41, 0x01, 0xB2, 0xE5, 0x29, 0x01, 0x7D, 0x80, 0xF8, 0xCC, 0xC6, 0x22, 0x20, 0x3A, 0x43, 0xA2, + 0x31, 0x39, 0xED, 0x1E, 0xEF, 0x41, 0x4F, 0x13, 0xCB, 0xDB, 0x1E, 0xCD, 0xAB, 0x13, 0xF5, 0x75, + 0xE9, 0x89, 0x15, 0xCA, 0xC6, 0xFE, 0x70, 0x19, 0xDA, 0x35, 0x3F, 0x82, 0x9F, 0x56, 0xF3, 0x13, + 0x7C, 0xCD, 0xEC, 0xD8, 0xEA, 0x8F, 0xC4, 0x75, 0x21, 0xB4, 0xB6, 0xF3, 0x19, 0x37, 0xB5, 0x37, + 0x49, 0x9F, 0x52, 0x76, 0x4C, 0x6D, 0xE6, 0x2D, 0xCD, 0xE6, 0xB5, 0x74, 0xBD, 0xEF, 0x94, 0xEB, + 0xA8, 0x2D, 0x48, 0x36, 0x64, 0xB5, 0x27, 0x92, 0x46, 0x97, 0xC3, 0x22, 0x6B, 0xBC, 0x97, 0xA4, + 0x17, 0xEB, 0x1E, 0x51, 0x02, 0x1A, 0xE9, 0x40, 0x3C, 0x8C, 0x80, 0x28, 0xA2, 0x0A, 0xDD, 0x23, + 0x01, 0x59, 0xE0, 0xED, 0xB3, 0xA2, 0x9F, 0x35, 0x03, 0xCA, 0x44, 0xDB, 0x67, 0xA3, 0xA5, 0xB5, + 0x14, 0x9C, 0x56, 0x7B, 0xA8, 0x0C, 0x58, 0xDE, 0xD2, 0xA5, 0x94, 0x58, 0x6D, 0x6F, 0x04, 0x44, + 0xCB, 0x5A, 0x44, 0xC1, 0xB7, 0x13, 0x0E, 0x86, 0x7E, 0x6E, 0x49, 0x40, 0xD9, 0x7D, 0x9A, 0x5E, + 0x02, 0xF2, 0xEA, 0x8F, 0x04, 0xA2, 0x0E, 0x5D, 0x82, 0x45, 0x33, 0xB2, 0x2D, 0xB5, 0x09, 0x4D, + 0xEB, 0xA6, 0xF9, 0x53, 0x22, 0xCB, 0x2A, 0x8B, 0x80, 0xF8, 0x1B, 0x25, 0x68, 0x5A, 0x10, 0x9A, + 0xA4, 0x4B, 0x92, 0x9B, 0xB7, 0xDD, 0xBA, 0xCF, 0x4F, 0x4A, 0xBD, 0x33, 0xC8, 0x83, 0xF8, 0xDA, + 0x94, 0x9D, 0xD9, 0xD7, 0xE7, 0x40, 0xA0, 0x3C, 0xCD, 0x17, 0xF4, 0xE1, 0xF4, 0x5D, 0x34, 0x41, + 0x5A, 0x26, 0x9B, 0xA3, 0xA7, 0x77, 0xAA, 0x4F, 0xFC, 0xFF, 0x67, 0xA3, 0x3D, 0x74, 0x66, 0xF8, + 0x07, 0x5C, 0xCE, 0xEC, 0xDF, 0x82, 0x3E, 0x93, 0x93, 0x12, 0xC9, 0x79, 0xB9, 0xA1, 0x22, 0xED, + 0x91, 0x10, 0xDD, 0xD7, 0xD1, 0x5E, 0x62, 0xE0, 0x95, 0xCF, 0xEE, 0xE3, 0x5A, 0xED, 0xF0, 0x4E, + 0xB7, 0x9E, 0x48, 0xB9, 0x61, 0x04, 0x14, 0xCD, 0x98, 0x76, 0x2B, 0x02, 0xCA, 0x4C, 0x43, 0x33, + 0x04, 0x04, 0x09, 0xB9, 0x33, 0x04, 0xC4, 0x09, 0xC2, 0xDB, 0x63, 0xEB, 0xCD, 0x98, 0x87, 0xF5, + 0x47, 0xD3, 0x84, 0x78, 0xA9, 0x73, 0x29, 0xF8, 0x0C, 0x28, 0x93, 0x0C, 0x6E, 0x34, 0x01, 0xF1, + 0xBA, 0xAD, 0x84, 0x67, 0xF4, 0xA9, 0xFE, 0x09, 0x2E, 0xC3, 0x01, 0xDE, 0x9C, 0x74, 0xA6, 0xD9, + 0x91, 0x97, 0x28, 0x8F, 0x82, 0x26, 0x91, 0xC3, 0x84, 0x5E, 0x99, 0x31, 0xE0, 0xDD, 0xA3, 0x67, + 0x93, 0x38, 0x4B, 0x40, 0x5C, 0x0E, 0xAD, 0x1D, 0xC0, 0xEE, 0x2F, 0xD9, 0xD1, 0xDD, 0x12, 0xD0, + 0x0C, 0x71, 0xA3, 0xA0, 0xD7, 0x15, 0x01, 0xE9, 0xFA, 0x97, 0xE4, 0x93, 0x10, 0xCD, 0xF9, 0x24, + 0xC9, 0x30, 0x92, 0x80, 0x68, 0xDB, 0x71, 0x8F, 0x2C, 0xF2, 0x06, 0x8A, 0x19, 0xCE, 0x03, 0x65, + 0x02, 0x7D, 0x5F, 0x07, 0x41, 0x49, 0xD7, 0x93, 0x81, 0xE7, 0xAC, 0x8A, 0x90, 0x04, 0xD5, 0xA7, + 0x47, 0x12, 0xA8, 0xA3, 0xCC, 0x86, 0x7E, 0x0F, 0x01, 0xA1, 0x6E, 0x9B, 0xAE, 0xAE, 0x39, 0x8E, + 0xBF, 0x5B, 0x02, 0xB2, 0xD6, 0xFC, 0xD6, 0x75, 0x6B, 0x12, 0xD0, 0xD2, 0x4B, 0xB0, 0x6C, 0x0A, + 0xCE, 0x1E, 0xFD, 0xF3, 0x25, 0xD8, 0x01, 0x62, 0x1B, 0xA6, 0x00, 0xCB, 0x10, 0x50, 0x26, 0x25, + 0xAE, 0x76, 0xD8, 0x60, 0xB5, 0x8D, 0xEF, 0xED, 0x58, 0x6D, 0xE1, 0x32, 0x78, 0xED, 0xE1, 0xED, + 0xA7, 0x7D, 0x1C, 0xC9, 0x2D, 0xBE, 0xE4, 0x0C, 0x28, 0xFB, 0x50, 0xB2, 0xF4, 0x31, 0xC4, 0x0F, + 0x68, 0x3A, 0xFD, 0x7C, 0x3E, 0xFD, 0x8C, 0xBE, 0x9E, 0x39, 0xF3, 0xF2, 0xBA, 0x8C, 0x23, 0x62, + 0x6B, 0x0F, 0x7D, 0x75, 0x48, 0x26, 0xF3, 0x1F, 0xEF, 0x5C, 0x69, 0x0F, 0x84, 0x6E, 0x80, 0x6A, + 0x72, 0x4B, 0x6F, 0xAC, 0xF0, 0xDE, 0x5B, 0x96, 0xD9, 0x84, 0xBE, 0xF6, 0xBD, 0x51, 0x33, 0xF8, + 0x33, 0x20, 0x2E, 0x43, 0x26, 0x8F, 0x34, 0xDE, 0x23, 0x93, 0x12, 0x37, 0x93, 0xED, 0x8F, 0x22, + 0x92, 0x57, 0x59, 0xD3, 0x8B, 0xD4, 0x76, 0x7E, 0x88, 0xE1, 0xCD, 0x40, 0x29, 0x61, 0x79, 0x3A, + 0xF2, 0x5E, 0xC6, 0xA0, 0xE9, 0x86, 0xC2, 0x22, 0xEB, 0xDE, 0xE4, 0xF4, 0x3D, 0xBE, 0x7C, 0xD7, + 0xBA, 0xDF, 0xDC, 0x35, 0x01, 0xD1, 0xB4, 0xA6, 0x7B, 0x21, 0xA0, 0x06, 0x6A, 0x74, 0xD1, 0x7C, + 0xD3, 0x59, 0x37, 0x88, 0xE8, 0x9B, 0x30, 0x7B, 0x09, 0x08, 0xDB, 0x13, 0x31, 0xD0, 0x8C, 0x41, + 0xD3, 0x59, 0xE1, 0x0C, 0xB1, 0x13, 0xD2, 0xA8, 0xFD, 0xF0, 0x19, 0xA2, 0xE7, 0x4D, 0xCC, 0xDB, + 0x1D, 0xBD, 0x4F, 0x66, 0x93, 0xB8, 0x87, 0x80, 0xB6, 0x72, 0x0A, 0x96, 0xA9, 0x2B, 0x8A, 0x69, + 0x8D, 0x58, 0xB0, 0xCC, 0x12, 0xE0, 0x91, 0x70, 0xAD, 0x13, 0x5F, 0x74, 0x0F, 0xA8, 0x30, 0x16, + 0x38, 0xE8, 0x96, 0xD2, 0xFB, 0xAD, 0xFC, 0x80, 0xA2, 0xF5, 0x0F, 0xC5, 0x1A, 0x04, 0x54, 0x19, + 0xF0, 0x64, 0x14, 0x01, 0xED, 0x13, 0x38, 0xB3, 0x5A, 0x2A, 0x7A, 0x60, 0x4F, 0x9E, 0xD0, 0x69, + 0xDC, 0x92, 0x80, 0x7A, 0xDF, 0xF5, 0xFE, 0x28, 0xE0, 0x1D, 0x91, 0xD1, 0xCF, 0x35, 0xD7, 0x16, + 0xFA, 0xE1, 0x1D, 0x2C, 0x8C, 0x42, 0x26, 0x16, 0x2C, 0x83, 0xD1, 0xB1, 0x60, 0x69, 0xAC, 0x45, + 0x40, 0xF5, 0x94, 0x7E, 0x8D, 0x22, 0xA0, 0xFD, 0x21, 0xEB, 0x24, 0xD8, 0x8B, 0x4C, 0x34, 0x7C, + 0x06, 0xF4, 0x6D, 0xBC, 0xAB, 0x24, 0xE9, 0xFF, 0x3F, 0xE8, 0x71, 0xF3, 0xE4, 0xD2, 0x4E, 0x85, + 0x55, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 +}; +const int Rockwell_Condensed_12_Bold_size = 4269; diff --git a/examples/3D_Light2/source/gfx/font.h b/examples/3D_Light2/source/gfx/Rockwell_Condensed_12_Bold.h similarity index 51% rename from examples/3D_Light2/source/gfx/font.h rename to examples/3D_Light2/source/gfx/Rockwell_Condensed_12_Bold.h index b5ca4a6..133454a 100644 --- a/examples/3D_Light2/source/gfx/font.h +++ b/examples/3D_Light2/source/gfx/Rockwell_Condensed_12_Bold.h @@ -1,14 +1,13 @@ -/* - This file was autogenerated by raw2c. -Visit http://www.devkitpro.org -*/ +/** + * This file was autogenerated from Rockwell_Condensed_12_Bold.png by WiiBuilder. + */ //--------------------------------------------------------------------------------- -#ifndef _font_h_ -#define _font_h_ +#ifndef _Rockwell_Condensed_12_Bold_h_ +#define _Rockwell_Condensed_12_Bold_h_ //--------------------------------------------------------------------------------- -extern const unsigned char font[]; -extern const int font_size; +extern const unsigned char Rockwell_Condensed_12_Bold[]; +extern const int Rockwell_Condensed_12_Bold_size; //--------------------------------------------------------------------------------- -#endif //_font_h_ +#endif //_Rockwell_Condensed_12_Bold_h_ //--------------------------------------------------------------------------------- diff --git a/examples/3D_Light2/source/gfx/Rockwell_Condensed_12_Bold.png b/examples/3D_Light2/source/gfx/Rockwell_Condensed_12_Bold.png new file mode 100644 index 0000000..9a9f74f Binary files /dev/null and b/examples/3D_Light2/source/gfx/Rockwell_Condensed_12_Bold.png differ diff --git a/examples/3D_Light2/source/gfx/font.c b/examples/3D_Light2/source/gfx/font.c deleted file mode 100644 index d1e37af..0000000 --- a/examples/3D_Light2/source/gfx/font.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - This file was autogenerated by raw2c. -Visit http://www.devkitpro.org -*/ - -const unsigned char font[] = { - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x00, 0x30, 0x08, 0x06, 0x00, 0x00, 0x00, 0x60, 0xc5, 0xa3, - 0xdf, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, - 0x03, 0x5e, 0x49, 0x44, 0x41, 0x54, 0x78, 0xda, 0xed, 0x9d, 0xd1, 0xb2, 0xad, 0x20, 0x08, 0x40, - 0x4f, 0x4d, 0xff, 0xff, 0xcb, 0xdd, 0xa7, 0x3d, 0xd3, 0x6d, 0x6c, 0x54, 0x40, 0x40, 0x5d, 0xeb, - 0xe9, 0xcc, 0xd9, 0x91, 0x26, 0x48, 0x44, 0x4a, 0xc7, 0xdf, 0x20, 0xee, 0xfb, 0xbe, 0x7f, 0x7f, - 0x1f, 0xc7, 0x71, 0xfc, 0x81, 0x2b, 0xcf, 0xf1, 0xd7, 0xea, 0xe0, 0x7d, 0xae, 0xf7, 0x39, 0x6b, - 0xbf, 0x43, 0x4e, 0xbb, 0x78, 0xea, 0xe7, 0x4b, 0x87, 0x5f, 0xd4, 0x74, 0xdb, 0x3b, 0xff, 0xb5, - 0xed, 0xb7, 0xca, 0xbf, 0xe5, 0x0e, 0xef, 0x81, 0x86, 0x78, 0x63, 0x1f, 0x7d, 0x0e, 0x74, 0x3f, - 0xaf, 0xf3, 0xfb, 0xd2, 0x57, 0xc9, 0xc1, 0xb4, 0x1e, 0x6b, 0xe9, 0x2c, 0x4b, 0xc7, 0xf6, 0xf6, - 0xff, 0x79, 0xcc, 0x89, 0x59, 0xc0, 0xca, 0x13, 0xbe, 0x37, 0xb2, 0xe0, 0x66, 0xa8, 0x8b, 0xce, - 0x66, 0x1b, 0xef, 0x0b, 0xd3, 0xc0, 0xe0, 0x01, 0x5b, 0x68, 0x95, 0xad, 0x39, 0xb8, 0x5a, 0x5a, - 0x64, 0x44, 0xaa, 0x44, 0x23, 0x8f, 0x03, 0x5c, 0x14, 0x9c, 0x1e, 0x58, 0x3b, 0x3f, 0xaf, 0x7e, - 0x5a, 0xd8, 0x77, 0xeb, 0xf9, 0x2e, 0x2f, 0x25, 0x30, 0x21, 0xc1, 0x7b, 0xc2, 0x7b, 0x4e, 0x64, - 0xeb, 0x09, 0xbc, 0xab, 0xf3, 0xb3, 0x6a, 0xab, 0xf5, 0x25, 0xc9, 0x19, 0x69, 0x98, 0x00, 0xb0, - 0xb7, 0xf3, 0x8b, 0x86, 0x47, 0x60, 0x18, 0x1a, 0xc9, 0x7b, 0x47, 0xff, 0xa5, 0xb7, 0x9b, 0x1e, - 0xed, 0x67, 0x72, 0x14, 0xd9, 0x9c, 0x5f, 0x8f, 0x0d, 0x78, 0xd8, 0xcb, 0xb3, 0x8d, 0x6b, 0x07, - 0x83, 0x80, 0xbd, 0x9c, 0xe0, 0x88, 0x27, 0x96, 0x59, 0xfa, 0x6f, 0xe5, 0xc0, 0xac, 0xaf, 0x37, - 0xab, 0x13, 0x24, 0x02, 0x04, 0xf8, 0x70, 0x00, 0xd1, 0x69, 0x9b, 0xde, 0x08, 0x76, 0x87, 0x47, - 0x57, 0xe9, 0x3a, 0x40, 0xf7, 0x47, 0xe0, 0x9e, 0x85, 0x93, 0x00, 0x3c, 0x85, 0xe4, 0x88, 0xfc, - 0xb6, 0xb3, 0x11, 0x1c, 0x20, 0x48, 0x74, 0xf9, 0x75, 0x07, 0x5e, 0xc5, 0x11, 0xcd, 0xe4, 0x50, - 0xac, 0x77, 0xfc, 0x58, 0xdc, 0x5c, 0x34, 0x3b, 0x47, 0x24, 0x7d, 0xc8, 0xf8, 0x16, 0x1e, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe2, 0x51, 0x97, 0x93, 0x79, 0xff, 0xd6, 0xd5, - 0xb8, 0x51, 0x12, 0x33, 0x43, 0x12, 0x55, 0x5a, 0x8f, 0x0c, 0xf4, 0x48, 0xf4, 0x3f, 0x62, 0x9d, - 0x9b, 0xa7, 0xfd, 0x6a, 0xe7, 0x60, 0xa6, 0xf6, 0x23, 0xe5, 0xcd, 0x1d, 0xe0, 0xa8, 0x7a, 0x5e, - 0xb3, 0xcb, 0xb3, 0x4c, 0xc1, 0xc7, 0x01, 0x5a, 0x17, 0xea, 0xf4, 0x68, 0x1f, 0xf9, 0x38, 0x79, - 0xea, 0x01, 0x02, 0xc0, 0xb6, 0xb8, 0xef, 0x04, 0x19, 0x51, 0xfb, 0x6b, 0xf5, 0x55, 0xef, 0x33, - 0x5c, 0x5f, 0xe4, 0x3a, 0x2c, 0x22, 0xea, 0x79, 0xc6, 0x2a, 0xb2, 0xf6, 0x5f, 0x49, 0xfe, 0xfa, - 0xfd, 0xf3, 0x67, 0xc0, 0xda, 0xed, 0x3f, 0xda, 0x5c, 0x98, 0x54, 0x5e, 0x33, 0x01, 0x25, 0xd7, - 0xaf, 0x95, 0x87, 0x75, 0x1c, 0xb0, 0xa6, 0x1f, 0xd6, 0xf2, 0x59, 0xf5, 0x20, 0xd9, 0xce, 0xa7, - 0xd1, 0x57, 0xcb, 0x38, 0xfe, 0xb7, 0x17, 0x58, 0x53, 0x60, 0xb0, 0xa7, 0x73, 0x4f, 0x47, 0x21, - 0x89, 0xe6, 0x4a, 0xf2, 0xda, 0xbc, 0x8e, 0x24, 0x87, 0xf0, 0xee, 0xbf, 0x55, 0x81, 0xc6, 0x59, - 0x23, 0x9b, 0xc8, 0xbe, 0x66, 0xca, 0xaf, 0x6a, 0xed, 0xa0, 0x55, 0x3e, 0xab, 0x6d, 0x44, 0x47, - 0x78, 0xbd, 0x01, 0x16, 0x39, 0x40, 0x80, 0x0d, 0x22, 0x5e, 0x28, 0x73, 0x66, 0x1b, 0xfc, 0xe8, - 0x47, 0x08, 0x0f, 0xc3, 0x6a, 0x6d, 0x63, 0xa6, 0x8f, 0xfa, 0xdc, 0x9d, 0xe0, 0x98, 0x90, 0xcf, - 0x20, 0x7f, 0x66, 0x74, 0x14, 0x38, 0x41, 0xe8, 0x7d, 0xdc, 0xf9, 0x81, 0x13, 0x44, 0xbe, 0x47, - 0xfe, 0xb2, 0x56, 0xf8, 0x8e, 0x6f, 0xe4, 0x46, 0x5d, 0x3f, 0x39, 0x40, 0xec, 0x6f, 0xb5, 0xb1, - 0xca, 0xa6, 0x2b, 0x72, 0x80, 0x00, 0xb0, 0xef, 0xd3, 0x83, 0x26, 0xac, 0x8c, 0xd8, 0x4a, 0xd6, - 0xda, 0xf6, 0xc8, 0x8f, 0x3f, 0x5b, 0xf7, 0x1f, 0xd6, 0x89, 0x6a, 0x6a, 0xfd, 0xa8, 0xed, 0x64, - 0xc8, 0x32, 0x7f, 0x76, 0x9b, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, - 0x26, 0x26, 0xe5, 0x68, 0x34, 0xc7, 0xb5, 0x92, 0xa5, 0x1c, 0x57, 0xed, 0x9c, 0xcd, 0x03, 0xbf, - 0x69, 0x3d, 0xb8, 0xd2, 0xf8, 0xce, 0x78, 0xfd, 0x52, 0xfb, 0xf1, 0x2c, 0x07, 0x55, 0xda, 0x36, - 0x97, 0xb1, 0x1c, 0x9c, 0x45, 0x3d, 0x4f, 0x29, 0x7c, 0x17, 0xd8, 0xfa, 0x8e, 0x22, 0xdc, 0x4b, - 0xac, 0x91, 0xb7, 0xd8, 0xcb, 0x3c, 0xba, 0xfd, 0x5a, 0xbb, 0x91, 0xd7, 0x5f, 0x73, 0xca, 0xbc, - 0x31, 0xcc, 0x37, 0x7f, 0xac, 0x60, 0x1d, 0x20, 0x00, 0x6c, 0x0b, 0x11, 0x20, 0x10, 0x61, 0xc0, - 0xb6, 0x3a, 0xb9, 0x46, 0x87, 0x98, 0xde, 0x64, 0xfb, 0x36, 0xc7, 0x4c, 0x45, 0x4d, 0x33, 0x8c, - 0x9f, 0x34, 0x1f, 0xa8, 0xa9, 0xe7, 0x88, 0x03, 0x8a, 0xaf, 0x87, 0x19, 0xb5, 0x90, 0xf9, 0x8a, - 0x7e, 0x06, 0x8f, 0xca, 0x21, 0xd4, 0x72, 0x51, 0xdc, 0x8d, 0x73, 0xeb, 0xef, 0x7d, 0x5c, 0x6f, - 0xc1, 0x4d, 0xf4, 0x5f, 0x9e, 0xd3, 0x11, 0xf5, 0x30, 0x23, 0xf3, 0xad, 0xe4, 0x00, 0x61, 0xe9, - 0x48, 0x1f, 0xa0, 0xcb, 0x01, 0x8e, 0x30, 0x2c, 0xeb, 0x73, 0xb6, 0xde, 0x4d, 0x22, 0xfa, 0x8a, - 0xfc, 0x7a, 0x25, 0xe1, 0x7b, 0xfa, 0x94, 0x69, 0xfc, 0x24, 0x25, 0xc2, 0xa2, 0x4b, 0xc1, 0x79, - 0xeb, 0xff, 0xf4, 0xea, 0x04, 0x4e, 0x10, 0x79, 0x9c, 0x20, 0xe3, 0x9f, 0xcd, 0x09, 0x5e, 0xd9, - 0x8c, 0x2b, 0x7b, 0x5e, 0x86, 0xf5, 0x61, 0xe8, 0xc4, 0x9a, 0xe7, 0x4b, 0x84, 0x19, 0xaf, 0xd3, - 0xb3, 0x5f, 0xd6, 0x6d, 0xb1, 0x0c, 0x06, 0xdc, 0x26, 0x39, 0xa3, 0x20, 0x77, 0x82, 0xdc, 0x78, - 0x17, 0x8e, 0x00, 0xa3, 0x97, 0x31, 0x94, 0x8c, 0x4f, 0xfb, 0xf5, 0xae, 0xe8, 0xc9, 0xe3, 0xd9, - 0x7f, 0x49, 0xfb, 0x96, 0x7d, 0x58, 0xc5, 0x7e, 0x5a, 0xae, 0xa3, 0x26, 0x17, 0xad, 0x7f, 0xab, - 0xf1, 0xe7, 0x25, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0xf0, 0x0f, - 0xab, 0xb9, 0x5f, 0xb5, 0x2f, 0x5e, 0xd2, 0x50, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, - 0xae, 0x42, 0x60, 0x82 -}; -const int font_size = sizeof(font); diff --git a/examples/3D_Light2/source/gfx/font.png b/examples/3D_Light2/source/gfx/font.png deleted file mode 100644 index ac5131a..0000000 Binary files a/examples/3D_Light2/source/gfx/font.png and /dev/null differ diff --git a/examples/3D_Light2/source/main.c b/examples/3D_Light2/source/main.c index f1f5a4f..976b0f9 100644 --- a/examples/3D_Light2/source/main.c +++ b/examples/3D_Light2/source/main.c @@ -9,22 +9,21 @@ #include #include -#include "gfx/font.h" +#include "gfx/Rockwell_Condensed_12_Bold.h" extern Mtx _GRR_view; int main() { - float a=0; - float objscal=0.5f; + float a = 0; + float objscal = 0.5f; int objqual = 20; GRRLIB_Init(); WPAD_Init(); - GRRLIB_texImg *tex_font = GRRLIB_LoadTexture(font); - GRRLIB_InitTileSet(tex_font, 16, 16, 32); - + GRRLIB_texImg *tex_font = GRRLIB_LoadTexture(Rockwell_Condensed_12_Bold); + GRRLIB_InitTileSet(tex_font, 12, 19, 32); GRRLIB_Settings.antialias = true; diff --git a/examples/3D_sample5/source/main.c b/examples/3D_sample5/source/main.c index a98b3ba..8d6aadf 100644 --- a/examples/3D_sample5/source/main.c +++ b/examples/3D_sample5/source/main.c @@ -12,9 +12,9 @@ #include "gfx/font.h" int main(void){ -f32 a=0; -f32 offset = 1.5f; -f32 rotpas=60.0f; + f32 a = 0; + f32 offset = 1.5f; + f32 rotpas = 60.0f; GRRLIB_Init(); WPAD_Init(); @@ -35,63 +35,62 @@ f32 rotpas=60.0f; GRRLIB_3dMode(0.1,1000,45,0,1); - GRRLIB_SetLightAmbient(0x111111FF); - GRRLIB_SetLightDiff(0,(guVector){0.0f,3.0f,3.0f},20.0f,1.0f,0xFFFFFFFF); + GRRLIB_SetLightAmbient(0x111111FF); + GRRLIB_SetLightDiff(0,(guVector){0.0f,3.0f,3.0f},20.0f,1.0f,0xFFFFFFFF); GRRLIB_ObjectViewBegin(); - GRRLIB_ObjectViewRotate(0,a*3,0); - GRRLIB_ObjectViewTrans(0,offset,0); - GRRLIB_ObjectViewRotate(a,a*3,a*2+0*rotpas); - GRRLIB_ObjectViewEnd(); - GRRLIB_DrawCube(0.8f,1,0xFFFFFFFF); + GRRLIB_ObjectViewRotate(0,a*3,0); + GRRLIB_ObjectViewTrans(0,offset,0); + GRRLIB_ObjectViewRotate(a,a*3,a*2+0*rotpas); + GRRLIB_ObjectViewEnd(); + GRRLIB_DrawCube(0.8f,1,0xFFFFFFFF); GRRLIB_ObjectViewBegin(); - GRRLIB_ObjectViewRotate(0,a*3,0); - GRRLIB_ObjectViewTrans(0,offset,0); - GRRLIB_ObjectViewRotate(a,a*3,a*2+1*rotpas); - GRRLIB_ObjectViewEnd(); - GRRLIB_DrawCube(0.8f,1,0xFFFFFFFF); + GRRLIB_ObjectViewRotate(0,a*3,0); + GRRLIB_ObjectViewTrans(0,offset,0); + GRRLIB_ObjectViewRotate(a,a*3,a*2+1*rotpas); + GRRLIB_ObjectViewEnd(); + GRRLIB_DrawCube(0.8f,1,0xFFFFFFFF); GRRLIB_ObjectViewBegin(); - GRRLIB_ObjectViewRotate(0,a*3,0); - GRRLIB_ObjectViewTrans(0,offset,0); - GRRLIB_ObjectViewRotate(a,a*3,a*2+2*rotpas); - GRRLIB_ObjectViewEnd(); - GRRLIB_DrawCube(0.8f,1,0xFFFFFFFF); + GRRLIB_ObjectViewRotate(0,a*3,0); + GRRLIB_ObjectViewTrans(0,offset,0); + GRRLIB_ObjectViewRotate(a,a*3,a*2+2*rotpas); + GRRLIB_ObjectViewEnd(); + GRRLIB_DrawCube(0.8f,1,0xFFFFFFFF); GRRLIB_ObjectViewBegin(); - GRRLIB_ObjectViewRotate(0,a*3,0); - GRRLIB_ObjectViewTrans(0,offset,0); - GRRLIB_ObjectViewRotate(a,a*3,a*2+3*rotpas); - GRRLIB_ObjectViewEnd(); - GRRLIB_DrawCube(0.8f,1,0xFFFFFFFF); + GRRLIB_ObjectViewRotate(0,a*3,0); + GRRLIB_ObjectViewTrans(0,offset,0); + GRRLIB_ObjectViewRotate(a,a*3,a*2+3*rotpas); + GRRLIB_ObjectViewEnd(); + GRRLIB_DrawCube(0.8f,1,0xFFFFFFFF); GRRLIB_ObjectViewBegin(); - GRRLIB_ObjectViewRotate(0,a*3,0); - GRRLIB_ObjectViewTrans(0,offset,0); - GRRLIB_ObjectViewRotate(a,a*3,a*2+4*rotpas); - GRRLIB_ObjectViewEnd(); - GRRLIB_DrawCube(0.8f,1,0xFFFFFFFF); + GRRLIB_ObjectViewRotate(0,a*3,0); + GRRLIB_ObjectViewTrans(0,offset,0); + GRRLIB_ObjectViewRotate(a,a*3,a*2+4*rotpas); + GRRLIB_ObjectViewEnd(); + GRRLIB_DrawCube(0.8f,1,0xFFFFFFFF); GRRLIB_ObjectViewBegin(); - GRRLIB_ObjectViewRotate(0,a*3,0); - GRRLIB_ObjectViewTrans(0,offset,0); - GRRLIB_ObjectViewRotate(a,a*3,a*2+5*rotpas); - GRRLIB_ObjectViewEnd(); - GRRLIB_DrawCube(0.8f,1,0xFFFFFFFF); + GRRLIB_ObjectViewRotate(0,a*3,0); + GRRLIB_ObjectViewTrans(0,offset,0); + GRRLIB_ObjectViewRotate(a,a*3,a*2+5*rotpas); + GRRLIB_ObjectViewEnd(); + GRRLIB_DrawCube(0.8f,1,0xFFFFFFFF); GRRLIB_ObjectViewBegin(); - GRRLIB_ObjectViewRotate(0,a*3,0); - GRRLIB_ObjectViewTrans(0,offset,0); - GRRLIB_ObjectViewRotate(a,a*3,a*2+6*rotpas); - GRRLIB_ObjectViewEnd(); - GRRLIB_DrawCube(0.8f,1,0xFFFFFFFF); - - a+=0.8; - GRRLIB_2dMode(); + GRRLIB_ObjectViewRotate(0,a*3,0); + GRRLIB_ObjectViewTrans(0,offset,0); + GRRLIB_ObjectViewRotate(a,a*3,a*2+6*rotpas); + GRRLIB_ObjectViewEnd(); + GRRLIB_DrawCube(0.8f,1,0xFFFFFFFF); + a+=0.8; + GRRLIB_2dMode(); // Switch To 2D Mode to display text GRRLIB_2dMode();