namespacify everything

This commit is contained in:
2024-04-06 14:42:10 +03:00
parent 68b735b59c
commit 6430cc9b4d
42 changed files with 10066 additions and 10107 deletions

View File

@@ -6,8 +6,8 @@ using FlaxEngine;
using Console = Game.Console;
using Object = FlaxEngine.Object;
namespace Game
{
namespace Game;
[Flags]
public enum AudioFlags
{
@@ -253,4 +253,3 @@ namespace Game
}
}
}
}

View File

@@ -5,8 +5,8 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Game
{
namespace Game;
public class AudioSourceDelayed : AudioSource
{
public float Delay = 0f;
@@ -44,4 +44,3 @@ namespace Game
}
}
}
}

View File

@@ -1,7 +1,7 @@
using FlaxEngine;
namespace Game
{
namespace Game;
public class CameraMovement : Script
{
private float viewPitch;
@@ -96,4 +96,3 @@ namespace Game
Actor.Transform = camTrans;
}
}
}

View File

@@ -1,8 +1,8 @@
using FlaxEditor.Content.Settings;
using FlaxEngine;
namespace Game
{
namespace Game;
/// <summary>
/// CameraRender Script.
/// </summary>
@@ -179,4 +179,3 @@ namespace Game
//OnAwake();
}
}
}

View File

@@ -1,7 +1,7 @@
using FlaxEngine;
namespace Game
{
namespace Game;
public class CameraSpring : Script
{
private bool lastGround;
@@ -72,4 +72,3 @@ namespace Game
lastGround = playerMovement.OnGround;
}
}
}

View File

@@ -1,8 +1,8 @@
using System;
using FlaxEngine;
namespace Game
{
namespace Game;
public class WeaponSway : Script
{
private Actor cameraHolder;
@@ -80,4 +80,3 @@ namespace Game
Actor.LocalOrientation = Quaternion.Euler(angles);
}
}
}

View File

@@ -1,7 +1,7 @@
using System;
namespace Game
{
namespace Game;
// Holds common miscellaneous Console variables and commands
public static class CommonCommands
{
@@ -39,4 +39,3 @@ namespace Game
throw new Exception(string.Join(" ", text));
}
}
}

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
namespace Game
{
namespace Game;
public class Config
{
private Dictionary<string, string> dictionary = new Dictionary<string, string>();
@@ -31,4 +31,3 @@ namespace Game
return lines;
}
}
}

View File

@@ -1,8 +1,8 @@
using System.Collections.Generic;
using System.IO;
namespace Game
{
namespace Game;
public class ConfigParser
{
private ConfigParser()
@@ -48,4 +48,3 @@ namespace Game
return config;
}
}
}

View File

@@ -8,8 +8,8 @@ using System.Runtime.InteropServices;
using FlaxEditor;
using FlaxEngine;
namespace Game
{
namespace Game;
public struct ConsoleLine
{
public string content;
@@ -561,4 +561,3 @@ namespace Game
return null;
}
}
}

View File

@@ -2,8 +2,8 @@
using System.Collections.Generic;
using System.Linq;
namespace Game
{
namespace Game;
[AttributeUsage(AttributeTargets.All)]
public abstract class ConsoleBaseAttribute : Attribute
{
@@ -64,4 +64,3 @@ namespace Game
public class ConsoleSubsystemInitializer : Attribute
{
}
}

View File

@@ -1,8 +1,8 @@
using System;
using System.Reflection;
namespace Game
{
namespace Game;
internal struct ConsoleCommand
{
public string name { get; }
@@ -75,4 +75,3 @@ namespace Game
throw new Exception("Unexpected number of parameters.");
}
}
}

View File

@@ -6,8 +6,8 @@ using System.Text;
using FlaxEngine;
using FlaxEngine.GUI;
namespace Game
{
namespace Game;
public class ConsoleContentTextBox : Control
{
private readonly FontReference Font;
@@ -681,4 +681,3 @@ namespace Game
public int lineLength;
}
}
}

View File

@@ -2,8 +2,8 @@
using System.Linq;
using FlaxEngine;
namespace Game
{
namespace Game;
public class ConsoleInputTextBox : ConsoleTextBoxBase
{
private readonly ConsoleContentTextBox contentBox;
@@ -169,4 +169,3 @@ namespace Game
Profiler.EndEvent();
}
}
}

View File

@@ -6,8 +6,8 @@ using System.Linq;
using FlaxEditor;
#endif
namespace Game
{
namespace Game;
public class ConsolePlugin : GamePlugin
{
public ConsolePlugin()
@@ -180,4 +180,3 @@ namespace Game
}
}
#endif
}

View File

@@ -6,8 +6,8 @@ using FlaxEngine.Assertions;
using FlaxEngine.GUI;
using Object = FlaxEngine.Object;
namespace Game
{
namespace Game;
public class ConsoleScript : Script
{
public Color BackgroundColor;
@@ -395,4 +395,3 @@ namespace Game
consoleInputBox.Text = text;
}
}
}

View File

@@ -2,8 +2,8 @@
using FlaxEngine;
using FlaxEngine.GUI;
namespace Game
{
namespace Game;
// Mostly based on TextBox
public class ConsoleTextBoxBase : TextBoxBase
{
@@ -387,4 +387,3 @@ namespace Game
}
}
}
}

View File

@@ -1,8 +1,8 @@
using System;
using System.Reflection;
namespace Game
{
namespace Game;
[Flags]
public enum ConsoleFlags
{
@@ -72,4 +72,3 @@ namespace Game
}
}
}
}

View File

@@ -9,8 +9,8 @@ using FlaxEditor.Content.Settings;
using FlaxEngine;
using FlaxEngine.Networking;
namespace Game
{
namespace Game;
public enum UpscalingMode
{
None,
@@ -730,4 +730,3 @@ namespace Game
Debug.Log(string.Join(" ", text));
}
}
}

View File

@@ -1,8 +1,8 @@
using System;
using FlaxEngine;
namespace Game
{
namespace Game;
public static class Utilities
{
public static ScopeProfiler ProfileScope(string eventName)
@@ -23,4 +23,3 @@ namespace Game
}
}
}
}

View File

@@ -7,8 +7,8 @@ using FlaxEngine.Assertions;
using FlaxEngine.Networking;
using Console = Game.Console;
namespace Game
{
namespace Game;
[AttributeUsage(AttributeTargets.Class)]
public class NetworkPredictedAttribute : Attribute
{
@@ -202,4 +202,3 @@ namespace Game
}
}
}
}

View File

@@ -6,8 +6,8 @@ using FlaxEngine.Networking;
using Console = Game.Console;
using Object = FlaxEngine.Object;
namespace Game
{
namespace Game;
public static partial class NetworkManager
{
public static uint LocalPlayerClientId { get; /*private*/ set; }
@@ -155,4 +155,3 @@ namespace Game
{
}
}
}

View File

@@ -11,8 +11,8 @@ using FlaxEngine.Networking;
using Console = Game.Console;
using Object = FlaxEngine.Object;
namespace Game
{
namespace Game;
public static unsafe partial class NetworkManager
{
public const byte DemoVer = 2;
@@ -275,4 +275,3 @@ namespace Game
DemoEndFrame();
}
}
}

View File

@@ -8,8 +8,8 @@ using FlaxEngine.Networking;
using Console = Game.Console;
using Object = FlaxEngine.Object;
namespace Game
{
namespace Game;
public static partial class NetworkManager
{
private static List<NetworkConnection> ConnectedClients;
@@ -210,4 +210,3 @@ namespace Game
//Console.Print($"actor spawned: {actor.Name} ({actor.TypeName})");
}
}
}

View File

@@ -10,8 +10,8 @@ using FlaxEngine.Json;
using FlaxEngine.Networking;
using Console = Game.Console;
namespace Game
{
namespace Game;
public enum GameModeMessageType : byte
{
WelcomePlayer, // WelcomePlayerMessage
@@ -725,5 +725,4 @@ namespace Game
Console.Print($"simulated {simframs} frames");
}
}
}
#endif

View File

@@ -3,8 +3,8 @@ using System.Diagnostics;
using FlaxEngine;
using FlaxEngine.GUI;
namespace Game
{
namespace Game;
public class CrosshairWidget : Script
{
private Image control;
@@ -22,4 +22,3 @@ namespace Game
{
}
}
}

View File

@@ -3,8 +3,8 @@ using System.Diagnostics;
using FlaxEngine;
using FlaxEngine.GUI;
namespace Game
{
namespace Game;
[ExecuteInEditMode]
public class PerformanceWidget : Script
{
@@ -100,4 +100,3 @@ namespace Game
#endif
}
}
}

View File

@@ -3,8 +3,8 @@ using System.Diagnostics;
using FlaxEngine;
using FlaxEngine.GUI;
namespace Game
{
namespace Game;
public class SpeedWidget : Script
{
public override void OnAwake()
@@ -17,4 +17,3 @@ namespace Game
}
}
}

View File

@@ -1,7 +1,7 @@
using FlaxEngine;
namespace Game
{
namespace Game;
/// <summary>
/// List of supported materials for loaded levels.
/// Maps the given texture/shader name to Flax Material/MaterialInstance.
@@ -20,4 +20,3 @@ namespace Game
[EditorOrder(2)] [EditorDisplay(name: "Material")]
public MaterialBase asset;
}
}

View File

@@ -1,10 +1,9 @@
using System;
using FlaxEngine;
namespace Game
{
namespace Game;
[ExecuteInEditMode]
public class BrushScript : Script
{
}
}

View File

@@ -2,8 +2,8 @@
using FlaxEngine;
using FlaxEditor;
namespace Game
{
namespace Game;
[ExecuteInEditMode]
public class LevelScript : Script
{
@@ -16,4 +16,3 @@ namespace Game
public string MapName;
public DateTime MapTimestamp;
}
}

View File

@@ -7,8 +7,8 @@ using FlaxEngine;
// https://web.archive.org/web/20160316213335/http://forums.ubergames.net/topic/2658-understanding-the-quake-3-map-format/
// https://web.archive.org/web/20210228125854/https://forums.thedarkmod.com/index.php?/topic/15668-plugin-request-save-map-in-quake-3-format/
namespace Game
{
namespace Game;
public struct MapFacePlane
{
public Float3 v1, v2, v3;
@@ -526,4 +526,3 @@ namespace Game
} while (index++ < data.Length && !verticesParsed);
}
}
}

View File

@@ -17,8 +17,8 @@ using FlaxEngine.GUI;
using Console = Game.Console;
using Debug = FlaxEngine.Debug;
namespace Game
{
namespace Game;
public class BrushGeometryMesh
{
public List<uint> indices = new List<uint>();
@@ -1530,4 +1530,3 @@ namespace Game
base.OnDestroy();
}
}
}

View File

@@ -8,8 +8,8 @@ using FlaxEngine;
using FlaxEngine.Assertions;
using FlaxEngine.Utilities;
namespace Game
{
namespace Game;
public class HalfEdge
{
public Face face;
@@ -1311,6 +1311,5 @@ namespace Game
} while (currentEdge != startingEdge);
}
}
}
#endif

View File

@@ -1,7 +1,7 @@
using FlaxEngine;
namespace Game
{
namespace Game;
public static class InputManager
{
public static bool GetAction(string name)
@@ -25,4 +25,3 @@ namespace Game
return Input.GetAxisRaw(name);
}
}
}

View File

@@ -2,8 +2,8 @@
using FlaxEngine;
using FlaxEngine.Networking;
namespace Game
{
namespace Game;
[StructLayout(LayoutKind.Sequential)]
public struct PlayerInputState
{
@@ -171,4 +171,3 @@ namespace Game
return currentState.actor;
}
}
}

View File

@@ -8,8 +8,8 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Console = Game.Console;
namespace Game
{
namespace Game;
public class PlayerInputDemo : PlayerInput
{
protected List<PlayerInputState> buffer = new List<PlayerInputState>();
@@ -99,4 +99,3 @@ namespace Game
//currentState.actor = actorState;
}
}
}

View File

@@ -9,8 +9,8 @@ using FlaxEngine;
using FlaxEngine.Networking;
using Console = Game.Console;
namespace Game
{
namespace Game;
public class PlayerInputLocal : PlayerInput
{
protected List<PlayerInputState> buffer = new List<PlayerInputState>();
@@ -147,4 +147,3 @@ namespace Game
demoFileStream = null;
}
}
}

View File

@@ -1,5 +1,5 @@
namespace Game
{
namespace Game;
public class PlayerInputNetwork : PlayerInput
{
public override bool Predict => true;
@@ -10,4 +10,3 @@
base.OnEndFrame();
}
}
}

View File

@@ -9,8 +9,8 @@ using FlaxEngine.Assertions;
using FlaxEngine.Networking;
using Console = Game.Console;
namespace Game
{
namespace Game;
public class PlayerMovementParameters
{
// FIXME, should be much smaller but needed to avoid issues with box collider edges against brush edges diagonally
@@ -1465,4 +1465,3 @@ namespace Game
Other = 4
}
}
}

View File

@@ -1,8 +1,8 @@
using System.IO;
using FlaxEngine;
namespace Game
{
namespace Game;
public static class AssetManager
{
public static string ContentPath { get; private set; } =
@@ -24,4 +24,3 @@ namespace Game
Config = ConfigParser.ParseFile(Path.Combine(ContentPath, "config.cfg"));
}
}
}