Ticket #1589: rms_interface.patch

source/graphics/MapGenerator.cpp

@@ -1 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2014 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -91 +91 @@
     m_ScriptInterface->RegisterFunction<void, int, CMapGeneratorWorker::SetProgress>("SetProgress");
     m_ScriptInterface->RegisterFunction<void, CMapGeneratorWorker::MaybeGC>("MaybeGC");
     m_ScriptInterface->RegisterFunction<std::vector<std::string>, CMapGeneratorWorker::GetCivData>("GetCivData");
+    m_ScriptInterface->RegisterFunction<CParamNode, std::string, CMapGeneratorWorker::GetTemplate>("GetTemplate");
+    m_ScriptInterface->RegisterFunction<std::vector<std::string>, std::string, bool, CMapGeneratorWorker::FindTemplates>("FindTemplates");
+    m_ScriptInterface->RegisterFunction<std::vector<std::string>, std::string, bool, CMapGeneratorWorker::FindActorTemplates>("FindActorTemplates");
 
     // TODO: This code is a bit ugly because we have to ensure that CScriptValRooted gets destroyed before the ScriptInterface.
     // In the future we should work more with the standard JSAPI types for rooting on the stack, which should avoid such problems.
@@ -220 +223 @@
 
 }
 
+CParamNode CMapGeneratorWorker::GetTemplate(ScriptInterface::CxPrivate* pCxPrivate, std::string templateName)
+{
+    // TODO: Find a way to validate templates outside of the simulation.
+    // This should be implemented in TemplateLoader though.
+    
+    CMapGeneratorWorker* self = static_cast<CMapGeneratorWorker*>(pCxPrivate->pCBData);
+    const CParamNode& templateRoot = self->m_TemplateLoader.GetTemplateFileData(templateName).GetChild("Entity");
+    if (!templateRoot.IsOk())
+        LOGERROR(L"Invalid template found for '%hs'", templateName.c_str());
+    
+    return templateRoot;
+}
+
+std::vector<std::string> CMapGeneratorWorker::FindTemplates(ScriptInterface::CxPrivate* pCxPrivate, std::string path, bool includeSubdirectories)
+{
+    CMapGeneratorWorker* self = static_cast<CMapGeneratorWorker*>(pCxPrivate->pCBData);
+    return self->m_TemplateLoader.FindTemplates(path, includeSubdirectories, SIMULATION_TEMPLATES);
+}
+
+std::vector<std::string> CMapGeneratorWorker::FindActorTemplates(ScriptInterface::CxPrivate* pCxPrivate, std::string path, bool includeSubdirectories)
+{
+    CMapGeneratorWorker* self = static_cast<CMapGeneratorWorker*>(pCxPrivate->pCBData);
+    return self->m_TemplateLoader.FindTemplates(path, includeSubdirectories, ACTOR_TEMPLATES);
+}
+
 bool CMapGeneratorWorker::LoadScripts(const std::wstring& libraryName)
 {
     // Ignore libraries that are already loaded

source/graphics/MapGenerator.h

@@ -1 @@
-/* Copyright (C) 2013 Wildfire Games.
+/* Copyright (C) 2014 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20 +20 @@
 
 #include "ps/FileIo.h"
 #include "ps/ThreadUtil.h"
+#include "ps/TemplateLoader.h"
 #include "scriptinterface/ScriptInterface.h"
 
 #include <boost/random/linear_congruential.hpp>
@@ -125 +126 @@
     static void SetProgress(ScriptInterface::CxPrivate* pCxPrivate, int progress);
     static void MaybeGC(ScriptInterface::CxPrivate* pCxPrivate);
     static std::vector<std::string> GetCivData(ScriptInterface::CxPrivate* pCxPrivate);
+    static CParamNode GetTemplate(ScriptInterface::CxPrivate* pCxPrivate, std::string templateName);
+    static std::vector<std::string> FindTemplates(ScriptInterface::CxPrivate* pCxPrivate, std::string path, bool includeSubdirectories);
+    static std::vector<std::string> FindActorTemplates(ScriptInterface::CxPrivate* pCxPrivate, std::string path, bool includeSubdirectories);
 
     std::set<std::wstring> m_LoadedLibraries;
     shared_ptr<ScriptInterface::StructuredClone> m_MapData;
@@ -133 +137 @@
     ScriptInterface* m_ScriptInterface;
     VfsPath m_ScriptPath;
     std::string m_Settings;
+    CTemplateLoader m_TemplateLoader;
 
 // Thread
     static void* RunThread(void* data);