Ticket #969: AI Territories.patch

binaries/data/mods/public/simulation/ai/common-api/base.js

@@ -84 +84 @@
     this.timeElapsed = state.timeElapsed;
     this.map = state.map;
     this.passabilityClasses = state.passabilityClasses;
+    this.territoryMap = state.territoryMap;
 
     Engine.ProfileStop();
 
@@ -97 +98 @@
     delete this.timeElapsed;
     delete this.map;
     delete this.passabilityClasses;
+    delete this.territoryMap;
 };
 
 BaseAI.prototype.ApplyEntitiesDelta = function(state)

source/simulation2/components/CCmpAIManager.cpp

@@ -34 +34 @@
 #include "simulation2/components/ICmpObstructionManager.h"
 #include "simulation2/components/ICmpRangeManager.h"
 #include "simulation2/components/ICmpTemplateManager.h"
+#include "simulation2/components/ICmpTerritoryManager.h"
 #include "simulation2/helpers/Grid.h"
 #include "simulation2/serialization/DebugSerializer.h"
 #include "simulation2/serialization/StdDeserializer.h"
@@ -286 +287 @@
         return true;
     }
 
-    void StartComputation(const shared_ptr<ScriptInterface::StructuredClone>& gameState, const Grid<u16>& map)
+    void StartComputation(const shared_ptr<ScriptInterface::StructuredClone>& gameState, const Grid<u16>& map, const Grid<u8>& territoryMap)
     {
         ENSURE(m_CommandsComputed);
 
@@ -300 +301 @@
             m_GameStateMapVal = CScriptValRooted(cx, ScriptInterface::ToJSVal(cx, m_GameStateMap));
         }
 
+        if (true) //territoryMap.m_DirtyID != m_TerritoryMap.m_DirtyID) couldn't manage to get this working the ID's always matched 
+            // I tried debugging and the DirtyID of territoryMap did not change
+        {
+            PROFILE("territoryMap");
+            m_TerritoryMap = territoryMap;
+
+            JSContext* cx = m_ScriptInterface.GetContext();
+            m_TerritoryMapVal = CScriptValRooted(cx, ScriptInterface::ToJSVal(cx, m_TerritoryMap));
+        }
+
+
         m_CommandsComputed = false;
     }
 
@@ -427 +439 @@
 
     void PerformComputation()
     {
+
         // Deserialize the game state, to pass to the AI's HandleMessage
         CScriptVal state;
         {
             PROFILE("AI compute read state");
             state = m_ScriptInterface.ReadStructuredClone(m_GameState);
             m_ScriptInterface.SetProperty(state.get(), "map", m_GameStateMapVal, true);
+            m_ScriptInterface.SetProperty(state.get(), "territoryMap", m_TerritoryMapVal, true);
         }
 
         // It would be nice to do
@@ -469 +483 @@
     shared_ptr<ScriptInterface::StructuredClone> m_GameState;
     Grid<u16> m_GameStateMap;
     CScriptValRooted m_GameStateMapVal;
+    Grid<u8> m_TerritoryMap;
+    CScriptValRooted m_TerritoryMapVal;
 
     bool m_CommandsComputed;
 };
@@ -575 +591 @@
         if (!cmpPathfinder.null())
             map = &cmpPathfinder->GetPassabilityGrid();
 
+        // Get the territory data
+        Grid<u8> dummyGrid2;
+        const Grid<u8>* territoryMap = &dummyGrid2;
+        CmpPtr<ICmpTerritoryManager> cmpTerritoryManager(GetSimContext(), SYSTEM_ENTITY);
+        if (!cmpTerritoryManager.null())// || !cmpTerritoryManager->NeedUpdate(&m_TerritoriesDirtyID)) - Don't think this is appropriate here so have ignored it
+            territoryMap = &cmpTerritoryManager->GetTerritoryGrid();
+
         LoadPathfinderClasses(state);
 
-        m_Worker.StartComputation(scriptInterface.WriteStructuredClone(state.get()), *map);
+        m_Worker.StartComputation(scriptInterface.WriteStructuredClone(state.get()), *map, *territoryMap);
     }
 
     virtual void PushCommands()

source/simulation2/scripting/EngineScriptConversions.cpp

@@ -236 +236 @@
 
     return OBJECT_TO_JSVAL(obj);
 }
+
+template<> jsval ScriptInterface::ToJSVal<Grid<u8> >(JSContext* cx, const Grid<u8>& val)
+{
+    JSObject* obj = JS_NewObject(cx, NULL, NULL, NULL);
+    if (!obj)
+        return JSVAL_VOID;
+
+    jsuint len = val.m_W * val.m_H;
+    JSObject *darray = js_CreateTypedArray(cx, js::TypedArray::TYPE_INT8, len);
+    if (!darray)
+        return JSVAL_VOID;
+
+    js::TypedArray *tdest = js::TypedArray::fromJSObject(darray);
+    ENSURE(tdest->byteLength == len*sizeof(u8));
+
+    memcpy(tdest->data, val.m_Data, tdest->byteLength);
+
+    jsval w = ToJSVal(cx, val.m_W);
+    jsval h = ToJSVal(cx, val.m_H);
+    jsval data = OBJECT_TO_JSVAL(darray);
+
+    JS_SetProperty(cx, obj, "width", &w);
+    JS_SetProperty(cx, obj, "height", &h);
+    JS_SetProperty(cx, obj, "data", &data);
+
+    return OBJECT_TO_JSVAL(obj);
+}
+ No newline at end of file