From be75c40812c8f9ab4bb918ab320982e92b463f98 Mon Sep 17 00:00:00 2001 From: Scott Duensing Date: Tue, 8 Oct 2019 20:06:25 -0500 Subject: [PATCH] Updated for new blit routines. --- ansiterm.c | 4 ++-- build-IIgs.sh | 55 ++------------------------------------------- gamedata.dat | 2 +- joeyio.c | 6 ++--- main.c | 2 +- nowhere.vec | Bin 28 -> 128 bytes nowhere.vec.source | 6 ++--- thin.sta | Bin 32036 -> 130 bytes 8 files changed, 12 insertions(+), 63 deletions(-) diff --git a/ansiterm.c b/ansiterm.c index dbe6312..d21cff6 100644 --- a/ansiterm.c +++ b/ansiterm.c @@ -502,7 +502,7 @@ void termRenderCharacterAtCursor(byte c) { _screenBuffer[i].x = cx; _screenBuffer[i].y = cy; if (_cursor.y > _hiddenLines) { - jlDrawBlit8x8(_ansiFont, cx, cy, _cursor.x - 1 + _xoff, _cursor.y - 1 + _yoff); + jlDrawBlit8x8(jlStaSurfaceGet(_ansiFont), cx, cy, (_cursor.x - 1 + _xoff) * 8, (_cursor.y - 1 + _yoff) * 8); } } @@ -513,7 +513,7 @@ void termRepaint(void) { int y; for (y=_hiddenLines; y<_rows; y++) { for (x=0; x<_columns; x++) { - jlDrawBlit8x8(_ansiFont, _screenBuffer[i].x, _screenBuffer[i].y, x + _xoff, y + _yoff); + jlDrawBlit8x8(jlStaSurfaceGet(_ansiFont), _screenBuffer[i].x, _screenBuffer[i].y, (jint16)(x + _xoff) * 8, (jint16)(y + _yoff) * 8); i++; } } diff --git a/build-IIgs.sh b/build-IIgs.sh index 6e042e6..8e78780 100755 --- a/build-IIgs.sh +++ b/build-IIgs.sh @@ -1,59 +1,8 @@ #!/bin/bash -e PROJECT=ifengine -DATA=(thin.sta output.z8 gamedata.dat) +DATA=(thin.sta output.z8 gamedata.dat nowhere.vec) #SOURCE=(*.c *.h) SOURCE=() -# --- HERE BE DRAGONS --- - -TARGET=${JOEY}/sdks/iix/IIgs/out/${PROJECT} -GSTARGET=31:/out/${PROJECT} -AC=${JOEY}/sdks/iix/ac/ -IMPORT=/tmp/import.po - -if [ -d ${TARGET} ]; then - rm -rf ${TARGET} -fi -mkdir -p ${TARGET} - -rm JLSTATS || true -rm /tmp/import.po || true - -cp -f ${JOEY}/dist/joey.h . -CFILES=($(ls -1 *.c)) -OFILES="" -for F in "${CFILES[@]}"; do - O=${F%.*} - OFILES="${OFILES} ${GSTARGET}/${O}" - echo "Compiling ${F}..." - iix compile ${F} keep=${GSTARGET}/${O} -done -rm joey.h - -cp -f ${JOEY}/dist/IIgs/joeylib#b20000 ${JOEY}/sdks/iix/IIgs/Libraries/joeylib -iix chtyp -t lib ${JOEY}/sdks/iix/IIgs/Libraries/joeylib -iix -DKeepType=S16 link ${OFILES} 13:joeylib keep=${GSTARGET}/${PROJECT} - -${AC}/import.sh ${TARGET}/${PROJECT} S16 -for F in "${DATA[@]}"; do - ${AC}/import.sh ${F} BIN -done - -mkdir -p /tmp/IIgs/source -for S in "${SOURCE[@]}"; do - for F in `ls -1 ${S}`; do - tr "\n" "\r" < ${F} > /tmp/IIgs/source/${F} - ${AC}/import.sh /tmp/IIgs/source/${F} TXT - rm /tmp/IIgs/source/${F} - done -done - -if [ ! -z $1 ]; then - pushd ${JOEY}/sdks/iix/gsplus - ./gsplus -config IIgsTest.cfg || true - popd - echo "" - ${AC}/export.sh JLSTATS - cat JLSTATS -fi +. ${JOEY}/joeylib/joeylib/build-IIgs.helper.sh diff --git a/gamedata.dat b/gamedata.dat index 1d10dce..b48d5be 100644 --- a/gamedata.dat +++ b/gamedata.dat @@ -1,3 +1,3 @@ IF Engine Test Game -output.z8 +data/output.z8 thin.sta diff --git a/joeyio.c b/joeyio.c index 3c465b3..0f51977 100644 --- a/joeyio.c +++ b/joeyio.c @@ -118,7 +118,7 @@ void display_char(int c) { _displayMode = DISPLAY_MODE_GRAPHICS - 1; set_next_display_mode(); // Render the image. - jlVecDisplay(_vectorImage, x, y); + jlVecDisplay(_vectorImage, (jint16)x, (jint16)y); // Save it to the graphics page. jlStaCreate(_graphicsPage); } @@ -179,9 +179,9 @@ void initialize_screen(void) { // Also handled in main // Create initial empty graphics image. - jlDrawColor(0); + jlDrawColorSet(0); jlDrawClear(); - jlDrawColor(15); + jlDrawColorSet(15); jlDisplayPresent(); jlStaCreate(_graphicsPage); } diff --git a/main.c b/main.c index d82d4a9..1ac8cd5 100644 --- a/main.c +++ b/main.c @@ -106,7 +106,7 @@ int main(void) { char game[40]; char text[40]; - in = fopen("gamedata.dat", "rt"); + in = fopen("data/gamedata.dat", "rt"); if (in != NULL) { fgets(name, 40, in); diff --git a/nowhere.vec b/nowhere.vec index 7dc1ad3de81b9b18881f2ca90b532e0efd656303..46c46cd1db12198183f73252d42d8e818ca2d4fb 100644 GIT binary patch literal 128 zcmWN?$q~aK3;@7CRnS1pVJ^EHfuz7p5k?P~e&R+B#t$$>l^BB8Q&o&<~9?N|_ z^HTa-jf0B1jOY#Js9=5A*SPASbpnHsxP-tQ9BdIVYfm1NcZIp==p0AmZ_Jd@FlL(l3^2P65$YGXJlezVPpUREL;L6 diff --git a/nowhere.vec.source b/nowhere.vec.source index 55d6523..7c004ef 100644 --- a/nowhere.vec.source +++ b/nowhere.vec.source @@ -18,12 +18,12 @@ line 0 101 87 124 126 128 148 133 160 136 168 141 172 146 171 149 169 153 169 15 # Fill Sun color 12 -# fill 242 74 +fill 242 74 # Fill Beach color 14 -#fill 105 161 +fill 105 161 # Fill Ocean color 1 -#fill 194 106 +fill 194 106 diff --git a/thin.sta b/thin.sta index 331d8dafb7495db67f12b807325b7cf5aae88e67..7884ce55a1981d3b0278162346eed46f1facfc97 100644 GIT binary patch literal 130 zcmWN?K@!3s3;@78uiyg~5*kYTn-D;lQRxWw;OliSd*%0N{iW-i=QxbHw|RS%vHY)} zxJZARab__WsNRwum67~Go^o`U1A!$#UpBD}Y?EY>z)+ZE^&BAC4LL+lc3)9~+kvn| MRHJ>fc4(bfKi+F6761SM literal 32036 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 a&A`pT&A`pT&A`pT&A`pT&A|U61OEamllT?@