GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'expose-actor-func' of https://github.com/Tryibion/FlaxEngine into Tryibion-expose-actor-func

Browse Source
This commit is contained in:
Wojtek Figat
2024-08-15 14:59:54 +02:00
parent 17f32246da 6f15bf7209
commit 4e5c163732
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Engine/Level/Actor.h
View File

@@ -996,37 +996,37 @@ public:
/// <summary> /// <summary>
/// Called when actor parent gets changed. /// Called when actor parent gets changed.
/// </summary> /// </summary>
virtual void OnParentChanged(); API_FUNCTION() virtual void OnParentChanged();
/// <summary> /// <summary>
/// Called when actor transform gets changed. /// Called when actor transform gets changed.
/// </summary> /// </summary>
virtual void OnTransformChanged(); API_FUNCTION() virtual void OnTransformChanged();
/// <summary> /// <summary>
/// Called when actor active state gets changed. /// Called when actor active state gets changed.
/// </summary> /// </summary>
virtual void OnActiveChanged(); API_FUNCTION() virtual void OnActiveChanged();
/// <summary> /// <summary>
/// Called when actor active in tree state gets changed. /// Called when actor active in tree state gets changed.
/// </summary> /// </summary>
virtual void OnActiveInTreeChanged(); API_FUNCTION() virtual void OnActiveInTreeChanged();
/// <summary> /// <summary>
/// Called when order in parent children array gets changed. /// Called when order in parent children array gets changed.
/// </summary> /// </summary>
virtual void OnOrderInParentChanged(); API_FUNCTION() virtual void OnOrderInParentChanged();
/// <summary> /// <summary>
/// Called when actor static flag gets changed. /// Called when actor static flag gets changed.
/// </summary> /// </summary>
virtual void OnStaticFlagsChanged(); API_FUNCTION() virtual void OnStaticFlagsChanged();
/// <summary> /// <summary>
/// Called when layer gets changed. /// Called when layer gets changed.
/// </summary> /// </summary>
virtual void OnLayerChanged(); API_FUNCTION() virtual void OnLayerChanged();
/// <summary> /// <summary>
/// Called when adding object to the game. /// Called when adding object to the game.

6
Source/Engine/UI/UICanvas.cpp
View File

@@ -17,7 +17,7 @@ MMethod* UICanvas_PostDeserialize = nullptr;
MMethod* UICanvas_Enable = nullptr; MMethod* UICanvas_Enable = nullptr;
MMethod* UICanvas_Disable = nullptr; MMethod* UICanvas_Disable = nullptr;
#if USE_EDITOR #if USE_EDITOR
MMethod* UICanvas_OnActiveInTreeChanged = nullptr; MMethod* UICanvas_ActiveInTreeChanged = nullptr;
#endif #endif
MMethod* UICanvas_EndPlay = nullptr; MMethod* UICanvas_EndPlay = nullptr;
MMethod* UICanvas_ParentChanged = nullptr; MMethod* UICanvas_ParentChanged = nullptr;
@@ -49,7 +49,7 @@ UICanvas::UICanvas(const SpawnParams& params)
UICanvas_Enable = mclass->GetMethod("Enable"); UICanvas_Enable = mclass->GetMethod("Enable");
UICanvas_Disable = mclass->GetMethod("Disable"); UICanvas_Disable = mclass->GetMethod("Disable");
#if USE_EDITOR #if USE_EDITOR
UICanvas_OnActiveInTreeChanged = mclass->GetMethod("OnActiveInTreeChanged"); UICanvas_ActiveInTreeChanged = mclass->GetMethod("ActiveInTreeChanged");
#endif #endif
UICanvas_EndPlay = mclass->GetMethod("EndPlay"); UICanvas_EndPlay = mclass->GetMethod("EndPlay");
UICanvas_ParentChanged = mclass->GetMethod("ParentChanged"); UICanvas_ParentChanged = mclass->GetMethod("ParentChanged");
@@ -182,7 +182,7 @@ void UICanvas::OnTransformChanged()
void UICanvas::OnActiveInTreeChanged() void UICanvas::OnActiveInTreeChanged()
{ {
UICANVAS_INVOKE(OnActiveInTreeChanged); UICANVAS_INVOKE(ActiveInTreeChanged);
// Base // Base
Actor::OnActiveInTreeChanged(); Actor::OnActiveInTreeChanged();

2
Source/Engine/UI/UICanvas.cs
View File

@@ -773,7 +773,7 @@ namespace FlaxEngine
} }
#if FLAX_EDITOR #if FLAX_EDITOR
internal void OnActiveInTreeChanged() internal void ActiveInTreeChanged()
{ {
if (RenderMode == CanvasRenderMode.ScreenSpace && _editorRoot != null && _guiRoot != null) if (RenderMode == CanvasRenderMode.ScreenSpace && _editorRoot != null && _guiRoot != null)
{ {