diff options
Diffstat (limited to 'web/adapter.cpp')
| -rw-r--r-- | web/adapter.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/web/adapter.cpp b/web/adapter.cpp index 3613730..c3134e9 100644 --- a/web/adapter.cpp +++ b/web/adapter.cpp | |||
| @@ -108,17 +108,13 @@ bool solver_valid(const std::string& name) | |||
| 108 | 108 | ||
| 109 | int poll_status(void *arg) | 109 | int poll_status(void *arg) |
| 110 | { | 110 | { |
| 111 | return nissy::status::RUN.value; | 111 | if (arg == NULL || *(int *)arg == -1) |
| 112 | /* | ||
| 113 | TODO: reintroduce poll status | ||
| 114 | int id = *(int *)arg; | ||
| 115 | if (id == -1) | ||
| 116 | return nissy::status::RUN.value; | 112 | return nissy::status::RUN.value; |
| 117 | return callFunctionInt(id); | 113 | |
| 118 | */ | 114 | return callFunctionInt(*(int *)arg); |
| 119 | } | 115 | } |
| 120 | 116 | ||
| 121 | #if 0 | 117 | #if 1 |
| 122 | 118 | ||
| 123 | nissy::solver::solve_result solve(std::string name, | 119 | nissy::solver::solve_result solve(std::string name, |
| 124 | nissy::cube cube, nissy::nissflag nissflag, unsigned minmoves, | 120 | nissy::cube cube, nissy::nissflag nissflag, unsigned minmoves, |
| @@ -212,17 +208,17 @@ EMSCRIPTEN_BINDINGS(Nissy) | |||
| 212 | .function("toString", &nissy::cube::to_string) | 208 | .function("toString", &nissy::cube::to_string) |
| 213 | ; | 209 | ; |
| 214 | 210 | ||
| 211 | /* | ||
| 215 | emscripten::register_vector<std::string>("StringVector"); | 212 | emscripten::register_vector<std::string>("StringVector"); |
| 216 | emscripten::value_array<nissy::solver::solve_result>("SolveResult") | 213 | emscripten::value_array<nissy::solver::solve_result>("SolveResult") |
| 217 | .element(&nissy::solver::solve_result::err) | 214 | .element(&nissy::solver::solve_result::err) |
| 218 | .element(&nissy::solver::solve_result::solutions) | 215 | .element(&nissy::solver::solve_result::solutions) |
| 219 | ; | 216 | ; |
| 220 | /* | 217 | */ |
| 221 | emscripten::class_<nissy::solver::solve_result>("SolveResult") | 218 | emscripten::class_<nissy::solver::solve_result>("SolveResult") |
| 222 | .property("err", &nissy::solver::solve_result::err) | 219 | .property("err", &nissy::solver::solve_result::err) |
| 223 | .property("solutions", &nissy::solver::solve_result::solutions) | 220 | .property("solutions", &nissy::solver::solve_result::solutions) |
| 224 | ; | 221 | ; |
| 225 | */ | ||
| 226 | 222 | ||
| 227 | emscripten::function("countMoves", &nissy::count_moves); | 223 | emscripten::function("countMoves", &nissy::count_moves); |
| 228 | emscripten::function("solve", &solve, | 224 | emscripten::function("solve", &solve, |
