mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-09 18:44:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify user API for Sprite observers

Browse Source
This commit is contained in:
lampysprites 2021-10-02 16:22:31 +07:00
parent f8ef06a86e
commit 22e3e6244a
1 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/app/script/sprite_class.cpp
View File

@ -59,7 +59,7 @@ namespace app {
namespace script { namespace script {
namespace { namespace {
// in lua, observers become `Sprite.onChange`
class ScriptDocObserver : public DocUndoObserver { class ScriptDocObserver : public DocUndoObserver {
public: public:
ScriptDocObserver(int callbackRef) ScriptDocObserver(int callbackRef)
@ -73,6 +73,9 @@ public:
void onClearRedo(DocUndo* history) { } void onClearRedo(DocUndo* history) { }
void onTotalUndoSizeChange(DocUndo* history) { } void onTotalUndoSizeChange(DocUndo* history) { }
int callbackRef() { return m_callbackRef; }
void setCallbackRef(int callbackRef) { m_callbackRef = callbackRef; }
private: private:
void callback() { void callback() {
script::Engine* engine = App::instance()->scriptEngine(); script::Engine* engine = App::instance()->scriptEngine();
@ -89,13 +92,8 @@ private:
int m_callbackRef; int m_callbackRef;
}; };
const luaL_Reg ScriptDocObserver_methods[] = { // used to maintain one-to-one relation between sprites and observers
{ nullptr, nullptr } std::map<doc::ObjectId, ScriptDocObserver*> script_observers;
};
const Property ScriptDocObserver_properties[] = {
{ nullptr, nullptr, nullptr }
};
int Sprite_new(lua_State* L) int Sprite_new(lua_State* L)
{ {
@ -629,28 +627,42 @@ int Sprite_deleteSlice(lua_State* L)
} }
} }
int Sprite_watch(lua_State* L) int Sprite_get_onChange(lua_State* L)
{
auto sprite = get_docobj<Sprite>(L, 1);
ScriptDocObserver* obs = script_observers[sprite->id()];
if (obs) {
lua_rawgeti(L, LUA_REGISTRYINDEX, obs->callbackRef());
}
else {
lua_pushnil(L);
}
return 1;
}
int Sprite_set_onChange(lua_State* L)
{ {
auto sprite = get_docobj<Sprite>(L, 1); auto sprite = get_docobj<Sprite>(L, 1);
auto doc = static_cast<Doc*>(sprite->document()); auto doc = static_cast<Doc*>(sprite->document());
ScriptDocObserver* obs; ScriptDocObserver* obs = script_observers[sprite->id()];
if (lua_isfunction(L, 2)) {
int callbackRef = luaL_ref(L, LUA_REGISTRYINDEX);
obs = push_new<ScriptDocObserver>(L, callbackRef);
doc->undoHistory()->add_observer(obs);
return 1;
}
return 0;
}
int Sprite_unwatch(lua_State* L)
{
if (auto obs = may_get_obj<ScriptDocObserver>(L, 2)) {
auto sprite = get_docobj<Sprite>(L, 1);
auto doc = static_cast<Doc*>(sprite->document());
if (lua_isnil(L, 2) && obs) {
doc->undoHistory()->remove_observer(obs); doc->undoHistory()->remove_observer(obs);
script_observers.erase(sprite->id());
luaL_unref(L, LUA_REGISTRYINDEX, obs->callbackRef());
delete obs;
}
else if (lua_isfunction(L, 2)) {
int callbackRef = luaL_ref(L, LUA_REGISTRYINDEX);
if (obs) {
obs->setCallbackRef(callbackRef);
}
else {
obs = new ScriptDocObserver(callbackRef);
doc->undoHistory()->add_observer(obs);
script_observers[sprite->id()] = obs;
}
} }
return 0; return 0;
} }
@ -887,9 +899,6 @@ const luaL_Reg Sprite_methods[] = {
// Slices // Slices
{ "newSlice", Sprite_newSlice }, { "newSlice", Sprite_newSlice },
{ "deleteSlice", Sprite_deleteSlice }, { "deleteSlice", Sprite_deleteSlice },
// Observer
{ "watch", Sprite_watch },
{ "unwatch", Sprite_unwatch },
{ nullptr, nullptr } { nullptr, nullptr }
}; };
@ -912,13 +921,13 @@ const Property Sprite_properties[] = {
{ "bounds", Sprite_get_bounds, nullptr }, { "bounds", Sprite_get_bounds, nullptr },
{ "gridBounds", Sprite_get_gridBounds, Sprite_set_gridBounds }, { "gridBounds", Sprite_get_gridBounds, Sprite_set_gridBounds },
{ "pixelRatio", Sprite_get_pixelRatio, Sprite_set_pixelRatio }, { "pixelRatio", Sprite_get_pixelRatio, Sprite_set_pixelRatio },
{ "onChange", Sprite_get_onChange, Sprite_set_onChange },
{ nullptr, nullptr, nullptr } { nullptr, nullptr, nullptr }
}; };
} // anonymous namespace } // anonymous namespace
DEF_MTNAME(doc::Sprite); DEF_MTNAME(doc::Sprite);
DEF_MTNAME(ScriptDocObserver);
void register_sprite_class(lua_State* L) void register_sprite_class(lua_State* L)
{ {
@ -926,8 +935,6 @@ void register_sprite_class(lua_State* L)
REG_CLASS(L, Sprite); REG_CLASS(L, Sprite);
REG_CLASS_NEW(L, Sprite); REG_CLASS_NEW(L, Sprite);
REG_CLASS_PROPERTIES(L, Sprite); REG_CLASS_PROPERTIES(L, Sprite);
REG_CLASS(L, ScriptDocObserver);
} }
} // namespace script } // namespace script