ace-dent/kolibrios-gitea
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

demos/3d/flatwav: small update, add to ISO, fix RUS menu.dat

Browse Source 
git-svn-id: svn://kolibrios.org@7930 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2020-05-16 14:59:32 +00:00
parent 6ac952ed64
commit 1a76473439
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/rus/settings/menu.dat
View File

@ -33,7 +33,6 @@ UnvWater /sys/demos/unvwater
Ray tracing /sys/3d/ray Ray tracing /sys/3d/ray
<EFBFBD>à®á¬®âà騪 3DS /sys/3d/view3ds <EFBFBD>à®á¬®âà騪 3DS /sys/3d/view3ds
˜¥áâ¥àñ­ª¨ /sys/3d/gears ˜¥áâ¥àñ­ª¨ /sys/3d/gears
FlatWave /sys/3d/flatwav
3D-‚®«­ë /sys/3d/3dwav 3D-‚®«­ë /sys/3d/3dwav
#3 **** ƒà ä¨ª  **** #3 **** ƒà ä¨ª  ****
<EFBFBD>à®á¬®âà ä®â® KIV /sys/media/kiv <EFBFBD>à®á¬®âà ä®â® KIV /sys/media/kiv

6
programs/cmm/lib/collection.h
View File

@ -100,6 +100,7 @@ struct collection_int
void alloc(); void alloc();
void add(); void add();
dword get(); dword get();
dword len();
dword get_last(); dword get_last();
void pop(); void pop();
void drop(); void drop();
@ -127,6 +128,11 @@ struct collection_int
return ESDWORD[pos * sizeof(dword) + buf]; return ESDWORD[pos * sizeof(dword) + buf];
} }
:dword collection_int::len(dword pos) {
if (pos<0) || (pos+1>=count) return 0;
return get(pos+1) - get(pos);
}
:dword collection_int::get_last() { :dword collection_int::get_last() {
return get(count-1); return get(count-1);
} }

32
programs/demos/flatwav/trunk/FLATWAV.ASM
View File

@ -681,26 +681,28 @@ draw_window:
; DRAW WINDOW ; DRAW WINDOW
mov eax,0 ; function 0 : define and draw window mov eax,0 ; function 0 : define and draw window
mov ebx,120*65536+SIZE_X+20 ; [x start] *65536 + [x size] mov ebx,120*65536+SIZE_X+20 ; [x start] *65536 + [x size]
mov ecx,120*65536+SIZE_Y+45 ; [y start] *65536 + [y size] mov ecx,120*65536+SIZE_Y+55 ; [y start] *65536 + [y size]
mov edx,0x34000000 ; color of work area RRGGBB,8->color gl mov edx,0x34000000 ; color of work area RRGGBB,8->color gl
;mov esi,0x805080d0 ; color of grab bar RRGGBB,8->color gl mov edi,win_title ; color of frames RRGGBB
mov edi,labelt ; color of frames RRGGBB
int 0x40 int 0x40
; flag color button ; flag color button
mov eax,8 ; function 8 : define and draw button mov eax,8 ; function 8 : define and draw button
mov ebx,(SIZE_X-30)*65536+20 ; [x start] *65536 + [x size] mov ebx,(SIZE_X-52)*65536+40 ; [x start] *65536 + [x size]
mov ecx,5*65536+12 ; [y start] *65536 + [y size]
mov edx,2 ; button id
mov esi,0x555555 ; button color RRGGBB
int 0x40
; spped button
mov eax,8 ; function 8 : define and draw button
mov ebx,(SIZE_X-60)*65536+20 ; [x start] *65536 + [x size]
mov ecx,5*65536+12 ; [y start] *65536 + [y size] mov ecx,5*65536+12 ; [y start] *65536 + [y size]
mov edx,3 ; button id mov edx,3 ; button id
mov esi,0x555555 ; button color RRGGBB mov esi,0x888888 ; button color RRGGBB
int 0x40 int 0x40
; speed button
sub ebx,48*65536 ; [x start] *65536 + [x size]
dec edx ; button id
int 0x40
mov eax, 4
mov ebx, (SIZE_X-100+6)*65536+8
mov ecx, 0x80EEEeee
mov edx, btn_title
int 0x40
mov eax,12 ; function 12:tell os about windowdraw mov eax,12 ; function 12:tell os about windowdraw
mov ebx,2 ; 2, end of draw mov ebx,2 ; 2, end of draw
@ -731,9 +733,9 @@ dw 38,39,29
labelt: win_title db '3d wavy rotaring area',0
db '3d wavy rotaring area',0 btn_title db 'Color Speed',0
labellen:
sinbeta rd 1 sinbeta rd 1
cosbeta rd 1 cosbeta rd 1
singamma rd 1 singamma rd 1

2
programs/demos/flatwav/trunk/Tupfile.lua
View File

@ -1,2 +1,2 @@
if tup.getconfig("NO_FASM") ~= "" then return end if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("FLATWAV.ASM", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "FLATWAV") tup.rule("FLATWAV.ASM", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "flatwav")