Skip to content
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

Scroll fixes #22

Merged
merged 11 commits into from
Jul 5, 2023
Merged

Scroll fixes #22

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ed4b118
Bump json5 from 1.0.1 to 1.0.2
dependabot[bot] Jan 7, 2023
1320a84
Merge pull request #20 from bhj/dependabot/npm_and_yarn/json5-1.0.2
bhj Jan 8, 2023
c4d1ae4
Bump webpack from 5.75.0 to 5.76.0
dependabot[bot] Mar 15, 2023
6aafc50
Merge pull request #21 from bhj/dependabot/npm_and_yarn/webpack-5.76.0
bhj Mar 16, 2023
cc27503
Fix fine scroll direction and max y offset
hcs64 Jun 23, 2023
56bbf21
Don't render hidden pixels in the borders
hcs64 Jun 23, 2023
18d14c7
Initialize colors
hcs64 Jun 23, 2023
846d45e
Don't wrap, we never fetch past the border
hcs64 Jun 25, 2023
21f3a59
Don't initialize background color
hcs64 Jun 25, 2023
91acb87
Merge branch 'main' into scroll-fixes
bhj Jun 27, 2023
aa6f8f0
improve: skip display bounds check if no border color
bhj Jul 5, 2023
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
46 changes: 22 additions & 24 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class CDGContext {
this.vOffset = 0
this.keyColor = null // clut index
this.bgColor = null // clut index
this.borderColor = null // clut index
this.clut = new Array(16).fill([0, 0, 0]) // color lookup table
this.pixels = new Uint8ClampedArray(this.WIDTH * this.HEIGHT).fill(0)
this.buffer = new Uint8ClampedArray(this.WIDTH * this.HEIGHT).fill(0)
Expand All @@ -53,11 +54,23 @@ class CDGContext {

for (let y = top; y < bottom; y++) {
for (let x = left; x < right; x++) {
// Respect the horizontal and vertical offsets for grabbing the pixel color
const px = ((x - this.hOffset) + this.WIDTH) % this.WIDTH
const py = ((y - this.vOffset) + this.HEIGHT) % this.HEIGHT
const pixelIndex = px + (py * this.WIDTH)
const colorIndex = this.pixels[pixelIndex]
let colorIndex

if (this.borderColor !== null && (
x < this.DISPLAY_BOUNDS[0] ||
y < this.DISPLAY_BOUNDS[1] ||
x >= this.DISPLAY_BOUNDS[2] ||
y >= this.DISPLAY_BOUNDS[3])
) {
colorIndex = this.borderColor
} else {
// Respect the horizontal and vertical offsets for grabbing the pixel color
const px = x + this.hOffset
const py = y + this.vOffset
const pixelIndex = px + (py * this.WIDTH)
colorIndex = this.pixels[pixelIndex]
}

const [r, g, b] = this.clut[colorIndex]
const isKeyColor = colorIndex === this.keyColor ||
(forceKey && (colorIndex === this.bgColor || this.bgColor == null))
Expand Down Expand Up @@ -112,6 +125,7 @@ class CDGMemoryPresetInstruction {
execute (ctx) {
ctx.pixels.fill(this.color)
ctx.bgColor = this.color
ctx.borderColor = null
}
}

Expand All @@ -123,24 +137,8 @@ class CDGBorderPresetInstruction {
this.color = bytes[CDG_DATA] & 0x0F
}

execute ({ DISPLAY_BOUNDS, WIDTH, pixels, HEIGHT }) {
const b = DISPLAY_BOUNDS
for (let x = 0; x < WIDTH; x++) {
for (let y = 0; y < b[1]; y++) {
pixels[x + y * WIDTH] = this.color
}
for (let y = b[3] + 1; y < HEIGHT; y++) {
pixels[x + y * WIDTH] = this.color
}
}
for (let y = b[1]; y <= b[3]; y++) {
for (let x = 0; x < b[0]; x++) {
pixels[x + y * WIDTH] = this.color
}
for (let x = b[2] + 1; x < WIDTH; x++) {
pixels[x + y * WIDTH] = this.color
}
}
execute (ctx) {
ctx.borderColor = this.color
}
}

Expand Down Expand Up @@ -203,7 +201,7 @@ class CDGScrollPresetInstruction {

const vScroll = bytes[CDG_DATA + 2] & 0x3F
this.vCmd = (vScroll & 0x30) >> 4
this.vOffset = (vScroll & 0x07)
this.vOffset = (vScroll & 0x0f)
}

execute (ctx) {
Expand Down