Apps/firework: Improved code style and readability

This commit is contained in:
2025-03-15 19:19:14 +02:00
parent 784b02b4a4
commit fbd99c82a4
4 changed files with 41 additions and 55 deletions

View File

@@ -456,7 +456,7 @@ tup.append_table(img_files, {
{"DEMOS/BCDCLK", VAR_PROGS .. "/demos/bcdclk/trunk/bcdclk"}, {"DEMOS/BCDCLK", VAR_PROGS .. "/demos/bcdclk/trunk/bcdclk"},
{"DEMOS/BUDHBROT", VAR_PROGS .. "/demos/buddhabrot/trunk/buddhabrot"}, {"DEMOS/BUDHBROT", VAR_PROGS .. "/demos/buddhabrot/trunk/buddhabrot"},
{"DEMOS/EYES", VAR_PROGS .. "/demos/eyes/trunk/eyes"}, {"DEMOS/EYES", VAR_PROGS .. "/demos/eyes/trunk/eyes"},
{"DEMOS/FIREWORK", VAR_PROGS .. "/demos/firework/trunk/firework"}, {"DEMOS/FIREWORK", VAR_PROGS .. "/demos/firework/firework"},
{"DEMOS/MOVBACK", VAR_PROGS .. "/demos/movback/trunk/movback"}, {"DEMOS/MOVBACK", VAR_PROGS .. "/demos/movback/trunk/movback"},
{"DEMOS/PLASMA", VAR_PROGS .. "/demos/plasma/trunk/plasma"}, {"DEMOS/PLASMA", VAR_PROGS .. "/demos/plasma/trunk/plasma"},
{"DEMOS/SPIRAL", VAR_PROGS .. "/demos/spiral/spiral"}, {"DEMOS/SPIRAL", VAR_PROGS .. "/demos/spiral/spiral"},

View File

@@ -0,0 +1,2 @@
@fasm.exe -m 16384 firework.asm firework.kex
pause

View File

@@ -1,6 +1,8 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; A firework demo ; A firework demo
; Programmed by Yaniv LEVIATHAN ; Copyright (C) 2010-2025 KolibriOS team
;
; Initially ðrogrammed by Yaniv Leviathan
; http://yaniv.leviathanonline.com ; http://yaniv.leviathanonline.com
; Converted to DexOS, By Dex ; Converted to DexOS, By Dex
; Converted to KolibriOS, By Asper ; Converted to KolibriOS, By Asper
@@ -21,9 +23,11 @@ use32
dd stacktop ; reserved=no extended header dd stacktop ; reserved=no extended header
dd 0, 0 dd 0, 0
include '../../../macros.inc' include '../../macros.inc'
SCREEN_WIDTH = 320 include '../../KOSfuncs.inc'
SCREEN_HEIGHT = 200
SCREEN_WIDTH = 600 ;.. mod 8 == 0
SCREEN_HEIGHT = 400
SIMD equ SSE SIMD equ SSE
SIMD_BYTES = 8 SIMD_BYTES = 8
; SSE 8 ; SSE 8
@@ -46,9 +50,9 @@ PART_SIZE = 20
macro shade macro shade
{ {
local .lop local .lop
if SIMD eq SSE
mov ecx, SCREEN_WIDTH * SCREEN_HEIGHT / SIMD_BYTES mov ecx, SCREEN_WIDTH * SCREEN_HEIGHT / SIMD_BYTES
mov edi, buffer mov edi, buffer
if SIMD eq SSE
movq mm1, qword [sub_mask] movq mm1, qword [sub_mask]
.lop: .lop:
movq mm0, [edi] movq mm0, [edi]
@@ -57,8 +61,6 @@ if SIMD eq SSE
add edi, SIMD_BYTES add edi, SIMD_BYTES
loop .lop loop .lop
else if SIMD eq AVX else if SIMD eq AVX
mov ecx, SCREEN_WIDTH * SCREEN_HEIGHT / SIMD_BYTES
mov edi, buffer
vmovdqa xmm1, xword [sub_mask] vmovdqa xmm1, xword [sub_mask]
.lop: .lop:
vmovdqa xmm0, [edi] vmovdqa xmm0, [edi]
@@ -67,8 +69,6 @@ else if SIMD eq AVX
add edi, SIMD_BYTES add edi, SIMD_BYTES
loop .lop loop .lop
else if SIMD eq AVX2 else if SIMD eq AVX2
mov ecx, SCREEN_WIDTH * SCREEN_HEIGHT / SIMD_BYTES
mov edi, buffer
vmovdqa ymm1, yword [sub_mask] vmovdqa ymm1, yword [sub_mask]
.lop: .lop:
vmovdqa ymm0, [edi] vmovdqa ymm0, [edi]
@@ -77,8 +77,6 @@ else if SIMD eq AVX2
add edi, SIMD_BYTES add edi, SIMD_BYTES
loop .lop loop .lop
else if SIMD eq AVX512 else if SIMD eq AVX512
mov ecx, SCREEN_WIDTH * SCREEN_HEIGHT / SIMD_BYTES
mov edi, buffer
vmovdqa64 zmm1, zword [sub_mask] vmovdqa64 zmm1, zword [sub_mask]
.lop: .lop:
vmovdqa64 zmm0, [edi] vmovdqa64 zmm0, [edi]
@@ -91,7 +89,7 @@ end if
macro blur_prepare macro blur_prepare
{ {
mov ecx, (SCREEN_WIDTH * SCREEN_HEIGHT - SCREEN_WIDTH * 2 - SIMD_BYTES*2) / SIMD_BYTES mov ecx, (SCREEN_WIDTH * (SCREEN_HEIGHT - 2) - SIMD_BYTES*2) / SIMD_BYTES
mov edi, buffer + SCREEN_WIDTH + SIMD_BYTES mov edi, buffer + SCREEN_WIDTH + SIMD_BYTES
} }
@@ -217,12 +215,12 @@ STARTAPP:
init_palette: init_palette:
mov edi, pal mov edi, pal
xor eax, eax xor eax, eax
red_loop: @@:
stosd stosd
stosd stosd
add eax, 0x040000 add eax, 0x040000
and eax, 0xFFFFFF and eax, 0xFFFFFF
jnz red_loop jnz @b
mov eax, 63*4 SHL 16 mov eax, 63*4 SHL 16
@@: @@:
@@ -254,29 +252,21 @@ end virtual
jmp MAIN jmp MAIN
align 4
red: red:
mcall 9, proc_info, -1 mcall SF_THREAD_INFO, proc_info, -1
x = 100 x = 100
y = 70 y = 70
xsize = SCREEN_WIDTH+9 xsize = SCREEN_WIDTH+9
ysize = SCREEN_HEIGHT+4 ysize = SCREEN_HEIGHT+4
areacolor = 0x54224466 areacolor = 0x54224466
mov eax, 12 ; function 12:tell os about windowdraw mcall SF_REDRAW, SSF_BEGIN_DRAW
mov ebx, 1 ; 1, start of draw mcall SF_STYLE_SETTINGS, SSF_GET_SKIN_HEIGHT
int 0x40
mov eax, 48
mov ebx, 4
int 0x40
lea ecx, [(y SHL 16) + ysize + eax] lea ecx, [(y SHL 16) + ysize + eax]
xor eax, eax ; function 0 : define and draw window mcall SF_CREATE_WINDOW, <x, xsize>,, areacolor,, window_title
mov ebx, (x SHL 16) + xsize ; [x start] *65536 + [x size] mcall SF_REDRAW, SSF_END_DRAW ; end of redraw
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
align 4
MAIN: MAIN:
test [proc_info.wnd_state], 0x04 test [proc_info.wnd_state], 0x04
jnz still jnz still
@@ -339,22 +329,17 @@ MAIN:
.copy_buffer_to_video: .copy_buffer_to_video:
mcall 48, 4 mcall SF_STYLE_SETTINGS, SSF_GET_SKIN_HEIGHT
lea edx, [(5 SHL 16) + eax] lea edx, [(5 shl 16) + eax]
mov eax, 65
mov ebx, buffer
mov ecx, (SCREEN_WIDTH SHL 16) + SCREEN_HEIGHT
push 8 push 8
pop esi pop esi
mov edi, pal
xor ebp, ebp xor ebp, ebp
int 0x40 mcall SF_PUT_IMAGE_EXT, buffer, (SCREEN_WIDTH SHL 16) + SCREEN_HEIGHT,,, pal
align 4
still: still:
mov eax, 11 ; Test if there is an event in the queue. mcall SF_WAIT_EVENT_TIMEOUT, 1
int 0x40
dec eax ; redraw request ? dec eax ; redraw request ?
jz red jz red
@@ -365,10 +350,9 @@ still:
jmp MAIN jmp MAIN
align 4
key: key:
mov eax, 2 mcall SF_GET_KEY
int 0x40
; cmp ah, 1 ; Test Esc in Scan ; cmp ah, 1 ; Test Esc in Scan
; je close_app ; je close_app
cmp ah, 27 ; Test Esc in ASCII cmp ah, 27 ; Test Esc in ASCII
@@ -378,8 +362,7 @@ key:
button: button:
; we have only one button, close ; we have only one button, close
close_app: close_app:
mov eax, -1 ; close this program mcall SF_TERMINATE_PROCESS
int 0x40
init_particle: init_particle:
rdtsc rdtsc
@@ -445,6 +428,7 @@ align 16
pal rb 256 * 4 pal rb 256 * 4
align SIMD_BYTES align SIMD_BYTES
buffer rb SCREEN_WIDTH * SCREEN_HEIGHT buffer rb SCREEN_WIDTH * SCREEN_HEIGHT
E_END: align 4
rd 0x200 rd 1024
stacktop: stacktop:
E_END: