Completed first iteration of drawings management on v2

backend/core/src/core.cpp

@@ -22,6 +22,7 @@ Scheduler* scheduler = nullptr;
 
 /* Data jsons */
 json::value missionData = json::value::object();
+json::value drawingsByLayer = json::value::object();
 
 mutex mutexLock;
 string sessionHash;
@@ -161,3 +162,17 @@ extern "C" DllExport int coreMissionData(lua_State * L)
 
     return(0);
 }
+
+extern "C" DllExport int coreDrawingsData(lua_State* L)
+{
+    log("Olympus coreDrawingsData called successfully");
+
+    /* Lock for thread safety */
+    lock_guard<mutex> guard(mutexLock);
+
+    lua_getglobal(L, "Olympus");
+    lua_getfield(L, -1, "drawingsByLayer");
+    luaTableToJSON(L, -1, drawingsByLayer);
+
+    return(0);
+}

backend/core/src/server.cpp

@@ -17,6 +17,7 @@ extern UnitsManager* unitsManager;
 extern WeaponsManager* weaponsManager;
 extern Scheduler* scheduler;
 extern json::value missionData;
+extern json::value drawingsByLayer;
 extern mutex mutexLock;
 extern string sessionHash;
 extern string instancePath;
@@ -149,6 +150,11 @@ void Server::handle_get(http_request request)
                     else if (URI.compare(COMMANDS_URI) == 0 && query.find(L"commandHash") != query.end()) {
                         answer[L"commandExecuted"] = json::value(scheduler->isCommandExecuted(to_string(query[L"commandHash"])));
                     }
+                    /* Drawings data*/
+                    else if (URI.compare(DRAWINGS_URI) == 0 && drawingsByLayer.has_object_field(L"drawings")) {
+                        log("Trying to answer with drawings...");
+                        answer[L"drawings"] = drawingsByLayer[L"drawings"];
+                    }
                     
                     /* Common data */
                     answer[L"time"] = json::value::string(to_wstring(ms.count()));

backend/olympus/src/olympus.cpp

@@ -11,12 +11,14 @@ typedef int(__stdcall* f_coreFrame)(lua_State* L);
 typedef int(__stdcall* f_coreUnitsData)(lua_State* L);
 typedef int(__stdcall* f_coreWeaponsData)(lua_State* L);
 typedef int(__stdcall* f_coreMissionData)(lua_State* L);
+typedef int(__stdcall* f_coreDrawingsData)(lua_State* L);
 f_coreInit coreInit = nullptr;
 f_coreDeinit coreDeinit = nullptr;
 f_coreFrame coreFrame = nullptr;
 f_coreUnitsData coreUnitsData = nullptr;
 f_coreWeaponsData coreWeaponsData = nullptr;
 f_coreMissionData coreMissionData = nullptr;
+f_coreDrawingsData coreDrawingsData = nullptr;
 
 string modPath;
 
@@ -108,6 +110,13 @@ static int onSimulationStart(lua_State* L)
         goto error;
     }
 
+    coreDrawingsData = (f_coreDrawingsData)GetProcAddress(hGetProcIDDLL, "coreDrawingsData");
+    if (!coreDrawingsData)
+    {
+        LogError(L, "Error getting coreDrawingsData ProcAddress from DLL");
+        goto error;
+    }
+
     coreInit(L, modPath.c_str());
 
     LogInfo(L, "Module loaded and started successfully.");
@@ -155,6 +164,8 @@ static int onSimulationStop(lua_State* L)
         coreUnitsData = nullptr;
         coreWeaponsData = nullptr;
         coreMissionData = nullptr;
+
+        coreDrawingsData = nullptr;
     }
 
     hGetProcIDDLL = NULL;
@@ -193,6 +204,15 @@ static int setMissionData(lua_State* L)
     return 0;
 }
 
+static int setDrawingsData(lua_State* L)
+{
+    if (coreDrawingsData)
+    {
+        coreDrawingsData(L);
+    }
+    return 0;
+}
+
 static const luaL_Reg Map[] = {
 	{"onSimulationStart", onSimulationStart},
     {"onSimulationFrame", onSimulationFrame},
@@ -200,6 +220,7 @@ static const luaL_Reg Map[] = {
     {"setUnitsData", setUnitsData },
     {"setWeaponsData", setWeaponsData },
     {"setMissionData", setMissionData },
+    {"setDrawingsData", setDrawingsData },
 	{NULL, NULL}
 };
 

backend/shared/include/defines.h

@@ -13,6 +13,7 @@
 #define SPOTS_URI "spots"
 #define MISSION_URI "mission"
 #define COMMANDS_URI "commands"
+#define DRAWINGS_URI "drawings"
 
 #define FRAMERATE_TIME_INTERVAL 0.05