Merge branch 'dev/tp-mem'

Author: nick-dodonov

complex.slnx

@@ -1,5 +1,6 @@
 <Solution>
   <Folder Name="/App/">
+    <Project Path="src\App\Common\Data\Common.Data.csproj" Type="Classic C#" />
     <Project Path="src\App\Common\Runtime\Common.csproj" Type="Classic C#" />
     <Project Path="src\App\Server\Server.csproj" Type="Classic C#" />
   </Folder>
@@ -16,6 +17,7 @@
     <Project Path="src\Shared\Shared.Sys\Runtime.Tests\Shared.Sys.Tests.csproj" Type="Classic C#" />
     <Project Path="src\Shared\Shared.Sys\Runtime\Shared.Sys.csproj" Type="Classic C#" />
     <Project Path="src\Shared\Shared.Tp\Asp~\Shared.Tp.Asp.csproj" Type="Classic C#" />
+    <Project Path="src\Shared\Shared.Tp\Data.Mem\Shared.Tp.Data.Mem.csproj" Type="Classic C#" />
     <Project Path="src\Shared\Shared.Tp\Data.Web\Shared.Tp.Data.Web.csproj" Type="Classic C#" />
     <Project Path="src\Shared\Shared.Tp\Rtc\Shared.Tp.Rtc.csproj" Type="Classic C#" />
     <Project Path="src\Shared\Shared.Tp\Runtime.Tests\Shared.Tp.Tests.csproj" Type="Classic C#" />

src/App/Client/Assets/Scripts/Logic/ClientSession.cs

@@ -4,14 +4,14 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Client.UI;
+using Common.Data;
 using Common.Logic;
 using Common.Meta;
 using Diagnostics.Debug;
 using Shared.Log;
 using Shared.Options;
 using Shared.Tp;
 using Shared.Tp.Data;
-using Shared.Tp.Data.Web;
 using Shared.Tp.Ext.Hand;
 using Shared.Tp.Ext.Misc;
 using Shared.Tp.Rtc;
@@ -140,8 +140,8 @@ private void Update()
         }
 
         SyncOptions ISyncHandler<ClientState, ServerState>.Options => context.syncOptions;
-        IObjWriter<ClientState> ISyncHandler<ClientState, ServerState>.LocalWriter { get; } = new WebObjWriter<ClientState>();
-        IObjReader<ServerState> ISyncHandler<ClientState, ServerState>.RemoteReader { get; } = new WebObjReader<ServerState>();
+        IObjWriter<ClientState> ISyncHandler<ClientState, ServerState>.LocalWriter { get; } = TickStateFactory.CreateObjWriter<ClientState>();
+        IObjReader<ServerState> ISyncHandler<ClientState, ServerState>.RemoteReader { get; } = TickStateFactory.CreateObjReader<ServerState>();
 
         ClientState ISyncHandler<ClientState, ServerState>.MakeLocalState(int sendIndex)
         {

src/App/Client/Assets/Scripts/Logic/ClientTap.cs

@@ -1,3 +1,4 @@
+using Common.Data;
 using Common.Logic;
 using Shared.Log;
 using UnityEngine;

src/App/Client/Assets/Scripts/Logic/PeerTap.cs

@@ -1,3 +1,4 @@
+using Common.Data;
 using Common.Logic;
 using TMPro;
 using UnityEngine;

src/App/Client/Assets/Scripts/Logic/StateExtensions.cs

@@ -1,3 +1,4 @@
+using Common.Data;
 using Common.Logic;
 using UnityEngine;
 

…mmon/Runtime/Editor/ReadOnlyAttribute.cs …t/Assets/Scripts/UI/ReadOnlyAttribute.cssrc/App/Common/Runtime/Editor/ReadOnlyAttribute.cs renamed to src/App/Client/Assets/Scripts/UI/ReadOnlyAttribute.cs src/App/Common/Runtime/Editor/ReadOnlyAttribute.cs renamed to src/App/Client/Assets/Scripts/UI/ReadOnlyAttribute.cs

@@ -28,6 +28,24 @@
       "scopes": [
         "org.nuget"
       ]
+    },
+    {
+      "name": "TryApp NuGet",
+      "url": "https://unitynuget.tryapp.org",
+      "scopes": [
+        "org.nuget.memorypack"
+      ],
+      "overrideBuiltIns": true
+    },
+    {
+      "name": "OpenUPM",
+      "url": "https://package.openupm.com",
+      "scopes": [
+        "com.cysharp.unitask",
+        "com.cysharp.memorypack",
+        "com.playeveryware.eos"
+      ],
+      "overrideBuiltIns": true
     }
   ]
 }

…Runtime/Editor/ReadOnlyAttribute.cs.meta …ets/Scripts/UI/ReadOnlyAttribute.cs.metasrc/App/Common/Runtime/Editor/ReadOnlyAttribute.cs.meta renamed to src/App/Client/Assets/Scripts/UI/ReadOnlyAttribute.cs.meta src/App/Common/Runtime/Editor/ReadOnlyAttribute.cs.meta renamed to src/App/Client/Assets/Scripts/UI/ReadOnlyAttribute.cs.meta

@@ -121,6 +121,23 @@
         "locator.api": "0.1.0"
       }
     },
+    "org.nuget.memorypack.core": {
+      "version": "1.21.4",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "org.nuget.system.collections.immutable": "6.0.0",
+        "org.nuget.system.runtime.compilerservices.unsafe": "6.0.0"
+      },
+      "url": "https://unitynuget.tryapp.org"
+    },
+    "org.nuget.memorypack.generator": {
+      "version": "1.21.4",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://unitynuget.tryapp.org"
+    },
     "org.nuget.microsoft.bcl.asyncinterfaces": {
       "version": "9.0.4",
       "depth": 2,
@@ -204,6 +221,16 @@
       "dependencies": {},
       "url": "https://unitynuget-registry.openupm.com"
     },
+    "org.nuget.system.collections.immutable": {
+      "version": "6.0.0",
+      "depth": 2,
+      "source": "registry",
+      "dependencies": {
+        "org.nuget.system.runtime.compilerservices.unsafe": "6.0.0",
+        "org.nuget.system.memory": "4.5.4"
+      },
+      "url": "https://unitynuget-registry.openupm.com"
+    },
     "org.nuget.system.componentmodel.annotations": {
       "version": "5.0.0",
       "depth": 3,
@@ -338,7 +365,9 @@
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "shared.sys": "0.1.0"
+        "shared.sys": "0.1.0",
+        "org.nuget.memorypack.core": "1.21.4",
+        "org.nuget.memorypack.generator": "1.21.4"
       }
     },
     "shared.web": {

src/App/Client/Packages/manifest.json

@@ -35,11 +35,29 @@ MonoBehaviour:
     m_IsDefault: 0
     m_Capabilities: 0
     m_ConfigSource: 4
-  m_UserSelectedRegistryName: Unity NuGet
+  - m_Id: scoped:project:TryApp NuGet
+    m_Name: TryApp NuGet
+    m_Url: https://unitynuget.tryapp.org
+    m_Scopes:
+    - org.nuget.memorypack
+    m_IsDefault: 0
+    m_Capabilities: 0
+    m_ConfigSource: 4
+  - m_Id: scoped:project:OpenUPM
+    m_Name: OpenUPM
+    m_Url: https://package.openupm.com
+    m_Scopes:
+    - com.cysharp.unitask
+    - com.cysharp.memorypack
+    - com.playeveryware.eos
+    m_IsDefault: 0
+    m_Capabilities: 0
+    m_ConfigSource: 4
+  m_UserSelectedRegistryName: TryApp NuGet
   m_UserAddingNewScopedRegistry: 0
   m_RegistryInfoDraft:
     m_Modified: 0
     m_ErrorMessage: 
-    m_UserModificationsInstanceId: -862
+    m_UserModificationsInstanceId: -864
     m_OriginalInstanceId: -866
   m_LoadAssets: 0