Public_Skunkworks/joeylib
Public_Skunkworks/joeylib
1
0
Fork 0
Code Issues 10 Pull requests Projects Releases Packages Wiki Activity Actions

Upgraded Tool221 to Tool222.

Browse source
This commit is contained in:
Scott Duensing 2020-08-06 14:59:38 -05:00
parent 9aed38a5b6
commit b82c0b10ff
5 changed files with 66 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
joeylib/build.sh
View file

@ -86,11 +86,11 @@ function doIIgsBuild() {
iix dumpobj +D 31:/out/joey/test &> test.dis || true iix dumpobj +D 31:/out/joey/test &> test.dis || true
php "${JOEY}/sdks/IIgs/ntconverter/ntconverter.php" *.mod php "${JOEY}/sdks/IIgs/ntpconverter/ntpconverter.php" *.mod
popd popd
cp -f "${OUT}/joeylib" "${DIST}/joeylib#b20000" cp -f "${OUT}/joeylib" "${DIST}/joeylib#b20000"
cp -f "${JOEY}/sdks/IIgs/Tool221#ba0000" "${JOEY}/dist/IIgs/." cp -f "${JOEY}/sdks/IIgs/Tool222#ba0000" "${JOEY}/dist/IIgs/."
cp -f "${JOEY}/joeylib/scripts/build-IIgs.helper.sh" "${JOEY}/dist/." cp -f "${JOEY}/joeylib/scripts/build-IIgs.helper.sh" "${JOEY}/dist/."
if [[ ! -z ${RUNTEST} ]]; then if [[ ! -z ${RUNTEST} ]]; then
@ -102,18 +102,16 @@ function doIIgsBuild() {
cp "${JOEY}/joeylib/joeylib/src/kanga.img" "${OUT}/kanga.img#060000" cp "${JOEY}/joeylib/joeylib/src/kanga.img" "${OUT}/kanga.img#060000"
cp "${JOEY}/joeylib/joeylib/src/font.img" "${OUT}/font.img#060000" cp "${JOEY}/joeylib/joeylib/src/font.img" "${OUT}/font.img#060000"
cp "${JOEY}/joeylib/joeylib/src/font.stn" "${OUT}/font.stn#060000" cp "${JOEY}/joeylib/joeylib/src/font.stn" "${OUT}/font.stn#060000"
cp "${JOEY}/joeylib/joeylib/src/music" "${OUT}/music#D50000" cp "${JOEY}/joeylib/joeylib/src/music.ntp" "${OUT}/music.ntp#D50008"
cp "${JOEY}/joeylib/joeylib/src/music.w" "${OUT}/music.w#060000"
"${CADIUS}" createvolume "${IMPORT}" ${VOL} 32MB > /dev/null "${CADIUS}" createvolume "${IMPORT}" ${VOL} 32MB > /dev/null
"${CADIUS}" createfolder "${IMPORT}" ${VOL}/data > /dev/null "${CADIUS}" createfolder "${IMPORT}" ${VOL}/data > /dev/null
"${CADIUS}" addfile "${IMPORT}" ${VOL} "${JOEY}/dist/IIgs/Tool221#ba0000" > /dev/null "${CADIUS}" addfile "${IMPORT}" ${VOL} "${JOEY}/dist/IIgs/Tool222#ba0000" > /dev/null
"${CADIUS}" addfile "${IMPORT}" ${VOL} "${OUT}/Test#b3db03" > /dev/null "${CADIUS}" addfile "${IMPORT}" ${VOL} "${OUT}/Test#b3db03" > /dev/null
"${CADIUS}" addfile "${IMPORT}" ${VOL}/data "${OUT}/kanga.img#060000" > /dev/null "${CADIUS}" addfile "${IMPORT}" ${VOL}/data "${OUT}/kanga.img#060000" > /dev/null
"${CADIUS}" addfile "${IMPORT}" ${VOL}/data "${OUT}/font.img#060000" > /dev/null "${CADIUS}" addfile "${IMPORT}" ${VOL}/data "${OUT}/font.img#060000" > /dev/null
"${CADIUS}" addfile "${IMPORT}" ${VOL}/data "${OUT}/font.stn#060000" > /dev/null "${CADIUS}" addfile "${IMPORT}" ${VOL}/data "${OUT}/font.stn#060000" > /dev/null
"${CADIUS}" addfile "${IMPORT}" ${VOL}/data "${OUT}/music#D50000" > /dev/null "${CADIUS}" addfile "${IMPORT}" ${VOL}/data "${OUT}/music.ntp#D50008" > /dev/null
"${CADIUS}" addfile "${IMPORT}" ${VOL}/data "${OUT}/music.w#060000" > /dev/null
pushd "${JOEY}/sdks/IIgs/gsplus" pushd "${JOEY}/sdks/IIgs/gsplus"
./GSplus -resizeable -config IIgsTest.cfg || true ./GSplus -resizeable -config IIgsTest.cfg || true

46
joeylib/src/jIIgs.c
View file

@ -58,13 +58,13 @@ extern void asmStart(jint16 myID, jint16 hertzBy10);
extern void asmStop(void); extern void asmStop(void);
extern pascal void NTStartUp(Word) inline(0x02DD, dispatcher); extern pascal void NTPStartUp(Word) inline(0x02DE, dispatcher);
extern pascal void NTShutDown(void) inline(0x03DD, dispatcher); extern pascal void NTPShutDown(void) inline(0x03DE, dispatcher);
extern pascal void NTLoadOneMusic(Pointer) inline(0x09DD, dispatcher); extern pascal void NTPLoadOneMusic(Pointer) inline(0x09DE, dispatcher);
extern pascal void NTPlayMusic(Word) inline(0x0ADD, dispatcher); extern pascal void NTPPlayMusic(Word) inline(0x0ADE, dispatcher);
extern pascal Word NTGetPlayingMusic(void) inline(0x10DD, dispatcher); extern pascal Word NTPGetPlayingMusic(void) inline(0x10DE, dispatcher);
extern pascal void NTPauseMusic(void) inline(0x13DD, dispatcher); extern pascal void NTPPauseMusic(void) inline(0x13DE, dispatcher);
extern pascal void NTContinueMusic(void) inline(0x14DD, dispatcher); extern pascal void NTPContinueMusic(void) inline(0x14DE, dispatcher);
char _jlKeyCheck(char key); char _jlKeyCheck(char key);
@ -261,37 +261,37 @@ bool _jlSoundLoad(jlSoundT **sound, char *filename) {
void jlSoundMusicContinue(void) { void jlSoundMusicContinue(void) {
NTContinueMusic(); NTPContinueMusic();
} }
bool jlSoundMusicIsPlaying(void) { bool jlSoundMusicIsPlaying(void) {
return (NTGetPlayingMusic() != 0xFFFF); return (NTPGetPlayingMusic() != 0xFFFF);
} }
void jlSoundMusicPause(void) { void jlSoundMusicPause(void) {
NTPauseMusic(); NTPPauseMusic();
} }
void jlSoundMusicPlay(char *name) { void jlSoundMusicPlay(char *name) {
char *temp = jlUtilMakePathname(name, NULL); char *temp = jlUtilMakePathname(name, "ntp");
_jlPascalStringT file; _jlPascalStringT file;
strcpy(file.text, temp); strcpy(file.text, temp);
file.length = strlen(temp); file.length = strlen(temp);
NTStartUp(_jlMusicMemID); NTPStartUp(_jlMusicMemID);
JOEY_CHECK_TOOL_ERROR("NTStartup") JOEY_CHECK_TOOL_ERROR("NTPStartup")
NTLoadOneMusic((Pointer)&file); NTPLoadOneMusic((Pointer)&file);
JOEY_CHECK_TOOL_ERROR("NTLoadOneMusic") JOEY_CHECK_TOOL_ERROR("NTPLoadOneMusic")
NTPlayMusic(false); NTPPlayMusic(false);
JOEY_CHECK_TOOL_ERROR("NTPlayMusic") JOEY_CHECK_TOOL_ERROR("NTPPlayMusic")
} }
void jlSoundMusicStop(void) { void jlSoundMusicStop(void) {
NTShutDown(); NTPShutDown();
JOEY_CHECK_TOOL_ERROR("NTShutDown") JOEY_CHECK_TOOL_ERROR("NTPShutDown")
} }
@ -349,13 +349,15 @@ void jlUtilStartup(char *appTitle) {
_jlMyID = MMStartUp(); // Memory Manager _jlMyID = MMStartUp(); // Memory Manager
_jlMemID = _jlMyID | 0x0100; // Set aux ID to 1. _jlMemID = _jlMyID | 0x0100; // Set aux ID to 1.
_jlMusicMemID = _jlMyID | 0x0200; // Set music ID. _jlMusicMemID = _jlMyID | 0x0200; // Set music ID.
MTStartUp(); // Misc Tools
/*
ZeroPageHandle = NewHandle((Long)DPTotal, (Word)_jlMyID, (Word)attrBank | attrPage | attrFixed | attrLocked, (Long)0); ZeroPageHandle = NewHandle((Long)DPTotal, (Word)_jlMyID, (Word)attrBank | attrPage | attrFixed | attrLocked, (Long)0);
ZeroPagePtr = *ZeroPageHandle; ZeroPagePtr = *ZeroPageHandle;
MTStartUp(); // Misc Tools
SoundStartUp((word)ZeroPagePtr + DPForSound); // Sound Tool Set SoundStartUp((word)ZeroPagePtr + DPForSound); // Sound Tool Set
MSStartUp(); // MIDI Synth MSStartUp(); // MIDI Synth
//LoadOneTool(0xDD, 0); // NinjaTracker */
//JOEY_CHECK_TOOL_ERROR("LoadOneTool") LoadOneTool(0xDE, 0); // NinjaTrackerPlus
JOEY_CHECK_TOOL_ERROR("LoadOneTool")
// Reserve shadow area for SHR // Reserve shadow area for SHR
_jlSHRShadowHandle = NewHandle((LongWord)0x8000, (Word)_jlMemID, (Word)(attrLocked + attrFixed + attrBank + attrAddr), (Pointer)0x012000); _jlSHRShadowHandle = NewHandle((LongWord)0x8000, (Word)_jlMemID, (Word)(attrLocked + attrFixed + attrBank + attrAddr), (Pointer)0x012000);

21
joeylib/src/test.c
View file

@ -275,13 +275,27 @@ void lineTest(void) {
} }
jlKeyRead(); jlKeyRead();
jlSoundMusicStop();
jlImgFree(font); jlImgFree(font);
jlImgFree(kanga); jlImgFree(kanga);
} }
void musicTest(void) {
jlImgT *kanga = NULL;
if (!jlImgLoad(kanga, "kanga")) jlUtilDie("Unable to load kanga.img!");
jlImgDisplay(kanga);
jlDisplayPresent();
jlSoundMusicPlay("music");
jlKeyWaitForAny();
jlSoundMusicStop();
}
void showStencil(void) { void showStencil(void) {
jlStnT *stencil = NULL; jlStnT *stencil = NULL;
jint16 y; jint16 y;
@ -340,10 +354,11 @@ void showStencil(void) {
int main(void) { int main(void) {
jlUtilStartup("JoeyLib Test"); jlUtilStartup("JoeyLib Test");
blitTest(); //blitTest();
//exerciseAPI(); //exerciseAPI();
//grid(); //grid();
//lineTest(); //lineTest();
musicTest();
//showStencil(); //showStencil();
jlUtilShutdown(); jlUtilShutdown();

6
scripts/build-IIgs.helper.sh
View file

@ -19,6 +19,10 @@ function buildIIgs() {
fi fi
mkdir -p ${WORK} mkdir -p ${WORK}
#***TODO*** Add image and music conversion.
# Automatically copy converted images, stencils, and audio so they
# no longer need to be specified in the build script.
# We temporarily need a local copy of the joey header # We temporarily need a local copy of the joey header
cp -f ${JOEY}/dist/joey.h . cp -f ${JOEY}/dist/joey.h .
@ -58,7 +62,7 @@ function buildIIgs() {
${CADIUS} createvolume ${IMPORT} ${VOL} 32MB > /dev/null ${CADIUS} createvolume ${IMPORT} ${VOL} 32MB > /dev/null
${CADIUS} createfolder ${IMPORT} ${VOL}/data > /dev/null ${CADIUS} createfolder ${IMPORT} ${VOL}/data > /dev/null
${CADIUS} addfile ${IMPORT} ${VOL} ${TARGET}/${PROJECT}#b3db03 > /dev/null ${CADIUS} addfile ${IMPORT} ${VOL} ${TARGET}/${PROJECT}#b3db03 > /dev/null
${CADIUS} addfile ${IMPORT} ${VOL} ${JOEY}/dist/IIgs/Tool221#ba0000 > /dev/null ${CADIUS} addfile ${IMPORT} ${VOL} ${JOEY}/dist/IIgs/Tool222#ba0000 > /dev/null
for F in "${DATA[@]}"; do for F in "${DATA[@]}"; do
N=${WORK}/data/`basename ${F}`#060000 N=${WORK}/data/`basename ${F}`#060000
cp -f ${F} ${N} cp -f ${F} ${N}

27
scripts/installer.sh
View file

@ -606,23 +606,24 @@ function installIIgs() {
popd &> /dev/null popd &> /dev/null
fi fi
if [[ ! -e "${IIGS}/ntconverter/ntconverter.php" ]]; then if [[ ! -e "${IIGS}/ntpconverter/ntpconverter.php" ]]; then
purple "Installing NinjaTracker Converter" purple "Installing NinjaTrackerPlus Converter"
download https://www.ninjaforce.com/downloads/ntconverter.zip download http://www.ninjaforce.com/downloads/ntpsources.zip
unzip ntconverter.zip unzip ntpsources.zip
mkdir -p "${IIGS}/ntconverter" mkdir -p "${IIGS}/ntpconverter"
cp -f ntconverter.php "${IIGS}/ntconverter/." cp -f ntpconverter.php "${IIGS}/ntpconverter/."
cp -f ntpconverter_lib.php "${IIGS}/ntpconverter/."
fi
if [[ ! -e "${IIGS}/Tool222#ba0000" ]]; then
purple "Installing NinjaTrackerPlus Tool222"
download http://www.ninjaforce.com/downloads/ninjatrackerplus_tool222_v1.1.2mg
"${IIGS}/cadius/cadius" extractfile ninjatrackerplus_tool222_v1.1.2mg NTP.TOOL222V1.1/SYSTEM/TOOLS/TOOL222 .
cp -f Tool222#BA0000 "${IIGS}/Tool222#ba0000"
fi fi
mkdir -p "${JOEY}/dist/IIgs" mkdir -p "${JOEY}/dist/IIgs"
if [[ ! -e "${IIGS}/Tool221#ba0000" ]]; then
purple "Installing Tool221"
download https://www.brutaldeluxe.fr/products/apple2gs/tool221/ninjatracker_tool221_v2.1.2mg
"${IIGS}/cadius/cadius" extractfile ninjatracker_tool221_v2.1.2mg NT.TOOL221.V2.1/SYSTEM/TOOLS/TOOL221 .
cp -f TOOL221#BA0000 "${IIGS}/Tool221#ba0000"
fi
purple "Building JoeyLib" purple "Building JoeyLib"
"${G_PARENT}/joeylib/joeylib/build.sh" iigs &> /dev/null "${G_PARENT}/joeylib/joeylib/build.sh" iigs &> /dev/null