Bellsworne/CogwheelUnity
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup up some console stuff, added a prefab, etc

Browse Source
This commit is contained in:
Spudnut2000
2024-10-03 21:49:30 -05:00
parent ee7aacc046
commit d15151a473
153 changed files with 27561 additions and 56159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Cogwheel/Assets/Cogwheel/Prefabs.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 11fed44903539a70fbb65479ddb880f6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

109
Cogwheel/Assets/Cogwheel/Prefabs/Cogwheel.prefab Normal file
View File

@@ -0,0 +1,109 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6812011641737714985
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2139542304717927576}
- component: {fileID: 8772092795256083104}
m_Layer: 0
m_Name: Cogwheel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2139542304717927576
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6812011641737714985}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 6.010771, y: 13.350267, z: 7.386556}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3643545667400016780}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8772092795256083104
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6812011641737714985}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ee15c0b36cc41568cc5ab4e83331046, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &6867388745892155766
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2139542304717927576}
m_Modifications:
- target: {fileID: 1524229190056341568, guid: 711d6fd55c44569cd91d159dcc393ac8, type: 3}
propertyPath: m_Name
value: CogwheelConsole
objectReference: {fileID: 0}
- target: {fileID: 7916664963331027706, guid: 711d6fd55c44569cd91d159dcc393ac8, type: 3}
propertyPath: m_LocalPosition.x
value: 6.010771
objectReference: {fileID: 0}
- target: {fileID: 7916664963331027706, guid: 711d6fd55c44569cd91d159dcc393ac8, type: 3}
propertyPath: m_LocalPosition.y
value: 13.350267
objectReference: {fileID: 0}
- target: {fileID: 7916664963331027706, guid: 711d6fd55c44569cd91d159dcc393ac8, type: 3}
propertyPath: m_LocalPosition.z
value: 7.386556
objectReference: {fileID: 0}
- target: {fileID: 7916664963331027706, guid: 711d6fd55c44569cd91d159dcc393ac8, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7916664963331027706, guid: 711d6fd55c44569cd91d159dcc393ac8, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7916664963331027706, guid: 711d6fd55c44569cd91d159dcc393ac8, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7916664963331027706, guid: 711d6fd55c44569cd91d159dcc393ac8, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7916664963331027706, guid: 711d6fd55c44569cd91d159dcc393ac8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7916664963331027706, guid: 711d6fd55c44569cd91d159dcc393ac8, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7916664963331027706, guid: 711d6fd55c44569cd91d159dcc393ac8, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 711d6fd55c44569cd91d159dcc393ac8, type: 3}
--- !u!4 &3643545667400016780 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7916664963331027706, guid: 711d6fd55c44569cd91d159dcc393ac8, type: 3}
m_PrefabInstance: {fileID: 6867388745892155766}
m_PrefabAsset: {fileID: 0}

7
Cogwheel/Assets/Cogwheel/Prefabs/Cogwheel.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: bfba73797df1fe94c91fd68237bdb897
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

23
Cogwheel/Assets/Cogwheel/Scripts/COGWHEEL.cs
View File

@@ -1,28 +1,21 @@
using System.Collections.Generic;
using OpenCover.Framework.Model;
using Unity.VisualScripting;
using UnityEngine;
namespace Cogwheel
{
public static class COGWHEEL
{
public static ICommandsManager CommandsManager { get; }
public static CogwheelSettings Settings { get; }
public static ICommandsManager CommandsManager { get; private set; }
public static CogwheelSettings Settings { get; private set; }
public static CogwheelConsole Console { get; private set; }
static Color _color = Color.blue;
static COGWHEEL()
public static void Start(CogwheelSettings settings, ICommandsManager commandsManager, CogwheelConsole console)
{
Settings = Resources.Load<CogwheelSettings>("CogwheelSettings");
if (Settings is null)
{
Debug.LogError("CogwheelSettings not found. Make sure you have a CogwheelSettings asset in a Resources folder.");
return;
}
Console = GameObject.Instantiate(Settings.CogwheelConsolePrefab).GetComponent<CogwheelConsole>();
CommandsManager = new CommandsManager(Console);
Settings = settings;
CommandsManager = commandsManager;
Console = console;
}
#region BUILT-IN COMMANDS
@@ -106,7 +99,5 @@ namespace Cogwheel
}
#endregion
}
}

36
Cogwheel/Assets/Cogwheel/Scripts/CogwheelInitializer.cs Normal file
View File

@@ -0,0 +1,36 @@
using System;
using Unity.VisualScripting;
using UnityEngine;
namespace Cogwheel
{
public class CogwheelInitializer : MonoBehaviour
{
private ICommandsManager _commandsManager;
private CogwheelConsole _console;
private CogwheelSettings _settings;
private void Start()
{
DontDestroyOnLoad(this);
if (!LoadSettings()) return;
_console = GetComponentInChildren<CogwheelConsole>();
_commandsManager = new CommandsManager(_console);
COGWHEEL.Start(_settings, _commandsManager, _console);
}
private bool LoadSettings()
{
var settings = Resources.Load<CogwheelSettings>("CogwheelSettings");
if (settings is null)
{
Debug.LogError("CogwheelSettings not found. Make sure you have a CogwheelSettings asset in a Resources folder.");
return false;
}
_settings = settings;
return true;
}
}
}

3
Cogwheel/Assets/Cogwheel/Scripts/CogwheelInitializer.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 0ee15c0b36cc41568cc5ab4e83331046
timeCreated: 1728005805

4
Cogwheel/Assets/Cogwheel/Scripts/CogwheelSettings.cs
View File

@@ -5,6 +5,8 @@ namespace Cogwheel
[CreateAssetMenu(fileName = "CogwheelSettings", menuName = "Cogwheel/CogwheelSettings", order = 0)]
public class CogwheelSettings : ScriptableObject
{
public CogwheelConsole CogwheelConsolePrefab;
[Header("Console Settings")]
public bool EnableConsole = true;
public KeyCode ConsoleToggleKey = KeyCode.Tilde;
}
}

21
Cogwheel/Assets/Cogwheel/Test.cs
View File

@@ -1,21 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using Cogwheel;
using UnityEngine;
public class Test : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
Debug.Log(COGWHEEL.Settings.CogwheelConsolePrefab.name);
//COGWHEEL.CommandsManager.SceneContext = gameObject;
}
[Command(Description = "Test command.")]
private void TestCommand()
{
}
}

11
Cogwheel/Assets/Cogwheel/Test.cs.meta
View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 4a61e49036c312c83a47481446b0c01a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

48
Cogwheel/Assets/Cogwheel/UI/CogwheelConsole.cs
View File

@@ -12,27 +12,73 @@ public class CogwheelConsole : MonoBehaviour
private VisualElement _consoleRoot;
private TextField _inputField;
private Label _outputLabel;
private ScrollView _scrollView;
private void Start()
{
_consoleRoot = uiDocument.rootVisualElement;
_inputField = _consoleRoot.Q<TextField>("InputTextField");
_outputLabel = _consoleRoot.Q<Label>("ConsoleOutputLabel");
_scrollView = _consoleRoot.Q<ScrollView>("ConsoleScrollView");
Hide();
}
private void Update()
{
//if input field has focus and enter key is pressed
HandleInput();
}
private void HandleInput()
{
if (_inputField.panel.focusController.focusedElement == _inputField && Input.GetKeyDown(KeyCode.Return))
{
SubmitInput();
}
if (COGWHEEL.Settings.EnableConsole && Input.GetKeyDown(COGWHEEL.Settings.ConsoleToggleKey) && _inputField.panel.focusController.focusedElement != _inputField)
{
if (_consoleRoot.ClassListContains("active"))
{
Hide();
}
else
{
Show();
}
}
}
private void Show()
{
_consoleRoot.AddToClassList("active");
_consoleRoot.RemoveFromClassList("hidden");
ScrollToBottom();
}
private void Hide()
{
_consoleRoot.RemoveFromClassList("active");
_consoleRoot.AddToClassList("hidden");
}
private void SubmitInput()
{
Log("> " + "<color=#555555><i>" + _inputField.value + "</i></color>");
var success = COGWHEEL.CommandsManager.RunCommand(_inputField.value);
_inputField.value = "";
_inputField.Focus();
ScrollToBottom();
}
private void ScrollToBottom()
{
_scrollView.schedule.Execute(() =>
{
_scrollView.verticalScroller.value = _scrollView.contentContainer.resolvedStyle.height;
}).ExecuteLater(10);
}
public void Log(string message)

24
Cogwheel/Assets/Cogwheel/UI/CogwheelConsole.uss
View File

@@ -1,11 +1,15 @@
#CogwheelConsoleRoot {
padding: 0;
margin: 0;
}
#ConsolePanel {
background-color: rgba(0, 0, 0, 0.9);
background-color: rgba(0, 0, 0, 0.96);
color: white;
padding: 1%;
max-height: 50%;
margin: 0;
}
#InputTextField {
@@ -13,14 +17,28 @@
}
#InputTextField #unity-text-input {
background-color: rgba(0, 0, 0, 0.9);
background-color: rgba(0, 0, 0, 0.98);
color: white;
border-width: 1px;
border-color: black;
padding: 0.5%;
margin: 0;
width: 100%;
}
#ConsoleScrollView Scroller{
opacity: 0;
display: none;
}
#InputTextField Label{
display: none;
}
.active {
display: flex;
}
.hidden {
display: none;
}

3
Cogwheel/Assets/Cogwheel/UI/CogwheelConsole.uxml
View File

@@ -1,3 +0,0 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
<ui:VisualElement name="CogwheelConsolePanel" style="flex-grow: 1; width: 100%;" />
</ui:UXML>

10
Cogwheel/Assets/Cogwheel/UI/CogwheelConsole.uxml.meta
View File

@@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: 6d915ffc1116cd340b99d408824b929e
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}

4
Cogwheel/Assets/Cogwheel/UI/CogwheelConsoleUI.uxml
View File

@@ -2,8 +2,8 @@
<Style src="project://database/Assets/Cogwheel/UI/CogwheelConsole.uss?fileID=7433441132597879392&amp;guid=a7724294777a80289a26a34dab7ad5c6&amp;type=3#CogwheelConsole" />
<ui:VisualElement name="CogwheelConsoleRoot" style="flex-grow: 1;">
<ui:VisualElement name="ConsolePanel" style="flex-grow: 1;">
<ui:ScrollView>
<ui:Label tabindex="-1" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ConsoleOutputLabel" focusable="true" />
<ui:ScrollView name="ConsoleScrollView">
<ui:Label tabindex="-1" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ConsoleOutputLabel" focusable="true" style="white-space: normal;" />
</ui:ScrollView>
</ui:VisualElement>
<ui:TextField picking-mode="Ignore" value="Command" name="InputTextField" />

3
Cogwheel/Assets/Resources/CogwheelSettings.asset
View File

@@ -12,4 +12,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 53d39a5b2f874ce2b49327a3ec509eba, type: 3}
m_Name: CogwheelSettings
m_EditorClassIdentifier:
CogwheelConsolePrefab: {fileID: 9161624000669002432, guid: 711d6fd55c44569cd91d159dcc393ac8, type: 3}
EnableConsole: 1
ConsoleToggleKey: 96

146
Cogwheel/Assets/Scenes/SampleScene.unity
View File

@@ -38,7 +38,6 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -309,100 +308,67 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1312985368
GameObject:
--- !u!1001 &1414270578
PrefabInstance:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1312985370}
- component: {fileID: 1312985369}
m_Layer: 0
m_Name: Test2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1312985369
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1312985368}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a2c4c2a5f3f0432eaf914b6d27031ca6, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1312985370
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1312985368}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1830122060
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1830122061}
- component: {fileID: 1830122062}
m_Layer: 0
m_Name: Test
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1830122061
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1830122060}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1830122062
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1830122060}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f2dd85165475cf7a81bf4b02e9502f4, type: 3}
m_Name:
m_EditorClassIdentifier:
context: {fileID: 0}
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2139542304717927576, guid: bfba73797df1fe94c91fd68237bdb897, type: 3}
propertyPath: m_LocalPosition.x
value: 6.010771
objectReference: {fileID: 0}
- target: {fileID: 2139542304717927576, guid: bfba73797df1fe94c91fd68237bdb897, type: 3}
propertyPath: m_LocalPosition.y
value: 13.350267
objectReference: {fileID: 0}
- target: {fileID: 2139542304717927576, guid: bfba73797df1fe94c91fd68237bdb897, type: 3}
propertyPath: m_LocalPosition.z
value: 7.386556
objectReference: {fileID: 0}
- target: {fileID: 2139542304717927576, guid: bfba73797df1fe94c91fd68237bdb897, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2139542304717927576, guid: bfba73797df1fe94c91fd68237bdb897, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2139542304717927576, guid: bfba73797df1fe94c91fd68237bdb897, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2139542304717927576, guid: bfba73797df1fe94c91fd68237bdb897, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2139542304717927576, guid: bfba73797df1fe94c91fd68237bdb897, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2139542304717927576, guid: bfba73797df1fe94c91fd68237bdb897, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2139542304717927576, guid: bfba73797df1fe94c91fd68237bdb897, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6812011641737714985, guid: bfba73797df1fe94c91fd68237bdb897, type: 3}
propertyPath: m_Name
value: Cogwheel
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bfba73797df1fe94c91fd68237bdb897, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 963194228}
- {fileID: 705507995}
- {fileID: 1830122061}
- {fileID: 1312985370}
- {fileID: 1414270578}