Editor: Can't create prefab in a new project #1086

engine/includes/editor/assetmanager.h

@@ -69,6 +69,8 @@ class ENGINE_EXPORT AssetManager : public QObject {
 
     bool pushToImport(AssetConverterSettings *settings);
 
+    void createFromTemplate(const TString &destination);
+
 public slots:
     void reimport();
 

engine/includes/editor/converters/prefabconverter.h

@@ -21,13 +21,13 @@ class PrefabConverter : public AssetConverter {
 public:
     void makePrefab(Actor *actor, AssetConverterSettings *settings);
 
+    AssetConverterSettings *createSettings() override;
+
 private:
     StringList suffixes() const override { return {"fab"}; }
 
     ReturnCode convertFile(AssetConverterSettings *) override;
 
-    AssetConverterSettings *createSettings() override;
-
     Actor *createActor(const AssetConverterSettings *settings, const TString &guid) const override;
 
     TString templatePath() const override;

engine/src/editor/assetmanager.cpp

@@ -181,6 +181,23 @@ bool AssetManager::pushToImport(AssetConverterSettings *settings) {
     return true;
 }
 
+void AssetManager::createFromTemplate(const TString &destination) {
+    AssetConverter *converter = getConverter(destination);
+    if(converter) {
+        converter->createFromTemplate(destination);
+    } else {
+        TString suffix = Url(destination).suffix().toLower();
+        for(auto builder : m_builders) {
+            for(auto it : builder->suffixes()) {
+                if(it == suffix) {
+                    builder->createFromTemplate(destination);
+                    return;
+                }
+            }
+        }
+    }
+}
+
 TString AssetManager::pathToLocal(const TString &source) const {
     static QDir dir(m_projectManager->contentPath().data());
     TString path(dir.relativeFilePath(source.data()).toStdString());
@@ -236,7 +253,7 @@ void AssetManager::makePrefab(const TString &source, const TString &target) {
     int index = source.indexOf(':');
     TString id = source.left(index);
     TString name = source.right(index + 1);
-    Actor *actor = dynamic_cast<Actor *>(Engine::findObject(id.toInt()));
+    Actor *actor = dynamic_cast<Actor *>(Engine::findObject(id.toLong()));
     if(actor) {
         TString path(m_projectManager->contentPath());
         path += TString("/") + QFileInfo(target.data()).filePath().toStdString() + "/" + name + ".fab";
@@ -245,7 +262,12 @@ void AssetManager::makePrefab(const TString &source, const TString &target) {
         if(converter) {
             Object *parent = actor->parent();
 
-            AssetConverterSettings *settings = fetchSettings(path);
+            AssetConverterSettings *settings = converter->createSettings();
+
+            settings->setSource(path);
+            settings->setDestination(QUuid::createUuid().toString().toStdString());
+            settings->setAbsoluteDestination(m_projectManager->importPath() + "/" + settings->destination());
+            m_converterSettings[path] = settings;
 
             converter->makePrefab(actor, settings);
 
@@ -255,7 +277,7 @@ void AssetManager::makePrefab(const TString &source, const TString &target) {
 
             Actor *clone = static_cast<Actor *>(actor->clone(parent));
 
-            emit prefabCreated(id.toInt(), clone->uuid());
+            emit prefabCreated(id.toLong(), clone->uuid());
         }
     }
 }
@@ -517,7 +539,7 @@ void AssetManager::onPerform() {
 }
 
 AssetConverter *AssetManager::getConverter(const TString &source) {
-    auto it = m_converters.find(QFileInfo(source.data()).completeSuffix().toLower().toStdString());
+    auto it = m_converters.find(Url(source).suffix().toLower());
     if(it != m_converters.end()) {
         return it->second;
     }

engine/src/editor/converters/prefabconverter.cpp

@@ -35,9 +35,9 @@ TString PrefabConverter::templatePath() const {
 }
 
 void PrefabConverter::createFromTemplate(const TString &destination) {
-    File src(templatePath().data());
-    if(src.open(File::ReadOnly)) {
-        TString data = src.readAll();
+    QFile src(templatePath().data());
+    if(src.open(QFile::ReadOnly)) {
+        TString data = src.readAll().toStdString();
         src.close();
 
         Variant variant = Json::load(data);

worldeditor/src/screens/contentbrowser/contenttree.cpp

@@ -68,10 +68,7 @@ bool ContentTree::setData(const QModelIndex &index, const QVariant &value, int r
                     QDir dir(path);
                     dir.mkdir(value.toString());
                 } else {
-                    AssetConverter *converter = AssetManager::instance()->getConverter(source.toStdString());
-                    if(converter) {
-                        converter->createFromTemplate((QString(path + "/" + value.toString() + "." + QFileInfo(source).suffix())).toStdString());
-                    }
+                    AssetManager::instance()->createFromTemplate((path + "/" + value.toString() + "." + QFileInfo(source).suffix()).toStdString());
                 }
 
                 m_newAsset->setParent(nullptr);

worldeditor/src/screens/objecthierarchy/hierarchybrowser.cpp

@@ -137,6 +137,12 @@ HierarchyBrowser::HierarchyBrowser(QWidget *parent) :
 }
 
 HierarchyBrowser::~HierarchyBrowser() {
+    delete m_filter->sourceModel();
+
+    delete m_filter;
+
+    delete m_components;
+
     delete ui;
 }