Skip to content

Fixing large mipmap issue on chrome #30

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
merged 2 commits into from
Feb 1, 2025
Merged

Fixing large mipmap issue on chrome #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1c9f0d
Fixed mipmap issue on chrome
codewithkyle Feb 1, 2025
ff029e5
Bumped version
codewithkyle Feb 1, 2025
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
14 changes: 13 additions & 1 deletion client/src/pages/tabletop-page/tabletop-component/table-canvas/table-canvas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,10 +397,18 @@ export default class TableCanvas extends SuperComponent<ITableCanvas> {
this.gl.bindTexture(this.gl.TEXTURE_2D, this.imgProgram.get_texture());
this.gl.texImage2D(this.gl.TEXTURE_2D, 0, this.gl.RGBA, this.gl.RGBA, this.gl.UNSIGNED_BYTE, this.image);

if ((this.image.width % 2) === 0 && (this.image.height % 2) === 0) {
if (this.isPowerOfTwo(this.image.width) && this.isPowerOfTwo(this.image.height)) {
this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_MIN_FILTER, this.gl.LINEAR_MIPMAP_NEAREST);
this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_MAG_FILTER, this.gl.NEAREST);
this.gl.generateMipmap(this.gl.TEXTURE_2D);

const error = this.gl.getError();
if (error !== this.gl.NO_ERROR) {
this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_WRAP_S, this.gl.CLAMP_TO_EDGE);
this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_WRAP_T, this.gl.CLAMP_TO_EDGE);
this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_MIN_FILTER, this.gl.NEAREST);
this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_MAG_FILTER, this.gl.NEAREST);
}
} else {
this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_WRAP_S, this.gl.CLAMP_TO_EDGE);
this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_WRAP_T, this.gl.CLAMP_TO_EDGE);
Expand Down Expand Up @@ -679,5 +687,9 @@ export default class TableCanvas extends SuperComponent<ITableCanvas> {
const clipY = (y / h) * 2 - 1;
return [clipX, clipY];
}

private isPowerOfTwo(value) {
return (value & (value - 1)) === 0; // Check if the value is a power of 2
}
}
env.bind("table-canvas", TableCanvas);
2 changes: 1 addition & 1 deletion server/views/layouts/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height, target-densitydpi=device-dpi" />

<title>Tabletopper v0.7.0</title>
<title>Tabletopper v0.7.1</title>
<meta name="description" content="Jump into a D&D tabletop session with your friends, hassle free.">

<link rel="icon" href="/static/favicon.png" sizes="any">
Expand Down
2 changes: 1 addition & 1 deletion server/views/layouts/vtt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height, target-densitydpi=device-dpi" />

<title>Tabletopper v0.7.0</title>
<title>Tabletopper v0.7.1</title>
<meta name="description" content="Jump into a D&D tabletop session with your friends, hassle free.">

<link rel="icon" href="/static/favicon.png" sizes="any">
Expand Down