Skip to content

[pull] master from rdeioris:master #6

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

Merged
pull merged 4 commits into from
Apr 14, 2023
Merged

[pull] master from rdeioris:master #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b45b9fd
Fix `print` when `bLuaOpenLibs` is `false`
KristofMorva Mar 4, 2023
604d910
- Update Asset Type Actions, to give "Reimport" and "Reimport With Ne…
Apr 13, 2023
dd5a203
Merge pull request #54 from tonysergi/master
rdeioris Apr 14, 2023
fd80def
Merge pull request #51 from KristofMorva/patch-2
rdeioris Apr 14, 2023
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
18 changes: 9 additions & 9 deletions Source/LuaMachine/Private/LuaState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,6 @@ ULuaState* ULuaState::GetLuaState(UWorld* InWorld)
luaL_openlibs(L);
}

ULuaState** LuaExtraSpacePtr = (ULuaState**)lua_getextraspace(L);
*LuaExtraSpacePtr = this;
// get the global table
lua_pushglobaltable(L);
// override print
PushCFunction(ULuaState::TableFunction_print);
SetField(-2, "print");

// load "package" for allowing minimal setup
luaL_requiref(L, "package", luaopen_package, 1);
lua_pop(L, 1);
Expand Down Expand Up @@ -126,6 +118,14 @@ ULuaState* ULuaState::GetLuaState(UWorld* InWorld)
}
}

ULuaState** LuaExtraSpacePtr = (ULuaState**)lua_getextraspace(L);
*LuaExtraSpacePtr = this;
// get the global table
lua_pushglobaltable(L);
// override print
PushCFunction(ULuaState::TableFunction_print);
SetField(-2, "print");

GetField(-1, "package");
if (!OverridePackagePath.IsEmpty())
{
Expand Down Expand Up @@ -2780,4 +2780,4 @@ FLuaValue ULuaState::RunString(const FString & CodeString, FString CodePath)

Pop();
return ReturnValue;
}
}
18 changes: 18 additions & 0 deletions Source/LuaMachineEditor/Private/LuaCodeFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,21 @@ uint32 FLuaCodeAssetTypeActions::GetCategories()
{
return FLuaMachineEditorModule::Get().GetAssetCategory();
}

bool FLuaCodeAssetTypeActions::IsImportedAsset() const
{
return true;
}

void FLuaCodeAssetTypeActions::GetResolvedSourceFilePaths( const TArray<UObject*>& TypeAssets, TArray<FString>& OutSourceFilePaths ) const
{
for ( auto& Asset : TypeAssets )
{
const auto LuaCode = CastChecked<ULuaCode>( Asset );
if ( LuaCode->AssetImportData )
{
LuaCode->AssetImportData->ExtractFilenames( OutSourceFilePaths );
}
}
}

2 changes: 1 addition & 1 deletion Source/LuaMachineEditor/Private/LuaMachineEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ class SLuaMachineDebugger : public SCompoundWidget, public FGCObject
case ELuaValueType::Thread:
if (SelectedLuaState == Item->LuaTableValue.LuaState)
{
Value = "status: " + FindObject<UEnum>(ANY_PACKAGE, TEXT("ELuaThreadStatus"), true)->GetNameStringByIndex((int32)SelectedLuaState->GetLuaThreadStatus(Item->LuaTableValue)) + ", stack top: " + FString::FromInt(SelectedLuaState->GetLuaThreadStackTop(Item->LuaTableValue));
Value = "status: " + FindObject<UEnum>(nullptr, TEXT("/Script/LuaMachine.ELuaThreadStatus"), true)->GetNameStringByIndex((int32)SelectedLuaState->GetLuaThreadStatus(Item->LuaTableValue)) + ", stack top: " + FString::FromInt(SelectedLuaState->GetLuaThreadStackTop(Item->LuaTableValue));
}
break;
default:
Expand Down
2 changes: 2 additions & 0 deletions Source/LuaMachineEditor/Public/LuaCodeFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,7 @@ class FLuaCodeAssetTypeActions : public FAssetTypeActions_Base
//virtual void GetActions(const TArray<UObject*>& InObjects, FMenuBuilder& MenuBuilder) override;
//virtual void OpenAssetEditor(const TArray<UObject*>& InObjects, TSharedPtr<class IToolkitHost> EditWithinLevelEditor = TSharedPtr<IToolkitHost>()) override;
virtual uint32 GetCategories() override;
virtual bool IsImportedAsset() const override;
virtual void GetResolvedSourceFilePaths( const TArray<UObject*>& TypeAssets, TArray<FString>& OutSourceFilePaths ) const override;
// End of IAssetTypeActions interface
};