Editor: Add Velocity modificator doesn't work as expected in the Effects Editor #1111

engine/src/resources/visualeffect.cpp

@@ -209,17 +209,25 @@ inline void movOp(float *ret, int retSize, const float *arg, int argSize) {
 }
 
 inline void addOp(float *ret, int retSize, std::array<const float *, 3> &arg, std::array<int, 3> &argSize) {
+    float value = arg[1][0];
     for(int i = 0; i < retSize; i++) {
-        if(i < argSize[0] && i < argSize[1]) {
-            ret[i] = arg[0][i] + arg[1][i];
+        if(i < argSize[1]) {
+            value = arg[1][i];
+        }
+        if(i < argSize[0]) {
+            ret[i] = arg[0][i] + value;
         }
     }
 }
 
 inline void subOp(float *ret, int retSize, std::array<const float *, 3> &arg, std::array<int, 3> &argSize) {
+    float value = arg[1][0];
     for(int i = 0; i < retSize; i++) {
-        if(i < argSize[0] && i < argSize[1]) {
-            ret[i] = arg[0][i] - arg[1][i];
+        if(i < argSize[1]) {
+            value = arg[1][i];
+        }
+        if(i < argSize[0]) {
+            ret[i] = arg[0][i] - value;
         }
     }
 }
@@ -233,18 +241,26 @@ inline void mulOp(float *ret, int retSize, std::array<const float *, 3> &arg, st
 
         *r = *m * *v;
     } else {
+        float value = arg[1][0];
         for(int i = 0; i < retSize; i++) {
-            if(i < argSize[0] && i < argSize[1]) {
-                ret[i] = arg[0][i] * arg[1][i];
+            if(i < argSize[1]) {
+                value = arg[1][i];
+            }
+            if(i < argSize[0]) {
+                ret[i] = arg[0][i] * value;
             }
         }
     }
 }
 
 inline void divOp(float *ret, int retSize, std::array<const float *, 3> &arg, std::array<int, 3> &argSize) {
+    float value = arg[1][0];
     for(int i = 0; i < retSize; i++) {
-        if(i < argSize[0] && i < argSize[1]) {
-            ret[i] = arg[0][i] / arg[1][i];
+        if(i < argSize[1]) {
+            value = arg[1][i];
+        }
+        if(i < argSize[0]) {
+            ret[i] = arg[0][i] / value;
         }
     }
 }

modules/editor/particletools/converter/effectgraph.cpp

@@ -42,6 +42,7 @@ EffectGraph::EffectGraph() :
 
     m_nodeTypes.push_back("Render/SpriteParticle");
     m_nodeTypes.push_back("Render/MeshParticle");
+
 }
 
 void EffectGraph::scanForFunctions() {
@@ -70,7 +71,8 @@ void EffectGraph::scanForFunctions() {
                     TString name(function.attribute("name").as_string());
 
                     m_nodeTypes.push_back(name);
-                    m_exposedModules[Url(name).baseName()] = path.toStdString();
+                    TString baseName(Url(name).baseName());
+                    m_exposedModules[baseName] = path.toStdString();
                 }
             }
         }
@@ -117,7 +119,7 @@ void EffectGraph::onNodesLoaded() {
 }
 
 StringList EffectGraph::nodeList() const {
-    return m_nodeTypes;
+    return StringList();
 }
 
 GraphNode *EffectGraph::defaultNode() const {

modules/editor/particletools/converter/effectrootnode.cpp

@@ -458,7 +458,9 @@ void EffectRootNode::removeModule(EffectModule *module) {
 }
 
 void EffectRootNode::removeAllModules() {
-    for(auto it : getChildren()) {
+    Object::ObjectList children = getChildren();
+
+    for(auto it : children) {
         Widget *widget = static_cast<EffectModule *>(it)->widget(nullptr);
         delete widget->actor();
 

modules/editor/particletools/converter/modules/effectmodule.cpp

@@ -379,26 +379,30 @@ EffectModule::VariableData EffectModule::variable(const TString &name) const {
     }
 
     if(result.offset == -1 && !name.isEmpty()) {
-        StringList split = name.split('.');
-        const EffectRootNode::ParameterData *parameter = m_effect->parameterConst(split.front(), false);
-        if(parameter) {
-            result.size = EffectModule::typeSize(parameter->min.type());
-
-            TString comp;
-            if(split.size() > 1) {
-                comp = split.back();
-                result.size = comp.size();
-            }
-            result.min = toVector(parameter->min, comp);
-            result.max = toVector(parameter->max, comp);
-
-            result.space = parameter->mode;
+        if(result.space != Space::None) {
+            // Module uses invalid attribute
         } else {
-            Variant v = EffectRootNode::toVariantHelper(name, "auto");
-            result.min = result.max = toVector(v);
+            StringList split = name.split('.');
+            const EffectRootNode::ParameterData *parameter = m_effect->parameterConst(split.front(), false);
+            if(parameter) {
+                result.size = EffectModule::typeSize(parameter->min.type());
+
+                TString comp;
+                if(split.size() > 1) {
+                    comp = split.back();
+                    result.size = comp.size();
+                }
+                result.min = toVector(parameter->min, comp);
+                result.max = toVector(parameter->max, comp);
 
-            result.size = EffectModule::typeSize(v.type());
-            result.space = EffectModule::Constant;
+                result.space = parameter->mode;
+            } else {
+                Variant v = EffectRootNode::toVariantHelper(name, "auto");
+                result.min = result.max = toVector(v);
+
+                result.size = EffectModule::typeSize(v.type());
+                result.space = EffectModule::Constant;
+            }
         }
     }
 

modules/editor/particletools/converter/modules/effectmodule.h

@@ -76,7 +76,7 @@ class EffectModule : public Object {
     };
 
     struct VariableData {
-        Space space = Space::_Particle;
+        Space space = Space::None;
         int32_t offset = 0;
         int32_t size = 0;
 

modules/editor/particletools/modules/addvelocity.vfm

@@ -5,7 +5,7 @@
     </params>
     <attributes>
         <attribute name="p.velocity" type="vec4"/>
-    <attributes/>
+    </attributes>
     <operations>
         <operation code="set" result="p.velocity.xyz" arg0="velocityDirection"/>
         <operation code="set" result="p.velocity.w" arg0="velocitySpeed"/>