Kelder/planet-wars
32
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update with refactored mozaic

Browse source
This commit is contained in:
ajuvercr 2019-11-03 12:26:43 +01:00
parent 2fb497236a
commit 9b2faccfd2
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/src/main.rs
View file

@ -28,7 +28,7 @@ fn main() {
}; };
} }
use mozaic::server::runtime::{Broker}; use mozaic::runtime::{Broker};
use rand::Rng; use rand::Rng;
use errors::Consumable; use errors::Consumable;
use mozaic::modules::ConnectionManager; use mozaic::modules::ConnectionManager;

2
client/Cargo.toml
View file

@ -7,7 +7,7 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
mozaic = { git = "https://github.com/ajuvercr/MOZAIC" } mozaic = { git = "https://github.com/ZeusWPI/MOZAICP" }
tokio = "0.1.22" tokio = "0.1.22"
capnp = "0.10.1" capnp = "0.10.1"
futures = "0.1.28" futures = "0.1.28"

2
client/run.sh
View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
rm bot*.txt rm bot*.txt
cargo run $1 python simple.py cargo run $1 python3 simple.py

11
client/src/main.rs
View file

@ -15,10 +15,11 @@ use mozaic::core_capnp::{initialize, terminate_stream, identify, actor_joined};
use mozaic::messaging::reactor::*; use mozaic::messaging::reactor::*;
use mozaic::messaging::types::*; use mozaic::messaging::types::*;
use mozaic::errors::*; use mozaic::errors::*;
use mozaic::client_capnp::{client_message, host_message, client_kicked}; use mozaic::base_capnp::{client_message, host_message};
use mozaic::mozaic_cmd_capnp::{bot_input, bot_return}; use mozaic::connection_capnp::client_kicked;
use mozaic::server::runtime::{Broker, BrokerHandle}; use mozaic::cmd_capnp::{bot_input, bot_return};
use mozaic::server; use mozaic::runtime::{Broker, BrokerHandle};
use mozaic::runtime;
use mozaic::modules::{BotReactor}; use mozaic::modules::{BotReactor};
use std::env; use std::env;
@ -44,7 +45,7 @@ fn main() {
}; };
broker.spawn(self_id.clone(), reactor.params(), "main").display(); broker.spawn(self_id.clone(), reactor.params(), "main").display();
tokio::spawn(server::connect_to_server(broker, self_id, &addr)); tokio::spawn(runtime::connect_to_server(broker, self_id, &addr));
Ok(()) Ok(())
})); }));
} }