mirror of
https://github.com/griffi-gh/kubi.git
synced 2024-11-22 23:08:43 -06:00
change stuff :3 (will break android builds)
This commit is contained in:
parent
43ca458896
commit
bd327c86f3
|
@ -1,5 +1,3 @@
|
||||||
#link crt statically on msvc
|
|
||||||
|
|
||||||
[target.x86_64-pc-windows-msvc]
|
[target.x86_64-pc-windows-msvc]
|
||||||
rustflags = ["-Ctarget-feature=+crt-static"]
|
rustflags = ["-Ctarget-feature=+crt-static"]
|
||||||
|
|
||||||
|
@ -9,12 +7,5 @@ rustflags = ["-Ctarget-feature=+crt-static"]
|
||||||
[target.i586-pc-windows-msvc]
|
[target.i586-pc-windows-msvc]
|
||||||
rustflags = ["-Ctarget-feature=+crt-static"]
|
rustflags = ["-Ctarget-feature=+crt-static"]
|
||||||
|
|
||||||
# enable sse,sse2,avx
|
|
||||||
|
|
||||||
[target.'cfg(target_arch = "x86_64")']
|
[target.'cfg(target_arch = "x86_64")']
|
||||||
rustflags = "-Ctarget-feature=+sse,+sse2,+avx"
|
rustflags = "-Ctarget-feature=+sse,+sse2,+avx"
|
||||||
|
|
||||||
# use sparse crates.io protocol
|
|
||||||
|
|
||||||
[registries.crates-io]
|
|
||||||
protocol = "sparse"
|
|
||||||
|
|
|
@ -5,6 +5,7 @@ edition = "2021"
|
||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
|
name = "kubilib"
|
||||||
crate-type = ["lib", "cdylib"]
|
crate-type = ["lib", "cdylib"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|
|
@ -6,7 +6,7 @@ use kubi_shared::{
|
||||||
player::PlayerHolding,
|
player::PlayerHolding,
|
||||||
};
|
};
|
||||||
use crate::{
|
use crate::{
|
||||||
player::MainPlayer,
|
player::MainPlayer,
|
||||||
world::{raycast::{LookingAtBlock, RAYCAST_STEP}, queue::BlockUpdateQueue},
|
world::{raycast::{LookingAtBlock, RAYCAST_STEP}, queue::BlockUpdateQueue},
|
||||||
input::{Inputs, PrevInputs, RawKbmInputState},
|
input::{Inputs, PrevInputs, RawKbmInputState},
|
||||||
events::{EventComponent, player_actions::PlayerActionEvent},
|
events::{EventComponent, player_actions::PlayerActionEvent},
|
||||||
|
|
|
@ -4,5 +4,5 @@
|
||||||
)]
|
)]
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
kubi::kubi_main();
|
kubilib::kubi_main();
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,8 @@ use glam::Mat4;
|
||||||
use shipyard::{Component, AllStoragesViewMut, UniqueViewMut};
|
use shipyard::{Component, AllStoragesViewMut, UniqueViewMut};
|
||||||
use kubi_shared::{
|
use kubi_shared::{
|
||||||
entity::{Entity, Health},
|
entity::{Entity, Health},
|
||||||
player::{PLAYER_HEALTH, PlayerHolding},
|
player::{Player, PLAYER_HEALTH, PlayerHolding},
|
||||||
|
block::Block,
|
||||||
networking::{
|
networking::{
|
||||||
client::{Username, Client, ClientIdMap},
|
client::{Username, Client, ClientIdMap},
|
||||||
messages::ClientInitData
|
messages::ClientInitData
|
||||||
|
@ -14,7 +15,6 @@ use crate::{
|
||||||
fly_controller::FlyController,
|
fly_controller::FlyController,
|
||||||
world::raycast::LookingAtBlock,
|
world::raycast::LookingAtBlock,
|
||||||
};
|
};
|
||||||
pub use kubi_shared::player::Player;
|
|
||||||
|
|
||||||
#[derive(Component)]
|
#[derive(Component)]
|
||||||
pub struct MainPlayer;
|
pub struct MainPlayer;
|
||||||
|
@ -32,7 +32,7 @@ pub fn spawn_player (
|
||||||
Camera::default(),
|
Camera::default(),
|
||||||
FlyController,
|
FlyController,
|
||||||
LookingAtBlock::default(),
|
LookingAtBlock::default(),
|
||||||
PlayerHolding::default(),
|
PlayerHolding(Some(Block::Cobblestone)),
|
||||||
Username("LocalPlayer".into())
|
Username("LocalPlayer".into())
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
2
rust-toolchain.toml
Normal file
2
rust-toolchain.toml
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
[toolchain]
|
||||||
|
channel = "nightly"
|
Loading…
Reference in a new issue