diff --git a/.gitignore b/.gitignore index 7f0cc7a..32148b5 100644 --- a/.gitignore +++ b/.gitignore @@ -19,8 +19,8 @@ client/.gradle client/build server/.idea -server/.env -auth/.env +#server/.env +#auth/.env *.db *.db-shm diff --git a/client/Cargo.toml b/client/Cargo.toml new file mode 100644 index 0000000..ab7eb0b --- /dev/null +++ b/client/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "realm_client" +version = "0.1.0" +edition = "2021" + +[dependencies] +realm_auth = { path = "../auth" } +realm_server = { path = "../server" } +realm_shared = { path = "../shared" } \ No newline at end of file diff --git a/client/godot/.gitignore b/client/godot/.gitignore deleted file mode 100644 index 4709183..0000000 --- a/client/godot/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Godot 4+ specific ignores -.godot/ diff --git a/client/godot/HelloWorld.gdextension b/client/godot/HelloWorld.gdextension deleted file mode 100644 index eae8e9e..0000000 --- a/client/godot/HelloWorld.gdextension +++ /dev/null @@ -1,14 +0,0 @@ -[configuration] -entry_symbol = "gdext_rust_init" -compatibility_minimum = 4.1 -reloadable = true - -[libraries] -linux.debug.x86_64 = "res://../realmchat_client/target/debug/librealmchat_client.so" -linux.release.x86_64 = "res://../realmchat_client/target/release/librealmchat_client.so" -windows.debug.x86_64 = "res://../realmchat_client/target/debug/realmchat_client.dll" -windows.release.x86_64 = "res://../realmchat_client/target/release/realmchat_client.dll" -macos.debug = "res://../realmchat_client/target/debug/librealmchat_client.dylib" -macos.release = "res://../realmchat_client/target/release/librealmchat_client.dylib" -macos.debug.arm64 = "res://../realmchat_client/target/debug/librealmchat_client.dylib" -macos.release.arm64 = "res://../realmchat_client/target/release/librealmchat_client.dylib" \ No newline at end of file diff --git a/client/godot/icon.svg b/client/godot/icon.svg deleted file mode 100644 index 3fe4f4a..0000000 --- a/client/godot/icon.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/client/godot/icon.svg.import b/client/godot/icon.svg.import deleted file mode 100644 index 267a25a..0000000 --- a/client/godot/icon.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cfyo2ucchmj72" -path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://icon.svg" -dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/client/godot/main.gd b/client/godot/main.gd deleted file mode 100644 index dc0ffa7..0000000 --- a/client/godot/main.gd +++ /dev/null @@ -1,11 +0,0 @@ -extends Control - - -# Called when the node enters the scene tree for the first time. -func _ready(): - OS.set_low_processor_usage_mode(true) - - -# Called every frame. 'delta' is the elapsed time since the previous frame. -func _process(delta): - pass diff --git a/client/godot/main.tscn b/client/godot/main.tscn deleted file mode 100644 index e872b6a..0000000 --- a/client/godot/main.tscn +++ /dev/null @@ -1,108 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://csdvvecgjhecv"] - -[ext_resource type="Script" path="res://main.gd" id="1_vv44s"] - -[node name="Control" type="Control"] -layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -script = ExtResource("1_vv44s") - -[node name="Panel" type="Panel" parent="."] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="HBoxContainer" type="HBoxContainer" parent="Panel"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="Servers" type="Panel" parent="Panel/HBoxContainer"] -clip_contents = true -custom_minimum_size = Vector2(200, 0) -layout_mode = 2 - -[node name="Rooms" type="Panel" parent="Panel/HBoxContainer"] -clip_contents = true -custom_minimum_size = Vector2(200, 0) -layout_mode = 2 - -[node name="Room View" type="Panel" parent="Panel/HBoxContainer"] -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="VBoxContainer" type="VBoxContainer" parent="Panel/HBoxContainer/Room View"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="ScrollContainer" type="ScrollContainer" parent="Panel/HBoxContainer/Room View/VBoxContainer"] -layout_mode = 2 -size_flags_vertical = 3 -horizontal_scroll_mode = 0 - -[node name="Messages" type="VBoxContainer" parent="Panel/HBoxContainer/Room View/VBoxContainer/ScrollContainer"] -clip_contents = true -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_vertical = 3 - -[node name="RichTextLabel" type="RichTextLabel" parent="Panel/HBoxContainer/Room View/VBoxContainer/ScrollContainer/Messages"] -layout_mode = 2 -size_flags_vertical = 3 -focus_mode = 2 -text = "asdfasdfasdfqweqwerqwerqw -erq -we -rqw -er -qwer -qw -er -qwer -qw -r -qw -er -qwer -qw -errqwerqwer -qwer -qw -er -qwer -qw -erq -wer -qw -er -qw -erq -wer -qwerqwerqwer -qwer -qw -erq -wer -qwe -r" -scroll_following = true -selection_enabled = true - -[node name="TextEdit" type="TextEdit" parent="Panel/HBoxContainer/Room View/VBoxContainer"] -custom_minimum_size = Vector2(0, 30) -layout_mode = 2 -placeholder_text = "Write a Message" diff --git a/client/godot/project.godot b/client/godot/project.godot deleted file mode 100644 index 60c9d70..0000000 --- a/client/godot/project.godot +++ /dev/null @@ -1,24 +0,0 @@ -; Engine configuration file. -; It's best edited using the editor UI and not directly, -; since the parameters that go here are not all obvious. -; -; Format: -; [section] ; section goes between [] -; param=value ; assign values to parameters - -config_version=5 - -[application] - -config/name="RealmChat" -run/main_scene="res://main.tscn" -config/features=PackedStringArray("4.2", "GL Compatibility") -boot_splash/show_image=false -boot_splash/fullsize=false -boot_splash/use_filter=false -config/icon="res://icon.svg" - -[rendering] - -renderer/rendering_method="gl_compatibility" -renderer/rendering_method.mobile="gl_compatibility" diff --git a/client/realmchat_client/Cargo.toml b/client/realmchat_client/Cargo.toml deleted file mode 100644 index 9fcfbf0..0000000 --- a/client/realmchat_client/Cargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[package] -name = "realmchat_client" -version = "0.1.0" -edition = "2021" - -[lib] -crate-type = ["cdylib"] # Compile this crate to a dynamic C library. - -[dependencies] -godot = { git = "https://github.com/godot-rust/gdext", branch = "master" } \ No newline at end of file diff --git a/client/realmchat_client/src/lib.rs b/client/realmchat_client/src/lib.rs deleted file mode 100644 index d39b4f1..0000000 --- a/client/realmchat_client/src/lib.rs +++ /dev/null @@ -1,10 +0,0 @@ -use godot::prelude::*; - -struct MyExtension; - -#[gdextension] -unsafe impl ExtensionLibrary for MyExtension {} - -pub fn add(left: usize, right: usize) -> usize { - left + right -} diff --git a/client/src/client.rs b/client/src/client.rs new file mode 100644 index 0000000..e69de29 diff --git a/client/src/lib.rs b/client/src/lib.rs new file mode 100644 index 0000000..d1b8c2a --- /dev/null +++ b/client/src/lib.rs @@ -0,0 +1,2 @@ +pub mod client; +pub mod types; \ No newline at end of file diff --git a/client/src/main.rs b/client/src/main.rs new file mode 100644 index 0000000..e7a11a9 --- /dev/null +++ b/client/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Hello, world!"); +} diff --git a/client/src/types.rs b/client/src/types.rs new file mode 100644 index 0000000..e69de29