Skip to content
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

Jump to bottom

upgrade unreal engine 5.2 #37

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

upgrade unreal engine 5.2 #37

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c20a69
fix：升级并适配到UE5.0。已知问题:
Tonyangl May 16, 2022
02f265b
fix:returning address of local variable or temporary
Tonyangl May 16, 2022
6a736ce
fix: upgrade plugin to unreal engine 5.2 & :bug: AsyncLoadThread enab…
Tonyangl Jul 29, 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
6 changes: 5 additions & 1 deletion Source/FairyGUI/Private/UI/GComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ UGComponent::UGComponent() :

Container = SNew(SContainer);
Container->SetOpaque(false);
RootContainer->AddChild(Container.ToSharedRef());

if (IsInGameThread())
{
RootContainer->AddChild(Container.ToSharedRef());
}
}

UGComponent::~UGComponent()
Expand Down
4 changes: 3 additions & 1 deletion Source/FairyGUI/Public/Event/EventContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ class FAIRYGUI_API UEventContext : public UObject
UFUNCTION(BlueprintCallable, Category = "FairyGUI")
const FVector2D& GetPointerPosition() const
{
return PointerEvent->GetScreenSpacePosition();
achedPointerPosition = PointerEvent->GetScreenSpacePosition();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

最前面漏了一个大写字母C

return CachedPointerPosition;
}

UFUNCTION(BlueprintCallable, Category = "FairyGUI")
Expand Down Expand Up @@ -135,6 +136,7 @@ class FAIRYGUI_API UEventContext : public UObject
bool bDefaultPrevented;
bool bIsMouseCaptor;
FPointerEvent* PointerEvent;
mutable FVector2D CachedPointerPosition;
FKeyEvent* KeyEvent;
int32 ClickCount;
FNVariant Data;
Expand Down