Commit 61dc9f3e authored by ROOL's avatar ROOL 🤖
Browse files

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'
parent a5eb5af3
......@@ -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
......
......@@ -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
......
No preview for this file type
/* (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"
......@@ -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",,"<ChangeFSI$Dir>.Template3d"
ELSE
SYS "Wimp_OpenTemplate",,"<ChangeFSI$Dir>.Templates"
ENDIF
SYS "Wimp_OpenTemplate",,"<ChangeFSI$Dir>.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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment