Skip to content

Commit 3e5b185

Browse files
JimmacleJimmacle
authored
Merge pull request #1 from TorchAPI/jenkins
Continuous Integration Support
2 parents 0f17140 + a7d7864 commit 3e5b185

9 files changed

Lines changed: 199 additions & 115 deletions

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,3 +250,6 @@ paket-files/
250250
# JetBrains Rider
251251
.idea/
252252
*.sln.iml
253+
254+
GameBinaries
255+
TorchBinaries

‎Concealment.sln‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26730.8
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Concealment", "Concealment/Concealment.csproj", "{E5C0184B-7DC4-43D8-872E-2F71162748AA}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|x64 = Debug|x64
11+
Release|x64 = Release|x64
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{E5C0184B-7DC4-43D8-872E-2F71162748AA}.Debug|x64.ActiveCfg = Debug|x64
15+
{E5C0184B-7DC4-43D8-872E-2F71162748AA}.Debug|x64.Build.0 = Debug|x64
16+
{E5C0184B-7DC4-43D8-872E-2F71162748AA}.Release|x64.ActiveCfg = Release|x64
17+
{E5C0184B-7DC4-43D8-872E-2F71162748AA}.Release|x64.Build.0 = Release|x64
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {E12ECB82-E5CA-4599-B2D4-FE455DC8ED54}
24+
EndGlobalSection
25+
EndGlobal

‎Concealment/Concealment.csproj‎

Lines changed: 54 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
75
<ProjectGuid>{E5C0184B-7DC4-43D8-872E-2F71162748AA}</ProjectGuid>
86
<OutputType>Library</OutputType>
97
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -12,88 +10,62 @@
1210
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1311
<FileAlignment>512</FileAlignment>
1412
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>pdbonly</DebugType>
26-
<Optimize>true</Optimize>
27-
<OutputPath>bin\Release\</OutputPath>
28-
<DefineConstants>TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
</PropertyGroup>
3213
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
3314
<DebugSymbols>true</DebugSymbols>
34-
<OutputPath>bin\x64\Debug\</OutputPath>
15+
<OutputPath>$(SolutionDir)\bin\x64\Debug\</OutputPath>
3516
<DefineConstants>DEBUG;TRACE</DefineConstants>
3617
<DebugType>full</DebugType>
3718
<PlatformTarget>x64</PlatformTarget>
3819
<ErrorReport>prompt</ErrorReport>
3920
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
4021
</PropertyGroup>
4122
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
42-
<OutputPath>bin\x64\Release\</OutputPath>
43-
<DefineConstants>TRACE</DefineConstants>
44-
<Optimize>true</Optimize>
45-
<DebugType>pdbonly</DebugType>
46-
<PlatformTarget>x64</PlatformTarget>
47-
<ErrorReport>prompt</ErrorReport>
48-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
49-
</PropertyGroup>
50-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_NoPhys|AnyCPU'">
51-
<OutputPath>bin\Release_NoPhys\</OutputPath>
23+
<OutputPath>$(SolutionDir)\bin\x64\Release\</OutputPath>
5224
<DefineConstants>TRACE</DefineConstants>
5325
<Optimize>true</Optimize>
5426
<DebugType>pdbonly</DebugType>
55-
<PlatformTarget>AnyCPU</PlatformTarget>
56-
<ErrorReport>prompt</ErrorReport>
57-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
58-
</PropertyGroup>
59-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_NoPhys|x64'">
60-
<OutputPath>bin\x64\Release_NoPhys\</OutputPath>
61-
<DefineConstants>TRACE;NOPHYS</DefineConstants>
62-
<Optimize>true</Optimize>
63-
<DebugType>pdbonly</DebugType>
6427
<PlatformTarget>x64</PlatformTarget>
6528
<ErrorReport>prompt</ErrorReport>
6629
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
6730
</PropertyGroup>
6831
<ItemGroup>
6932
<Reference Include="HavokWrapper">
70-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\HavokWrapper.dll</HintPath>
33+
<HintPath>$(SolutionDir)\GameBinaries\HavokWrapper.dll</HintPath>
34+
<Private>False</Private>
7135
</Reference>
72-
<Reference Include="NLog">
73-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\NLog.dll</HintPath>
36+
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
37+
<HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
38+
<Private>False</Private>
7439
</Reference>
7540
<Reference Include="PresentationCore" />
7641
<Reference Include="PresentationFramework" />
7742
<Reference Include="Sandbox.Common">
78-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\Sandbox.Common.dll</HintPath>
43+
<HintPath>$(SolutionDir)\GameBinaries\Sandbox.Common.dll</HintPath>
44+
<Private>False</Private>
7945
</Reference>
8046
<Reference Include="Sandbox.Game">
81-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\Sandbox.Game.dll</HintPath>
47+
<HintPath>$(SolutionDir)\GameBinaries\Sandbox.Game.dll</HintPath>
48+
<Private>False</Private>
8249
</Reference>
8350
<Reference Include="Sandbox.Graphics">
84-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\Sandbox.Graphics.dll</HintPath>
51+
<HintPath>$(SolutionDir)\GameBinaries\Sandbox.Graphics.dll</HintPath>
52+
<Private>False</Private>
8553
</Reference>
8654
<Reference Include="SpaceEngineers.Game">
87-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\SpaceEngineers.Game.dll</HintPath>
55+
<HintPath>$(SolutionDir)\GameBinaries\SpaceEngineers.Game.dll</HintPath>
56+
<Private>False</Private>
8857
</Reference>
8958
<Reference Include="SpaceEngineers.ObjectBuilders">
90-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\SpaceEngineers.ObjectBuilders.dll</HintPath>
59+
<HintPath>$(SolutionDir)\GameBinaries\SpaceEngineers.ObjectBuilders.dll</HintPath>
60+
<Private>False</Private>
9161
</Reference>
9262
<Reference Include="SpaceEngineers.ObjectBuilders.XmlSerializers">
93-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\SpaceEngineers.ObjectBuilders.XmlSerializers.dll</HintPath>
63+
<HintPath>$(SolutionDir)\GameBinaries\SpaceEngineers.ObjectBuilders.XmlSerializers.dll</HintPath>
64+
<Private>False</Private>
9465
</Reference>
9566
<Reference Include="SteamSDK">
96-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\SteamSDK.dll</HintPath>
67+
<HintPath>$(SolutionDir)\GameBinaries\SteamSDK.dll</HintPath>
68+
<Private>False</Private>
9769
</Reference>
9870
<Reference Include="System" />
9971
<Reference Include="System.Core" />
@@ -106,50 +78,65 @@
10678
<Reference Include="System.Xml" />
10779
<Reference Include="Torch, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
10880
<SpecificVersion>False</SpecificVersion>
109-
<HintPath>..\..\Torch\Torch.Server\bin\x64\Release\Torch.dll</HintPath>
81+
<HintPath>$(SolutionDir)\TorchBinaries\Torch.dll</HintPath>
82+
<Private>False</Private>
11083
</Reference>
11184
<Reference Include="Torch.API, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
11285
<SpecificVersion>False</SpecificVersion>
113-
<HintPath>..\..\Torch\Torch.Server\bin\x64\Release\Torch.API.dll</HintPath>
86+
<HintPath>$(SolutionDir)\TorchBinaries\Torch.API.dll</HintPath>
87+
<Private>False</Private>
11488
</Reference>
11589
<Reference Include="VRage">
116-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.dll</HintPath>
90+
<HintPath>$(SolutionDir)\GameBinaries\VRage.dll</HintPath>
91+
<Private>False</Private>
11792
</Reference>
11893
<Reference Include="VRage.Audio">
119-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Audio.dll</HintPath>
94+
<HintPath>$(SolutionDir)\GameBinaries\VRage.Audio.dll</HintPath>
95+
<Private>False</Private>
12096
</Reference>
12197
<Reference Include="VRage.Dedicated">
122-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Dedicated.dll</HintPath>
98+
<HintPath>$(SolutionDir)\GameBinaries\VRage.Dedicated.dll</HintPath>
99+
<Private>False</Private>
123100
</Reference>
124101
<Reference Include="VRage.Game">
125-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Game.dll</HintPath>
102+
<HintPath>$(SolutionDir)\GameBinaries\VRage.Game.dll</HintPath>
103+
<Private>False</Private>
126104
</Reference>
127105
<Reference Include="VRage.Game.XmlSerializers">
128-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Game.XmlSerializers.dll</HintPath>
106+
<HintPath>$(SolutionDir)\GameBinaries\VRage.Game.XmlSerializers.dll</HintPath>
107+
<Private>False</Private>
129108
</Reference>
130109
<Reference Include="VRage.Input">
131-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Input.dll</HintPath>
110+
<HintPath>$(SolutionDir)\GameBinaries\VRage.Input.dll</HintPath>
111+
<Private>False</Private>
132112
</Reference>
133113
<Reference Include="VRage.Library">
134-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Library.dll</HintPath>
114+
<HintPath>$(SolutionDir)\GameBinaries\VRage.Library.dll</HintPath>
115+
<Private>False</Private>
135116
</Reference>
136117
<Reference Include="VRage.Math">
137-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Math.dll</HintPath>
118+
<HintPath>$(SolutionDir)\GameBinaries\VRage.Math.dll</HintPath>
119+
<Private>False</Private>
138120
</Reference>
139121
<Reference Include="VRage.Native">
140-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Native.dll</HintPath>
122+
<HintPath>$(SolutionDir)\GameBinaries\VRage.Native.dll</HintPath>
123+
<Private>False</Private>
141124
</Reference>
142125
<Reference Include="VRage.OpenVRWrapper">
143-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.OpenVRWrapper.dll</HintPath>
126+
<HintPath>$(SolutionDir)\GameBinaries\VRage.OpenVRWrapper.dll</HintPath>
127+
<Private>False</Private>
144128
</Reference>
145129
<Reference Include="VRage.Render">
146-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Render.dll</HintPath>
130+
<HintPath>$(SolutionDir)\GameBinaries\VRage.Render.dll</HintPath>
131+
<Private>False</Private>
147132
</Reference>
148133
<Reference Include="VRage.Render11">
149-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Render11.dll</HintPath>
134+
<HintPath>$(SolutionDir)\GameBinaries\VRage.Render11.dll</HintPath>
135+
<Private>False</Private>
150136
</Reference>
151137
<Reference Include="VRage.Scripting">
152-
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Scripting.dll</HintPath>
138+
<HintPath>$(SolutionDir)\GameBinaries\VRage.Scripting.dll</HintPath>
139+
<Private>False</Private>
153140
</Reference>
154141
<Reference Include="WindowsBase" />
155142
</ItemGroup>
@@ -183,5 +170,8 @@
183170
<ItemGroup>
184171
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
185172
</ItemGroup>
173+
<ItemGroup>
174+
<None Include="packages.config" />
175+
</ItemGroup>
186176
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
187177
</Project>

‎Concealment/Concealment.sln‎

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

‎Concealment/ConcealmentPlugin.cs‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,8 @@ private void ConcealEntity(IMyEntity entity)
204204
return;
205205

206206
entity.GetStorage().SetValue(Id, "True");
207-
#if !NOPHYS
208207
MyGamePruningStructure.Remove((MyEntity)entity);
209208
entity.Physics?.Deactivate();
210-
#endif
211209
UnregisterRecursive(entity);
212210

213211
void UnregisterRecursive(IMyEntity e)
@@ -227,10 +225,8 @@ private void RevealEntity(IMyEntity entity)
227225
return;
228226

229227
entity.GetStorage().SetValue(Id, "False");
230-
#if !NOPHYS
231228
MyGamePruningStructure.Add((MyEntity)entity);
232229
entity.Physics?.Activate();
233-
#endif
234230
RegisterRecursive(entity);
235231

236232
void RegisterRecursive(IMyEntity e)
@@ -251,11 +247,9 @@ private int ConcealGroup(ConcealGroup group)
251247

252248
Log.Debug($"Concealing grids: {group.GridNames}");
253249
group.Grids.ForEach(ConcealEntity);
254-
#if !NOPHYS
255250
group.UpdateAABB();
256251
var aabb = group.WorldAABB;
257252
group.ProxyId = _concealedAabbTree.AddProxy(ref aabb, group, 0);
258-
#endif
259253
group.Closing += Group_Closing;
260254
Task.Run(() =>
261255
{
@@ -284,27 +278,16 @@ public int RevealGroup(ConcealGroup group)
284278
var count = group.Grids.Count;
285279
Log.Debug($"Revealing grids: {group.GridNames}");
286280
group.Grids.ForEach(RevealEntity);
287-
#if !NOPHYS
288281
ConcealedGroups.Remove(group);
289282
_concealedAabbTree.RemoveProxy(group.ProxyId);
290283
group.UpdatePostReveal();
291-
#endif
292284
return count;
293285
}
294286

295287
public int RevealGridsInSphere(BoundingSphereD sphere)
296288
{
297289
var revealed = 0;
298-
#if !NOPHYS
299290
_concealedAabbTree.OverlapAllBoundingSphere(ref sphere, _intersectGroups);
300-
#else
301-
foreach (var group in ConcealedGroups)
302-
{
303-
group.UpdateAABB();
304-
if (sphere.Contains(group.WorldAABB) != ContainmentType.Disjoint)
305-
_intersectGroups.Add(group);
306-
}
307-
#endif
308291
Log.Trace($"{_intersectGroups.Count} groups");
309292
foreach (var group in _intersectGroups)
310293
revealed += RevealGroup(group);

‎Concealment/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="NLog" version="4.4.12" targetFramework="net461" />
4+
</packages>

‎Jenkins/jenkins-grab-se.ps1‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
pushd
2+
3+
$steamData = "C:/Steam/Data/"
4+
$steamCMDPath = "C:/Steam/steamcmd/"
5+
$steamCMDZip = "C:/Steam/steamcmd.zip"
6+
7+
Add-Type -AssemblyName System.IO.Compression.FileSystem
8+
9+
if (!(Test-Path $steamData)) {
10+
mkdir "$steamData"
11+
}
12+
if (!(Test-Path $steamCMDPath)) {
13+
if (!(Test-Path $steamCMDZip)) {
14+
(New-Object System.Net.WebClient).DownloadFile("https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip", "$steamCMDZip");
15+
}
16+
[System.IO.Compression.ZipFile]::ExtractToDirectory($steamCMDZip, $steamCMDPath)
17+
}
18+
19+
cd "$steamData"
20+
& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740" "+quit"
21+
22+
popd

0 commit comments

Comments
 (0)