Skip to content

Commit

Permalink
fix everything
Browse files Browse the repository at this point in the history
  • Loading branch information
Tnze committed Nov 11, 2023
1 parent 4849d1c commit 44f6cfa
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 15 deletions.
4 changes: 3 additions & 1 deletion src-libs/src/solver/depth_first_search_solver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@ pub fn solve(status: Status, maximum_depth: usize, specialist: bool) -> Vec<Acti
*best_score = score;
*best_actions = stack_seq.clone();
}
} else {
} else if best_score.quality != new_s.recipe.quality
|| best_score.steps >= new_s.step as u16
{
search(
&new_s,
stack_seq,
Expand Down
1 change: 0 additions & 1 deletion src/components/designer/Buffs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ const buffsDisplay = computed<{
.filter(v => !fakeBuffs.includes(v[0]))
.filter(v => v[1] > 0)
.map(([buffName, duration]) => {
console.log(buffName, duration)
if (buffName == 'inner_quiet') {
return {
url: new URL(`../../assets/buffs/${buffName}_${duration as number}.png`, import.meta.url),
Expand Down
2 changes: 1 addition & 1 deletion src/components/designer/Page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function reload() {
</script>

<template>
<Suspense :timeout="300">
<Suspense :timeout="30">
<el-result v-if="errorMessage" icon="error" :title="$t('error-happens')" :sub-title="$t(errorMessage)">
<template #extra>
<el-button @click="reload">{{ $t('reload') }}</el-button>
Expand Down
16 changes: 8 additions & 8 deletions src/libs/Solver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ if (import.meta.env.VITE_BESTCRAFT_TARGET == "tauri") {
// They are using the Web edition. Only wasm solvers could be used.
// Check if the browser supports Web Worker.
if (!window.Worker) supported = false
var invokeWasmSolver = (name: string, args: any): Promise<Actions[]> => {
return new Promise((resolve, reject) => {
const worker = new Worker(new URL('./SolverWorker.ts', import.meta.url), { type: 'module' })
worker.onmessage = ev => resolve(ev.data)
worker.onerror = ev => reject(ev)
worker.postMessage({ name, args: JSON.stringify(args) })
})
}
}

function invokeWasmSolver(name: string, args: any): Promise<Actions[]> {
return new Promise((resolve, reject) => {
const worker = new Worker(new URL('./SolverWorker.ts', import.meta.url), { type: 'module' })
worker.onmessage = ev => resolve(ev.data)
worker.onerror = ev => reject(ev)
worker.postMessage({ name, args: JSON.stringify(args) })
})
}

export async function create_solver(
status: Status,
Expand Down
10 changes: 6 additions & 4 deletions src/libs/SolverWorker.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
onmessage = async (e) => {
if (import.meta.env.VITE_BESTCRAFT_TARGET == "web") {
var { dfs_solve, nq_solve } = await import("../../pkg-wasm/app_wasm")
} else return
const { name, args } = e.data
switch (name) {
case "dfs_solve":
case "nq_solve":
const { status, depth, specialist } = JSON.parse(args)
let { dfs_solve } = await import("../../pkg-wasm/app_wasm")
let solve = name == "dfs_solver" ? dfs_solve : dfs_solve
let solve = name == "dfs_solve" ? dfs_solve : nq_solve
const result = solve(status, depth, specialist)
postMessage(result)
break;
case "rika_solve":
case "rika_solve_tnzever":
case "reflect_solve":
// throw "unsupported"
throw "unsupported"
}
// close()
close()
};
1 change: 1 addition & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export default defineConfig({
worker: {
format: "es",
plugins: [
defineTarget(),
wasm(),
topLevelAwait(),
],
Expand Down

0 comments on commit 44f6cfa

Please sign in to comment.