Merge branch 'master' of https://github.com/Saltosion/Cyber
This commit is contained in:
commit
5f3c56cf42
|
|
@ -41,21 +41,17 @@ namespace Cyber.Console {
|
|||
public int RowLength = 80;
|
||||
|
||||
/// <summary>
|
||||
/// The linecount threshold when the <see cref="TextField"/> is cleaned
|
||||
/// up so it has <see cref="LineCountSavedFromCleanup"/> lines left.
|
||||
/// How many lines are included in the <see cref="TextField"/> when
|
||||
/// the total amount of lines exceeds this.
|
||||
/// </summary>
|
||||
public int MaxLinesUntilCleanup = 48;
|
||||
|
||||
/// <summary>
|
||||
/// See <see cref="MaxLinesUntilCleanup"/>.
|
||||
/// </summary>
|
||||
public int LineCountSavedFromCleanup = 24;
|
||||
public int LinesRendered = 15;
|
||||
|
||||
private Dictionary<string, DebugConsoleAction> Actions = new Dictionary<string, DebugConsoleAction>();
|
||||
private List<string> Lines = new List<string>();
|
||||
private List<string> Commands = new List<string>();
|
||||
private int LastCommandIndex = 0;
|
||||
private string LastUnexecutedCommand = "";
|
||||
private int ScrollOffset = 1;
|
||||
|
||||
/// <summary>
|
||||
/// Creates a new <see cref="DebugConsole"/>, and sets the <see cref="Term"/>'s singleton.
|
||||
|
|
@ -128,7 +124,6 @@ namespace Cyber.Console {
|
|||
/// </remarks>
|
||||
/// <param name="text">Text.</param>
|
||||
public void Print(string text) {
|
||||
|
||||
// Wrap lines and log them to Lines
|
||||
int Index = 0;
|
||||
int EscapeIndex = 0;
|
||||
|
|
@ -143,16 +138,19 @@ namespace Cyber.Console {
|
|||
TextField.text += Line + "\n";
|
||||
EscapeIndex++;
|
||||
} while (Index < text.Length && EscapeIndex < 10);
|
||||
if (Lines.Count > MaxLinesUntilCleanup) {
|
||||
// The print history is too long, clear up until there are only
|
||||
// a small amount left (so the user doesn't notice the cleanup)
|
||||
string NewLog = "";
|
||||
Lines.RemoveRange(0, Lines.Count - LineCountSavedFromCleanup);
|
||||
foreach (string Line in Lines) {
|
||||
NewLog += Line + "\n";
|
||||
UpdateTextField();
|
||||
}
|
||||
|
||||
private void UpdateTextField() {
|
||||
string NewLog = "";
|
||||
int LineAmt = Mathf.Min(LinesRendered, Lines.Count);
|
||||
for (int i = 0; i < LineAmt; i++) {
|
||||
int Index = Lines.Count - (i + ScrollOffset);
|
||||
if (Index >= 0 && Index < Lines.Count) {
|
||||
NewLog += Lines[i] + "\n";
|
||||
}
|
||||
TextField.text = NewLog;
|
||||
}
|
||||
TextField.text = NewLog;
|
||||
}
|
||||
|
||||
private void Start() {
|
||||
|
|
@ -229,6 +227,14 @@ namespace Cyber.Console {
|
|||
InputField.text = LastUnexecutedCommand;
|
||||
}
|
||||
}
|
||||
if (Input.GetAxis("Mouse ScrollWheel") > 0 && ScrollOffset + 1 <= Lines.Count) {
|
||||
ScrollOffset++;
|
||||
UpdateTextField();
|
||||
}
|
||||
if (Input.GetAxis("Mouse ScrollWheel") < 0 && ScrollOffset - 1 > 1) {
|
||||
ScrollOffset--;
|
||||
UpdateTextField();
|
||||
}
|
||||
|
||||
// Slide up/down animation
|
||||
RectTransform Rect = Panel.GetComponent<RectTransform>();
|
||||
|
|
|
|||
|
|
@ -4,9 +4,21 @@ using Cyber.Console;
|
|||
using Cyber.Util;
|
||||
|
||||
namespace Cyber.Entities.SyncBases {
|
||||
|
||||
/// <summary>
|
||||
/// Runs functions.
|
||||
/// </summary>
|
||||
/// \todo Implement programs in an editor-friendly way
|
||||
public class Computer : Interactable {
|
||||
/// <summary>The "left key" key code.</summary>
|
||||
public const string KeyCodeLeft = "KeyLeft";
|
||||
/// <summary>The "right key" key code.</summary>
|
||||
public const string KeyCodeRight = "KeyRight";
|
||||
|
||||
/// <summary>
|
||||
/// The delegate which defines the function that will be run when the
|
||||
/// computer is interacted with (directly or through keys).
|
||||
/// </summary>
|
||||
public delegate void RunProgram(Computer host, string key);
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -32,6 +44,12 @@ namespace Cyber.Entities.SyncBases {
|
|||
/// </summary>
|
||||
public RunProgram Program;
|
||||
|
||||
/// <summary>
|
||||
/// Runs the <see cref="Program"/> with some input, determined by the
|
||||
/// Trigger.
|
||||
/// </summary>
|
||||
/// <param name="Trigger">Determines the keycode given to the
|
||||
/// <see cref="Program"/>.</param>
|
||||
public override void Interact(SyncBase Trigger) {
|
||||
if (Trigger == KeyLeft) {
|
||||
Screen.SetTextProperties(new TextTextureProperties("\n Pressed left!"));
|
||||
|
|
@ -42,16 +60,36 @@ namespace Cyber.Entities.SyncBases {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// No serialization needed (yet).
|
||||
/// </summary>
|
||||
/// <param name="reader"></param>
|
||||
public override void Deserialize(NetworkReader reader) {
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// No serialization needed (yet).
|
||||
/// </summary>
|
||||
/// <param name="writer"></param>
|
||||
public override void Serialize(NetworkWriter writer) {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Computers could have lots of data, and therefore should be hashed
|
||||
/// to optimize bandwidth usage. No hurry in updating them though, so
|
||||
/// an update per 10 ticks is enough.
|
||||
/// </summary>
|
||||
/// <returns>The sync handletype.</returns>
|
||||
public override SyncHandletype GetSyncHandletype() {
|
||||
return new SyncHandletype(true, 10);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Computers should share state between different clients, so sync and
|
||||
/// send interactions to the network.
|
||||
/// </summary>
|
||||
/// <returns>The Interaction information.</returns>
|
||||
public override InteractableSyncdata GetInteractableSyncdata() {
|
||||
return new InteractableSyncdata(true, true);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ namespace Cyber.Networking.Serverside {
|
|||
SendToAll(PktType.TextMessage, new TextMessagePkt("Server: " + args[0]));
|
||||
});
|
||||
|
||||
gameObject.AddComponent<Syncer>();
|
||||
Syncer = gameObject.AddComponent<Syncer>();
|
||||
|
||||
ServerSyncHandler = new ServerSyncHandler(Players);
|
||||
|
||||
|
|
|
|||
|
|
@ -63,10 +63,20 @@ namespace Cyber.Util {
|
|||
/// <param name="forceRender">Whether the texture should be rendered
|
||||
/// again even if it's cached.</param>
|
||||
public static Texture2D GetText(TextTextureProperties text, bool forceRender = false) {
|
||||
if (forceRender || !Cache.ContainsKey(text.Text)) {
|
||||
Cache[text.Text] = Singleton.RenderText(text);
|
||||
string Hash = CreateHash(text);
|
||||
if (forceRender || !Cache.ContainsKey(Hash)) {
|
||||
Cache[Hash] = Singleton.RenderText(text);
|
||||
Term.Println("Created a new texture for:");
|
||||
Term.Println(Hash);
|
||||
Term.Println("====");
|
||||
}
|
||||
return Cache[text.Text];
|
||||
return Cache[Hash];
|
||||
}
|
||||
|
||||
private static string CreateHash(TextTextureProperties text) {
|
||||
return text.Text + "," + text.Width + "," + text.Height + "," +
|
||||
text.FontSize + "," + text.Background.r + "," +
|
||||
text.Background.g + "," + text.Background.b;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -37,9 +37,9 @@ Version 0.3.0 - Mortician
|
|||
|
||||
Version 0.2.0 - Juniper
|
||||
-----------------------
|
||||
- [ ] Basic interactions and an environment for testing.
|
||||
- [ ] A room with a door, a button and a screen.
|
||||
- [ ] Both players should be able to open the door and press the button, and see a reaction in the world (door opening, screen flashing).
|
||||
- [x] Basic interactions and an environment for testing.
|
||||
- [x] A room with a door, a button and a screen.
|
||||
- [x] Both players should be able to open the door and press the button, and see a reaction in the world (door opening, screen flashing).
|
||||
|
||||
Version 0.1.0 - Gigantic
|
||||
------------------------
|
||||
|
|
|
|||
Loading…
Reference in New Issue