~starkingdoms/starkingdoms

e591c22f48308cd66fa8ebdf26ab18e350e40df8 — ghostlyzsh 2 years ago 28eaeed
cargo fix
M server/src/handler.rs => server/src/handler.rs +7 -7
@@ 3,15 3,15 @@ use crate::entity::{get_entity_id, Entity, EntityHandler};
use crate::manager::{
    ClientHandlerMessage, ClientManager, Player, PhysicsData,
};
use crate::module::{AttachedModule, ModuleTemplate, Module, Attachment};
use crate::module::{AttachedModule, Module};
use crate::{recv, send, SCALE};
use async_std::net::TcpStream;
use async_std::{channel::Receiver, sync::RwLock};
use async_tungstenite::WebSocketStream;
use futures::stream::{SplitSink, SplitStream};
use futures::{FutureExt, SinkExt, StreamExt};
use log::{debug, error, info, warn, trace};
use nalgebra::{point, vector, Matrix, Vector2};
use log::{error, info, warn};
use nalgebra::{point, vector, Vector2};
use rand::Rng;
use rapier2d_f64::prelude::{
    Collider, ColliderBuilder, MassProperties, RigidBodyBuilder, RigidBodyType, Isometry,


@@ 21,7 21,7 @@ use starkingdoms_protocol::message_s2c::{
    MessageS2CChat, MessageS2CGoodbye, MessageS2CHello, MessageS2CModulesUpdate,
    MessageS2CPlanetData, MessageS2CPlayersUpdate, MessageS2CPong, MessageS2CModuleAdd, MessageS2CModuleTreeUpdate, MessageS2CModuleRemove,
};
use starkingdoms_protocol::module::ModuleType;

use starkingdoms_protocol::state::State;
use starkingdoms_protocol::{MessageC2S, MessageS2C, PROTOCOL_VERSION};
use std::error::Error;


@@ 441,13 441,13 @@ pub async fn handle_client(
                            }
                        }
                    }
                    MessageC2S::MouseInput(p) => {
                    MessageC2S::MouseInput(_p) => {
                        //debug!("[{}] player input: {:?}", remote_addr, p);
                    }
                    MessageC2S::ModuleDetach(p) => {
                        let mut entities = entities.write().await;
                        let mut data_handle = data.write().await;
                        let mut module: Option<AttachedModule> = None;
                        let module: Option<AttachedModule>;
                        //debug!("[{}] detach: {:?}", remote_addr, p);
                        //debug!("[{}] {:?}", remote_addr, entities.entities);



@@ 481,7 481,7 @@ pub async fn handle_client(
                        send!(client_tx, msg).await?;
                    }
                    MessageC2S::ModuleGrabBegin(p) => {
                        if let Entity::Module(module) = entities.write().await.entities.get_mut(&p.module_id).unwrap() {
                        if let Entity::Module(_module) = entities.write().await.entities.get_mut(&p.module_id).unwrap() {
                            //debug!("[{}] grab begin: {:?}, flags: {}", remote_addr, p, module.flags);
                        }
                    }

M server/src/main.rs => server/src/main.rs +2 -2
@@ 9,12 9,12 @@ use async_std::sync::RwLock;
use entity::EntityHandler;
use futures::StreamExt;
use lazy_static::lazy_static;
use log::{error, info, warn, Level, debug};
use log::{error, info, warn, Level};
use manager::PhysicsData;
use nalgebra::vector;
use rapier2d_f64::prelude::{
    BroadPhase, CCDSolver, ColliderSet, ImpulseJointSet, IntegrationParameters, IslandManager,
    MultibodyJointSet, NarrowPhase, RigidBodySet, Real,
    MultibodyJointSet, NarrowPhase, RigidBodySet,
};
use serde::{Deserialize, Serialize};
use starkingdoms_protocol::PROTOCOL_VERSION;

M server/src/manager.rs => server/src/manager.rs +9 -9
@@ 1,23 1,23 @@
use async_std::channel::Sender;
use async_std::sync::RwLock;
use log::debug;
use nalgebra::{point, vector};


use rapier2d_f64::na::Vector2;
use rapier2d_f64::prelude::{
    BroadPhase, CCDSolver, ColliderBuilder, ColliderSet, FixedJointBuilder, ImpulseJointHandle,
    ImpulseJointSet, IntegrationParameters, IslandManager, Isometry, MassProperties,
    MultibodyJointSet, NarrowPhase, PhysicsPipeline, Real, RigidBodyBuilder, RigidBodyHandle,
    BroadPhase, CCDSolver, ColliderSet,
    ImpulseJointSet, IntegrationParameters, IslandManager,
    MultibodyJointSet, NarrowPhase, PhysicsPipeline, RigidBodyHandle,
    RigidBodySet,
};
use starkingdoms_protocol::api::APISavedPlayerData;
use starkingdoms_protocol::module::ModuleType;

use std::collections::HashMap;
use std::f64::consts::PI;

use std::net::SocketAddr;
use std::sync::Arc;

use crate::entity::{get_entity_id, Entity, EntityHandler, EntityId};
use crate::SCALE;
use crate::entity::{Entity, EntityHandler, EntityId};

use crate::module::{Attachment, AttachedModule};

#[derive(Clone)]

M server/src/module.rs => server/src/module.rs +2 -2
@@ 1,7 1,7 @@
use std::f64::consts::PI;

use log::debug;
use nalgebra::{Vector2, point, vector, Isometry, Isometry2, Complex, Unit};

use nalgebra::{Vector2, point, vector, Isometry2, Unit};
use rapier2d_f64::prelude::{RigidBodyHandle, Real, MassProperties, ColliderBuilder, RigidBodyBuilder, FixedJointBuilder, ImpulseJointHandle, RigidBodySet};
use starkingdoms_protocol::module::ModuleType;


M server/src/planet.rs => server/src/planet.rs +1 -1
@@ 1,4 1,4 @@
use log::debug;

use nalgebra::{vector, Vector2};
use rapier2d_f64::prelude::{
    ColliderBuilder, ColliderSet, RigidBodyBuilder, RigidBodyHandle, RigidBodySet,

M server/src/timer.rs => server/src/timer.rs +2 -2
@@ 12,11 12,11 @@ use crate::{
};
use async_std::sync::RwLock;
use async_std::task::sleep;
use log::{info, warn, debug};
use log::{warn};
use nalgebra::{point, vector};
use rand::Rng;
use rapier2d_f64::prelude::{
    ColliderBuilder, MassProperties, PhysicsPipeline, RigidBodyBuilder, RigidBodyHandle,
    ColliderBuilder, MassProperties, PhysicsPipeline, RigidBodyBuilder,
};
use starkingdoms_protocol::{module::ModuleType, planet::PlanetType, player::Player};
use std::{f64::consts::PI, sync::Arc, time::Duration};