From 61dc9f3eecd7649bc75224653d17a2bd3da96a20 Mon Sep 17 00:00:00 2001 From: ROOL Date: Sat, 20 Feb 2021 17:57:13 +0000 Subject: [PATCH] Remove 2D templates, minor 16bpp improvements Detail: * Remove support for pre 'NewLook' 2D templates * Correct interactive help messages for square/rectangular sprite output (broken in ChangeFSI-1_63) * Distinguish between 4k/32k/64k modes when the output mode is the current mode Version 1.64. Tagged as 'ChangeFSI-1_64' --- Makefile | 2 -- UK/Messages | 7 ++++--- UK/Template3D,fec | Bin 7849 -> 0 bytes UK/Templates,fec | Bin 7173 -> 7849 bytes VersionNum | 24 +++++++++++------------- source/DesktopFE | 16 ++++++++-------- 6 files changed, 23 insertions(+), 26 deletions(-) delete mode 100644 UK/Template3D,fec diff --git a/Makefile b/Makefile index ea96a6e..352fba2 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,6 @@ FILES =\ ${DDIR}.btpc.HourOff\ ${DDIR}.btpc.!Run\ ${DDIR}.hpcdtoppm\ - ${LDIR}.Template3D\ ${LDIR}.Templates\ ${MSGS} \ ${DDIR}.djpeg.djpeg\ @@ -224,7 +223,6 @@ install: ${FILES} CPFDL ${DDIR} hpcdtoppm CPFDL ${DDIR} Messages CPFDL ${LDIR} Templates - CPFDL ${LDIR} Template3D CPFDL ${DDIR} ChangeFSI CPFDL ${DDIR} CFSIpng CPFDL ${DDIR} CFSIjpeg diff --git a/UK/Messages b/UK/Messages index 8636a60..e5d0b0d 100644 --- a/UK/Messages +++ b/UK/Messages @@ -79,10 +79,11 @@ Hproc?/Hproc??:This \w sets up special effects to perform on the source image. Hout16:\Screate colour sprites. Hout17:\Screate greyscale sprites. Hout18:\Screate a sprite for the current desktop mode. -Hout24:\Screate a sprite for the a numbered mode. +Hout24:\Screate a sprite for a numbered mode. Hout33:Enter a numbered Archimedes screen mode. -Hout3/Hout4/Hout5/Hout6/Hout7/Hout8:\Screate a sprite with the given number of colours, and square pixels. -Hout9/Hout10/Hout11/Hout12/Hout13/Hout14:\Screate a sprite with the given number of colours, and rectangular pixels. +Hout2/Hout3/Hout4/Hout5/Hout6/Hout7/Hout8/Hout9:\Screate a sprite with the given number of colours. +Hout10:\Screate a sprite with rectangular pixels. +Hout11:\Screate a sprite with square pixels. Hout20:This is the equivalent mode number based on the current selection. Hout15:\Screate a sprite using one of ChangeFSI's special colour matching options. Hout19:Choose from one of four colour matching options, depending on the output colours selected.|Mc: 2 or 4 colours|Md: 2, 16 or 256 colours|Mt: 2, 16 or 256 colours|Mr: 4, 16 or 256 colours diff --git a/UK/Template3D,fec b/UK/Template3D,fec deleted file mode 100644 index fcf2581a8d1d0fd7b26ba8728cf7dec13fe86b56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7849 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 diff --git a/VersionNum b/VersionNum index 3d92827..ce59e77 100644 --- a/VersionNum +++ b/VersionNum @@ -1,23 +1,21 @@ -/* (1.63) +/* (1.64) * * This file is automatically maintained by srccommit, do not edit manually. - * Last processed by srccommit version: 1.1. * */ -#define Module_MajorVersion_CMHG 1.63 -#define Module_MinorVersion_CMHG -#define Module_Date_CMHG 16 Nov 2018 +#define Module_MajorVersion_CMHG 1.64 +#define Module_MinorVersion_CMHG +#define Module_Date_CMHG 20 Feb 2021 -#define Module_MajorVersion "1.63" -#define Module_Version 163 +#define Module_MajorVersion "1.64" +#define Module_Version 164 #define Module_MinorVersion "" -#define Module_Date "16 Nov 2018" +#define Module_Date "20 Feb 2021" -#define Module_ApplicationDate "16-Nov-18" +#define Module_ApplicationDate "20-Feb-21" #define Module_ComponentName "ChangeFSI" -#define Module_ComponentPath "mixed/RiscOS/Sources/Apps/ChangeFSI" -#define Module_FullVersion "1.63" -#define Module_HelpVersion "1.63 (16 Nov 2018)" -#define Module_LibraryVersionInfo "1:63" +#define Module_FullVersion "1.64" +#define Module_HelpVersion "1.64 (20 Feb 2021)" +#define Module_LibraryVersionInfo "1:64" diff --git a/source/DesktopFE b/source/DesktopFE index 92dd173..e7bdaa7 100644 --- a/source/DesktopFE +++ b/source/DesktopFE @@ -88,12 +88,7 @@ IF task% THEN isopen%= FALSE lastm%= 0 z$= STRING$(12,CHR$13) - SYS "OS_Byte",161,&8C TO ,,f% - IF f% AND 1 THEN - SYS "Wimp_OpenTemplate",,".Template3d" - ELSE - SYS "Wimp_OpenTemplate",,".Templates" - ENDIF + SYS "Wimp_OpenTemplate",,".Templates" LOCAL ERROR ON ERROR SYS "Wimp_CloseTemplate":ERROR 0,REPORT$+" (code "+ STR$ERL+")" IF version%>=300 THEN @@ -1443,7 +1438,7 @@ ENDPROC : REM « » DEF FNdeducemode - LOCAL m,x,y + LOCAL n,m,f,x,y IF FNgeticonstate(output%,18) THEN REM Use current screen mode SYS &35,-1,9 TO ,,m:REM log2bpp @@ -1452,7 +1447,12 @@ DEF FNdeducemode SYS &35,-1,5 TO ,,y:REM yeigen x=180/(2^x) y=180/(2^y) - ="S"+ STR$(2^m)+","+ STR$x+","+ STR$y + IF m=4 THEN + SYS &35,-1,3 TO ,,n:REM ncolour + SYS &35,-1,0 TO ,,f:REM modeflags + IF n=4095 THEN f=4 ELSE IF n=65535 AND (f AND 128)=0 THEN f=1 ELSE f=0 + ENDIF + ="S"+ STR$((2^m)-f)+","+ STR$x+","+ STR$y ELSE = STR$MODE ENDIF -- GitLab