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

Test code now exercising ASM line drawing.

Browse source
This commit is contained in:
Scott Duensing 2019-10-04 19:43:53 -05:00
parent ec08f48556
commit 0ecf3e1c8b
2 changed files with 74 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
joeylib/src/jIIgs.asm
View file

@ -368,7 +368,6 @@ odd_c equ 19
; Say surface = $012000... ; Say surface = $012000...
; lda #<surface ; Should be $2000
lda surface ; Should be $2000 lda surface ; Should be $2000
sta __e0 ; set "even" addresses sta __e0 ; set "even" addresses
sta __e1 sta __e1
@ -402,7 +401,6 @@ odd_c equ 19
sta __o13 sta __o13
phb ; keep original bank phb ; keep original bank
; lda #>surface ; Should be $0120
lda surface+1 ; Should be $0120 lda surface+1 ; Should be $0120
pha ; switch to bank we're pointing into pha ; switch to bank we're pointing into
plb ; B is now $20 - bad! plb ; B is now $20 - bad!

87
joeylib/src/test.c
View file

@ -32,6 +32,10 @@ segment "testapp";
#endif #endif
extern jint16 asmTest(jlSurfaceT source);
extern void asmDrawLine(jlSurfaceT target, jint16 color, jint16 x1, jint16 y1, jint16 x2, jint16 y2);
// Font hacking! // Font hacking!
__attribute__((__format__ (__printf__, 4, 0))) __attribute__((__format__ (__printf__, 4, 0)))
void printAt(jlStaT *font, jint16 cx, jint16 cy, const char *what, ...) { void printAt(jlStaT *font, jint16 cx, jint16 cy, const char *what, ...) {
@ -58,10 +62,15 @@ int main(void) {
jlStaT *kanga = NULL; jlStaT *kanga = NULL;
jlStaT *font = NULL; jlStaT *font = NULL;
jint16 y; jint16 y;
jint16 phase = 0;
jint16 x2 = 0;
jint16 y2 = 0; jint16 y2 = 0;
jint16 dy = 1; jint16 ox = 0;
jint16 oy = 0;
jint16 op = 0;
jint16 color = 15; jint16 color = 15;
jint16 nextColor = 1; jint16 nextColor = 1;
char what[32];
jlUtilStartup("JoeyLib Test"); jlUtilStartup("JoeyLib Test");
@ -72,26 +81,78 @@ int main(void) {
jlDrawColorSet(1); jlDrawColorSet(1);
jlDrawBox(0, 0, 319, 199); jlDrawBox(0, 0, 319, 199);
jlSoundMusicPlay("music"); //jlSoundMusicPlay("music");
jlPaletteSet(15, 15, 15, 15); jlPaletteSet(15, 15, 15, 15);
printAt(font, 1, 16, "X"); strcpy(what, "Left to Right");
while (!jlKeyPressed()) { while (!jlKeyPressed()) {
y = 17; y = 17;
printAt(font, 1, y++, "X = %d ", jlGameGetAxis(0)); //printAt(font, 1, y++, "R = %d ", asmTest((jlSurfaceT)0x012000));
printAt(font, 1, y++, "Y = %d ", jlGameGetAxis(1)); printAt(font, 1, y++, "Drawing %s ", what);
printAt(font, 1, y++, "T = %d ", jlUtilTimer());
printAt(font, 1, y++, "R = %d ", asmTest((jlSurfaceT)0x012000));
jlDrawColorSet((byte)color); jlDrawColorSet((byte)color);
jlDrawLine(0, y2, 319, 199-y2); if (phase < 2) {
//asmDrawLine(_jlDrawTargetActual, _jlDrawColor, 0, y2, 319, 199-y2); asmDrawLine(_jlDrawTargetActual, _jlDrawColor, x2, y2, 319-x2, 199-y2);
y2 += dy; } else {
if (y2 == 199 || y2 == 0) dy = -dy; asmDrawLine(_jlDrawTargetActual, _jlDrawColor, 319-x2, 199-y2, x2, y2);
}
ox = x2;
oy = y2;
op = phase;
switch (phase) {
// Left, Y incrementing
case 0:
y2++;
if (y2 == 199) {
strcpy(what, "Bottom to Top");
phase = 1;
}
break;
// Bottom, X incrementing
case 1:
x2++;
if (x2 == 319) {
strcpy(what, "Right to Left");
phase = 2;
}
break;
// Right, Y decrementing
case 2:
y2--;
if (y2 == 0) {
strcpy(what, "Top to Bottom");
phase = 3;
}
break;
// Top, X decrementing
case 3:
x2--;
if (x2 == 0) {
strcpy(what, "Left to Right");
phase = 0;
}
break;
}
jlDisplayPresent(); jlDisplayPresent();
//jlUtilNibbleSwap((byte *)font->pixels, 32000, (byte)(color), (byte)(nextColor));
jlDrawColorSet((byte)0);
if (op < 2) {
asmDrawLine(_jlDrawTargetActual, _jlDrawColor, ox, oy, 319-ox, 199-oy);
} else {
asmDrawLine(_jlDrawTargetActual, _jlDrawColor, 319-ox, 199-oy, ox, oy);
}
color = nextColor; color = nextColor;
nextColor++; nextColor++;
if (nextColor > 15) nextColor = 1; if (nextColor > 15) {
nextColor = 1;
}
} }
jlKeyRead(); jlKeyRead();