1 files changed, 19 insertions, 12 deletions

diff --git a/Main.cs b/Main.cs
index b281710..0194169 100644
--- a/Main.cs
+++ b/Main.cs
@@ -1,4 +1,5 @@
-using System.Numerics;
+using System.Globalization;
+using System.Numerics;
 using Raylib_cs;
 
 namespace OnekoOnline;
@@ -10,23 +11,26 @@ static class OnekoOnline
     public static Net.Server? Server;
     public static Net.Client? Client;
 
-    const ConfigFlags raylibConfFlags = 
-        //ConfigFlags.FLAG_WINDOW_UNDECORATED |
-        //ConfigFlags.FLAG_WINDOW_TRANSPARENT |
-        //ConfigFlags.FLAG_WINDOW_MOUSE_PASSTHROUGH |
-        //ConfigFlags.FLAG_WINDOW_TOPMOST |
-        //ConfigFlags.FLAG_WINDOW_RESIZABLE |
-        ConfigFlags.FLAG_VSYNC_HINT;
+    public static readonly int WindowX = 320;
+    public static readonly int WindowY = 240;
+    public static readonly int WindowScale = Config.GetValue("WindowScale", 2);
+    public static Vector2 Resolution => new(WindowX, WindowY);
+
+    public static Font DefaultFont;
+
+    const ConfigFlags raylibConfFlags = ConfigFlags.FLAG_VSYNC_HINT;
     
     public static void Main()
     {
         Raylib.SetConfigFlags(raylibConfFlags);
-        Raylib.InitWindow(640, 480, "OnekoOnline");
+        Raylib.InitWindow(WindowX*WindowScale, WindowY*WindowScale, "OnekoOnline");
         Raylib.SetTargetFPS(30);
+        Raylib.HideCursor();
 
         OnekoLocal LocalOneko = new();
+        Mouse LocalMouse = new();
 
-        RenderTexture2D RenderTexture = Raylib.LoadRenderTexture(320,240);
+        RenderTexture2D RenderTexture = Raylib.LoadRenderTexture(WindowX, WindowY);
 
         int port = Config.GetValue("ServerPort", 42069);
         string serverPassword = Config.GetValue("ServerPassword", "");
@@ -38,6 +42,8 @@ static class OnekoOnline
             Client = new(Config.GetValue("ServerIP", "pond.sarahduck.ca"), port, serverPassword);
         }
 
+        DefaultFont = Raylib.LoadFont("misc/MPlusBitmap.fnt");
+
         while (!Raylib.WindowShouldClose())
         {
             //Poll networking
@@ -47,14 +53,15 @@ static class OnekoOnline
             Raylib.BeginTextureMode(RenderTexture);
 
             Raylib.ClearBackground(Color.GRAY);
-            Raylib.DrawText("Oneko Online",12, 12, 8, Color.WHITE);
+            Raylib.DrawTextEx(DefaultFont, "こんにちは", new(32,32), 11, 0, Color.WHITE);
+            Raylib.DrawText("Oneko Online", 12, 12, 8, Color.WHITE);
 
             Drawable.DrawAll();
 
             Raylib.EndTextureMode();
 
             Raylib.BeginDrawing();
-            Raylib.DrawTexturePro(RenderTexture.Texture, new Rectangle(0f,0f,320,-240), new Rectangle(0,0,640,480), Vector2.Zero,0f,Color.WHITE);
+            Raylib.DrawTexturePro(RenderTexture.Texture, new Rectangle(0f,0f,WindowX,-WindowY), new Rectangle(0,0,WindowX*WindowScale,WindowY*WindowScale), Vector2.Zero,0f,Color.WHITE);
             Raylib.EndDrawing();
         }