KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

function 'buf2d_line_sm' - fix error when the line is 45 degrees

Browse Source 
git-svn-id: svn://kolibrios.org@9520 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA
2021-12-28 21:57:16 +00:00
parent 130b0311ad
commit c5dc86cc2c
4 changed files with 74 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
programs/develop/libraries/buf2d/trunk/examples/e5_lines_sm.asm
View File

@@ -13,6 +13,8 @@ include '../../../../../dll.inc'
buf2d_l equ word[edi+4] ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᫥<><E1ABA5>
buf2d_t equ word[edi+6] ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᢥ<><E1A2A5><EFBFBD>
buf2d_w equ dword[edi+8]
buf2d_h equ dword[edi+12]
buf2d_color equ dword[edi+16] ;梥<> 䮭<> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
align 4
@@ -21,7 +23,7 @@ start:
cmp eax,-1
jz button.exit
mcall 40,0x27
mcall SF_SET_EVENTS_MASK,0xC0000027
stdcall [buf2d_create], buf_0 ;ᮧ<><E1AEA7><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
;<3B><><EFBFBD>㥬 <20><>ࢮ<EFBFBD><E0A2AE>砫<EFBFBD><E7A0AB><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
stdcall [buf2d_filled_rect_by_size], buf_0, 100-50,70-25, 100,50, 0xffffff ;<3B><><EFBFBD>㥬 <20><>אַ㣮<EFACAE>쭨<EFBFBD>
@@ -34,7 +36,7 @@ red_win:
align 4
still:
mcall 10
mcall SF_WAIT_EVENT
cmp al,1 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
jz red_win
cmp al,2
@@ -48,21 +50,21 @@ still:
align 4
draw_window:
pushad
mcall 12,1
mcall SF_REDRAW,SSF_BEGIN_DRAW
;mov edx,0x32000000
mov edx,0x33000000
mcall 0,(50 shl 16)+330,(30 shl 16)+275,,,caption
mcall SF_CREATE_WINDOW,(50 shl 16)+330,(30 shl 16)+275,,,caption
stdcall [buf2d_draw], buf_0
mcall 12,2
mcall SF_REDRAW,SSF_END_DRAW
popad
ret
align 4
key:
mcall 2
mcall SF_GET_KEY
cmp ah,27 ;Esc
je button.exit
@@ -71,26 +73,30 @@ key:
align 4
button:
mcall 17 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>⮩ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mcall SF_GET_BUTTON
cmp ah,1
jne still
.exit:
stdcall [buf2d_delete],buf_0 ;㤠<>塞 <20><><EFBFBD><EFBFBD><EFBFBD>
mcall -1 ;<3B><>室 <20><> <20>ணࠬ<E0AEA3><E0A0AC>
mcall SF_TERMINATE_PROCESS
align 4
mouse:
;<3B><>ࠡ<EFBFBD><E0A0A1>뢠<EFBFBD><EBA2A0> <20><><EFBFBD><EFBFBD> ।<><E0A5A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mcall 37,2 ;get mouse buttons
mcall SF_MOUSE_GET,SSF_BUTTON
cmp al,1
jne @f
mcall 37,1 ;get mouse coords
mcall SF_MOUSE_GET,SSF_WINDOW_POSITION
mov ebx,eax
shr ebx,16 ;<3B> eax <20><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> 'x'
and eax,0xffff ;<3B> eax <20><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> 'y'
mov edi,buf_0
sub ax,buf2d_t ;ᤢ<><E1A4A2><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>뢠<EFBFBD> ᬥ饭<E1ACA5><E9A5AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
cmp eax,buf2d_h
jge @f
sub bx,buf2d_l
cmp ebx,buf2d_w
jge @f
;<3B><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>⨨
stdcall [buf2d_clear], edi, buf2d_color ;<3B><><EFBFBD>頥<EFBFBD> <20><>࠭ <20><> <20>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD>
@@ -164,6 +170,7 @@ system_path db '/sys/lib/'
lib0_name db 'buf2d.obj',0
;--------------------------------------------------
align 16
i_end: ;<3B><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
rb 1024
stacktop:

118
programs/develop/libraries/buf2d/trunk/fun_draw.inc
View File

@@ -5,7 +5,7 @@
align 16
proc buf_draw_buf, buf_struc:dword
pushad
mov edi,dword[buf_struc]
mov edi,[buf_struc]
cmp buf2d_bits,24
jne .error
mov eax,7
@@ -226,7 +226,7 @@ endp
align 4
proc buf_clear, buf_struc:dword, color:dword ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD>⪠ <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 梥⮬
pushad
mov edi,dword[buf_struc]
mov edi,[buf_struc]
mov ecx,buf2d_w
mov ebx,buf2d_h
@@ -275,15 +275,14 @@ locals
napravl db ?
endl
pushad
mov eax,dword[coord_x1]
sub eax,dword[coord_x0]
mov eax,[coord_x1]
sub eax,[coord_x0]
bt eax,31
jae @f
neg eax
inc eax
@@:
mov ebx,dword[coord_y1]
sub ebx,dword[coord_y0]
mov ebx,[coord_y1]
sub ebx,[coord_y0]
jnz @f
;<EFBFBD>᫨ <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>ਧ<EFBFBD><EFBFBD>⠫쭠<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> y0=y1
stdcall buf_line_h, [buf_struc], [coord_x0], [coord_y0], [coord_x1], [color]
@@ -292,9 +291,8 @@ endl
bt ebx,31
jae @f
neg ebx
inc ebx
@@:
mov edx,dword[color]
mov edx,[color]
mov [napravl],byte 0 ;bool steep=false
cmp eax,ebx
@@ -315,15 +313,15 @@ endl
; int error ebp-6
; int ystep ebp-8
mov eax,dword[coord_y0]
mov esi,dword[coord_y1]
mov eax,[coord_y0]
mov esi,[coord_y1]
sub esi,eax ;deltax = y1-y0
mov ebx,esi
shr ebx,1
mov [loc_1],ebx ;error = deltax/2
mov eax,dword[coord_x0]
mov edi,dword[coord_x1]
mov edi,[coord_x1]
mov [loc_2],dword -1 ;ystep = -1
cmp eax,edi ;if (x0<x1) ystep = 1;
jge @f
@@ -334,7 +332,6 @@ endl
bts edi,31
jae @f
neg edi
inc edi
@@:
and edi,0x7fffffff ;deltay = abs(x1-x0)
@@ -399,15 +396,18 @@ locals
napravl db ?
endl
pushad
mov eax,dword[coord_x1]
sub eax,dword[coord_x0]
mov eax,[coord_x1]
sub eax,[coord_x0]
jnz @f
stdcall buf_line_brs, [buf_struc], [coord_x0], [coord_y0], [coord_x1], [coord_y1], [color] ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |
jmp .coord_end
@@:
bt eax,31
jae @f
neg eax
inc eax
@@:
mov ebx,dword[coord_y1]
sub ebx,dword[coord_y0]
mov ebx,[coord_y1]
sub ebx,[coord_y0]
jnz @f
;<EFBFBD>᫨ <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>ਧ<EFBFBD><EFBFBD>⠫쭠<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> y0=y1
stdcall buf_line_h, [buf_struc], [coord_x0], [coord_y0], [coord_x1], [color]
@@ -416,9 +416,8 @@ endl
bt ebx,31
jae @f
neg ebx
inc ebx
@@:
mov edx,dword[color]
mov edx,[color]
mov [napravl],byte 0 ;bool steep=false
cmp eax,ebx
@@ -427,8 +426,8 @@ endl
swap dword[coord_x0],dword[coord_y0] ;swap(x0, y0);
swap dword[coord_x1],dword[coord_y1] ;swap(x1, y1);
@@:
mov eax,dword[coord_y0] ;x0
cmp eax,dword[coord_y1] ;if(x0>x1)
mov eax,[coord_y0] ;x0
cmp eax,[coord_y1] ;if(x0>x1)
jle @f
swap dword[coord_y0],dword[coord_y1] ;swap(x0, x1);
swap dword[coord_x0],dword[coord_x1] ;swap(y0, y1);
@@ -439,15 +438,15 @@ endl
; int error ebp-6
; int ystep ebp-8
mov eax,dword[coord_y0]
mov esi,dword[coord_y1]
mov eax,[coord_y0]
mov esi,[coord_y1]
sub esi,eax ;deltax = y1-y0
mov ebx,esi
shr ebx,1
mov [loc_1],ebx ;error = deltax/2
mov eax,dword[coord_x0]
mov edi,dword[coord_x1]
mov eax,[coord_x0]
mov edi,[coord_x1]
mov [loc_2],dword -1 ;ystep = -1
cmp eax,edi ;if (x0<x1) ystep = 1;
jge @f
@@ -458,7 +457,6 @@ endl
bts edi,31
jae @f
neg edi
inc edi
@@:
and edi,0x7fffffff ;deltay = abs(x1-x0)
@@ -469,11 +467,11 @@ endl
cmp [napravl],0
jne .coord_yx
mov ebx,dword[coord_x0]
mov ecx,dword[coord_y0]
mov ebx,[coord_x0]
mov ecx,[coord_y0]
@@: ;for (x=x0 ; x<x1; x++) ;------------------------------------
cmp ecx,dword[coord_y1]
cmp ecx,[coord_y1]
jg @f ;jge ???
push eax
mov eax,esi
@@ -484,7 +482,7 @@ endl
stdcall draw_pixel_transp, [loc_1],esi
sub ebx,[loc_2]
sub dword[loc_1],eax ;error -= deltay
sub [loc_1],eax ;error -= deltay
cmp dword[loc_1],0 ;if(error<0)
jge .if0
add ebx,[loc_2] ;y += ystep
@@ -495,11 +493,11 @@ endl
@@:
jmp .coord_end
.coord_yx:
mov ebx,dword[coord_y0]
mov ecx,dword[coord_x0]
mov ebx,[coord_y0]
mov ecx,[coord_x0]
@@: ;for (x=x0 ; x<x1; x++) ;------------------------------------
cmp ebx,dword[coord_y1]
cmp ebx,[coord_y1]
jg @f ;jge ???
push eax
mov eax,esi
@@ -510,7 +508,7 @@ endl
stdcall draw_pixel_transp, [loc_1],esi
sub ecx,[loc_2]
sub dword[loc_1],eax ;error -= deltay
sub [loc_1],eax ;error -= deltay
cmp dword[loc_1],0 ;if(error<0)
jge .if1
add ecx,[loc_2] ;y += ystep
@@ -623,8 +621,8 @@ pushad
mov ecx,[w]
;cmp ecx,1
;jl .coord_end
cmp ecx,0
je .coord_end
or ecx,ecx
jz .coord_end
jg @f
add eax,ecx
inc eax
@@ -635,8 +633,8 @@ pushad
mov edx,[h]
;cmp edx,1
;jl .coord_end
cmp edx,0
je .coord_end
or edx,edx
jz .coord_end
jg @f
add ebx,edx
inc ebx
@@ -645,7 +643,7 @@ pushad
add edx,ebx
dec edx
mov esi,dword[color]
mov esi,[color]
stdcall buf_line_h, edi, eax, ebx, ecx, esi ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> -
stdcall buf_line_brs, edi, eax, ebx, eax, edx, esi ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |
stdcall buf_line_h, edi, eax, edx, ecx, esi ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> -
@@ -668,26 +666,24 @@ pushad
mov eax,[coord_x]
mov ebx,[coord_y]
mov edx,[w]
cmp edx,0
je .coord_end ;<EFBFBD>᫨ <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 0 <EFBFBD><EFBFBD><EFBFBD>ᥫ<EFBFBD><EFBFBD>
or edx,edx
jz .coord_end ;<EFBFBD>᫨ <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 0 <EFBFBD><EFBFBD><EFBFBD>ᥫ<EFBFBD><EFBFBD>
jg @f ;<EFBFBD>᫨ <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⥫쭠<EFBFBD>
add eax,edx
inc eax
neg edx ;<EFBFBD><EFBFBD>ਭ<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⥫쭮<EFBFBD>
;inc edx ;<EFBFBD><EFBFBD>祬<EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞 1-<EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD><EFBFBD> ࠡ<EFBFBD>⠥<EFBFBD> <EFBFBD><EFBFBD> <EFBFBD>ࠢ<EFBFBD><EFBFBD>쭮
@@:
add edx,eax
dec edx
mov ecx,[h]
cmp ecx,0
je .coord_end ;<EFBFBD>᫨ <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 0 <EFBFBD><EFBFBD><EFBFBD>ᥫ<EFBFBD><EFBFBD>
or ecx,ecx
jz .coord_end ;<EFBFBD>᫨ <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 0 <EFBFBD><EFBFBD><EFBFBD>ᥫ<EFBFBD><EFBFBD>
jg @f ;<EFBFBD>᫨ <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⥫쭠<EFBFBD>
add ebx,ecx ;ᤢ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>न<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>אַ㣮<EFBFBD>쭨<EFBFBD><EFBFBD>
inc ebx
neg ecx ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⥫쭮<EFBFBD>
;inc ecx ;<EFBFBD><EFBFBD>祬<EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞 1-<EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD><EFBFBD> ࠡ<EFBFBD>⠥<EFBFBD> <EFBFBD><EFBFBD> <EFBFBD>ࠢ<EFBFBD><EFBFBD>쭮
@@:
mov esi,dword[color]
mov esi,[color]
cld
@@:
stdcall buf_line_h, edi, eax, ebx, edx, esi ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> -
@@ -705,7 +701,7 @@ locals
po_y dd ?
endl
pushad
mov edi,dword[buf_struc]
mov edi,[buf_struc]
cmp buf2d_bits,8
je @f
cmp buf2d_bits,24
@@ -773,10 +769,10 @@ proc buf_flood_fill, buf_struc:dword, coord_x:dword, coord_y:dword, mode:dword,
cmp buf2d_bits,24
jne .end24
mov ebx,dword[coord_x]
mov ecx,dword[coord_y]
mov edx,dword[color_f]
mov esi,dword[color_b]
mov ebx,[coord_x]
mov ecx,[coord_y]
mov edx,[color_f]
mov esi,[color_b]
cmp dword[mode],1 ;<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᨬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> 'mode' <EFBFBD><EFBFBD>।<EFBFBD><EFBFBD>塞 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⬮<EFBFBD> <EFBFBD>㤥<EFBFBD> <EFBFBD><EFBFBD><EFBFBD>짮<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
je @f
@@ -903,10 +899,10 @@ buf_flood_fill_recurs_1:
;<EFBFBD>㭪<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>ᮢ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>窨
align 4
proc buf_set_pixel uses ebx ecx edx edi, buf_struc:dword, coord_x:dword, coord_y:dword, color:dword
mov edi,dword[buf_struc]
mov ebx,dword[coord_x]
mov ecx,dword[coord_y]
mov edx,dword[color]
mov edi,[buf_struc]
mov ebx,[coord_x]
mov ecx,[coord_y]
mov edx,[color]
call draw_pixel
ret
endp
@@ -916,7 +912,7 @@ endp
; <EFBFBD> <EFBFBD><EFBFBD><EFBFBD>砥 <EFBFBD>訡<EFBFBD><EFBFBD> eax = 0xffffffff
align 4
proc buf_get_pixel uses ebx ecx edi, buf_struc:dword, coord_x:dword, coord_y:dword
mov edi,dword[buf_struc]
mov edi,[buf_struc]
mov ebx,[coord_x]
mov ecx,[coord_y]
@@ -949,7 +945,7 @@ proc buf_convert_text_matrix, buf_struc:dword
c3 dw ?
endl
pushad
mov edi,dword[buf_struc]
mov edi,[buf_struc]
cmp buf2d_bits,8
jne .error0
mov ecx,buf2d_h
@@ -1003,7 +999,7 @@ proc buf_convert_text_matrix, buf_struc:dword
cmp word[c3],0
jg .c_3
mov edi,dword[buf_struc] ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD>஢<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <EFBFBD>᭮<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mov edi,[buf_struc] ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD>஢<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <EFBFBD>᭮<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mov edi,buf2d_data
mov esi,[tmp_mem]
mov ecx,ebx
@@ -1028,10 +1024,10 @@ proc buf_draw_text, buf_struc:dword, buf_t_matr:dword, text:dword, coord_x:dword
buf_s_matr buf_2d_header ? ;ebp-BUF_STRUCT_SIZE <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>쭠<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᨬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
endl
pushad
mov edi,dword[buf_struc]
mov edi,[buf_struc]
cmp buf2d_bits,24
jne .error2
mov edi,dword[buf_t_matr]
mov edi,[buf_t_matr]
cmp buf2d_bits,8
jne .error1
mov edx,buf2d_data