From 6a4ecfdf0bdd2533f906524ad73c37f06a61cec1 Mon Sep 17 00:00:00 2001 From: Ari Vuollet Date: Sat, 14 May 2022 19:10:13 +0300 Subject: [PATCH] un-cabrito --- Source/Game/AudioManager.cs | 2 +- Source/Game/Camera/CameraMovement.cs | 3 +-- Source/Game/Camera/CameraRender.cs | 3 +-- Source/Game/Console/CommonCommands.cs | 2 +- Source/Game/Console/Console.cs | 2 +- Source/Game/Console/ConsoleAttributes.cs | 2 +- Source/Game/Console/ConsoleCommand.cs | 2 +- Source/Game/Console/ConsoleContentTextBox.cs | 2 +- Source/Game/Console/ConsoleInputTextBox.cs | 2 +- Source/Game/Console/ConsolePlugin.cs | 2 +- Source/Game/Console/ConsoleScript.cs | 2 +- Source/Game/Console/ConsoleTextBoxBase.cs | 2 +- Source/Game/Console/ConsoleVariable.cs | 2 +- Source/Game/Console/EngineSubsystem.cs | 2 +- Source/Game/GameMode/GameModeManager.cs | 2 +- Source/Game/Hud/FpsScript.cs | 2 +- Source/Game/Level/Q3MapImporter.cs | 2 +- Source/Game/Level/QuickHull2.cs | 2 +- Source/Game/Network/NetworkManager.cs | 2 +- Source/Game/Network/NetworkManagerPlugin.cs | 2 +- Source/Game/Network/NetworkManager_Client.cs | 2 +- Source/Game/Network/NetworkManager_Server.cs | 2 +- Source/Game/Player/InputManager.cs | 3 +-- Source/Game/Player/PlayerActor.cs | 1 - Source/Game/Player/PlayerInputDemo.cs | 2 +- Source/Game/Player/PlayerInputLocal.cs | 2 +- Source/Game/Player/PlayerMovement.cs | 2 +- Tests/ConsoleTests.cs | 2 +- 28 files changed, 27 insertions(+), 31 deletions(-) diff --git a/Source/Game/AudioManager.cs b/Source/Game/AudioManager.cs index 16e7c24..f741399 100644 --- a/Source/Game/AudioManager.cs +++ b/Source/Game/AudioManager.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; using FlaxEngine; -using Console = Cabrito.Console; +using Console = Game.Console; using Object = FlaxEngine.Object; namespace Game diff --git a/Source/Game/Camera/CameraMovement.cs b/Source/Game/Camera/CameraMovement.cs index 9cdc398..057579a 100644 --- a/Source/Game/Camera/CameraMovement.cs +++ b/Source/Game/Camera/CameraMovement.cs @@ -1,5 +1,4 @@ -using Cabrito; -using FlaxEngine; +using FlaxEngine; namespace Game { diff --git a/Source/Game/Camera/CameraRender.cs b/Source/Game/Camera/CameraRender.cs index 0983109..529e43a 100644 --- a/Source/Game/Camera/CameraRender.cs +++ b/Source/Game/Camera/CameraRender.cs @@ -1,5 +1,4 @@ -using Cabrito; -using FlaxEditor.Content.Settings; +using FlaxEditor.Content.Settings; using FlaxEngine; namespace Game diff --git a/Source/Game/Console/CommonCommands.cs b/Source/Game/Console/CommonCommands.cs index 05fe675..7c72cf6 100644 --- a/Source/Game/Console/CommonCommands.cs +++ b/Source/Game/Console/CommonCommands.cs @@ -1,6 +1,6 @@ using System; -namespace Cabrito +namespace Game { // Holds common miscellaneous Console variables and commands public static class CommonCommands diff --git a/Source/Game/Console/Console.cs b/Source/Game/Console/Console.cs index cc387b7..d23d939 100644 --- a/Source/Game/Console/Console.cs +++ b/Source/Game/Console/Console.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Reflection; using FlaxEditor; -namespace Cabrito +namespace Game { public class ConsoleLine { diff --git a/Source/Game/Console/ConsoleAttributes.cs b/Source/Game/Console/ConsoleAttributes.cs index 4a5cb21..404c986 100644 --- a/Source/Game/Console/ConsoleAttributes.cs +++ b/Source/Game/Console/ConsoleAttributes.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace Cabrito +namespace Game { [AttributeUsage(AttributeTargets.All)] public abstract class ConsoleBaseAttribute : Attribute diff --git a/Source/Game/Console/ConsoleCommand.cs b/Source/Game/Console/ConsoleCommand.cs index e2cc608..8b8664e 100644 --- a/Source/Game/Console/ConsoleCommand.cs +++ b/Source/Game/Console/ConsoleCommand.cs @@ -1,7 +1,7 @@ using System; using System.Reflection; -namespace Cabrito +namespace Game { internal struct ConsoleCommand { diff --git a/Source/Game/Console/ConsoleContentTextBox.cs b/Source/Game/Console/ConsoleContentTextBox.cs index 3f1de9a..9cbcf5f 100644 --- a/Source/Game/Console/ConsoleContentTextBox.cs +++ b/Source/Game/Console/ConsoleContentTextBox.cs @@ -6,7 +6,7 @@ using System.Text; using FlaxEngine; using FlaxEngine.GUI; -namespace Cabrito +namespace Game { public class ConsoleContentTextBox : Control { diff --git a/Source/Game/Console/ConsoleInputTextBox.cs b/Source/Game/Console/ConsoleInputTextBox.cs index c93458e..e13939b 100644 --- a/Source/Game/Console/ConsoleInputTextBox.cs +++ b/Source/Game/Console/ConsoleInputTextBox.cs @@ -2,7 +2,7 @@ using System.Linq; using FlaxEngine; -namespace Cabrito +namespace Game { public class ConsoleInputTextBox : ConsoleTextBoxBase { diff --git a/Source/Game/Console/ConsolePlugin.cs b/Source/Game/Console/ConsolePlugin.cs index af42765..5b11957 100644 --- a/Source/Game/Console/ConsolePlugin.cs +++ b/Source/Game/Console/ConsolePlugin.cs @@ -1,6 +1,6 @@ using System; using FlaxEngine; -using Console = Cabrito.Console; +using Console = Game.Console; #if FLAX_EDITOR using FlaxEditor; #endif diff --git a/Source/Game/Console/ConsoleScript.cs b/Source/Game/Console/ConsoleScript.cs index 5749a57..92f140d 100644 --- a/Source/Game/Console/ConsoleScript.cs +++ b/Source/Game/Console/ConsoleScript.cs @@ -6,7 +6,7 @@ using FlaxEngine.Assertions; using FlaxEngine.GUI; using Object = FlaxEngine.Object; -namespace Cabrito +namespace Game { public class ConsoleScript : Script { diff --git a/Source/Game/Console/ConsoleTextBoxBase.cs b/Source/Game/Console/ConsoleTextBoxBase.cs index fe61609..c324aa1 100644 --- a/Source/Game/Console/ConsoleTextBoxBase.cs +++ b/Source/Game/Console/ConsoleTextBoxBase.cs @@ -2,7 +2,7 @@ using FlaxEngine; using FlaxEngine.GUI; -namespace Cabrito +namespace Game { // Mostly based on TextBox public class ConsoleTextBoxBase : TextBoxBase diff --git a/Source/Game/Console/ConsoleVariable.cs b/Source/Game/Console/ConsoleVariable.cs index 22a5085..cc0d80e 100644 --- a/Source/Game/Console/ConsoleVariable.cs +++ b/Source/Game/Console/ConsoleVariable.cs @@ -1,7 +1,7 @@ using System; using System.Reflection; -namespace Cabrito +namespace Game { [Flags] public enum ConsoleFlags diff --git a/Source/Game/Console/EngineSubsystem.cs b/Source/Game/Console/EngineSubsystem.cs index 2f99cf3..b4f3935 100644 --- a/Source/Game/Console/EngineSubsystem.cs +++ b/Source/Game/Console/EngineSubsystem.cs @@ -2,7 +2,7 @@ using FidelityFX; using FlaxEngine; -namespace Cabrito +namespace Game { // Holds Console variables and commands to control engine behaviour public static class EngineSubsystem diff --git a/Source/Game/GameMode/GameModeManager.cs b/Source/Game/GameMode/GameModeManager.cs index 9bab02e..2e57203 100644 --- a/Source/Game/GameMode/GameModeManager.cs +++ b/Source/Game/GameMode/GameModeManager.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using FlaxEngine; using FlaxEngine.Networking; -using Console = Cabrito.Console; +using Console = Game.Console; namespace Game { diff --git a/Source/Game/Hud/FpsScript.cs b/Source/Game/Hud/FpsScript.cs index c4bdbb3..54aefcc 100644 --- a/Source/Game/Hud/FpsScript.cs +++ b/Source/Game/Hud/FpsScript.cs @@ -5,7 +5,7 @@ using FlaxEditor.Content.Settings; using FlaxEngine; using FlaxEngine.GUI; -namespace Cabrito +namespace Game { [ExecuteInEditMode] public class FpsScript : Script diff --git a/Source/Game/Level/Q3MapImporter.cs b/Source/Game/Level/Q3MapImporter.cs index 34bee28..e97aa6e 100644 --- a/Source/Game/Level/Q3MapImporter.cs +++ b/Source/Game/Level/Q3MapImporter.cs @@ -5,7 +5,7 @@ using System.IO; using System.Linq; using FlaxEngine; using FlaxEngine.Assertions; -using Console = Cabrito.Console; +using Console = Game.Console; namespace Game { diff --git a/Source/Game/Level/QuickHull2.cs b/Source/Game/Level/QuickHull2.cs index 74d0cda..f10bf78 100644 --- a/Source/Game/Level/QuickHull2.cs +++ b/Source/Game/Level/QuickHull2.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Runtime.CompilerServices; using FlaxEngine; using FlaxEngine.Assertions; -using Console = Cabrito.Console; +using Console = Game.Console; namespace Game { diff --git a/Source/Game/Network/NetworkManager.cs b/Source/Game/Network/NetworkManager.cs index 7c37b90..a069b8a 100644 --- a/Source/Game/Network/NetworkManager.cs +++ b/Source/Game/Network/NetworkManager.cs @@ -3,7 +3,7 @@ using System.Linq; using FlaxEditor; using FlaxEngine; using FlaxEngine.Networking; -using Console = Cabrito.Console; +using Console = Game.Console; namespace Game { diff --git a/Source/Game/Network/NetworkManagerPlugin.cs b/Source/Game/Network/NetworkManagerPlugin.cs index 0d90b95..36ad1c1 100644 --- a/Source/Game/Network/NetworkManagerPlugin.cs +++ b/Source/Game/Network/NetworkManagerPlugin.cs @@ -1,6 +1,6 @@ using System; using FlaxEngine; -using Console = Cabrito.Console; +using Console = Game.Console; #if FLAX_EDITOR using System.Diagnostics; using FlaxEditor; diff --git a/Source/Game/Network/NetworkManager_Client.cs b/Source/Game/Network/NetworkManager_Client.cs index 5330733..3c5dc22 100644 --- a/Source/Game/Network/NetworkManager_Client.cs +++ b/Source/Game/Network/NetworkManager_Client.cs @@ -2,7 +2,7 @@ using System.Linq; using FlaxEngine; using FlaxEngine.Networking; -using Console = Cabrito.Console; +using Console = Game.Console; using Object = FlaxEngine.Object; namespace Game diff --git a/Source/Game/Network/NetworkManager_Server.cs b/Source/Game/Network/NetworkManager_Server.cs index c27da04..a9d97a1 100644 --- a/Source/Game/Network/NetworkManager_Server.cs +++ b/Source/Game/Network/NetworkManager_Server.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Reflection; using FlaxEngine; using FlaxEngine.Networking; -using Console = Cabrito.Console; +using Console = Game.Console; using Object = FlaxEngine.Object; namespace Game diff --git a/Source/Game/Player/InputManager.cs b/Source/Game/Player/InputManager.cs index 62597cc..7c75c2c 100644 --- a/Source/Game/Player/InputManager.cs +++ b/Source/Game/Player/InputManager.cs @@ -1,5 +1,4 @@ -using Cabrito; -using FlaxEngine; +using FlaxEngine; namespace Game { diff --git a/Source/Game/Player/PlayerActor.cs b/Source/Game/Player/PlayerActor.cs index f2020fd..4bf96ea 100644 --- a/Source/Game/Player/PlayerActor.cs +++ b/Source/Game/Player/PlayerActor.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using Cabrito; using FlaxEngine; #if FLAX_EDITOR using FlaxEditor.CustomEditors.Dedicated; diff --git a/Source/Game/Player/PlayerInputDemo.cs b/Source/Game/Player/PlayerInputDemo.cs index b617685..8db8e32 100644 --- a/Source/Game/Player/PlayerInputDemo.cs +++ b/Source/Game/Player/PlayerInputDemo.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.InteropServices; -using Console = Cabrito.Console; +using Console = Game.Console; namespace Game { diff --git a/Source/Game/Player/PlayerInputLocal.cs b/Source/Game/Player/PlayerInputLocal.cs index f853249..ed1d1f2 100644 --- a/Source/Game/Player/PlayerInputLocal.cs +++ b/Source/Game/Player/PlayerInputLocal.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Runtime.InteropServices; using FlaxEngine; -using Console = Cabrito.Console; +using Console = Game.Console; namespace Game { diff --git a/Source/Game/Player/PlayerMovement.cs b/Source/Game/Player/PlayerMovement.cs index 4bdeebb..ece5ae0 100644 --- a/Source/Game/Player/PlayerMovement.cs +++ b/Source/Game/Player/PlayerMovement.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using FlaxEngine; -using Console = Cabrito.Console; +using Console = Game.Console; namespace Game { diff --git a/Tests/ConsoleTests.cs b/Tests/ConsoleTests.cs index fc41c54..3b6c933 100644 --- a/Tests/ConsoleTests.cs +++ b/Tests/ConsoleTests.cs @@ -1,6 +1,6 @@ using NUnit.Framework; using Cabrito; -using Console = Cabrito.Console; +using Console = Game.Console; namespace GoakeTests.ConsoleTests {