Core : Project template managment

main/builtint/templates/vortex.templates.builtin.blank/README.md

@@ -0,0 +1 @@
+# Sample template for Vortex

main/builtint/templates/vortex.templates.builtin.blank/base/vortex.config

@@ -0,0 +1,11 @@
+{
+    "project": {
+        "author": "unknow",
+        "compatibleWith": "unknow",
+        "description": "unknow",
+        "include_system_templates": true,
+        "name": "unknow",
+        "type": "unknow",
+        "version": "unknow"
+    }
+}

main/builtint/templates/vortex.templates.builtin.blank/template.json

@@ -0,0 +1,14 @@
+{
+    "type": "project",
+    "group": "Core",
+    "name": "vortex.templates.builtin.blank",
+    "proper_name": "Blank",
+    "author": "Infinite",
+    "version": "1.0.0",
+    "contributors": [
+    ],
+    "deps": [],
+    "tarball": "./base.tar.gz",
+    "picture": "./assets/logo.png",
+    "description": "This is a module that allow the creation, manipulation, development & production of a toolchain"
+}

main/builtint/templates/vortex.templates.builtin.gmp/base/vortex.config

@@ -0,0 +1,11 @@
+{
+    "project": {
+        "author": "unknow",
+        "compatibleWith": "unknow",
+        "description": "unknow",
+        "include_system_templates": true,
+        "name": "unknow",
+        "type": "unknow",
+        "version": "unknow"
+    }
+}

main/builtint/templates/vortex.templates.builtin.gmp/template.json

@@ -24,7 +24,7 @@
             ]
         }
     ],
-    "tarball": "./dist/template.tar.gz",
+    "tarball": "./base.tar.gz",
     "picture": "./assets/logo.png",
     "description": "This is a module that allow the creation, manipulation, development & production of a toolchain"
 }

main/src/templates/install.cpp

@@ -60,7 +60,12 @@ VORTEX_API void VortexMaker::InstallTemplate(const std::string &name, const std:
 
                     VortexMaker::LogInfo("Core", "Installing the template \"" + name + "\" ...");
 
-                    std::string cmd = "tar -xvf " + tem->m_path + tem->m_tarball + " " + path; 
+                    std::string cmd = "tar -xvf " + tem->m_path + tem->m_tarball + " --strip-components=1 " + " -C " + path; 
+                    std::cout << cmd << std::endl;
+                    system(cmd.c_str());
+
+                    // Puis reprendre le ficheir vortex.condfig et l'overrider
+
         }
 
     }

main/src/vortex/environment/environment.cpp

@@ -22,27 +22,6 @@ VORTEX_API void VortexMaker::InitEnvironment()
         std::string path = VortexMaker::getHomeDirectory() + "/.vx/templates/vortex.templates.builtin.__blankproject/";
         VortexMaker::createFolderIfNotExists(path);
     }
-    {
-        std::string path = VortexMaker::getHomeDirectory() + "/.vx/templates/vortex.templates.builtin.__blankproject/";
-        std::string file = path + "template.json";
-
-        nlohmann::json default_data = {
-            {"type", "project"},
-            {"group", "Core"},
-            {"name", "vortex.templates.builtin.blankproject"},
-            {"proper_name", "Blank project"},
-            {"author", "Infinite"},
-            {"version", "--"},
-            {"compatibleWith", "--"},
-            {"tarball", "--"},
-            {"picture", "/icon.png"},
-            {"description", "This the most minimum sample project for Vortex."},
-            {"deps", nlohmann::json::array()},
-            {"contributors", nlohmann::json::array()}
-        };
-
-        VortexMaker::createJsonFileIfNotExists(file, default_data);
-    }
 
     {
         std::string path = VortexMaker::getHomeDirectory() + "/.vx/data/";

main/src/vortex/project/create_project.cpp

@@ -98,21 +98,24 @@ VORTEX_API void VortexMaker::CreateProject(const std::string &name, const std::s
     VortexMaker::createFolderIfNotExists(path);
     VortexMaker::InstallTemplate(template_name, path);
 
+    std::string version = VORTEX_VERSION;
+
     // Creating and populating JSON data for vortex.config
+    /*
     {
         nlohmann::json j;
         j["project"]["author"] = author;
         j["project"]["description"] = description;
         j["project"]["name"] = name;
         j["project"]["type"] = "???";
         j["project"]["version"] = "1.0.0";
-        j["project"]["compatibleWith"] = VORTEX_VERSION;
+        j["project"]["compatibleWith"] = version;
         j["project"]["include_system_templates"] = true;
 
         // Store JSON into vortex.config file
         std::ofstream o(path + "/vortex.config");
         o << std::setw(4) << j << std::endl;
         o.close();
-    }
+    }*/
 
 }

main/src/vortex/project/init_project.cpp

@@ -16,7 +16,6 @@ VORTEX_API void VortexMaker::InitProject(const nlohmann::json &main_configs)
 {
     // Get reference to the Vortex context
     VxContext &ctx = *CVortexMaker;
-
     // Initialize context properties based on JSON configurations
     ctx.author = main_configs["project"]["author"].get<std::string>();
     ctx.description = main_configs["project"]["description"].get<std::string>();

tools/editor/app/core/ModuleManager.cpp

@@ -85,6 +85,9 @@ static void logo(const std::string &path, std::string index_group, int total)
 
     int index = getIndex(index_group);
 
+    if(index == -1)
+    return;
+
     if (total > logos.size())
     {
         void *data = UIKit::Image::Decode(hexData, hexTable.size(), w, h);
@@ -536,8 +539,7 @@ void ModuleManager::menubar()
 
                     {
                         ImGui::BeginChild("LOGO_", ImVec2(70, 70), true);
-                        logo(ctx->IO.sys_em[i]->m_logo_path, ctx->IO.em[i]->m_group, this->ctx->IO.sys_em.size());
-
+                        logo(ctx->IO.sys_em[i]->m_logo_path, ctx->IO.sys_em[i]->m_group, this->ctx->IO.sys_em.size());
                         ImGui::EndChild();
                         ImGui::SameLine();
                     }

tools/launcher/app/core/ProjectManager.cpp

@@ -50,12 +50,9 @@ static void logo(const std::string &path, int index, int total)
         std::shared_ptr<UIKit::Image> _icon = std::make_shared<UIKit::Image>(w, h, UIKit::ImageFormat::RGBA, data);
         logos.push_back(_icon);
         VX_FREE(data);
-
-        if (index <= logos.size())
-        {
             ImTextureID addIcon = logos[index]->GetImGuiTextureID(VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
             textures.push_back(addIcon);
-        }
+
     }
 
     if (index <= textures.size())
@@ -166,8 +163,6 @@ void ProjectManager::OnImGuiRender()
             }
 
             {
-                if (!this->ctx->IO.sys_projects[row]->name.empty() && !this->ctx->IO.sys_projects[row]->name.empty())
-                {
                     ImGuiID _id = ImGui::GetID("TEXT_");
                     ImGui::BeginChild(_id, ImVec2(0, 100), true);
                     float oldsize = ImGui::GetFont()->Scale;
@@ -188,7 +183,7 @@ void ProjectManager::OnImGuiRender()
                     ImGui::Text(this->ctx->IO.sys_projects[row]->author.c_str());
 
                     ImGui::EndChild();
-                }
+
             }
 
             if (ImGui::Button("Open"))
@@ -321,15 +316,14 @@ void ProjectManager::OnImGuiRender()
         ImGui::SameLine();
         ImGui::TextColored(ImVec4(1.0f, 1.0f, 1.0f, 0.5f), selected_template_object->m_proper_name.c_str());
         ImGui::Text("Description : ");
-        ImGui::SameLine();
+        ImGui::SameLine(); 
         ImGui::TextColored(ImVec4(1.0f, 1.0f, 1.0f, 0.5f), selected_template_object->m_description.c_str());
         ImGui::Separator();
 
         ImGui::Checkbox("Open the project after creation", &open);
-std::ostringstream oss;
-oss << buf << "/" << name;
-static std::string path = oss.str();
-        ImGui::Text("This new project will be install in ");
+        std::string path = s + name;
+
+        ImGui::Text("This new project will be install in "); // Fix path and allow project creation + fix core dumped 
         ImGui::SameLine();
         ImGui::TextColored(ImVec4(1.0f, 1.0f, 1.0f, 0.5f), path.c_str());
 
@@ -344,7 +338,6 @@ static std::string path = oss.str();
         {
             VortexMaker::CreateProject(name, auth, desc, path, selected_template_object->m_name);
         }
-path.clear();
         ImGui::EndChild();
     }