5 Commits

Author SHA1 Message Date
9357a21169 Plasma: Fix code style and added support for window resizing
All checks were successful
Build system / Check kernel codestyle (pull_request) Successful in 23s
Build system / Build (pull_request) Successful in 5m0s
2025-03-15 23:02:16 +01:00
75e732a437 Apps/plasma: Deleted trunk dir. Files moved 2025-03-15 23:02:16 +01:00
afd07534ab Apps/fire: Improved code style and readability 2025-03-15 22:31:23 +01:00
20aba254bc Apps/firework: Added support for window resizing
All checks were successful
Build system / Check kernel codestyle (pull_request) Successful in 32s
Build system / Build (pull_request) Successful in 5m36s
2025-03-15 22:35:09 +02:00
fbd99c82a4 Apps/firework: Improved code style and readability 2025-03-15 19:48:49 +02:00
5 changed files with 236 additions and 194 deletions

View File

@@ -1,82 +1,60 @@
;
; FIRE for MENUET - Compile with FASM
; Fire for Kolibri OS - Compile with FASM
;
use32
org 0
db 'MENUET01' ; 8 byte id
dd 1 ; header version
dd START ; program start
dd image_end ; image size
dd mem_end ; reguired amount of memory
dd stacktop
dd 0,0 ; no parameters, no path
org 0x0
db 'MENUET01' ; 8 byte id
dd 1 ; header version
dd START ; program start
dd I_END ; image size
dd mem_end ; reguired amount of memory
dd mem_end
dd 0,0 ; no parameters, no path
include '..\..\macros.inc'
include '..\..\KOSfuncs.inc'
Screen_W equ 480
include '..\..\..\macros.inc'
START:
red:
; ************************************************
; ********* WINDOW DEFINITIONS AND DRAW **********
; ************************************************
draw_window:
mov eax,12 ; tell os about redraw
mov ebx,1
mcall
mcall SF_REDRAW, SSF_BEGIN_DRAW
xor eax,eax ; define and draw window
mov ebx,100*65536+321
mov ecx,70*65536+222
mov edx,0x01000000
mov esi,0x00000000
mov edi,0x00000000
mcall
mcall SF_CREATE_WINDOW,<100,Screen_W+1>,<70,222>,0x01000000,0,0
mcall 13,0*65536+321,0*65536+30,0
mcall ,0*65536+1 ,0*65536+222
mcall ,321*65536+1,0*65536+223
mcall ,0*65536+321,222*65536+1
mcall SF_DRAW_RECT,<0,Screen_W+1>,<0,30>,0
mcall ,<0,1>,<0,222>
mcall ,<Screen_W+1,1>,<0,223>
mcall ,<0,Screen_W+1>,<222,1>
mcall SF_DRAW_TEXT,<(Screen_W-108)/2,8>,dword 0x00FFFFFF,text,textlen-text
mov al,4 ; 'FIRE FOR KOLIBRI'
mov ebx,106*65536+8
mov ecx,dword 0x00FFFFFF
mov edx,text
mov esi,textlen-text
mcall
mcall SF_DEFINE_BUTTON,<(Screen_W+1-19),12>,<5,12>,1,0x009a0000
mov al,8
mov ebx,(321-19)*65536+12 ; button start x & size
mov ecx,5*65536+12 ; button start y & size
mov edx,1 ; button number
mov esi,0x009a0000
mcall
mov ebx,ecx ;5*65536+12
inc edx
mcall
mov ebx,ecx ;5*65536+12
inc edx
mcall
mcall ,<18,12>
mov ebx,18*65536+12
inc edx
mcall
mcall ,<31,12>
mov ebx,31*65536+12
inc edx
mcall
mov al,12 ; tell os about redraw end
mov ebx,2
mcall
mcall SF_REDRAW, SSF_END_DRAW
sta: ; calculate fire image
mov esi, FireScreen+0x2300-80
mov ecx, 80
mov esi, FireScreen.end+Screen_W*3-Screen_W/4
mov ecx, Screen_W/4
mov eax, [FireSeed]
NEWLINE:
@@ -89,7 +67,7 @@ sta: ; calculate fire image
mov [FireSeed], eax
mov ecx, 0x2300-80
mov ecx, (Screen_W*200)/8+Screen_W*3-Screen_W/4
sub esi, ecx
xor edx, edx
xor eax, eax
@@ -103,7 +81,7 @@ sta: ; calculate fire image
add eax, edx
mov dl, [esi]
add eax, edx
mov dl, [esi + 80]
mov dl, [esi + Screen_W/4]
jmp typedone
notype1:
@@ -114,7 +92,7 @@ sta: ; calculate fire image
; mov dl, [esi - 2]
; add eax, edx
lea eax, [eax + edx*2]
mov dl, [esi + 78]
mov dl, [esi + Screen_W/4-2]
; notype2:
; type 2 is never used
@@ -124,7 +102,7 @@ sta: ; calculate fire image
; add eax, edx
; mov dl, [esi]
; add eax, edx
; mov dl, [esi + 80]
; mov dl, [esi + Screen_W/4]
; notype3:
typedone:
@@ -135,12 +113,10 @@ typedone:
ZERO:
mov [esi - 81], al
mov [esi - Screen_W/4-1], al
loop FIRELOOP
mov al, 5 ; in this moment always high 24 bits of eax are zero!
mov ebx,[delay]
mcall
mcall SF_SLEEP,[delay]
inc [calc]
cmp [calc], byte 2
@@ -169,7 +145,7 @@ typedone:
mov [edi+3],ecx
mov [edi+6],ecx
mov [edi+9],cx
lea ebx, [edi+320*3]
lea ebx, [edi+Screen_W*3]
mov [ebx+0],ecx
mov [ebx+3],ecx
mov [ebx+6],ecx
@@ -177,50 +153,43 @@ typedone:
add edi,12
inc edx
cmp edx,80
cmp edx,Screen_W/4
jnz nnl
xor edx,edx
add edi,320*3
add edi,Screen_W*3
nnl:
cmp esi,FireScreen+8000; 0x2000
cmp esi,FireScreen.end
jnz newc
mov al,7 ; display image
; high 24 bits of eax are zero!
pop ebx
mov ecx,4*80*65536+200
mov edx,1*65536+22
mcall
mcall SF_PUT_IMAGE,,<Screen_W,200>,<1,22>
nodrw:
mov eax,11 ; check if os wants to talk to us
mcall
mcall SF_CHECK_EVENT ; check if os wants to talk to us
dec eax
jz red
jz draw_window
cmp al, 3-1
jnz nob4
button: ; get button id
mov al,17
mcall
mcall SF_GET_BUTTON
shr eax, 8
dec eax
jnz noclose
or eax,-1 ; close this program
mcall
noclose:
jnz @f
mcall SF_TERMINATE_PROCESS ; close this program
@@:
dec eax ; change fire type
jnz nob2
jnz @f
xor [type], 1
nob2:
@@:
dec eax ; change delay
jnz nob3
jnz @f
xor [delay], 1
nob3:
@@:
dec eax ; change color
jnz nob4
@@ -233,7 +202,7 @@ typedone:
fcok:
mov [fcolor],eax
mov edi,ImageData
mov ecx,(320*600)/4
mov ecx,(Screen_W*200*3)/4
xor eax,eax
rep stosd
@@ -246,19 +215,23 @@ fcolor dd 2
xx db 'x'
type db 0
calc db 0
delay dd 0
delay dd 1
FireSeed dd 0x1234
text: db 'FIRE FOR KOLIBRI'
text: db 'Fire for Kolibri'
textlen:
I_END:
align 4
image_end:
FireScreen:
rb 0x2300
rb (Screen_W*200)/8 ;wisible fire
.end:
rb Screen_W*3 ;hidden fire (need for generation)
ImageData:
rb 320*200*3
rb Screen_W*200*3
; stack
align 512
rb 512
align 512
rb 512
stacktop:
mem_end:

View File

@@ -1,2 +0,0 @@
@fasm fire.asm fire
@pause

View File

@@ -1,6 +1,9 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; SPDX-License-Identifier: GPL-2.0-only
; A firework demo
; Programmed by Yaniv LEVIATHAN
; Copyright (C) 2010-2025 KolibriOS team
;
; Initially ðrogrammed by Yaniv Leviathan
; http://yaniv.leviathanonline.com
; Converted to DexOS, By Dex
; Converted to KolibriOS, By Asper
@@ -11,19 +14,24 @@
; optionally AVX, AVX2, AVX512
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
use32
org 0x0
org 0
db 'MENUET01' ; 8 byte id
dd 0x01 ; version
dd 1 ; version
dd STARTAPP ; program start
dd I_END ; program image size
dd E_END ; required amount of memory
dd stacktop ; reserved=no extended header
dd 0, 0
include '../../../macros.inc'
SCREEN_WIDTH = 320
SCREEN_HEIGHT = 200
include '../../macros.inc'
include '../../KOSfuncs.inc'
SCREEN_WIDTH = 600 ;.. mod 8 == 0
Screen_W dd SCREEN_WIDTH
Screen_H dd 400
lost_bytes dd 0
SIMD equ SSE
SIMD_BYTES = 8
; SSE 8
@@ -46,41 +54,37 @@ PART_SIZE = 20
macro shade
{
local .lop
mov ecx, [Screen_H]
imul ecx, [Screen_W]
shr ecx, 3 ;ecx = Screen_W * Screen_H / SIMD_BYTES
mov edi, [buffer]
if SIMD eq SSE
mov ecx, SCREEN_WIDTH * SCREEN_HEIGHT / SIMD_BYTES
mov edi, buffer
movq mm1, qword [sub_mask]
.lop:
.lop:
movq mm0, [edi]
psubusb mm0, mm1
movq [edi], mm0
add edi, SIMD_BYTES
loop .lop
else if SIMD eq AVX
mov ecx, SCREEN_WIDTH * SCREEN_HEIGHT / SIMD_BYTES
mov edi, buffer
vmovdqa xmm1, xword [sub_mask]
.lop:
.lop:
vmovdqa xmm0, [edi]
vpsubusb xmm0, xmm0, xmm1
vmovdqa [edi], xmm0
add edi, SIMD_BYTES
loop .lop
else if SIMD eq AVX2
mov ecx, SCREEN_WIDTH * SCREEN_HEIGHT / SIMD_BYTES
mov edi, buffer
vmovdqa ymm1, yword [sub_mask]
.lop:
.lop:
vmovdqa ymm0, [edi]
vpsubusb ymm0, ymm0, ymm1
vmovdqa [edi], ymm0
add edi, SIMD_BYTES
loop .lop
else if SIMD eq AVX512
mov ecx, SCREEN_WIDTH * SCREEN_HEIGHT / SIMD_BYTES
mov edi, buffer
vmovdqa64 zmm1, zword [sub_mask]
.lop:
.lop:
vmovdqa64 zmm0, [edi]
vpsubusb zmm0, zmm0, zmm1
vmovdqa64 [edi], zmm0
@@ -91,10 +95,18 @@ end if
macro blur_prepare
{
mov ecx, (SCREEN_WIDTH * SCREEN_HEIGHT - SCREEN_WIDTH * 2 - SIMD_BYTES*2) / SIMD_BYTES
mov edi, buffer + SCREEN_WIDTH + SIMD_BYTES
mov ecx, [Screen_H]
dec ecx
dec ecx
imul ecx, [Screen_W]
sub ecx, SIMD_BYTES*2
shr ecx, 3 ;ecx = (Screen_W * (Screen_H - 2) - SIMD_BYTES*2) / SIMD_BYTES
mov edi, SIMD_BYTES
add edi, [buffer]
add edi, [Screen_W]
}
; eax = [Screen_W]
macro blur
{
local .lop
@@ -104,8 +116,10 @@ if SIMD eq SSE
movq mm1, [edi + 1]
movq mm2, [edi - 1]
movq mm3, mm0
movq mm4, [edi - SCREEN_WIDTH]
movq mm5, [edi + SCREEN_WIDTH]
neg eax
movq mm4, [edi + eax]
neg eax
movq mm5, [edi + eax]
pavgb mm0, mm1 ; mm0 = avg(cur,cur+1)
pavgb mm3, mm2 ; mm3 = avg(cur,cur-1)
@@ -120,11 +134,13 @@ else if SIMD eq AVX
.lop:
vmovdqa xmm0, [edi]
vmovdqa xmm1, xmm0
vmovdqa xmm2, [edi - SCREEN_WIDTH]
neg eax
vmovdqa xmm2, [edi + eax]
neg eax
vpavgb xmm0, xmm0, [edi + 1]
vpavgb xmm1, xmm1, [edi - 1]
vpavgb xmm2, xmm2, [edi + SCREEN_WIDTH]
vpavgb xmm2, xmm2, [edi + eax]
vpavgb xmm1, xmm1, xmm2
vpavgb xmm0, xmm0, xmm1
@@ -135,11 +151,13 @@ else if SIMD eq AVX2
.lop:
vmovdqa ymm0, [edi]
vmovdqa ymm1, ymm0
vmovdqa ymm2, [edi - SCREEN_WIDTH]
neg eax
vmovdqa ymm2, [edi + eax]
neg eax
vpavgb ymm0, ymm0, [edi + 1]
vpavgb ymm1, ymm1, [edi - 1]
vpavgb ymm2, ymm2, [edi + SCREEN_WIDTH]
vpavgb ymm2, ymm2, [edi + eax]
vpavgb ymm1, ymm1, ymm2
vpavgb ymm0, ymm0, ymm1
@@ -150,11 +168,13 @@ else if SIMD eq AVX512
.lop:
vmovdqa64 zmm0, [edi]
vmovdqa64 zmm1, zmm0
vmovdqa64 zmm2, [edi - SCREEN_WIDTH]
neg eax
vmovdqa64 zmm2, [edi + eax]
neg eax
vpavgb zmm0, zmm0, [edi + 1]
vpavgb zmm1, zmm1, [edi - 1]
vpavgb zmm2, zmm2, [edi + SCREEN_WIDTH]
vpavgb zmm2, zmm2, [edi + eax]
vpavgb zmm1, zmm1, zmm2
vpavgb zmm0, zmm0, zmm1
@@ -164,6 +184,7 @@ else if SIMD eq AVX512
end if
}
; eax = [Screen_W]
macro blur_right
{
local .lop
@@ -171,8 +192,8 @@ if SIMD eq SSE
.lop:
movq mm0, [edi]
movq mm1, [edi + 1]
movq mm2, [edi + SCREEN_WIDTH]
movq mm3, [edi + SCREEN_WIDTH + 1]
movq mm2, [edi + eax]
movq mm3, [edi + eax + 1]
pavgb mm0, mm1
pavgb mm3, mm2
pavgb mm0, mm3
@@ -182,30 +203,30 @@ if SIMD eq SSE
else if SIMD eq AVX
.lop:
vmovdqa xmm0, [edi]
vmovdqu xmm1, [edi + SCREEN_WIDTH + 1]
vpavgb xmm2, xmm0, [edi + 1]
vpavgb xmm3, xmm1, [edi + SCREEN_WIDTH]
vpavgb xmm4, xmm2, xmm3
vmovdqu xmm1, [edi + eax + 1]
vpavgb xmm2, xmm0, [edi + 1]
vpavgb xmm3, xmm1, [edi + eax]
vpavgb xmm4, xmm2, xmm3
vmovdqa [edi], xmm4
add edi, SIMD_BYTES
loop .lop
else if SIMD eq AVX2
.lop:
vmovdqa ymm0, [edi]
vmovdqu ymm1, [edi + SCREEN_WIDTH + 1]
vpavgb ymm2, ymm0, [edi + 1]
vpavgb ymm3, ymm1, [edi + SCREEN_WIDTH]
vpavgb ymm4, ymm2, ymm3
vmovdqu ymm1, [edi + eax + 1]
vpavgb ymm2, ymm0, [edi + 1]
vpavgb ymm3, ymm1, [edi + eax]
vpavgb ymm4, ymm2, ymm3
vmovdqa [edi], ymm4
add edi, SIMD_BYTES
loop .lop
else if SIMD eq AVX512
.lop:
vmovdqa64 zmm0, [edi]
vmovdqu64 zmm1, [edi + SCREEN_WIDTH + 1]
vmovdqu64 zmm1, [edi + eax + 1]
vpavgb zmm2, zmm0, [edi + 1]
vpavgb zmm3, zmm1, [edi + SCREEN_WIDTH]
vpavgb zmm4, zmm2, zmm3
vpavgb zmm3, zmm1, [edi + eax]
vpavgb zmm4, zmm2, zmm3
vmovdqa64 [edi], zmm4
add edi, SIMD_BYTES
loop .lop
@@ -217,12 +238,12 @@ STARTAPP:
init_palette:
mov edi, pal
xor eax, eax
red_loop:
@@:
stosd
stosd
add eax, 0x040000
and eax, 0xFFFFFF
jnz red_loop
jnz @b
mov eax, 63*4 SHL 16
@@:
@@ -231,11 +252,12 @@ red_loop:
add ax, 0x0404
jnc @b
;zero_buffer:
mov ecx, SCREEN_WIDTH * SCREEN_HEIGHT / 4
; mov edi, buffer
xor eax, eax
rep stosd
;init buffer
mcall SF_SYS_MISC,SSF_HEAP_INIT
mov ecx,[Screen_W]
imul ecx,[Screen_H]
mcall SF_SYS_MISC,SSF_MEM_ALLOC
mov [buffer],eax
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Main Functions
@@ -253,30 +275,63 @@ end virtual
jmp MAIN
align 4
OnResize:
mov ecx,[Screen_W]
imul ecx,[Screen_H]
;ecx = SCREEN_W*SCREEN_H
mcall SF_SYS_MISC,SSF_MEM_REALLOC,,[buffer]
ret
align 4
red:
mcall 9, proc_info, -1
x = 100
y = 70
xsize = SCREEN_WIDTH+9
ysize = SCREEN_HEIGHT+4
areacolor = 0x54224466
mov eax, 12 ; function 12:tell os about windowdraw
mov ebx, 1 ; 1, start of draw
int 0x40
mov eax, 48
mov ebx, 4
int 0x40
lea ecx, [(y SHL 16) + ysize + eax]
xor eax, eax ; function 0 : define and draw window
mov ebx, (x SHL 16) + xsize ; [x start] *65536 + [x size]
mov edx, areacolor ; color of work area RRGGBB
mov edi, window_title
int 0x40
mov eax, 12 ; end of redraw
mov ebx, 2
int 0x40
mcall SF_THREAD_INFO, proc_info, -1
areacolor = 0x53224466
mcall SF_REDRAW, SSF_BEGIN_DRAW
mcall SF_STYLE_SETTINGS, SSF_GET_SKIN_HEIGHT
add eax, 4
push eax ;for test resize
add eax, [Screen_H]
lea ecx, [(70 shl 16) + eax]
mov ebx, [Screen_W]
lea ebx, [(100 shl 16) + 9 + ebx]
mcall SF_CREATE_WINDOW,,, areacolor,, window_title
;test resize
pop eax
cmp dword[proc_info.box.height],0
je .resize_end
sub eax,[proc_info.box.height]
neg eax
cmp eax,[Screen_H]
je .end_h
cmp eax,32 ;min height
jge @f
mov eax,32
@@:
mov [Screen_H],eax
xor eax,eax
mov [Screen_W],eax
.end_h:
mov eax,[proc_info.box.width]
sub eax,9
mov [lost_bytes],eax
and eax,0xffff-(SIMD_BYTES-1)
cmp eax,[Screen_W]
je .resize_end
cmp eax,64 ;min width
jge @f
mov eax,64
@@:
mov [Screen_W],eax
call OnResize
.resize_end:
mcall SF_REDRAW, SSF_END_DRAW ; end of redraw
align 4
MAIN:
test [proc_info.wnd_state], 0x04
jnz still
@@ -291,11 +346,15 @@ MAIN:
cmp eax, 5
jb .new_particle
cmp eax, SCREEN_WIDTH - 5
mov edx, [Screen_W]
sub edx, 5
cmp eax, edx
jge .new_particle
cmp ebx, 5
jb .new_particle
cmp ebx, SCREEN_HEIGHT - 5
mov edx, [Screen_H]
sub edx, 5
cmp ebx, edx
jl .part_ok
.new_particle:
@@ -303,9 +362,11 @@ MAIN:
jmp .advance_particles
.part_ok:
imul edi, ebx, SCREEN_WIDTH
mov edi, ebx
imul edi, [Screen_W]
mov dl, [ebp+COLOR_OFFSET]
mov [buffer+eax+edi], dl
add eax,[buffer]
mov [eax+edi], dl
mov eax, [ebp+X_SPEED_OFFSET]
add [ebp+X_OFFSET], eax
@@ -324,6 +385,7 @@ MAIN:
shade
; jmp .copy_buffer_to_video
blur_prepare
mov eax, [Screen_W]
test dword [blur_right_flag] , 0x800000
jnz .do_blur_right
blur
@@ -339,36 +401,45 @@ MAIN:
.copy_buffer_to_video:
mcall 48, 4
lea edx, [(5 SHL 16) + eax]
mov eax, 65
mov ebx, buffer
mov ecx, (SCREEN_WIDTH SHL 16) + SCREEN_HEIGHT
push 8
pop esi
mov edi, pal
xor ebp, ebp
int 0x40
mcall SF_STYLE_SETTINGS, SSF_GET_SKIN_HEIGHT
lea edx, [(5 shl 16) + eax]
push 8
pop esi
xor ebp, ebp
mov ecx, [Screen_W]
shl ecx, 16
add ecx, [Screen_H]
mcall SF_PUT_IMAGE_EXT, [buffer],,,, pal
and [lost_bytes], SIMD_BYTES-1
jz still
mcall SF_STYLE_SETTINGS, SSF_GET_SKIN_HEIGHT
mov ecx, eax
shl ecx, 16
add ecx, [Screen_H]
mov ebx, [Screen_W]
add ebx, 5 ;left border
shl ebx, 16
add ebx, [lost_bytes]
xor edx, edx
mcall SF_DRAW_RECT
align 4
still:
mov eax, 11 ; Test if there is an event in the queue.
int 0x40
mcall SF_WAIT_EVENT_TIMEOUT, 1
dec eax ; redraw request ?
jz red
dec eax ; key in buffer ?
jz key
dec eax ; button in buffer ?
jz button
jmp MAIN
dec eax ; redraw request ?
jz red
dec eax ; key in buffer ?
jz key
dec eax ; button in buffer ?
jz button
jmp MAIN
align 4
key:
mov eax, 2
int 0x40
mcall SF_GET_KEY
; cmp ah, 1 ; Test Esc in Scan
; je close_app
cmp ah, 27 ; Test Esc in ASCII
@@ -378,8 +449,7 @@ key:
button:
; we have only one button, close
close_app:
mov eax, -1 ; close this program
int 0x40
mcall SF_TERMINATE_PROCESS
init_particle:
rdtsc
@@ -389,7 +459,7 @@ init_particle:
call rand
cdq
;xor dx, dx
mov ebx, SCREEN_WIDTH
mov ebx, [Screen_W]
div ebx
shl edx, 6
mov [4 + global_x], edx
@@ -397,7 +467,7 @@ init_particle:
call rand
cdq
;xor dx, dx
mov ebx, SCREEN_HEIGHT
mov ebx, [Screen_H]
div ebx
shl edx, 6
mov [4 + global_y], edx
@@ -444,7 +514,8 @@ proc_info process_information
align 16
pal rb 256 * 4
align SIMD_BYTES
buffer rb SCREEN_WIDTH * SCREEN_HEIGHT
E_END:
rd 0x200
buffer dd 0
align 4
rd 1024
stacktop:
E_END: