Skip to content

Commit 2c6814e

Browse files
luvoidluvoid
committed
Added remote model loading support
1 parent c1bbc55 commit 2c6814e

17 files changed

Lines changed: 837 additions & 270 deletions

‎COM3D2.LiveLink.sln‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiveLink.Tests", "LiveLink.
1414
EndProject
1515
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiveLink.CLI", "LiveLink.CLI\LiveLink.CLI.csproj", "{3FD79CB2-1469-44A5-A156-C27A2A8C8E1A}"
1616
EndProject
17-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CM3D2.Serialization", "..\CM3D2.Serialization\CM3D2.Serialization\CM3D2.Serialization.csproj", "{59786FC6-0C86-495E-AB89-7CFABCC966E6}"
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CM3D2.Serialization", "..\CM3D2.Serialization\CM3D2.Serialization\CM3D2.Serialization.csproj", "{59786FC6-0C86-495E-AB89-7CFABCC966E6}"
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CM3D2.Serialization.Tests", "..\CM3D2.Serialization\CM3D2.Serialization.Tests\CM3D2.Serialization.Tests.csproj", "{3A4C2284-D50C-4F0F-A6E3-9303B423595D}"
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CM3D2.Serialization.Tests", "..\CM3D2.Serialization\CM3D2.Serialization.Tests\CM3D2.Serialization.Tests.csproj", "{3A4C2284-D50C-4F0F-A6E3-9303B423595D}"
2020
EndProject
2121
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B0235D70-D8D6-4AF7-8D1F-25DD22CC681C}"
2222
ProjectSection(SolutionItems) = preProject
@@ -25,34 +25,45 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2525
EndProject
2626
Global
2727
GlobalSection(SolutionConfigurationPlatforms) = preSolution
28+
Debug_UnityEditor|Any CPU = Debug_UnityEditor|Any CPU
2829
Debug|Any CPU = Debug|Any CPU
2930
Release|Any CPU = Release|Any CPU
3031
EndGlobalSection
3132
GlobalSection(ProjectConfigurationPlatforms) = postSolution
33+
{7AB5BFFA-621F-48E4-AAED-943B97A1B7EC}.Debug_UnityEditor|Any CPU.ActiveCfg = Debug_UnityEditor|Any CPU
34+
{7AB5BFFA-621F-48E4-AAED-943B97A1B7EC}.Debug_UnityEditor|Any CPU.Build.0 = Debug_UnityEditor|Any CPU
3235
{7AB5BFFA-621F-48E4-AAED-943B97A1B7EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3336
{7AB5BFFA-621F-48E4-AAED-943B97A1B7EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
3437
{7AB5BFFA-621F-48E4-AAED-943B97A1B7EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
3538
{7AB5BFFA-621F-48E4-AAED-943B97A1B7EC}.Release|Any CPU.Build.0 = Release|Any CPU
39+
{4AE5C9FA-7423-4494-A656-EA80884F4EBC}.Debug_UnityEditor|Any CPU.ActiveCfg = Debug_UnityEditor|Any CPU
40+
{4AE5C9FA-7423-4494-A656-EA80884F4EBC}.Debug_UnityEditor|Any CPU.Build.0 = Debug_UnityEditor|Any CPU
3641
{4AE5C9FA-7423-4494-A656-EA80884F4EBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3742
{4AE5C9FA-7423-4494-A656-EA80884F4EBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
3843
{4AE5C9FA-7423-4494-A656-EA80884F4EBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
3944
{4AE5C9FA-7423-4494-A656-EA80884F4EBC}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{36D8B7A9-EE1A-4219-B768-D3EE0599054D}.Debug_UnityEditor|Any CPU.ActiveCfg = Debug_UnityEditor|Any CPU
46+
{36D8B7A9-EE1A-4219-B768-D3EE0599054D}.Debug_UnityEditor|Any CPU.Build.0 = Debug_UnityEditor|Any CPU
4047
{36D8B7A9-EE1A-4219-B768-D3EE0599054D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4148
{36D8B7A9-EE1A-4219-B768-D3EE0599054D}.Debug|Any CPU.Build.0 = Debug|Any CPU
4249
{36D8B7A9-EE1A-4219-B768-D3EE0599054D}.Release|Any CPU.ActiveCfg = Release|Any CPU
43-
{36D8B7A9-EE1A-4219-B768-D3EE0599054D}.Release|Any CPU.Build.0 = Release|Any CPU
50+
{3FD79CB2-1469-44A5-A156-C27A2A8C8E1A}.Debug_UnityEditor|Any CPU.ActiveCfg = Debug_UnityEditor|Any CPU
51+
{3FD79CB2-1469-44A5-A156-C27A2A8C8E1A}.Debug_UnityEditor|Any CPU.Build.0 = Debug_UnityEditor|Any CPU
4452
{3FD79CB2-1469-44A5-A156-C27A2A8C8E1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4553
{3FD79CB2-1469-44A5-A156-C27A2A8C8E1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
4654
{3FD79CB2-1469-44A5-A156-C27A2A8C8E1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
4755
{3FD79CB2-1469-44A5-A156-C27A2A8C8E1A}.Release|Any CPU.Build.0 = Release|Any CPU
56+
{59786FC6-0C86-495E-AB89-7CFABCC966E6}.Debug_UnityEditor|Any CPU.ActiveCfg = Debug_UnityEditor|Any CPU
57+
{59786FC6-0C86-495E-AB89-7CFABCC966E6}.Debug_UnityEditor|Any CPU.Build.0 = Debug_UnityEditor|Any CPU
4858
{59786FC6-0C86-495E-AB89-7CFABCC966E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4959
{59786FC6-0C86-495E-AB89-7CFABCC966E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
5060
{59786FC6-0C86-495E-AB89-7CFABCC966E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
5161
{59786FC6-0C86-495E-AB89-7CFABCC966E6}.Release|Any CPU.Build.0 = Release|Any CPU
62+
{3A4C2284-D50C-4F0F-A6E3-9303B423595D}.Debug_UnityEditor|Any CPU.ActiveCfg = Debug_UnityEditor|Any CPU
63+
{3A4C2284-D50C-4F0F-A6E3-9303B423595D}.Debug_UnityEditor|Any CPU.Build.0 = Debug_UnityEditor|Any CPU
5264
{3A4C2284-D50C-4F0F-A6E3-9303B423595D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5365
{3A4C2284-D50C-4F0F-A6E3-9303B423595D}.Debug|Any CPU.Build.0 = Debug|Any CPU
5466
{3A4C2284-D50C-4F0F-A6E3-9303B423595D}.Release|Any CPU.ActiveCfg = Release|Any CPU
55-
{3A4C2284-D50C-4F0F-A6E3-9303B423595D}.Release|Any CPU.Build.0 = Release|Any CPU
5667
EndGlobalSection
5768
GlobalSection(SolutionProperties) = preSolution
5869
HideSolutionNode = FALSE

‎LiveLink.CLI/LiveLink.CLI.csproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,15 @@
3333
<ErrorReport>prompt</ErrorReport>
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_UnityEditor|AnyCPU'">
37+
<DebugSymbols>true</DebugSymbols>
38+
<OutputPath>bin\Debug_UnityEditor\</OutputPath>
39+
<DefineConstants>DEBUG;TRACE</DefineConstants>
40+
<DebugType>full</DebugType>
41+
<PlatformTarget>AnyCPU</PlatformTarget>
42+
<LangVersion>7.3</LangVersion>
43+
<ErrorReport>prompt</ErrorReport>
44+
</PropertyGroup>
3645
<ItemGroup>
3746
<Reference Include="System" />
3847
<Reference Include="System.Core" />

‎LiveLink.Plugin/InternalSingleton.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace COM3D2.LiveLink.Plugin
88
internal abstract class InternalSingleton<T> : MonoSingleton<T>
99
where T : InternalSingleton<T>
1010
{
11-
protected static T Instance;
11+
internal protected static T Instance;
1212
public sealed override void OnInitialize()
1313
{
1414
Instance = this as T;

‎LiveLink.Plugin/LiveLink.Plugin.csproj‎

Lines changed: 35 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
43
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
54
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
@@ -13,29 +12,34 @@
1312
<RootNamespace>COM3D2.LiveLink.Plugin</RootNamespace>
1413
<AssemblyName>COM3D2.LiveLink.Plugin</AssemblyName>
1514
<LangVersion>latest</LangVersion>
16-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
17-
<FileAlignment>512</FileAlignment>
15+
<TargetFramework>net35</TargetFramework>
1816
<COM3D2InstallPath>C:\DJN\KISS\COM3D2</COM3D2InstallPath>
1917
<OutputPath>bin\$(Configuration)\$(Platform)</OutputPath>
2018
<StartProgram>$(COM3D2InstallPath)\COM3D2x64.exe</StartProgram>
19+
<Configurations>Debug;Release;Debug_UnityEditor</Configurations>
2120
</PropertyGroup>
2221
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
2322
<DebugSymbols>true</DebugSymbols>
2423
<DebugType>full</DebugType>
2524
<Optimize>false</Optimize>
2625
<DefineConstants>DEBUG;TRACE</DefineConstants>
27-
<ErrorReport>prompt</ErrorReport>
28-
<WarningLevel>4</WarningLevel>
29-
<OutputPath>bin\Debug\AnyCPU\</OutputPath>
30-
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
26+
</PropertyGroup>
27+
<PropertyGroup Condition="'$(Configuration)'=='Debug_UnityEditor'">
28+
<DebugSymbols>true</DebugSymbols>
29+
<DebugType>full</DebugType>
30+
<Optimize>false</Optimize>
31+
<DefineConstants>DEBUG;TRACE</DefineConstants>
32+
</PropertyGroup>
33+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug_UnityEditor' ">
34+
<DebugSymbols>true</DebugSymbols>
35+
<DebugType>full</DebugType>
36+
<Optimize>false</Optimize>
37+
<DefineConstants>DEBUG;TRACE;UNITY_EDITOR</DefineConstants>
3138
</PropertyGroup>
3239
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
3340
<DebugType>none</DebugType>
3441
<Optimize>true</Optimize>
3542
<DefineConstants>TRACE</DefineConstants>
36-
<ErrorReport>prompt</ErrorReport>
37-
<WarningLevel>4</WarningLevel>
38-
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
3943
</PropertyGroup>
4044
<PropertyGroup>
4145
<RestoreSources>$(RestoreSources);https://nuget.bepinex.dev/v3/index.json</RestoreSources>
@@ -44,33 +48,17 @@
4448
<PackageReference Include="BepInEx.Analyzers" Version="1.0.8" targetFramework="net35" developmentDependency="true">
4549
<PrivateAssets>all</PrivateAssets>
4650
</PackageReference>
47-
<PackageReference Include="BepInEx.BaseLib" Version="5.4.19" targetFramework="net35" />
51+
<PackageReference Include="BepInEx.BaseLib" Version="5.4.21" targetFramework="net35" />
4852
<PackageReference Include="BepInEx.Core" Version="5.4.19" targetFramework="net35" />
53+
<PackageReference Include="COM3D2.GameLibs" Version="2.24.0-r.0" />
4954
<PackageReference Include="HarmonyX" Version="2.7.0" targetFramework="net35" />
55+
<PackageReference Include="LuVoid.CM3D2.UGUI" Version="0.1.4-alpha.1" />
5056
<PackageReference Include="Mono.Cecil" Version="0.10.4" targetFramework="net35" />
5157
<PackageReference Include="MonoMod.RuntimeDetour" Version="21.12.13.1" targetFramework="net35" />
5258
<PackageReference Include="MonoMod.Utils" Version="21.12.13.1" targetFramework="net35" />
5359
</ItemGroup>
5460
<ItemGroup>
5561
<Reference Include="COM3D2.API, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
56-
<Reference Include="System">
57-
<Private>False</Private>
58-
</Reference>
59-
<Reference Include="System.Core">
60-
<Private>False</Private>
61-
</Reference>
62-
<Reference Include="System.Xml.Linq">
63-
<Private>False</Private>
64-
</Reference>
65-
<Reference Include="System.Data.DataSetExtensions">
66-
<Private>False</Private>
67-
</Reference>
68-
<Reference Include="System.Data">
69-
<Private>False</Private>
70-
</Reference>
71-
<Reference Include="System.Xml">
72-
<Private>False</Private>
73-
</Reference>
7462
<Reference Include="Assembly-CSharp">
7563
<HintPath>$(COM3D2InstallPath)\COM3D2x64_Data\Managed\Assembly-CSharp.dll</HintPath>
7664
<Private>False</Private>
@@ -95,22 +83,6 @@
9583
<ReferencePath>$(ReferencePath);$(COM3D2InstallPath)\Sybaris</ReferencePath>
9684
<ReferencePath>$(ReferencePath);$(COM3D2InstallPath)\Sybaris\UnityInjector</ReferencePath>
9785
</PropertyGroup>
98-
<ItemGroup>
99-
<Compile Include="CodeMatcherExtensions.cs" />
100-
<Compile Include="ImportCMExtensions.cs" />
101-
<Compile Include="LiveLinkModelViewer.cs" />
102-
<Compile Include="SystemDialogExtensions.cs" />
103-
<Compile Include="Tests\PluginTests.cs" />
104-
<Compile Include="LiveLinkAnimator.cs" />
105-
<Compile Include="LiveLinkPluginConfig.cs" />
106-
<Compile Include="InternalSingleton.cs" />
107-
<Compile Include="Properties\AssemblyInfo.cs" />
108-
<Compile Include="LiveLinkPlugin.cs" />
109-
<Compile Include="Tests\PluginTestHelper.cs" />
110-
<Compile Include="Tests\PluginTestLogListener.cs" />
111-
<Compile Include="Tests\SafeExitHelper.cs" />
112-
<Compile Include="Tests\TestRecieveMessageHelper.cs" />
113-
</ItemGroup>
11486
<ItemGroup>
11587
<ProjectReference Include="..\..\CM3D2.Serialization\CM3D2.Serialization\CM3D2.Serialization.csproj">
11688
<Project>{59786FC6-0C86-495E-AB89-7CFABCC966E6}</Project>
@@ -125,14 +97,28 @@
12597
<Name>LiveLink</Name>
12698
</ProjectReference>
12799
</ItemGroup>
128-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
129100
<PropertyGroup>
130-
<PostBuildEvent>
101+
<PostBuildEvent Condition=" '$(Configuration)' != 'Debug_UnityEditor' ">
131102
for /f "usebackq delims=|" %25%25f in (`dir /b *.dll`) do "$(ProjectDir)\pdb2mdb.exe" "%25%25f" 1&gt;nul
132103
rd "$(COM3D2InstallPath)\BepinEx\plugins\vsout_$(ProjectName)"
133104
mklink /J "$(COM3D2InstallPath)\BepinEx\plugins\vsout_$(ProjectName)" .
134-
</PostBuildEvent>
105+
</PostBuildEvent>
106+
</PropertyGroup>
107+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
108+
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
109+
<Deterministic>False</Deterministic>
135110
</PropertyGroup>
111+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_UnityEditor|AnyCPU'">
112+
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
113+
<Deterministic>False</Deterministic>
114+
</PropertyGroup>
115+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
116+
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
117+
<Deterministic>False</Deterministic>
118+
</PropertyGroup>
119+
<Target Name="CreateMonoDebugSymbols" AfterTargets="build" Condition="'$(Configuration)' == 'Debug_UnityEditor'">
120+
<Exec Command="for /f &quot;usebackq delims=|&quot; %25%25f in (`dir /b *.dll`) do &quot;$(ProjectDir)lib\pdb2mdb.exe&quot; %25%25f" WorkingDirectory="$(OutputPath)" />
121+
</Target>
136122
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
137123
Other similar extension points exist, see Microsoft.Common.targets.
138124
<Target Name="BeforeBuild">

‎LiveLink.Plugin/LiveLinkAnimator.cs‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)