优化蓝图执行器

This commit is contained in:
boyce
2025-10-30 16:00:46 +08:00
parent 21e9b2cd4b
commit 1995d91cfc
7 changed files with 40 additions and 58 deletions

View File

@@ -12,13 +12,11 @@ const globalVariablesPrefix = "g_"
type GetVariablesNode struct {
BaseExecNode
nodeName string
varName string
}
type SetVariablesNode struct {
BaseExecNode
nodeName string
varName string
}
func (g *GetVariablesNode) GetName() string {
@@ -27,14 +25,14 @@ func (g *GetVariablesNode) GetName() string {
func (g *GetVariablesNode) Exec() (int, error) {
var port IPort
if strings.HasPrefix(g.varName, globalVariablesPrefix) {
port = g.gr.globalVariables[g.varName]
if strings.HasPrefix(g.GetVariableName(), globalVariablesPrefix) {
port = g.gr.globalVariables[g.GetVariableName()]
} else {
port = g.gr.variables[g.varName]
port = g.gr.variables[g.GetVariableName()]
}
if port == nil {
return -1, fmt.Errorf("variable %s not found,node name %s", g.varName, g.nodeName)
return -1, fmt.Errorf("variable %s not found,node name %s", g.GetVariableName(), g.nodeName)
}
if !g.SetOutPort(0, port) {
@@ -44,10 +42,7 @@ func (g *GetVariablesNode) Exec() (int, error) {
return 0, nil
}
func (g *GetVariablesNode) setVariableName(name string) bool {
g.varName = name
return true
}
func (g *SetVariablesNode) GetName() string {
return g.nodeName
@@ -60,10 +55,10 @@ func (g *SetVariablesNode) Exec() (int, error) {
}
varPort := port.Clone()
if strings.HasPrefix(g.varName, globalVariablesPrefix) {
g.gr.globalVariables[g.varName] = varPort
if strings.HasPrefix(g.GetVariableName(), globalVariablesPrefix) {
g.gr.globalVariables[g.GetVariableName()] = varPort
} else {
g.gr.variables[g.varName] = varPort
g.gr.variables[g.GetVariableName()] = varPort
}
if !g.SetOutPort(1, varPort) {
@@ -73,7 +68,3 @@ func (g *SetVariablesNode) Exec() (int, error) {
return 0, nil
}
func (g *SetVariablesNode) setVariableName(name string) bool {
g.varName = name
return true
}