Merge branch 'release/v0.1.0'

Cargo.toml

@@ -6,13 +6,19 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-reverie-engine = {path = "lib/reverie-engine"}
+reverie-engine = { version = "0.0.4", path = "lib/reverie-engine" }
 nalgebra = "0.29.0"
 nalgebra-glm = "0.15.0"
 c_str_macro = "1.0.3"
 sdl2 = "0.34.5"
-imgui = "0.7.0"
-imgui-sdl2 = "0.14.0"
-imgui-opengl-renderer = "0.11.0"
 image = "0.23.14"
-tungstenite = "0.15.0"
+rust_socketio = "0.2.4"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0.68"
+encoding = "0.2"
+tokio = { version = "1.13.0", features = ["rt"] }
+uuid = { version = "0.8", features = ["serde", "v4"] }
+toml = "0.5"
+tracing = "0.1"
+tracing-subscriber = "0.2"
+tracing-unwrap = "0.9"

README.md

@@ -1,12 +1,25 @@
 # BlockingIO-client
 
+# 実行
+
+1. ビルドする
+
+2. `cargo run`
+
+※ WSL2 + VcXsrv を使う場合は、Native opengl をオフに、Disable access control をオンにする。
+
 # ビルド方法
 
 ## Windows
 ```
 > cargo build
 ```
 
+## macOS
+
+**macOSはOpenGLのバージョンが古いのでサポートできません。** 代わりにWebGLに対応したい。
+
+
 ## Linux
 
 いずれの場合も `gcc` が必要です。
@@ -29,13 +42,14 @@
 > cargo build
 ```
 
-## macOS
+# 設定ファイル
 
-**macOSはOpenGLのバージョンが古いのでサポートできません。** 代わりにWebGLに対応したい。
+1度実行すると、exeと同じディレクトリに`blocking-io-settings.toml`というファイルが生成される。
 
-# 実行
-```
-> cargo run
-```
+* `uuid` - ユーザーID
+* `server` - サーバーのアドレス
+* `fullscreen` - フルスクリーン
+
+# ログ
 
-WSL2 + VcXsrv X Server を使う場合は、Native opengl をオフに、Disable access control をオンにする。
+環境変数`BLKIO_TRACE=1`を設定すると一番細かいログが出力されるようになる。

doc/ClientState.dot

@@ -0,0 +1,86 @@
+digraph ClientState {
+  graph [
+    charset = "UTF-8"
+  ];
+  label = "ClientState 遷移図 (2021年11月12日)"
+  labelloc = t
+  labeljust = c
+  rankdir = TB
+  layout = dot
+
+  node [
+    fontname = "HackGen, Consolas, monospace"
+    shape = ellipse
+    style = filled
+    fillcolor = "#cfecff"
+  ];
+  edge [];
+
+  TitleScreen [
+    fontcolor = white
+    fillcolor = "#17a6ff" 
+  ];
+  SettingConnection;
+  WaitingSettingUid;
+  JoiningRoom;
+  WaitingInRoom;
+  Playing;
+  GameFinished [ label = "GameFinished{reason}" ];
+  Quit [ 
+    shape=doublecircle
+    fontcolor = white
+    fillcolor = "#17a6ff"  
+  ];
+  any [ label = "*" ];
+
+
+  TitleScreen -> SettingConnection [
+    label = "スペースキー"
+  ];
+
+  SettingConnection -> TitleScreen [
+    label = "接続失敗"
+  ];
+
+  SettingConnection -> WaitingSettingUid [
+    label = "connect & setup-uid"
+  ];
+
+  WaitingSettingUid -> JoiningRoom [
+    label = "ApiEvent::UpdateUser"
+  ];
+
+  JoiningRoom -> WaitingInRoom [
+    label = "join-room成功"
+  ];
+
+  JoiningRoom -> TitleScreen [
+    label = "join-room失敗"
+  ];
+
+  WaitingInRoom -> Playing [
+    label = "ApiEvent::RoomStateFulfilled\n{should_start=true}"
+  ];
+
+  Playing -> Playing [
+    label = "ApiEvent::UpdateField"
+  ];
+
+  Playing -> GameFinished [
+    label = "ApiEvent::GameFinished"
+  ];
+
+  GameFinished -> WaitingInRoom [
+    label = "スペースキー"
+  ];
+
+  GameFinished -> GameFinished [
+    label = "ApiEvent::RoomStateFulfilled{..}"
+  ];
+
+
+
+  any -> Quit [
+    label = "Alt + F4"
+  ];
+}

lib/reverie-engine/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reverie-engine"
-version = "0.0.3"
+version = "0.0.4"
 license = "MPL-2.0"
 authors  = ["yuma140902 <[email protected]>"]
 description = "A toy game engine"
@@ -15,6 +15,7 @@ build = "src/build.rs"
 [dependencies]
 image = "0.23.14"
 nalgebra = "0.29.0"
+c_str_macro = "1.0.3"
 
 [build-dependencies]
 gl_generator = "0.14.0"

lib/reverie-engine/rustfmt.toml

@@ -0,0 +1,3 @@
+unstable_features = true
+max_width = 105
+imports_granularity = 'Module'

lib/reverie-engine/src/gui/gui.rs

@@ -0,0 +1 @@
+