simplify overview (performance imrpovement); add async connect

Author: malytomas

c/uwapi/uwapi/modules/botsConnection.h

@@ -56,13 +56,15 @@ extern "C"
 	// connect
 
 	UNNATURAL_API void uwSetConnectStartGui(bool enabled, const char *extraCmdParams);
+	UNNATURAL_API void uwSetConnectAsync(bool async);
 	UNNATURAL_API bool uwConnectFindLan(uint64 timeoutMicroseconds);
 	UNNATURAL_API void uwConnectDirect(const char *address, uint16 port);
 	UNNATURAL_API void uwConnectLobbyId(uint64 lobbyId);
 	UNNATURAL_API bool uwConnectEnvironment();
 	UNNATURAL_API void uwConnectNewServer(uint32 visibility, const char *name, const char *extraCmdParams);
 	UNNATURAL_API bool uwTryReconnect(void);
 	UNNATURAL_API void uwDisconnect(void);
+	UNNATURAL_API bool uwAsyncUpdate(void);
 
 	// my player
 

c/uwapi/uwapi/modules/common.h

@@ -34,7 +34,7 @@ extern "C"
 	typedef uint64_t uint64;
 	typedef int64_t sint64;
 
-	static const uint32 UW_VERSION = 46;
+	static const uint32 UW_VERSION = 47;
 	static const uint32 UW_GameTicksPerSecond = 20;
 
 	typedef struct UwIds

csharp/uwapi/admin.cs

@@ -25,6 +25,11 @@ public static void SetMapSelection(string path)
             Interop.uwAdminSetMapSelection(path);
         }
 
+        public static void SetGameConfig(Interop.UwGameConfig cfg)
+        {
+            Interop.uwAdminSetGameConfig(ref cfg);
+        }
+
         public static void StartGame()
         {
             Interop.uwAdminStartGame();

csharp/uwapi/interop.cs

@@ -153,6 +153,9 @@ public enum UwConnectionStateEnum
         public static extern void uwSetConnectStartGui([MarshalAs(UnmanagedType.I1)] bool enabled,
                                                        [MarshalAs(UnmanagedType.LPStr)] string extraCmdParams);
 
+        [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void uwSetConnectAsync([MarshalAs(UnmanagedType.I1)] bool async);
+
         [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
         [return:MarshalAs(UnmanagedType.I1)]
         public static extern bool uwConnectFindLan(ulong timeoutMicroseconds);
@@ -178,6 +181,10 @@ public static extern void uwConnectNewServer(uint visibility, [MarshalAs(Unmanag
         [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void uwDisconnect();
 
+        [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
+        [return:MarshalAs(UnmanagedType.I1)]
+        public static extern bool uwAsyncUpdate();
+
         [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void uwSetPlayerName([MarshalAs(UnmanagedType.LPStr)] string name);
 
@@ -320,7 +327,7 @@ public static extern void uwCommandPlaceConstruction(uint constructionProto, uin
         [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void uwCommandSelfDestruct(uint entityId);
 
-        public const uint UW_VERSION = 46;
+        public const uint UW_VERSION = 47;
         public const uint UW_GameTicksPerSecond = 20;
         [StructLayout(LayoutKind.Sequential)]
         public struct UwIds

csharp/uwapi/world.cs

@@ -67,12 +67,17 @@ public static uint FindConstructionPlacement(uint constructionProto, uint positi
 
         public static IReadOnlyList<OverviewFlags> OverviewFlags()
         {
+            Interop.UwOverviewExtract ex = new Interop.UwOverviewExtract();
+            Interop.uwOverviewExtract(ref ex);
+            OverviewFlags[] overview = new OverviewFlags[ex.count];
+            if (ex.count > 0)
+                Marshal.Copy(ex.flags, (int[])(object)overview, 0, (int)ex.count);
             return overview;
         }
 
         public static OverviewFlags OverviewFlags(uint position)
         {
-            return overview[(int)position];
+            return Interop.uwOverviewFlags(position);
         }
 
         public static uint[] OverviewEntities(uint position)
@@ -128,7 +133,6 @@ public static void OfferForeignPolicy(uint forceId, PolicyEnum policy)
         static MyForceStatistics myForceStatistics = new MyForceStatistics();
         static readonly Dictionary<uint, Entity> entities = new Dictionary<uint, Entity>();
         static readonly Dictionary<uint, PolicyEnum> policies = new Dictionary<uint, PolicyEnum>();
-        static OverviewFlags[] overview = new OverviewFlags[0];
 
         static uint[] AllIds()
         {
@@ -196,21 +200,6 @@ static void UpdatePolicies()
             }
         }
 
-        static void UpdateOverview(bool stepping)
-        {
-            if (stepping)
-            {
-                Interop.UwOverviewExtract ex = new Interop.UwOverviewExtract();
-                Interop.uwOverviewExtract(ref ex);
-                if (overview.Length != ex.count)
-                    overview = new OverviewFlags[ex.count];
-                if (ex.count > 0)
-                    Marshal.Copy(ex.flags, (int[])(object)overview, 0, (int)ex.count);
-            }
-            else
-                overview = new OverviewFlags[0];
-        }
-
         static void Updating(object sender, bool stepping)
         {
             Interop.uwMyPlayer(ref myPlayer);
@@ -219,7 +208,6 @@ static void Updating(object sender, bool stepping)
             UpdateFresh();
             UpdateModified();
             UpdatePolicies();
-            UpdateOverview(stepping);
         }
 
         static World()

python/uwapi/admin.py

@@ -21,6 +21,9 @@ def get_server_port(self) -> int:
     def set_map_selection(self, path: str) -> None:
         uw_interop.uwAdminSetMapSelection(path)
 
+    def set_game_config(self, cfg: UwGameConfig) -> None:
+        uw_interop.uwAdminSetGameConfig(cfg)
+
     def start_game(self) -> None:
         uw_interop.uwAdminStartGame()
 

python/uwapi/bots.h

@@ -9,7 +9,7 @@ typedef int32_t sint32;
 typedef uint64_t uint64;
 typedef int64_t sint64;
 
-static const uint32 UW_VERSION = 46;
+static const uint32 UW_VERSION = 47;
 static const uint32 UW_GameTicksPerSecond = 20;
 
 typedef struct UwIds
@@ -131,13 +131,15 @@ void uwSetConnectionStateCallback(UwConnectionStateCallbackType callback);
 UwConnectionStateEnum uwConnectionState(void);
 
 void uwSetConnectStartGui(bool enabled, const char *extraCmdParams);
+void uwSetConnectAsync(bool async);
 bool uwConnectFindLan(uint64 timeoutMicroseconds);
 void uwConnectDirect(const char *address, uint16 port);
 void uwConnectLobbyId(uint64 lobbyId);
 bool uwConnectEnvironment();
 void uwConnectNewServer(uint32 visibility, const char *name, const char *extraCmdParams);
 bool uwTryReconnect(void);
 void uwDisconnect(void);
+bool uwAsyncUpdate(void);
 
 void uwSetPlayerName(const char *name);
 void uwPlayerJoinForce(uint32 force);

python/uwapi/interop.py

@@ -642,6 +642,9 @@ def uwSetConnectStartGui(self, enabled: bool, extraCmdParams: str) -> None:
         extraCmdParams_ = self._str_pytoc(extraCmdParams)
         self._api.uwSetConnectStartGui(enabled, extraCmdParams_)
 
+    def uwSetConnectAsync(self, async: bool) -> None:
+        self._api.uwSetConnectAsync(async)
+
     def uwConnectFindLan(self, timeoutMicroseconds: int) -> bool:
         ret = self._api.uwConnectFindLan(timeoutMicroseconds)
         ret = bool(ret)
@@ -672,6 +675,11 @@ def uwTryReconnect(self) -> bool:
     def uwDisconnect(self) -> None:
         self._api.uwDisconnect()
 
+    def uwAsyncUpdate(self) -> bool:
+        ret = self._api.uwAsyncUpdate()
+        ret = bool(ret)
+        return ret
+
     def uwSetPlayerName(self, name: str) -> None:
         name_ = self._str_pytoc(name)
         self._api.uwSetPlayerName(name_)

python/uwapi/world.py

@@ -18,7 +18,6 @@ class World:
     _my_force_statistics = _make_empty_UwMyForceStatistics()
     _entities: dict[int, Entity] = {}
     _policies: dict[int, UwForeignPolicyEnum] = {}
-    _overview: list[UwOverviewFlags] = []
 
     def __new__(cls):
         if cls._instance is None:
@@ -65,10 +64,10 @@ def find_construction_placement(
         )
 
     def overview_flags_all(self) -> list[UwOverviewFlags]:
-        return self._overview
+        return uw_interop.uwOverviewExtract().flags
 
     def overview_flags(self, position: int) -> UwOverviewFlags:
-        return self._overview[position]
+        return uw_interop.uwOverviewFlags(position)
 
     def overview_entities(self, position: int) -> list[int]:
         return uw_interop.uwOverviewIds(position).ids
@@ -144,12 +143,6 @@ def _update_policies(self) -> None:
             if fp.forces[1] == self._my_player.forceEntityId:
                 self._policies[fp.forces[0]] = fp.policy
 
-    def _update_overview(self, stepping: bool) -> None:
-        if stepping:
-            self._overview = uw_interop.uwOverviewExtract().flags
-        else:
-            self._overview = []
-
     def _update(self, stepping: bool) -> None:
         tmp = uw_interop.uwMyPlayer()
         self._my_player = tmp[1] if tmp[0] else _make_empty_UwMyPlayer()
@@ -158,7 +151,6 @@ def _update(self, stepping: bool) -> None:
         self._update_fresh()
         self._update_modified()
         self._update_policies()
-        self._update_overview(stepping)
 
 
 uw_world = World()