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

- Converting to parameter now also works in Particle and Visual Scripting editor

Browse Source
This commit is contained in:
Nils Hausfeld
2023-10-19 14:10:10 +02:00
parent 9bd002ea33
commit 41a7aff6d7
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Editor/Surface/Archetypes/ConvertableNode.cs
View File

@@ -59,11 +59,12 @@ internal class ConvertableNode : SurfaceNode
}; };
paramAction.Do(); paramAction.Do();
var parameterGuid = Surface.Parameters[paramIndex].ID; Guid parameterGuid = Surface.Parameters[paramIndex].ID;
bool undoEnabled = Surface.Undo.Enabled; bool undoEnabled = Surface.Undo.Enabled;
Surface.Undo.Enabled = false; Surface.Undo.Enabled = false;
SurfaceNode node = Surface.Context.SpawnNode(6, 1, this.Location, new object[] {parameterGuid}); NodeArchetype arch = Surface.GetParameterGetterNodeArchetype(out var groupId);
SurfaceNode node = Surface.Context.SpawnNode(groupId, arch.TypeID, this.Location, new object[] {parameterGuid}); // 1 Visject, 2 particle, 3 VS
Surface.Undo.Enabled = undoEnabled; Surface.Undo.Enabled = undoEnabled;
if (node is not Parameters.SurfaceNodeParamsGet getNode) if (node is not Parameters.SurfaceNodeParamsGet getNode)

2
Source/Editor/Surface/ParticleEmitterSurface.cs
View File

@@ -93,7 +93,7 @@ namespace FlaxEditor.Surface
} }
/// <inheritdoc /> /// <inheritdoc />
protected override NodeArchetype GetParameterGetterNodeArchetype(out ushort groupId) protected internal override NodeArchetype GetParameterGetterNodeArchetype(out ushort groupId)
{ {
groupId = 6; groupId = 6;
return Archetypes.Parameters.Nodes[1]; return Archetypes.Parameters.Nodes[1];

2
Source/Editor/Surface/VisjectSurface.DragDrop.cs
View File

@@ -151,7 +151,7 @@ namespace FlaxEditor.Surface
/// </summary> /// </summary>
/// <param name="groupId">The group ID.</param> /// <param name="groupId">The group ID.</param>
/// <returns>The node archetype.</returns> /// <returns>The node archetype.</returns>
protected virtual NodeArchetype GetParameterGetterNodeArchetype(out ushort groupId) protected internal virtual NodeArchetype GetParameterGetterNodeArchetype(out ushort groupId)
{ {
groupId = 6; groupId = 6;
return Archetypes.Parameters.Nodes[0]; return Archetypes.Parameters.Nodes[0];

2
Source/Editor/Surface/VisualScriptSurface.cs
View File

@@ -144,7 +144,7 @@ namespace FlaxEditor.Surface
} }
/// <inheritdoc /> /// <inheritdoc />
protected override NodeArchetype GetParameterGetterNodeArchetype(out ushort groupId) protected internal override NodeArchetype GetParameterGetterNodeArchetype(out ushort groupId)
{ {
groupId = 6; groupId = 6;
return Archetypes.Parameters.Nodes[2]; return Archetypes.Parameters.Nodes[2];