atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

correction of the waving of the text writing in monospace

Browse Source
This commit is contained in:
Edouard Dupin 2011-10-30 09:50:03 +01:00
parent 5e03ebf95b
commit 6548898cf1
3 changed files with 104 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Sources/ewolFont.cpp
View File

@ -177,11 +177,10 @@ void ewol::DrawText(double x, double y, const char * myString)
glBindTexture(GL_TEXTURE_2D, TextureIdBold); glBindTexture(GL_TEXTURE_2D, TextureIdBold);
while(*tmpVal != '\0') { while(*tmpVal != '\0') {
char tmpChar = *tmpVal; int32_t tmpChar = (int32_t)*tmpVal;
if (tmpChar >= 0x80) { if (tmpChar >= 0x80) {
tmpChar = 0; tmpChar = 0;
} }
glBegin(GL_QUADS); glBegin(GL_QUADS);
glTexCoord2f(listOfElement[tmpChar].posStart.x, listOfElement[tmpChar].posStart.y); glTexCoord2f(listOfElement[tmpChar].posStart.x, listOfElement[tmpChar].posStart.y);
glVertex3f(x, y, 0.0); glVertex3f(x, y, 0.0);

5
Sources/ewolWindows.cpp
View File

@ -163,6 +163,9 @@ void ewol::Windows::SysDraw(void)
myOObject.Rectangle(450, 450, 50, 50, 0.0, 0.0, 1.0, 1.0); myOObject.Rectangle(450, 450, 50, 50, 0.0, 0.0, 1.0, 1.0);
myOObject.Rectangle(500, 500, 50, 50, 0.0, 0.0, 0.0, 1.0); myOObject.Rectangle(500, 500, 50, 50, 0.0, 0.0, 0.0, 1.0);
myOObject.Rectangle(200, 300, 900, 54, 0.0, 0.0, 0.0, 1.0);
myOObject.Rectangle(200, 300, 900, 13, 0.0, 1.0, 0.0, 1.0);
myOObject.Rectangle(200, 343, 900, 11, 1.0, 0.0, 0.0, 1.0);
int32_t fontID = ewol::LoadFont("dataTest/TextMonospace.ebt"); int32_t fontID = ewol::LoadFont("dataTest/TextMonospace.ebt");
@ -272,7 +275,7 @@ void ewol::Windows::SysDraw(void)
} }
ewol::DrawText(200, 300, "Ma chere Aurelie, je T'aime"); ewol::DrawText(200, 300, "APet9_$*µ:/?,>< \"#',;KkgGyYf");

198
dataTest/TextMonospace.ebt
View File

@ -9,37 +9,37 @@ italic:TextMonospaceItalic.bmp
0x00 (99,458) (33,54) # Error : Unknow the UTF8 element ... 0x00 (99,458) (33,54) # Error : Unknow the UTF8 element ...
# hexa UTF8 code of the letter and start coordonate and size ==> 0x54 (33,45) (33,54) # hexa UTF8 code of the letter and start coordonate and size ==> 0x54 (33,45) (33,54)
# ABCDEFGHIJKLMN # ABCDEFGHIJKLMN
0x20 (0,3) (33,54) # space ... 0x20 (0,7) (33,54) # space ...
0x41 (33,3) (33,54) # A 0x41 (33,7) (33,54) # A
0x42 (66,3) (33,54) # B 0x42 (66,7) (33,54) # B
0x43 (99,3) (33,54) # C 0x43 (99,7) (33,54) # C
0x44 (132,3) (33,54) # D 0x44 (132,7) (33,54) # D
0x45 (165,3) (33,54) # E 0x45 (165,7) (33,54) # E
0x46 (198,3) (33,54) # F 0x46 (198,7) (33,54) # F
0x47 (231,3) (33,54) # G 0x47 (231,7) (33,54) # G
0x48 (264,3) (33,54) # H 0x48 (264,7) (33,54) # H
0x49 (297,3) (33,54) # I 0x49 (297,7) (33,54) # I
0x4A (330,3) (33,54) # J 0x4A (330,7) (33,54) # J
0x4B (363,3) (33,54) # K 0x4B (363,7) (33,54) # K
0x4C (396,3) (33,54) # L 0x4C (396,7) (33,54) # L
0x4D (429,3) (33,54) # M 0x4D (429,7) (33,54) # M
0x4E (462,3) (33,54) # N 0x4E (462,7) (33,54) # N
#OPQRSTUVWXYZabc #OPQRSTUVWXYZabc
0x4F (0,69) (33,54) # O 0x4F (0,71) (33,54) # O
0x50 (33,69) (33,54) # P 0x50 (33,71) (33,54) # P
0x51 (66,69) (33,54) # Q 0x51 (66,71) (33,54) # Q
0x52 (99,69) (33,54) # R 0x52 (99,71) (33,54) # R
0x53 (132,69) (33,54) # S 0x53 (132,71) (33,54) # S
0x54 (165,69) (33,54) # T 0x54 (165,71) (33,54) # T
0x55 (198,69) (33,54) # U 0x55 (198,71) (33,54) # U
0x56 (231,69) (33,54) # V 0x56 (231,71) (33,54) # V
0x57 (264,69) (33,54) # W 0x57 (264,71) (33,54) # W
0x58 (297,69) (33,54) # X 0x58 (297,71) (33,54) # X
0x59 (330,69) (33,54) # Y 0x59 (330,71) (33,54) # Y
0x5A (363,69) (33,54) # Z 0x5A (363,71) (33,54) # Z
0x61 (396,69) (33,54) # a 0x61 (396,71) (33,54) # a
0x62 (429,69) (33,54) # b 0x62 (429,71) (33,54) # b
0x63 (462,69) (33,54) # c 0x63 (462,71) (33,54) # c
#defghijklmnopqr #defghijklmnopqr
0x64 (0,135) (33,54) # d 0x64 (0,135) (33,54) # d
0x65 (33,135) (33,54) # e 0x65 (33,135) (33,54) # e
@ -57,76 +57,76 @@ italic:TextMonospaceItalic.bmp
0x71 (429,135) (33,54) # q 0x71 (429,135) (33,54) # q
0x72 (462,135) (33,54) # r 0x72 (462,135) (33,54) # r
#stuvwxyz1234567 #stuvwxyz1234567
0x73 (0,201) (33,54) # s 0x73 (0,199) (33,54) # s
0x74 (33,201) (33,54) # t 0x74 (33,199) (33,54) # t
0x75 (66,201) (33,54) # u 0x75 (66,199) (33,54) # u
0x76 (99,201) (33,54) # v 0x76 (99,199) (33,54) # v
0x77 (132,201) (33,54) # w 0x77 (132,199) (33,54) # w
0x78 (165,201) (33,54) # x 0x78 (165,199) (33,54) # x
0x79 (198,201) (33,54) # y 0x79 (198,199) (33,54) # y
0x7A (231,201) (33,54) # z 0x7A (231,199) (33,54) # z
0x31 (264,201) (33,54) # 1 0x31 (264,199) (33,54) # 1
0x32 (297,201) (33,54) # 2 0x32 (297,199) (33,54) # 2
0x33 (330,201) (33,54) # 3 0x33 (330,199) (33,54) # 3
0x34 (363,201) (33,54) # 4 0x34 (363,199) (33,54) # 4
0x35 (396,201) (33,54) # 5 0x35 (396,199) (33,54) # 5
0x36 (429,201) (33,54) # 6 0x36 (429,199) (33,54) # 6
0x37 (462,201) (33,54) # 7 0x37 (462,199) (33,54) # 7
#890&é~"#'{([-|è #890&é~"#'{([-|è
0x38 (0,267) (33,54) # 8 0x38 (0,263) (33,54) # 8
0x39 (33,267) (33,54) # 9 0x39 (33,263) (33,54) # 9
0x30 (66,267) (33,54) # 0 0x30 (66,263) (33,54) # 0
0x26 (99,267) (33,54) # & 0x26 (99,263) (33,54) # &
#0x (132,267) (33,54) # é #0x (132,263) (33,54) # é
0x7E (165,267) (33,54) # ~ 0x7E (165,263) (33,54) # ~
0x22 (198,267) (33,54) # " 0x22 (198,263) (33,54) # "
0x23 (231,267) (33,54) # # 0x23 (231,263) (33,54) # #
0x27 (264,267) (33,54) # ' 0x27 (264,263) (33,54) # '
0x7B (297,267) (33,54) # { 0x7B (297,263) (33,54) # {
0x28 (330,267) (33,54) # ( 0x28 (330,263) (33,54) # (
0x5B (363,267) (33,54) # [ 0x5B (363,263) (33,54) # [
0x2D (396,267) (33,54) # - 0x2D (396,263) (33,54) # -
0x7C (429,267) (33,54) # | 0x7C (429,263) (33,54) # |
#0x (462,267) (33,54) # è #0x (462,263) (33,54) # è
#`_\ç^à@)]=} #`_\ç^à@)]=}
0x60 (0,333) (33,54) # ` 0x60 (0,335) (33,54) # `
0x5F (33,333) (33,54) # _ 0x5F (33,335) (33,54) # _
0x5C (66,333) (33,54) # \ 0x5C (66,335) (33,54) # \
#0x (99,333) (33,54) # ç #0x (99,335) (33,54) # ç
0x5E (132,333) (33,54) # ^ 0x5E (132,335) (33,54) # ^
#0x (165,333) (33,54) # à #0x (165,335) (33,54) # à
0x40 (198,333) (33,54) # @ 0x40 (198,335) (33,54) # @
0x29 (231,333) (33,54) # ) 0x29 (231,335) (33,54) # )
0x5D (264,333) (33,54) # ] 0x5D (264,335) (33,54) # ]
0x3D (297,333) (33,54) # = 0x3D (297,335) (33,54) # =
0x7D (330,333) (33,54) # } 0x7D (330,335) (33,54) # }
#0x (363,333) (33,54) # #0x (363,335) (33,54) #
#0x (396,333) (33,54) # #0x (396,335) (33,54) #
#0x (429,333) (33,54) # #0x (429,335) (33,54) #
#0x (462,333) (33,54) # #0x (462,335) (33,54) #
#$£*µ%!§:/ #$£*µ%!§:/
#0x (0,399) (33,54) # i chap #0x (0,391) (33,54) # i chap
#0x (33,399) (33,54) # o trema #0x (33,391) (33,54) # o trema
#0x (66,399) (33,54) # u trema #0x (66,391) (33,54) # u trema
#0x (99,399) (33,54) # e trema #0x (99,391) (33,54) # e trema
#0x (132,399) (33,54) # a trema #0x (132,391) (33,54) # a trema
0x24 (165,399) (33,54) # $ 0x24 (165,391) (33,54) # $
#0x (198,399) (33,54) # £ #0x (198,391) (33,54) # £
0x2A (231,399) (33,54) # * 0x2A (231,391) (33,54) # *
#0x (264,399) (33,54) # µ #0x (264,391) (33,54) # µ
#0x (297,399) (33,54) # ù #0x (297,391) (33,54) # ù
0x25 (330,399) (33,54) # % 0x25 (330,391) (33,54) # %
0x21 (363,399) (33,54) # ! 0x21 (363,391) (33,54) # !
#0x (396,399) (33,54) # § #0x (396,391) (33,54) # §
0x3A (429,399) (33,54) # : 0x3A (429,391) (33,54) # :
0x2F (462,399) (33,54) # / 0x2F (462,391) (33,54) # /
#;.,?<>²!+ #;.,?<>²!+
0x3B (0,458) (33,54) # ; 0x3B (0,453) (33,54) # ;
0x2E (33,458) (33,54) # . 0x2E (33,453) (33,54) # .
0x2C (66,458) (33,54) # , 0x2C (66,453) (33,54) # ,
0x3F (99,458) (33,54) # ? 0x3F (99,453) (33,54) # ?
0x3C (132,458) (33,54) # < 0x3C (132,453) (33,54) # <
0x3E (165,458) (33,54) # > 0x3E (165,453) (33,54) # >
#0x (198,458) (33,54) # ² #0x (198,453) (33,54) # ²
#0x21 (231,458) (33,54) # ! ==> doublon ... #0x21 (231,453) (33,54) # ! ==> doublon ...
0x2B (264,458) (33,54) # + 0x2B (264,453) (33,54) # +