Skip to content

Commit 4e0607a

Browse files
committed
Fix path resolving in ci (2)
1 parent 24fba69 commit 4e0607a

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

scripts/shader-loader.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ const path = require("path");
44

55
module.exports = async function (shader) {
66
return shader
7-
.replace(/load(Vertex|Fragment)Shader\("([^"]+)"\);/g, (_, type, file) => `load${type}Shader(\`${readFileSync(path.resolve("src/renderer/shader/", file))}\`);`)
8-
.replace(/GameFont\.fromRaw\(ctx, *"([^"]+)", *"([^"]+)"\)/g, (_, image, data) => `GameFont.fromRaw(ctx, \`data:image/png;base64,${Buffer.from(readFileSync("src/renderer/font/" + image)).toString("base64")}\`, "${encodeFontData(JSON.parse(readFileSync(path.resolve("src/renderer/font/", data))))}")`);
7+
.replace(/load(Vertex|Fragment)Shader\("([^"]+)"\);/g, (_, type, file) => `load${type}Shader(\`${readFileSync(path.resolve("./src/renderer/shader/", file))}\`);`)
8+
.replace(/GameFont\.fromRaw\(ctx, *"([^"]+)", *"([^"]+)"\)/g, (_, image, data) => `GameFont.fromRaw(ctx, \`data:image/png;base64,${Buffer.from(readFileSync("src/renderer/font/" + image)).toString("base64")}\`, "${encodeFontData(JSON.parse(readFileSync(path.resolve("./src/renderer/font/", data))))}")`);
99
}
1010

1111
function encodeFontData(data) {

src/renderer/shader/ShaderManager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ export const msdfTextureFragmentShader = (ctx: GameGLContext) => ctx.loadFragmen
1919
export const simpleColorFragmentShader = (ctx: GameGLContext) => ctx.loadFragmentShader("SimpleColorShader.frag");
2020
export const constantColorFragmentShader = (ctx: GameGLContext) => ctx.loadFragmentShader("ConstantColorShader.frag");
2121

22-
export const mapFontData = async (ctx: GameGLContext) => await GameFont.fromRaw(ctx, "../../../resources/themes/overpass-regular.png", "../../../resources/themes/overpass-regular.json");
22+
export const mapFontData = async (ctx: GameGLContext) => await GameFont.fromRaw(ctx, "./../../../resources/themes/overpass-regular.png", "./../../../resources/themes/overpass-regular.json");

0 commit comments

Comments
 (0)