wip, doesnt compile

This commit is contained in:
griffi-gh 2023-01-16 02:42:50 +01:00
parent 85cab9fb2c
commit f7ad96b03d
6 changed files with 146 additions and 1 deletions

View file

@ -10,13 +10,16 @@ mod display;
mod shaders; mod shaders;
mod camera; mod camera;
mod controller; mod controller;
mod world;
mod chunk;
mod blocks;
mod items;
use assets::Assets; use assets::Assets;
use display::init_display; use display::init_display;
use shaders::{Programs, chunk::Vertex as ChunkVertex}; use shaders::{Programs, chunk::Vertex as ChunkVertex};
use camera::Camera; use camera::Camera;
use controller::Controls; use controller::Controls;
struct State { struct State {
pub camera: Camera, pub camera: Camera,
pub controls: Controls, pub controls: Controls,

126
src/game/blocks.rs Normal file
View file

@ -0,0 +1,126 @@
use crate::game::items::Item;
#[derive(Clone, Copy, Debug)]
pub enum CollisionType {
Solid,
Liquid,
Ladder,
}
#[derive(Clone, Copy, Debug)]
pub enum RenderType {
OpaqueBlock,
TranslucentBlock,
TranslucentLiquid,
CrossShape
}
#[derive(Clone, Copy, Debug)]
pub struct BlockTextures {
pub top: u8,
pub bottom: u8,
pub left: u8,
pub right: u8,
pub back: u8,
pub front: u8,
}
impl BlockTextures {
pub const fn all(tex: u8) -> Self {
Self {
top: tex,
bottom: tex,
left: tex,
right: tex,
back: tex,
front: tex,
}
}
pub const fn top_sides_bottom(top: u8, sides: u8, bottom: u8) -> Self {
Self {
top,
bottom,
left: sides,
right: sides,
back: sides,
front: sides,
}
}
}
#[derive(Clone, Copy, Debug)]
pub struct BlockDescriptor {
pub name: &'static str,
pub id: &'static str,
pub collision: Option<CollisionType>,
pub raycast_collision: bool,
pub render: Option<(RenderType, BlockTextures)>,
pub item: Option<Item>,
}
impl BlockDescriptor {
//Not using the Default trait because this function has to be const!
pub const fn default() -> Self {
Self {
name: "default",
id: "default",
collision: Some(CollisionType::Solid),
raycast_collision: true,
render: Some((RenderType::OpaqueBlock, BlockTextures::all(0))),
item: None
}
}
}
#[derive(Clone, Copy, Debug)]
pub enum Block {
Air,
Stone,
Dirt,
Grass,
Sand,
}
impl Block {
pub const fn get_by_id(id: &str) -> Option<Self> {
Some(match id {
"air" => Self::Air,
"stone" => Self::Stone,
_ => { return None },
})
}
pub const fn descriptor(self) -> BlockDescriptor {
match self {
Self::Air => BlockDescriptor {
name: "Air",
id: "air",
collision: None,
raycast_collision: false,
render: None,
item: None,
},
Self::Stone => BlockDescriptor {
name: "Stone",
id: "stone",
collision: Some(CollisionType::Solid),
raycast_collision: true,
render: Some((RenderType::OpaqueBlock, BlockTextures::all(1))),
item: Some(Item::StoneBlock)
},
Self::Dirt => BlockDescriptor {
name: "Dirt",
id: "dirt",
collision: Some(CollisionType::Solid),
raycast_collision: true,
render: Some((RenderType::OpaqueBlock, BlockTextures::all(2))),
item: Some(Item::DirtBlock)
},
Self::Grass => BlockDescriptor {
name: "Grass",
id: "grass",
collision: Some(CollisionType::Solid),
raycast_collision: true,
render: Some((RenderType::OpaqueBlock, BlockTextures::top_sides_bottom(0, 3, 2))),
item: Some(Item::DirtBlock)
},
_ => unimplemented!()
}
}
}

3
src/game/chunk.rs Normal file
View file

@ -0,0 +1,3 @@
pub struct Chunk {
}

View file

@ -39,6 +39,7 @@ pub struct Controls {
pub sensitivity: f32, pub sensitivity: f32,
} }
impl Controls { impl Controls {
//TODO locking controls
pub fn lock(&mut self) { pub fn lock(&mut self) {
todo!() todo!()
} }

9
src/game/items.rs Normal file
View file

@ -0,0 +1,9 @@
//TODO items
#[derive(Clone, Copy, Debug)]
pub enum Item {
StoneBlock,
DirtBlock,
GrassBlock,
SandBlock,
}

3
src/game/world.rs Normal file
View file

@ -0,0 +1,3 @@
pub struct World {
chunks: Vec<()>
}