From e570d29f367b038d4f3a855d7b880d9146cef3ae Mon Sep 17 00:00:00 2001 From: Andrew Date: Sat, 31 May 2025 21:35:02 +0100 Subject: [PATCH] demos/tinyfrac: Post-SVN tidy - Move source code from `trunk` into root directory. - Update build files and ASM include paths. --- data/Tupfile.lua | 2 +- programs/build_all.bat | 2 +- .../demos/tinyfrac/{trunk => }/Tupfile.lua | 2 +- .../demos/tinyfrac/{trunk => }/build_en.bat | 0 .../demos/tinyfrac/{trunk => }/build_ru.bat | 0 .../demos/tinyfrac/{trunk => }/tinyfrac.asm | 25 +++++++++++-------- 6 files changed, 17 insertions(+), 14 deletions(-) rename programs/demos/tinyfrac/{trunk => }/Tupfile.lua (79%) rename programs/demos/tinyfrac/{trunk => }/build_en.bat (100%) rename programs/demos/tinyfrac/{trunk => }/build_ru.bat (100%) rename programs/demos/tinyfrac/{trunk => }/tinyfrac.asm (98%) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index f131d667c..65351b13e 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -461,7 +461,7 @@ tup.append_table(img_files, { {"DEMOS/MOVBACK", VAR_PROGS .. "/demos/movback/movback"}, {"DEMOS/PLASMA", VAR_PROGS .. "/demos/plasma/plasma"}, {"DEMOS/SPIRAL", VAR_PROGS .. "/demos/spiral/spiral"}, - {"DEMOS/TINYFRAC", VAR_PROGS .. "/demos/tinyfrac/trunk/tinyfrac"}, + {"DEMOS/TINYFRAC", VAR_PROGS .. "/demos/tinyfrac/tinyfrac"}, {"DEMOS/TRANTEST", VAR_PROGS .. "/demos/trantest/trunk/trantest"}, {"DEMOS/TUBE", VAR_PROGS .. "/demos/tube/tube"}, {"DEMOS/UNVWATER", VAR_PROGS .. "/demos/unvwater/unvwater"}, diff --git a/programs/build_all.bat b/programs/build_all.bat index 31fd9732f..543e417e8 100644 --- a/programs/build_all.bat +++ b/programs/build_all.bat @@ -221,7 +221,7 @@ fasm demos\magnify\trunk\magnify.asm %BIN%\magnify fasm demos\movback\trunk\movback.asm %BIN%\demos\movback fasm demos\plasma\trunk\plasma.asm %BIN%\demos\plasma fasm demos\timer\timer.asm %BIN%\demos\timer -fasm demos\tinyfrac\trunk\tinyfrac.asm %BIN%\demos\tinyfrac +fasm demos\tinyfrac\tinyfrac.asm %BIN%\demos\tinyfrac fasm demos\transp\trunk\transp.asm %BIN%\demos\transp fasm demos\trantest\trunk\trantest.asm %BIN%\demos\trantest fasm demos\tube\trunk\tube.asm %BIN%\demos\tube diff --git a/programs/demos/tinyfrac/trunk/Tupfile.lua b/programs/demos/tinyfrac/Tupfile.lua similarity index 79% rename from programs/demos/tinyfrac/trunk/Tupfile.lua rename to programs/demos/tinyfrac/Tupfile.lua index 9837b93ca..50fc2930e 100644 --- a/programs/demos/tinyfrac/trunk/Tupfile.lua +++ b/programs/demos/tinyfrac/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/demos/tinyfrac/trunk/build_en.bat b/programs/demos/tinyfrac/build_en.bat similarity index 100% rename from programs/demos/tinyfrac/trunk/build_en.bat rename to programs/demos/tinyfrac/build_en.bat diff --git a/programs/demos/tinyfrac/trunk/build_ru.bat b/programs/demos/tinyfrac/build_ru.bat similarity index 100% rename from programs/demos/tinyfrac/trunk/build_ru.bat rename to programs/demos/tinyfrac/build_ru.bat diff --git a/programs/demos/tinyfrac/trunk/tinyfrac.asm b/programs/demos/tinyfrac/tinyfrac.asm similarity index 98% rename from programs/demos/tinyfrac/trunk/tinyfrac.asm rename to programs/demos/tinyfrac/tinyfrac.asm index 6af4c18bf..8414a70a0 100644 --- a/programs/demos/tinyfrac/trunk/tinyfrac.asm +++ b/programs/demos/tinyfrac/tinyfrac.asm @@ -1,3 +1,6 @@ +; SPDX-License-Identifier: NOASSERTION +; + ; tinyfrac.asm ; ; teeny program displays the Mandelbrot set. @@ -82,7 +85,7 @@ use32 dd 0,0 include 'lang.inc' -include '..\..\..\macros.inc' +include '..\..\macros.inc' START: call draw_fractal @@ -173,39 +176,39 @@ still: call draw_fractal jmp still no_right: - + cmp al,19 ;'r' jne no_red mov ah,3 call colorize jmp still no_red: - + cmp al,34 ;'g' jne no_green mov ah,4 call colorize jmp still no_green: - + cmp al,48 ;'b' jne no_blue mov ah,5 call colorize jmp still no_blue: - + cmp al,17 ;'w' jne no_set_as_wallpaper mcall 15, 1, PIXWIDTH, PIXHEIGHT mcall 15, 4, 1 ;mode 1-tiled, 0-stretch mcall 15, 5, IMGBUF, 0, PIXWIDTH*3*PIXHEIGHT - mcall 15, 3 + mcall 15, 3 no_set_as_wallpaper: jmp still -colorize: +colorize: shr eax,8 sub eax,3 imul eax,8 @@ -392,13 +395,13 @@ scale db STARTSCALE draw_window: pusha mcall 12, 1 - + mcall 48, 4 ;get skin height lea ecx, [50*65536+PIXHEIGHT+4+eax] mcall 0,<50,PIXWIDTH+9>,,0x74000000,,header_txt ;draw window - + call put_image - + mcall 12, 2 popa ret @@ -425,4 +428,4 @@ STARTY dd 120 scaleaddy dd 120 scaleaddx dd 200 -I_END: \ No newline at end of file +I_END: