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

Merge branch 'xxSeys1-NavigationContextSubmenu'

Browse Source
This commit is contained in:
Wojtek Figat
2025-04-08 16:53:58 +02:00
parent db20dae062 9beca96230
commit 242d400284
13 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.h
View File

@@ -11,7 +11,7 @@
/// <summary> /// <summary>
/// The scene animation playback actor. /// The scene animation playback actor.
/// </summary> /// </summary>
API_CLASS(Attributes="ActorContextMenu(\"New/Other/Scene Animation\"), ActorToolbox(\"Other\", \"Scene Animation\")") API_CLASS(Attributes="ActorContextMenu(\"New/Animation/Scene Animation\"), ActorToolbox(\"Other\", \"Scene Animation\")")
class FLAXENGINE_API SceneAnimationPlayer : public Actor, public IPostFxSettingsProvider class FLAXENGINE_API SceneAnimationPlayer : public Actor, public IPostFxSettingsProvider
{ {
DECLARE_SCENE_OBJECT(SceneAnimationPlayer); DECLARE_SCENE_OBJECT(SceneAnimationPlayer);

2
Source/Engine/Level/Actors/AnimatedModel.h
View File

@@ -12,7 +12,7 @@
/// <summary> /// <summary>
/// Performs an animation and renders a skinned model. /// Performs an animation and renders a skinned model.
/// </summary> /// </summary>
API_CLASS(Attributes="ActorContextMenu(\"New/Other/Animated Model\"), ActorToolbox(\"Visuals\")") API_CLASS(Attributes="ActorContextMenu(\"New/Animation/Animated Model\"), ActorToolbox(\"Visuals\")")
class FLAXENGINE_API AnimatedModel : public ModelInstanceActor class FLAXENGINE_API AnimatedModel : public ModelInstanceActor
{ {
DECLARE_SCENE_OBJECT(AnimatedModel); DECLARE_SCENE_OBJECT(AnimatedModel);

2
Source/Engine/Level/Actors/BoneSocket.h
View File

@@ -7,7 +7,7 @@
/// <summary> /// <summary>
/// Actor that links to the animated model skeleton node transformation. /// Actor that links to the animated model skeleton node transformation.
/// </summary> /// </summary>
API_CLASS(Attributes="ActorContextMenu(\"New/Other/Bone Socket\"), ActorToolbox(\"Other\")") API_CLASS(Attributes="ActorContextMenu(\"New/Animation/Bone Socket\"), ActorToolbox(\"Other\")")
class FLAXENGINE_API BoneSocket : public Actor class FLAXENGINE_API BoneSocket : public Actor
{ {
DECLARE_SCENE_OBJECT(BoneSocket); DECLARE_SCENE_OBJECT(BoneSocket);

2
Source/Engine/Level/Actors/BoxBrush.h
View File

@@ -65,7 +65,7 @@ public:
/// <summary> /// <summary>
/// Performs CSG box brush operation that adds or removes geometry. /// Performs CSG box brush operation that adds or removes geometry.
/// </summary> /// </summary>
API_CLASS(Attributes="ActorContextMenu(\"New/Other/Box Brush\"), ActorToolbox(\"Other\", \"CSG Box Brush\")") API_CLASS(Attributes="ActorContextMenu(\"New/Other/CSG Box Brush\"), ActorToolbox(\"Other\", \"CSG Box Brush\")")
class FLAXENGINE_API BoxBrush : public Actor, public CSG::Brush class FLAXENGINE_API BoxBrush : public Actor, public CSG::Brush
{ {
DECLARE_SCENE_OBJECT(BoxBrush); DECLARE_SCENE_OBJECT(BoxBrush);

2
Source/Engine/Level/Actors/EnvironmentProbe.h
View File

@@ -10,7 +10,7 @@
/// <summary> /// <summary>
/// Environment Probe can capture space around the objects to provide reflections. /// Environment Probe can capture space around the objects to provide reflections.
/// </summary> /// </summary>
API_CLASS(Attributes="ActorContextMenu(\"New/Visuals/Environment Probe\"), ActorToolbox(\"Visuals\")") API_CLASS(Attributes="ActorContextMenu(\"New/Visuals/Lighting & Effects/Environment Probe\"), ActorToolbox(\"Visuals\")")
class FLAXENGINE_API EnvironmentProbe : public Actor class FLAXENGINE_API EnvironmentProbe : public Actor
{ {
DECLARE_SCENE_OBJECT(EnvironmentProbe); DECLARE_SCENE_OBJECT(EnvironmentProbe);

2
Source/Engine/Level/Actors/ExponentialHeightFog.h
View File

@@ -12,7 +12,7 @@
/// <summary> /// <summary>
/// Used to create fogging effects such as clouds but with a density that is related to the height of the fog. /// Used to create fogging effects such as clouds but with a density that is related to the height of the fog.
/// </summary> /// </summary>
API_CLASS(Attributes="ActorContextMenu(\"New/Visuals/Exponential Height Fog\"), ActorToolbox(\"Visuals\")") API_CLASS(Attributes="ActorContextMenu(\"New/Visuals/Lighting & Effects/Exponential Height Fog\"), ActorToolbox(\"Visuals\")")
class FLAXENGINE_API ExponentialHeightFog : public Actor, public IFogRenderer class FLAXENGINE_API ExponentialHeightFog : public Actor, public IFogRenderer
{ {
DECLARE_SCENE_OBJECT(ExponentialHeightFog); DECLARE_SCENE_OBJECT(ExponentialHeightFog);

2
Source/Engine/Level/Actors/PostFxVolume.h
View File

@@ -9,7 +9,7 @@
/// <summary> /// <summary>
/// A special type of volume that blends custom set of post process settings into the rendering. /// A special type of volume that blends custom set of post process settings into the rendering.
/// </summary> /// </summary>
API_CLASS(Attributes="ActorContextMenu(\"New/Visuals/Post Fx Volume\"), ActorToolbox(\"Visuals\")") API_CLASS(Attributes="ActorContextMenu(\"New/Visuals/Lighting & Effects/Post Fx Volume\"), ActorToolbox(\"Visuals\")")
class FLAXENGINE_API PostFxVolume : public BoxVolume, public IPostFxSettingsProvider class FLAXENGINE_API PostFxVolume : public BoxVolume, public IPostFxSettingsProvider
{ {
DECLARE_SCENE_OBJECT(PostFxVolume); DECLARE_SCENE_OBJECT(PostFxVolume);

2
Source/Engine/Level/Actors/Sky.h
View File

@@ -14,7 +14,7 @@ class GPUPipelineState;
/// <summary> /// <summary>
/// Sky actor renders atmosphere around the scene with fog and sky. /// Sky actor renders atmosphere around the scene with fog and sky.
/// </summary> /// </summary>
API_CLASS(Attributes="ActorContextMenu(\"New/Visuals/Sky\"), ActorToolbox(\"Visuals\")") API_CLASS(Attributes="ActorContextMenu(\"New/Visuals/Sky/Sky\"), ActorToolbox(\"Visuals\")")
class FLAXENGINE_API Sky : public Actor, public IAtmosphericFogRenderer, public ISkyRenderer class FLAXENGINE_API Sky : public Actor, public IAtmosphericFogRenderer, public ISkyRenderer
{ {
DECLARE_SCENE_OBJECT(Sky); DECLARE_SCENE_OBJECT(Sky);

2
Source/Engine/Level/Actors/Skybox.h
View File

@@ -11,7 +11,7 @@
/// <summary> /// <summary>
/// Skybox actor renders sky using custom cube texture or material. /// Skybox actor renders sky using custom cube texture or material.
/// </summary> /// </summary>
API_CLASS(Attributes="ActorContextMenu(\"New/Visuals/Sky Box\"), ActorToolbox(\"Visuals\")") API_CLASS(Attributes="ActorContextMenu(\"New/Visuals/Sky/Sky Box\"), ActorToolbox(\"Visuals\")")
class FLAXENGINE_API Skybox : public Actor, public ISkyRenderer class FLAXENGINE_API Skybox : public Actor, public ISkyRenderer
{ {
DECLARE_SCENE_OBJECT(Skybox); DECLARE_SCENE_OBJECT(Skybox);

2
Source/Engine/Navigation/NavLink.h
View File

@@ -7,7 +7,7 @@
/// <summary> /// <summary>
/// The off-mesh link objects used to define a custom point-to-point edge within the navigation graph. An off-mesh connection is a user defined traversable connection made up to two vertices, at least one of which resides within a navigation mesh polygon allowing movement outside the navigation mesh. /// The off-mesh link objects used to define a custom point-to-point edge within the navigation graph. An off-mesh connection is a user defined traversable connection made up to two vertices, at least one of which resides within a navigation mesh polygon allowing movement outside the navigation mesh.
/// </summary> /// </summary>
API_CLASS(Attributes="ActorContextMenu(\"New/Other/Nav Link\"), ActorToolbox(\"Other\")") API_CLASS(Attributes="ActorContextMenu(\"New/Navigation/Nav Link\"), ActorToolbox(\"Other\")")
class FLAXENGINE_API NavLink : public Actor class FLAXENGINE_API NavLink : public Actor
{ {
DECLARE_SCENE_OBJECT(NavLink); DECLARE_SCENE_OBJECT(NavLink);

3
Source/Engine/Navigation/NavMesh.h
View File

@@ -14,7 +14,8 @@ class NavMeshRuntime;
/// <summary> /// <summary>
/// The navigation mesh actor that holds a navigation data for a scene. /// The navigation mesh actor that holds a navigation data for a scene.
/// </summary> /// </summary>
API_CLASS() class FLAXENGINE_API NavMesh : public Actor API_CLASS(Attributes = "ActorContextMenu(\"New/Navigation/Nav Mesh\")")
class FLAXENGINE_API NavMesh : public Actor
{ {
DECLARE_SCENE_OBJECT(NavMesh); DECLARE_SCENE_OBJECT(NavMesh);
public: public:

2
Source/Engine/Navigation/NavMeshBoundsVolume.h
View File

@@ -8,7 +8,7 @@
/// <summary> /// <summary>
/// A special type of volume that defines the area of the scene in which navigation meshes are generated. /// A special type of volume that defines the area of the scene in which navigation meshes are generated.
/// </summary> /// </summary>
API_CLASS(Attributes="ActorContextMenu(\"New/Other/Nav Mesh Bounds Volume\"), ActorToolbox(\"Other\")") API_CLASS(Attributes="ActorContextMenu(\"New/Navigation/Nav Mesh Bounds Volume\"), ActorToolbox(\"Other\")")
class FLAXENGINE_API NavMeshBoundsVolume : public BoxVolume class FLAXENGINE_API NavMeshBoundsVolume : public BoxVolume
{ {
DECLARE_SCENE_OBJECT(NavMeshBoundsVolume); DECLARE_SCENE_OBJECT(NavMeshBoundsVolume);

2
Source/Engine/Navigation/NavModifierVolume.h
View File

@@ -8,7 +8,7 @@
/// <summary> /// <summary>
/// A special type of volume that defines the area of the scene in which navigation is restricted (eg. higher traversal cost or dynamic obstacle block). /// A special type of volume that defines the area of the scene in which navigation is restricted (eg. higher traversal cost or dynamic obstacle block).
/// </summary> /// </summary>
API_CLASS(Attributes="ActorContextMenu(\"New/Other/Nav Modifier Volume\"), ActorToolbox(\"Other\")") class FLAXENGINE_API NavModifierVolume : public BoxVolume API_CLASS(Attributes="ActorContextMenu(\"New/Navigation/Nav Modifier Volume\"), ActorToolbox(\"Other\")") class FLAXENGINE_API NavModifierVolume : public BoxVolume
{ {
DECLARE_SCENE_OBJECT(NavModifierVolume); DECLARE_SCENE_OBJECT(NavModifierVolume);
public: public: