Engine: loadResource for the VisualEffect resource always returns nullptr #1025

modules/editor/particletools/converter/effectbuilder.cpp

@@ -80,9 +80,11 @@ AssetConverter::ReturnCode EffectBuilder::convertFile(AssetConverterSettings *se
         m_graph.load(settings->source().toStdString());
     }
 
+    Variant result = m_graph.object();
+
     QFile file(settings->absoluteDestination());
     if(file.open(QIODevice::WriteOnly)) {
-        ByteArray data = Bson::save( m_graph.object() );
+        ByteArray data = Bson::save( result );
         file.write(reinterpret_cast<const char *>(data.data()), data.size());
         file.close();
 

modules/editor/particletools/converter/effectgraph.cpp

@@ -140,7 +140,7 @@ Variant EffectGraph::object() const {
     VariantList object;
 
     object.push_back(VisualEffect::metaClass()->name()); // type
-    object.push_back(0); // id
+    object.push_back(Engine::generateUUID()); // id
     object.push_back(0); // parent
     object.push_back(""); // name
 

modules/editor/particletools/converter/effectmodule.cpp

@@ -139,20 +139,7 @@ void EffectModule::load(const std::string &path) {
             while(!n.isNull()) {
                 QDomElement element = n.toElement();
 
-                if(element.tagName() == "options") {
-                    std::string name = element.attribute(gName).toStdString();
-                    std::vector<std::string> values;
-
-                    QDomNode optionNode = element.firstChild();
-                    while(!optionNode.isNull()) {
-                        QDomElement optionElement = optionNode.toElement();
-                        values.push_back(optionElement.attribute(gValue).toStdString());
-
-                        optionNode = optionNode.nextSibling();
-                    }
-
-                    m_options[name] = values;
-                } else if(element.tagName() == "params") { // parse inputs
+                if(element.tagName() == "params") { // parse inputs
                     QDomNode paramNode = element.firstChild();
                     while(!paramNode.isNull()) {
                         QDomElement paramElement = paramNode.toElement();
@@ -279,11 +266,16 @@ void EffectModule::fromXml(const QDomElement &element) {
         std::string value = valueElement.text().toStdString();
 
         Variant variant = EffectRootNode::toVariantHelper(value, type);
-        auto it = m_options.find(type);
-        if(it != m_options.end()) {
-            int enumValue = metaEnum.keyToValue(value.c_str());
-            variant = Variant::fromValue(enumValue);
+
+        for(auto it : m_parameters) {
+            if(it.modeType == name) {
+                int enumValue = metaEnum.keyToValue(value.c_str());
+                variant = Variant::fromValue(enumValue);
+
+                break;
+            }
         }
+
         setProperty(name.c_str(), variant);
 
         valueElement = valueElement.nextSiblingElement();
@@ -444,7 +436,7 @@ void EffectModule::setRoot(EffectRootNode *effect) {
                     setDynamicPropertyInfo(maxName.c_str(), annotationHelper(it.type));
                 }
 
-            } else {
+            } else if(it.mode == Space::Constant) {
                 std::string name = type + "/" + gValue;
 
                 setProperty(name.c_str(), it.min);

modules/editor/particletools/converter/effectmodule.h

@@ -63,6 +63,7 @@ class EffectModule : public Object {
     };
 
     enum Space {
+        None = -1,
         _System,
         _Emitter,
         _Particle,
@@ -129,8 +130,6 @@ class EffectModule : public Object {
 
     std::vector<OperationData> m_operations;
 
-    std::map<std::string, std::vector<std::string>> m_options;
-
     std::string m_path;
 
     EffectRootNode *m_effect;

modules/editor/particletools/converter/effectrootnode.cpp

@@ -238,12 +238,14 @@ VariantList EffectRootNode::saveData() const {
         if(it->enabled() && it->stage() == EffectModule::Stage::Render) {
             EffectModule::ParameterData *data = it->parameter("material");
             if(data) {
-                materialPath = data->min.value<Template>().path.toStdString();
+                Material *material = data->min.value<Material *>();
+                materialPath = Engine::reference(material);
             }
 
             data = it->parameter("mesh");
             if(data) {
-                meshPath = data->min.value<Template>().path.toStdString();
+                Mesh *mesh = data->min.value<Mesh *>();
+                meshPath = Engine::reference(mesh);
             }
         }
     }

modules/editor/particletools/editor/particleedit.cpp

@@ -206,7 +206,9 @@ void ParticleEdit::loadAsset(AssetConverterSettings *settings) {
     if(!m_settings.contains(settings)) {
         AssetEditor::loadAsset(settings);
 
-        m_render->setEffect(Engine::loadResource<VisualEffect>(qPrintable(settings->destination())));
+        std::string dest = settings->destination().toStdString();
+        VisualEffect *effect = Engine::loadResource<VisualEffect>(dest);
+        m_render->setEffect(effect);
 
         EffectGraph &graph = m_builder->graph();
         graph.load(settings->source().toStdString());

modules/editor/particletools/modules/addvelocity.vfm

@@ -1,8 +1,4 @@
 <module name="Spawn/AddVelocity" stage="spawn">
-    <options name="velocitySpeedMode">
-        <option value="Constant"/>
-        <option value="Random"/>
-    </options>
     <params>
         <param name="velocitySpeed" type="vec3" default="0, 1, 0" mode="velocitySpeedMode"/>
     </params>

modules/editor/particletools/modules/colorscale.vfm

@@ -1,8 +1,4 @@
 <module name="Update/ColorScale" stage="update">
-    <options name="colorScaleMode">
-        <option value="Constant"/>
-        <option value="Random"/>
-    </options>
     <params>
         <param name="colorScale" type="vec4" default="0, 0, 0, 0" mode="colorScaleMode"/>
     </params>

modules/editor/particletools/modules/initparticle.vfm

@@ -1,24 +1,4 @@
 <module name="Spawn/InitializeParticle" stage="spawn">
-    <options name="lifetimeMode">
-        <option value="Constant"/>
-        <option value="Random"/>
-    </options>
-    <options name="positionMode">
-        <option value="Constant"/>
-        <option value="Random"/>
-    </options>
-    <options name="colorMode">
-        <option value="Constant"/>
-        <option value="Random"/>
-    </options>
-    <options name="rotationMode">
-        <option value="Constant"/>
-        <option value="Random"/>
-    </options>
-    <options name="sizeMode">
-        <option value="Constant"/>
-        <option value="Random"/>
-    </options>
     <params>
         <param name="lifetime" type="float" default="0" mode="lifetimeMode"/>
         <param name="position" type="vec3" default="0, 0, 0" mode="positionMode"/>

modules/editor/particletools/modules/rotationrate.vfm

@@ -1,8 +1,4 @@
 <module name="Update/RotationRate" stage="update">
-    <options name="rotationRateMode">
-        <option value="Constant"/>
-        <option value="Random"/>
-    </options>
     <params>
         <param name="rotationRate" type="vec3" default="0, 0, 0" mode="rotationRateMode"/>
     </params>

modules/editor/particletools/modules/sizescale.vfm

@@ -1,8 +1,4 @@
 <module name="Update/SizeScale" stage="update">
-    <options name="sizeScaleMode">
-        <option value="Constant"/>
-        <option value="Random"/>
-    </options>
     <params>
         <param name="sizeScale" type="vec3" default="0, 0, 0" mode="sizeScaleMode"/>
     </params>