Skip to content

Collision border now true to hardware #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
inactive123 merged 3 commits into from
Jul 30, 2021
Merged

Collision border now true to hardware #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd6e044
Collision borders now true to hardware
nanochess Jul 27, 2021
d4c67db
Corrected file permissions (new machine)
nanochess Jul 27, 2021
69e0eeb
Further permissions corrected
nanochess Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added src/.DS_Store
View file
Open in desktop
Binary file not shown.
35 changes: 19 additions & 16 deletions src/stic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,17 +138,19 @@ void drawBorder(int scanline)
int color = colors[Memory[0x2C] & 0x0f]; // border color

if(scanline>=112) { return; }
if (scanline == delayV - 1 || scanline == 104) {
for(i=7 * 2; i < (9 + 160) * 2; i += 2)
if (scanline == delayV - 1 || scanline == 104) { // Collision border is 1 pixel thick
for(i=1 * 2; i < (8 + 160) * 2; i += 2) // It extends from column -7 to 159
{
collBuffer[i] |= cbit;
collBuffer[i+384] |= cbit;
}
} else {
i = 7 * 2;
collBuffer[i] |= cbit;
collBuffer[i + 384] |= cbit;
i = (8 + 160) * 2;
} else if (scanline > delayV - 1 && scanline < 104) { // Left and right side collision border
for(i=1 * 2; i < 8 * 2; i += 2) // Left side from column -7 to -1
{
collBuffer[i] |= cbit;
collBuffer[i+384] |= cbit;
}
i = (8 + 159) * 2; // Right side collision is 1 pixel thick
collBuffer[i] |= cbit;
collBuffer[i + 384] |= cbit;
}
Expand All @@ -169,11 +171,15 @@ void drawBorder(int scanline)
for(i=0; i<16+(16*extendLeft); i++)
{
scanBuffer[i] = color;
scanBuffer[i+336] = color;
scanBuffer[i+168*2] = color;
scanBuffer[i+384] = color;
scanBuffer[i+384+336] = color;
scanBuffer[i+384+168*2] = color;
}
}
scanBuffer[167*2] = color; // Invisible 160th column
scanBuffer[167*2 + 1] = color;
scanBuffer[167*2 + 384] = color; // Invisible 160th column
scanBuffer[167*2 + 384 + 1] = color;
}
}

void drawBackgroundFGBG(int scanline)
Expand Down Expand Up @@ -383,7 +389,7 @@ void drawSprites(int scanline) // MOBs

// if sprite x coordinate is 0 or >167, it's disabled
// if it's not visible and not interactive, it's disabled
if(posX==0 || posX>=167 || ((Rx>>8)&0x03)==0 || posY>=104) { continue; }
if(posX==0 || posX>167 || ((Rx>>8)&0x03)==0 || posY>104) { continue; }

cbit = 1<<i; // set collision bit

Expand Down Expand Up @@ -538,11 +544,8 @@ void STICDrawFrame(int enabled)

// draw border and set final collision bits
drawBorder(row);
// clear collisions in column 167 //
collBuffer[167 * 2] = 0;
collBuffer[167 * 2 + 384] = 0;

for (i = 14; i < 169 * 2; i += 2) {

for (i = 1 * 2; i < 168 * 2; i += 2) {
if (collBuffer[i] == 0)
continue;
for (j = 0; j < 8; j++) {
Expand Down