From e80e9c8f637a03b2cc15342644a62fd5a6f82765 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 22 Aug 2015 14:10:51 +0000 Subject: [PATCH] 3DSView and 3dsheart: fix font git-svn-id: svn://kolibrios.org@5763 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/demos/3DS/VIEW3DS.ASM | 20 +++++------ programs/demos/3dsheart/trunk/3dsheart.asm | 42 +++++++++++----------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/programs/demos/3DS/VIEW3DS.ASM b/programs/demos/3DS/VIEW3DS.ASM index 274a84116c..4b663f39bd 100644 --- a/programs/demos/3DS/VIEW3DS.ASM +++ b/programs/demos/3DS/VIEW3DS.ASM @@ -788,7 +788,7 @@ update_flags: lea ebx,[ebx*3] lea ebx,[ebx*5] add ebx,(SIZE_X+12+70)*65536+28 ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) movzx edx,byte[edi+12] ; current flag shl edx,2 ; * 4 = text length add edx,dword[edi+13] ; pointer to text beginning @@ -2977,7 +2977,7 @@ buttons: ; draw some buttons (all but navigation and close ) lea ebx,[ebx*3] lea ebx,[ebx*5] add ebx,(SIZE_X+12)*65536+28 ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) lea edx,[edi+1] ; pointer to text beginning mov esi,10 ; text length int 0x40 @@ -2991,7 +2991,7 @@ buttons: ; draw some buttons (all but navigation and close ) ; lea ebx,[ebx*5] ; add ebx,(SIZE_X+12+70)*65536+28 ; [x start] *65536 + [y start] add ebx,70*65536 -; mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) +; mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) movzx edx,byte[edi+12] ; current flag shl edx,2 ; * 4 = text length add edx,dword[edi+13] ; pointer to text beginning @@ -3030,7 +3030,7 @@ ret ; ADD VECTOR LABEL ; add vector buttons - 30 ++ mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12)*65536+(168+15*(13+.Y_ADD)) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelvector ; pointer to text beginning mov esi,labelvectorend-labelvector ; text length ; cmp [move_flag],2 @@ -3048,7 +3048,7 @@ ret ;VECTOR Y- LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+32)*65536+(168+15*(14+.Y_ADD)) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelyminus ; pointer to text beginning mov esi,labelyminusend-labelyminus ; text length cmp [move_flag],2 @@ -3066,7 +3066,7 @@ ret ;VECTOR Z+ LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+53)*65536+(168+15*(14+.Y_ADD)) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelzplus ; pointer to text beginning mov esi,labelzplusend-labelzplus ; text length ; cmp [move_flag],2 @@ -3085,7 +3085,7 @@ ret ;VECTOR x- LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12)*65536+(168+15*(15+.Y_ADD)) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelxminus ; pointer to text beginning mov esi,labelxminusend-labelxminus ; text length ; cmp [move_flag],2 @@ -3103,7 +3103,7 @@ ret ;VECTOR x+ LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+53)*65536+(168+15*(15+.Y_ADD)) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelxplus ; pointer to text beginning mov esi,labelxplusend-labelxplus ; text length ; cmp [move_flag],2 @@ -3121,7 +3121,7 @@ ret ;VECTOR z- LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12)*65536+(168+15*(16+.Y_ADD)) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelzminus ; pointer to text beginning mov esi,labelzminusend-labelzminus ; text length ; cmp [move_flag],2 @@ -3139,7 +3139,7 @@ ret ;VECTOR Y+ LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+32)*65536+(168+15*(16+.Y_ADD)) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelyplus ; pointer to text beginning mov esi,labelyplusend-labelyplus ; text length ; cmp [move_flag],2 diff --git a/programs/demos/3dsheart/trunk/3dsheart.asm b/programs/demos/3dsheart/trunk/3dsheart.asm index 93b5728992..e8290ae762 100644 --- a/programs/demos/3dsheart/trunk/3dsheart.asm +++ b/programs/demos/3dsheart/trunk/3dsheart.asm @@ -1633,7 +1633,7 @@ draw_window: ; ROTARY LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12)*65536+28 ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelrot ; pointer to text beginning mov esi,labelrotend-labelrot ; text length int 0x40 @@ -1648,7 +1648,7 @@ draw_window: ; DRAW MODE LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12)*65536+28+15 ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labeldrmod ; pointer to text beginning mov esi,labeldrmodend-labeldrmod ; text length int 0x40 @@ -1663,7 +1663,7 @@ draw_window: ; SPEED MODE LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12)*65536+(28+15*2) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelspeedmod ; pointer to text beginning mov esi,labelspeedmodend-labelspeedmod ; text length int 0x40 @@ -1678,7 +1678,7 @@ draw_window: ; SCALE- MODE LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12)*65536+(28+15*3) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelzoomout ; pointer to text beginning mov esi,labelzoomoutend-labelzoomout ; text length int 0x40 @@ -1693,14 +1693,14 @@ draw_window: ; SCALE+ MODE LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12)*65536+(28+15*4) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelzoomin ; pointer to text beginning mov esi,labelzoominend-labelzoomin ; text length int 0x40 ; ADD VECTOR LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12)*65536+(28+15*5) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelvector ; pointer to text beginning mov esi,labelvectorend-labelvector ; text length int 0x40 @@ -1714,7 +1714,7 @@ draw_window: ;VECTOR Y- LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12+20)*65536+(28+15*6) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelyminus ; pointer to text beginning mov esi,labelyminusend-labelyminus ; text length int 0x40 @@ -1728,7 +1728,7 @@ draw_window: ;VECTOR Z+ LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12+41)*65536+(28+15*6) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelzplus ; pointer to text beginning mov esi,labelzplusend-labelzplus ; text length int 0x40 @@ -1742,7 +1742,7 @@ draw_window: ;VECTOR x- LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12)*65536+(28+15*7) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelxminus ; pointer to text beginning mov esi,labelxminusend-labelxminus ; text length int 0x40 @@ -1756,7 +1756,7 @@ draw_window: ;VECTOR x+ LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12+41)*65536+(28+15*7) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelxplus ; pointer to text beginning mov esi,labelxplusend-labelxplus ; text length int 0x40 @@ -1770,7 +1770,7 @@ draw_window: ;VECTOR z- LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12)*65536+(28+15*8) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelzminus ; pointer to text beginning mov esi,labelzminusend-labelzminus ; text length int 0x40 @@ -1784,14 +1784,14 @@ draw_window: ;VECTOR Y+ LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12+20)*65536+(28+15*8) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelyplus ; pointer to text beginning mov esi,labelyplusend-labelyplus ; text length int 0x40 ; LEAD COLOR LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12)*65536+(28+15*9) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelmaincolor ; pointer to text beginning mov esi,labelmaincolorend-labelmaincolor ; text length int 0x40 @@ -1806,7 +1806,7 @@ draw_window: ;RED+ LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12)*65536+(28+15*10) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelredplus ; pointer to text beginning mov esi,labelredplusend-labelredplus ; text length int 0x40 @@ -1820,7 +1820,7 @@ draw_window: ;GREEN+ LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12+20)*65536+(28+15*10) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelgreenplus ; pointer to text beginning mov esi,labelgreenplusend-labelgreenplus ; text length int 0x40 @@ -1834,7 +1834,7 @@ draw_window: ;BLUE+ LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12+41)*65536+(28+15*10) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelblueplus ; pointer to text beginning mov esi,labelblueplusend-labelblueplus ; text length int 0x40 @@ -1848,7 +1848,7 @@ draw_window: ;RED- LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12)*65536+(28+15*11) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelredminus ; pointer to text beginning mov esi,labelredminusend-labelredminus ; text length int 0x40 @@ -1862,7 +1862,7 @@ draw_window: ;GREEN- LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12+20)*65536+(28+15*11) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelgreenminus ; pointer to text beginning mov esi,labelgreenminusend-labelgreenminus ; text length int 0x40 @@ -1876,14 +1876,14 @@ draw_window: ;BLUE- LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12+41)*65536+(28+15*11) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelblueminus ; pointer to text beginning mov esi,labelblueminusend-labelblueminus ; text length int 0x40 ; Catmull LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12)*65536+(28+15*12) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelcatmullmod ; pointer to text beginning mov esi,labelcatmullmodend-labelcatmullmod ; text length int 0x40 @@ -1897,7 +1897,7 @@ draw_window: ; on/off LABEL mov eax,4 ; function 4 : write text to window mov ebx,(SIZE_X+12)*65536+(28+15*13) ; [x start] *65536 + [y start] - mov ecx,0x20ddeeff ; font 1 & color ( 0xF0RRGGBB ) + mov ecx,0x00ddeeff ; font 1 & color ( 0xF0RRGGBB ) mov edx,labelonoff ; pointer to text beginning mov esi,labelonoffend-labelonoff ; text length int 0x40