Skip to content

feature/log #57

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

Draft
Naruto wants to merge 1 commit into
base: dev/ssab
Choose a base branch
from
Draft

feature/log #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion gd_spritestudio/SpriteStudio7-SDK
Open in desktop
Submodule SpriteStudio7-SDK updated from 5f2151 to f4478f
6 changes: 5 additions & 1 deletion gd_spritestudio/gd_ss_import_dock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,11 @@ void GdSsImportControl::_notification(int p_what) {

void* GdSsImportControl::process_file(const String &source_sspj_path, const String &dst_dir_path) {
auto ctx = ss_converter_create();
ss_converter_convert(ctx, source_sspj_path.utf8().get_data(), dst_dir_path.utf8().get_data());
auto src = source_sspj_path.utf8().get_data();
ss_converter_convert(ctx, src, dst_dir_path.utf8().get_data(), [](const char *msg){
print_line("%s", msg);
});

return ctx;
}

Expand Down
7 changes: 6 additions & 1 deletion gd_spritestudio/runtime/ssconverter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ enum class CConverterError {

struct Context;

using LogCallback = void(*)(const char*);

extern "C" {

const char *ss_converter_version();
Expand All @@ -25,7 +27,10 @@ Context *ss_converter_create();

void ss_converter_destroy(Context *context);

void ss_converter_convert(Context *ctx, const char *sspj, const char *output_dir);
void ss_converter_convert(Context *ctx,
const char *sspj,
const char *output_dir,
LogCallback callback);

bool ss_converter_is_finished(Context *context);

Expand Down