Ticket #1696: progress_1696_II.patch

binaries/data/mods/public/simulation/data/placeablesFilter.json

@@ +1 @@
+ {
+   "templates": [
+     {"directory": "campaigns", "file": "*.xml"},
+     {"directory": "gaia", "file": "*.xml"},
+     {"directory": "other", "file": "*.xml"},
+     {"directory": "structures", "file": "*.xml"},
+     {"directory": "units", "file": "*.xml"},
+     {"directory": "special", "file": "trigger_point*.xml"},
+     {"directory": "special", "file": "territory*.xml"}
+   ]
+ }
+ No newline at end of file

source/ps/TemplateLoader.cpp

@@ -191 +191 @@
     return INFO::OK;
 }
 
+std::vector<std::string> CTemplateLoader::FindPlaceablesTemplates(const std::string& path, bool includeSubdirectories, ETemplatesType templatesType, ScriptInterface& scriptInterface)
+{
+    
+    std::vector<std::string> templates;
+    Status ok;
+    VfsPath templatePath;
+
+
+    if (templatesType == SIMULATION_TEMPLATES || templatesType == ALL_TEMPLATES)
+    {
+        CScriptValRooted placeablesFilter = scriptInterface.ReadJSONFile("simulation/data/placeablesFilter.json");
+        
+        std::vector<CScriptValRooted> folders;
+        if (scriptInterface.GetProperty(placeablesFilter.get(), "templates", folders))
+        {
+            templatePath = VfsPath(TEMPLATE_ROOT) / path;
+            //I have every object inside, just run for each
+            for (std::vector<CScriptValRooted>::iterator iterator = folders.begin(); iterator != folders.end();++iterator)
+            {
+                jsval val = (*iterator).get();
+                std::string directoryPath;
+                std::wstring fileFilter;
+                scriptInterface.GetProperty(val, "directory", directoryPath);
+                scriptInterface.GetProperty(val, "file", fileFilter);
+                
+                VfsPaths filenames;
+                if (vfs::GetPathnames(g_VFS, templatePath / (directoryPath + "/"), fileFilter.c_str(), filenames) == INFO::OK)
+                {
+                    for (VfsPaths::iterator it = filenames.begin(); it != filenames.end(); ++it)
+                    {
+                        VfsPath filename = *it;
+                        // Strip the .xml extension
+                        VfsPath pathstem = filename.ChangeExtension(L"");
+                        // Strip the root from the path
+                        std::wstring name = pathstem.string().substr(ARRAY_SIZE(TEMPLATE_ROOT) - 1);
+
+                        templates.push_back(std::string(name.begin(), name.end()));
+                    }
+                }
+            }
+            
+        }
+    }
+
+    if (templatesType == ACTOR_TEMPLATES || templatesType == ALL_TEMPLATES)
+    {
+        templatePath = VfsPath(ACTOR_ROOT) / path;
+        if (includeSubdirectories)
+            ok = vfs::ForEachFile(g_VFS, templatePath, AddActorToTemplates, (uintptr_t)&templates, L"*.xml", vfs::DIR_RECURSIVE);
+        else
+            ok = vfs::ForEachFile(g_VFS, templatePath, AddActorToTemplates, (uintptr_t)&templates, L"*.xml");
+        WARN_IF_ERR(ok);
+    }
+
+    if (templatesType != SIMULATION_TEMPLATES && templatesType != ACTOR_TEMPLATES && templatesType != ALL_TEMPLATES)
+        LOGERROR(L"Undefined template type (valid: all, simulation, actor)");
+
+    return templates;
+}
+
 std::vector<std::string> CTemplateLoader::FindTemplates(const std::string& path, bool includeSubdirectories, ETemplatesType templatesType)
 {
     std::vector<std::string> templates;

source/ps/TemplateLoader.h

@@ -19 +19 @@
 #define INCLUDED_TEMPLATELOADER
 
 #include "simulation2/system/ParamNode.h"
+#include "scriptinterface/ScriptInterface.h"
 
 enum ETemplatesType
 {
@@ -55 +56 @@
      */
     std::vector<std::string> FindTemplates(const std::string& path, bool includeSubdirectories, ETemplatesType templatesType);
 
+    std::vector<std::string> FindPlaceablesTemplates(const std::string& path, bool includeSubdirectories, ETemplatesType templatesType, ScriptInterface& scriptInterface);
+
 private:
     /**
      * (Re)loads the given template, regardless of whether it exists already,

source/simulation2/components/CCmpTemplateManager.cpp

@@ -130 +130 @@
 
     virtual std::vector<std::string> FindAllTemplates(bool includeActors);
 
+    virtual std::vector<std::string> FindAllPlaceablesTemplates(bool includeActors);
+
     virtual std::vector<entity_id_t> GetEntitiesUsingTemplate(std::string templateName);
 
 private:
@@ -232 +234 @@
     return m_templateLoader.FindTemplates("", true, templatesType);
 }
 
+std::vector<std::string> CCmpTemplateManager::FindAllPlaceablesTemplates(bool includeActors)
+{
+    ScriptInterface& scriptInterface = this->GetSimContext().GetScriptInterface();
+
+    ETemplatesType templatesType = includeActors ? ALL_TEMPLATES : SIMULATION_TEMPLATES;
+    return m_templateLoader.FindPlaceablesTemplates("", true, templatesType, scriptInterface);
+}
+
 /**
  * Get the list of entities using the specified template
  */

source/simulation2/components/ICmpTemplateManager.h

@@ -99 +99 @@
      */
     virtual std::vector<std::string> FindAllTemplates(bool includeActors) = 0;
 
+    virtual std::vector<std::string> FindAllPlaceablesTemplates(bool includeActors) = 0;
+
     /**
      * Permanently disable XML validation (intended solely for test cases).
      */

source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp

@@ -68 +68 @@
     CmpPtr<ICmpTemplateManager> cmpTemplateManager(*g_Game->GetSimulation2(), SYSTEM_ENTITY);
     if (cmpTemplateManager)
     {
-        std::vector<std::string> names = cmpTemplateManager->FindAllTemplates(true);
+        std::vector<std::string> names = cmpTemplateManager->FindAllPlaceablesTemplates(true);
 
         for (std::vector<std::string>::iterator it = names.begin(); it != names.end(); ++it)
         {