StrafesNET/strafe-client
5
Fork 4
Code Issues 2 Pull Requests 1 Packages Projects Releases 1 Wiki Activity

happy compiler happy programmer

Browse Source
This commit is contained in:
Quaternions 2023-09-08 16:14:01 -07:00
parent 8c2dda5205
commit d2d62007ba
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/body.rs
View File

@ -23,7 +23,7 @@ pub struct PhysicsState {
} }
#[derive(Clone,Copy)] #[derive(Clone,Copy)]
enum AabbFace{ pub enum AabbFace{
Right,//+X Right,//+X
Top, Top,
Back, Back,
@ -32,7 +32,7 @@ enum AabbFace{
Front, Front,
} }
struct Aabb { pub struct Aabb {
min: glam::Vec3, min: glam::Vec3,
max: glam::Vec3, max: glam::Vec3,
} }
@ -46,37 +46,37 @@ impl Aabb {
// [0.0f32, 1., 0.], // [0.0f32, 1., 0.],
// [0.0f32, -1., 0.], // [0.0f32, -1., 0.],
// ]; // ];
const VERTEX_DATA_RIGHT: &'static [glam::Vec3; 4] = &[ const VERTEX_DATA_RIGHT: [glam::Vec3; 4] = [
glam::vec3(1., -1., -1.), glam::vec3(1., -1., -1.),
glam::vec3(1., 1., -1.), glam::vec3(1., 1., -1.),
glam::vec3(1., 1., 1.), glam::vec3(1., 1., 1.),
glam::vec3(1., -1., 1.), glam::vec3(1., -1., 1.),
]; ];
const VERTEX_DATA_TOP: &'static [glam::Vec3; 4] = &[ const VERTEX_DATA_TOP: [glam::Vec3; 4] = [
glam::vec3(1., 1., -1.), glam::vec3(1., 1., -1.),
glam::vec3(-1., 1., -1.), glam::vec3(-1., 1., -1.),
glam::vec3(-1., 1., 1.), glam::vec3(-1., 1., 1.),
glam::vec3(1., 1., 1.), glam::vec3(1., 1., 1.),
]; ];
const VERTEX_DATA_BACK: &'static [glam::Vec3; 4] = &[ const VERTEX_DATA_BACK: [glam::Vec3; 4] = [
glam::vec3(-1., -1., 1.), glam::vec3(-1., -1., 1.),
glam::vec3(1., -1., 1.), glam::vec3(1., -1., 1.),
glam::vec3(1., 1., 1.), glam::vec3(1., 1., 1.),
glam::vec3(-1., 1., 1.), glam::vec3(-1., 1., 1.),
]; ];
const VERTEX_DATA_LEFT: &'static [glam::Vec3; 4] = &[ const VERTEX_DATA_LEFT: [glam::Vec3; 4] = [
glam::vec3(-1., -1., 1.), glam::vec3(-1., -1., 1.),
glam::vec3(-1., 1., 1.), glam::vec3(-1., 1., 1.),
glam::vec3(-1., 1., -1.), glam::vec3(-1., 1., -1.),
glam::vec3(-1., -1., -1.), glam::vec3(-1., -1., -1.),
]; ];
const VERTEX_DATA_BOTTOM: &'static [glam::Vec3; 4] = &[ const VERTEX_DATA_BOTTOM: [glam::Vec3; 4] = [
glam::vec3(1., -1., 1.), glam::vec3(1., -1., 1.),
glam::vec3(-1., -1., 1.), glam::vec3(-1., -1., 1.),
glam::vec3(-1., -1., -1.), glam::vec3(-1., -1., -1.),
glam::vec3(1., -1., -1.), glam::vec3(1., -1., -1.),
]; ];
const VERTEX_DATA_FRONT: &'static [glam::Vec3; 4] = &[ const VERTEX_DATA_FRONT: [glam::Vec3; 4] = [
glam::vec3(-1., 1., -1.), glam::vec3(-1., 1., -1.),
glam::vec3(1., 1., -1.), glam::vec3(1., 1., -1.),
glam::vec3(1., -1., -1.), glam::vec3(1., -1., -1.),
@ -102,7 +102,7 @@ impl Aabb {
AabbFace::Front => glam::vec3(0.,0.,-1.), AabbFace::Front => glam::vec3(0.,0.,-1.),
} }
} }
pub fn face_vertices(face:AabbFace) -> &'static [glam::Vec3;4] { pub fn face_vertices(face:AabbFace) -> [glam::Vec3;4] {
match face { match face {
AabbFace::Right => Self::VERTEX_DATA_RIGHT, AabbFace::Right => Self::VERTEX_DATA_RIGHT,
AabbFace::Top => Self::VERTEX_DATA_TOP, AabbFace::Top => Self::VERTEX_DATA_TOP,
@ -124,7 +124,10 @@ pub struct Model {
} }
impl Model { impl Model {
pub fn face_vertices(&self,face:Face) -> &'static [glam::Vec3;4] { pub fn new(transform:glam::Mat4) -> Self {
Self{transform}
}
pub fn face_vertices(&self,face:Face) -> [glam::Vec3;4] {
Aabb::face_vertices(face) Aabb::face_vertices(face)
} }
pub fn face_mesh(&self,face:Face) -> TreyMesh { pub fn face_mesh(&self,face:Face) -> TreyMesh {

4
src/main.rs
View File

@ -307,8 +307,8 @@ impl strafe_client::framework::Example for Skybox {
grounded: true, grounded: true,
jump_trying: false, jump_trying: false,
walkspeed: 18.0, walkspeed: 18.0,
contacts: Vec::<crate::body::RelativeCollision>::new(), contacts: Vec::<strafe_client::body::RelativeCollision>::new(),
models_cringe_clone: modeldatas.iter().map(|m|crate::body::Model{transform:m.transform}), models_cringe_clone: modeldatas.iter().map(|m|strafe_client::body::Model::new(m.transform)).collect(),
}; };
let camera_uniforms = camera.to_uniform_data(physics.extrapolate_position(0)); let camera_uniforms = camera.to_uniform_data(physics.extrapolate_position(0));