Skip to content

Commit

Permalink
Define CVars in a central location.
Browse files Browse the repository at this point in the history
Instead of a bunch of RegisterCVar<> calls, it's now similar to Key Functions.
  • Loading branch information
PJB3005 committed Sep 25, 2020
1 parent 927869a commit d4fefd4
Show file tree
Hide file tree
Showing 4 changed files with 132 additions and 8 deletions.
66 changes: 66 additions & 0 deletions Content.Benchmarks/DynamicTreeBenchmark.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
using BenchmarkDotNet.Attributes;
using Robust.Shared.Maths;
using Robust.Shared.Physics;

namespace Content.Benchmarks
{
[SimpleJob, MemoryDiagnoser]
public class DynamicTreeBenchmark
{
private static readonly Box2[] aabbs1 =
{
((Box2) default).Enlarged(1), //2x2 square
((Box2) default).Enlarged(2), //4x4 square
new Box2(-3, 3, -3, 3), // point off to the bottom left
new Box2(-3, -3, -3, -3), // point off to the top left
new Box2(3, 3, 3, 3), // point off to the bottom right
new Box2(3, -3, 3, -3), // point off to the top right
((Box2) default).Enlarged(1), //2x2 square
((Box2) default).Enlarged(2), //4x4 square
((Box2) default).Enlarged(1), //2x2 square
((Box2) default).Enlarged(2), //4x4 square
((Box2) default).Enlarged(1), //2x2 square
((Box2) default).Enlarged(2), //4x4 square
((Box2) default).Enlarged(1), //2x2 square
((Box2) default).Enlarged(2), //4x4 square
((Box2) default).Enlarged(3), //6x6 square
new Box2(-3, 3, -3, 3), // point off to the bottom left
new Box2(-3, -3, -3, -3), // point off to the top left
new Box2(3, 3, 3, 3), // point off to the bottom right
new Box2(3, -3, 3, -3), // point off to the top right
};

private B2DynamicTree<int> _b2Tree;
private DynamicTree<int> _tree;

[GlobalSetup]
public void Setup()
{
_b2Tree = new B2DynamicTree<int>();
_tree = new DynamicTree<int>((in int value) => aabbs1[value], capacity: 16);

for (var i = 0; i < aabbs1.Length; i++)
{
var aabb = aabbs1[i];
_b2Tree.CreateProxy(aabb, i);
_tree.Add(i);
}
}

[Benchmark]
public void BenchB2()
{
object state = null;
_b2Tree.Query(ref state, (ref object _, DynamicTree.Proxy __) => true, new Box2(-1, -1, 1, 1));
}

[Benchmark]
public void BenchQ()
{
foreach (var _ in _tree.QueryAabb(new Box2(-1, -1, 1, 1), true))
{

}
}
}
}
10 changes: 2 additions & 8 deletions Content.Server/GameTicking/GameTicker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
using Content.Server.Mobs;
using Content.Server.Mobs.Roles;
using Content.Server.Players;
using Content.Shared;
using Content.Shared.Chat;
using Content.Shared.Network.NetMessages;
using Content.Shared.Preferences;
Expand Down Expand Up @@ -128,13 +129,6 @@ public override void Initialize()

DebugTools.Assert(!_initialized);

_configurationManager.RegisterCVar("game.lobbyenabled", false, CVar.ARCHIVE);
_configurationManager.RegisterCVar("game.lobbyduration", 20, CVar.ARCHIVE);
_configurationManager.RegisterCVar("game.defaultpreset", "Suspicion", CVar.ARCHIVE);
_configurationManager.RegisterCVar("game.fallbackpreset", "Sandbox", CVar.ARCHIVE);

_configurationManager.RegisterCVar("game.enablewin", true, CVar.CHEAT);

PresetSuspicion.RegisterCVars(_configurationManager);

_netManager.RegisterNetMessage<MsgTickerJoinLobby>(nameof(MsgTickerJoinLobby));
Expand All @@ -147,7 +141,7 @@ public override void Initialize()
_netManager.RegisterNetMessage<MsgRequestWindowAttention>(nameof(MsgRequestWindowAttention));
_netManager.RegisterNetMessage<MsgTickerLateJoinStatus>(nameof(MsgTickerLateJoinStatus));

SetStartPreset(_configurationManager.GetCVar<string>("game.defaultpreset"));
SetStartPreset(_configurationManager.GetCVar(CCVars.GameLobbyDefaultPreset));

RestartRound();

Expand Down
25 changes: 25 additions & 0 deletions Content.Shared/CCVars.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using Robust.Shared;
using Robust.Shared.Configuration;

namespace Content.Shared
{
// ReSharper disable once InconsistentNaming
[CVarDefs]
public sealed class CCVars : CVars
{
public static readonly CVarDef<bool>
GameLobbyEnabled = CVarDef.Create("game.lobbyenabled", false, CVar.ARCHIVE);

public static readonly CVarDef<int>
GameLobbyDuration = CVarDef.Create("game.lobbyduration", 20, CVar.ARCHIVE);

public static readonly CVarDef<string>
GameLobbyDefaultPreset = CVarDef.Create("game.defaultpreset", "Suspicion", CVar.ARCHIVE);

public static readonly CVarDef<string>
GameLobbyFallbackPreset = CVarDef.Create("game.fallbackpreset", "Sandbox", CVar.ARCHIVE);

public static readonly CVarDef<bool>
GameLobbyEnableWin = CVarDef.Create("game.enablewin", true, CVar.ARCHIVE);
}
}
39 changes: 39 additions & 0 deletions auth.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#!/usr/bin/env pwsh

# Old version
<#
# Constants
$loginToken = "kSiBszXoB5hOQBAMBC//f2YcxD76Ec36rlKy+f8sjhY="
$authServer = "http://localhost:5000/"
$localServer = "http://localhost:1212/"
$userName = "PJB"
$authUrl = $authServer + "api/session/getToken"
$localUrl = $localServer + "info"
$pubKey = Invoke-WebRequest $localUrl |
select -exp Content |
ConvertFrom-Json |
select -exp auth |
select -exp public_key
$postData = @{"ServerPublicKey"=$pubkey} | ConvertTo-Json
$token = Invoke-WebRequest $authUrl `
-Method Post -Body $postData `
-Headers @{"Authorization"="SS14Auth $loginToken"} `
-ContentType "application/json" |
select -exp Content
echo $token
bin/Content.Client/Content.Client --launcher --username $userName `
--cvar "auth.token=$token" `
--cvar "auth.serverpubkey=$pubKey"
#>

$loginToken = "kSiBszXoB5hOQBAMBC//f2YcxD76Ec36rlKy+f8sjhY="
$authServer = "http://localhost:5000/"
$userName = "PJB"
$userId = "957ebebb-1a06-4a6e-b8ae-f76d98d01adf"

0 comments on commit d4fefd4

Please sign in to comment.