From ea084165bf2f414a49a559ddf5921b9073fc464c Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Tue, 25 Jul 2023 00:49:20 +1000 Subject: Optimize entityPortrait: Drawable > LuaTable instead of Drawable > Json > LuaTable --- source/game/scripting/StarWorldLuaBindings.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'source/game/scripting/StarWorldLuaBindings.cpp') diff --git a/source/game/scripting/StarWorldLuaBindings.cpp b/source/game/scripting/StarWorldLuaBindings.cpp index 087f88c..4645eb7 100644 --- a/source/game/scripting/StarWorldLuaBindings.cpp +++ b/source/game/scripting/StarWorldLuaBindings.cpp @@ -491,10 +491,10 @@ namespace LuaBindings { callbacks.registerCallbackWithSignature, EntityId>("entityGender", bind(WorldEntityCallbacks::entityGender, world, _1)); callbacks.registerCallbackWithSignature, EntityId>("entityName", bind(WorldEntityCallbacks::entityName, world, _1)); callbacks.registerCallbackWithSignature, EntityId, Maybe>("entityDescription", bind(WorldEntityCallbacks::entityDescription, world, _1, _2)); - callbacks.registerCallbackWithSignature, EntityId, String>("entityPortrait", bind(WorldEntityCallbacks::entityPortrait, world, _1, _2)); + callbacks.registerCallbackWithSignature>>, EntityId, String>("entityPortrait", bind(WorldEntityCallbacks::entityPortrait, world, _1, _2)); callbacks.registerCallbackWithSignature, EntityId, String>("entityHandItem", bind(WorldEntityCallbacks::entityHandItem, world, _1, _2)); callbacks.registerCallbackWithSignature("entityHandItemDescriptor", bind(WorldEntityCallbacks::entityHandItemDescriptor, world, _1, _2)); - callbacks.registerCallbackWithSignature, EntityId>("entityUniqueId", bind(WorldEntityCallbacks::entityUniqueId, world, _1)); + callbacks.registerCallbackWithSignature>, EntityId>("entityUniqueId", bind(WorldEntityCallbacks::entityUniqueId, world, _1)); callbacks.registerCallbackWithSignature>("getObjectParameter", bind(WorldEntityCallbacks::getObjectParameter, world, _1, _2, _3)); callbacks.registerCallbackWithSignature>("getNpcScriptParameter", bind(WorldEntityCallbacks::getNpcScriptParameter, world, _1, _2, _3)); callbacks.registerCallbackWithSignature, EntityId>("objectSpaces", bind(WorldEntityCallbacks::objectSpaces, world, _1)); @@ -1421,14 +1421,9 @@ namespace LuaBindings { return {}; } - LuaNullTermWrapper> WorldEntityCallbacks::entityPortrait(World* world, EntityId entityId, String const& portraitMode) { - auto entity = world->entity(entityId); - - if (auto portraitEntity = as(entity)) { - PortraitMode mode = PortraitModeNames.getLeft(portraitMode); - auto drawables = portraitEntity->portrait(mode); - return drawables.transformed(mem_fn(&Drawable::toJson)); - } + LuaNullTermWrapper>> WorldEntityCallbacks::entityPortrait(World* world, EntityId entityId, String const& portraitMode) { + if (auto portraitEntity = as(world->entity(entityId))) + return portraitEntity->portrait(PortraitModeNames.getLeft(portraitMode)); return {}; } -- cgit v1.2.3