Skip to content

Commit 0e9d050

Browse files
CuddlyBunion341CuddlyBunion341
committed
Introduce texture_manager
1 parent 60cd990 commit 0e9d050

File tree

3 files changed

+85
-43
lines changed

3 files changed

+85
-43
lines changed

‎src/client/terrain/systems.rs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ pub fn setup_world_system(
66
mut meshes: ResMut<Assets<Mesh>>,
77
mut materials: ResMut<Assets<StandardMaterial>>,
88
mut chunk_manager: ResMut<terrain_resources::ChunkManager>,
9+
texture_manager: ResMut<terrain_util::TextureManager>
910
) {
1011
let generator = terrain_util::generator::Generator::new(0);
1112

@@ -24,6 +25,7 @@ pub fn setup_world_system(
2425
&mut meshes,
2526
&mut materials,
2627
chunk,
28+
&texture_manager
2729
);
2830
}
2931

@@ -38,6 +40,7 @@ pub fn handle_chunk_mesh_update_events(
3840
mut chunk_manager: ResMut<terrain_resources::ChunkManager>,
3941
mut chunk_mesh_update_events: EventReader<terrain_events::ChunkMeshUpdateEvent>,
4042
mut mesh_query: Query<(Entity, &terrain_components::ChunkMesh)>,
43+
texture_manager: ResMut<terrain_util::TextureManager>
4144
) {
4245
for event in chunk_mesh_update_events.read() {
4346
let chunk_option = chunk_manager.get_chunk(event.position);
@@ -54,6 +57,7 @@ pub fn handle_chunk_mesh_update_events(
5457
&mut meshes,
5558
&mut materials,
5659
chunk,
60+
&texture_manager
5761
);
5862
}
5963
None => {
@@ -69,9 +73,10 @@ fn add_chunk_objects(
6973
meshes: &mut ResMut<Assets<Mesh>>,
7074
materials: &mut ResMut<Assets<StandardMaterial>>,
7175
chunk: &terrain_util::Chunk,
76+
texture_manager: &terrain_util::TextureManager,
7277
) {
7378
let texture_handle: Handle<Image> = asset_server.load("textures/texture_atlas.png");
74-
let mesh_option = terrain_util::create_chunk_mesh(chunk);
79+
let mesh_option = terrain_util::create_chunk_mesh(chunk, &texture_manager);
7580

7681
if mesh_option.is_none() {
7782
return;

‎src/client/terrain/util/blocks.rs‎

Lines changed: 73 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,58 @@
11
use crate::prelude::*;
22

3+
#[derive(Hash, Eq, PartialEq, Copy, Clone)]
4+
enum TextureName {
5+
Air,
6+
Stone,
7+
Dirt,
8+
GrassTop,
9+
GrassSide,
10+
Bedrock,
11+
RedSand,
12+
BrownTerracotta,
13+
CyanTerracotta,
14+
GrayTerracotta,
15+
LightGrayTerracotta,
16+
OrangeTerracotta,
17+
RedTerracotta,
18+
Terracotta,
19+
YellowTerracotta,
20+
}
21+
22+
#[derive(Resource)]
23+
pub struct TextureManager {
24+
textures: HashMap<TextureName, TextureUV>,
25+
}
26+
27+
impl TextureManager {
28+
pub fn new() -> Self {
29+
let mut textures = HashMap::new();
30+
textures.insert(TextureName::Air, [-1.0, -1.0]);
31+
textures.insert(TextureName::Stone, [0.0, 0.0]);
32+
textures.insert(TextureName::Dirt, [0.25, 0.0]);
33+
textures.insert(TextureName::GrassTop, [0.5, 0.0]);
34+
textures.insert(TextureName::GrassSide, [0.75, 0.0]);
35+
textures.insert(TextureName::Bedrock, [0.0, 0.25]);
36+
textures.insert(TextureName::RedSand, [0.25, 0.25]);
37+
textures.insert(TextureName::BrownTerracotta, [0.5, 0.25]);
38+
textures.insert(TextureName::CyanTerracotta, [0.75, 0.25]);
39+
textures.insert(TextureName::GrayTerracotta, [0.0, 0.5]);
40+
textures.insert(TextureName::LightGrayTerracotta, [0.25, 0.5]);
41+
textures.insert(TextureName::OrangeTerracotta, [0.5, 0.5]);
42+
textures.insert(TextureName::RedTerracotta, [0.75, 0.5]);
43+
textures.insert(TextureName::Terracotta, [0.0, 0.75]);
44+
textures.insert(TextureName::YellowTerracotta, [0.25, 0.75]);
45+
Self { textures }
46+
}
47+
48+
pub fn get_texture_uv(&self, name: TextureName) -> Option<&TextureUV> {
49+
self.textures.get(&name)
50+
}
51+
}
52+
353
pub struct Block {
454
pub id: BlockId,
5-
pub texture_names: [&'static TextureUV; 6],
55+
pub texture_names: [TextureName; 6],
656
pub is_solid: bool,
757
}
858

@@ -17,59 +67,43 @@ macro_rules! add_block {
1767
}
1868

1969
pub static BLOCKS: [Block; 14] = [
20-
add_block!(BlockId::Air, [&AIR_TEXTURE; 6], false),
70+
add_block!(BlockId::Air, [TextureName::Air; 6], false),
2171
add_block!(
2272
BlockId::Grass,
2373
[
24-
&GRASS_TOP,
25-
&DIRT_TEXTURE,
26-
&GRASS_SIDE,
27-
&GRASS_SIDE,
28-
&GRASS_SIDE,
29-
&GRASS_SIDE,
74+
TextureName::GrassTop,
75+
TextureName::Dirt,
76+
TextureName::GrassSide,
77+
TextureName::GrassSide,
78+
TextureName::GrassSide,
79+
TextureName::GrassSide,
3080
],
3181
true
3282
),
33-
add_block!(BlockId::Dirt, [&DIRT_TEXTURE; 6], true),
34-
add_block!(BlockId::Stone, [&STONE_TEXTURE; 6], true),
35-
add_block!(BlockId::Bedrock, [&BEDROCK; 6], true),
36-
add_block!(BlockId::RedSand, [&RED_SAND; 6], true),
37-
add_block!(BlockId::BrownTerracotta, [&BROWN_TERRACOTTA; 6], true),
38-
add_block!(BlockId::CyanTerracotta, [&CYAN_TERRACOTTA; 6], true),
39-
add_block!(BlockId::GrayTerracotta, [&GRAY_TERRACOTTA; 6], true),
83+
add_block!(BlockId::Dirt, [TextureName::Dirt; 6], true),
84+
add_block!(BlockId::Stone, [TextureName::Stone; 6], true),
85+
add_block!(BlockId::Bedrock, [TextureName::Bedrock; 6], true),
86+
add_block!(BlockId::RedSand, [TextureName::RedSand; 6], true),
87+
add_block!(BlockId::BrownTerracotta, [TextureName::BrownTerracotta; 6], true),
88+
add_block!(BlockId::CyanTerracotta, [TextureName::CyanTerracotta; 6], true),
89+
add_block!(BlockId::GrayTerracotta, [TextureName::GrayTerracotta; 6], true),
4090
add_block!(
4191
BlockId::LightGrayTerracotta,
42-
[&LIGHT_GRAY_TERRACOTTA; 6],
92+
[TextureName::LightGrayTerracotta; 6],
4393
true
4494
),
45-
add_block!(BlockId::OrangeTerracotta, [&ORANGE_TERRACOTTA; 6], true),
46-
add_block!(BlockId::RedTerracotta, [&RED_TERRACOTTA; 6], true),
47-
add_block!(BlockId::Terracotta, [&TERRACOTTA; 6], true),
48-
add_block!(BlockId::YellowTerracotta, [&YELLOW_TERRACOTTA; 6], true),
95+
add_block!(BlockId::OrangeTerracotta, [TextureName::OrangeTerracotta; 6], true),
96+
add_block!(BlockId::RedTerracotta, [TextureName::RedTerracotta; 6], true),
97+
add_block!(BlockId::Terracotta, [TextureName::Terracotta; 6], true),
98+
add_block!(BlockId::YellowTerracotta, [TextureName::YellowTerracotta; 6], true),
4999
];
50100

51101
type TextureUV = [f32; 2];
52102

53-
const AIR_TEXTURE: TextureUV = [-1.0, -1.0];
54-
const STONE_TEXTURE: TextureUV = [0.0, 0.0];
55-
const DIRT_TEXTURE: TextureUV = [0.25, 0.0];
56-
const GRASS_TOP: TextureUV = [0.5, 0.0];
57-
const GRASS_SIDE: TextureUV = [0.75, 0.0];
58-
const BEDROCK: TextureUV = [0.0, 0.25];
59-
const RED_SAND: TextureUV = [0.25, 0.25];
60-
const BROWN_TERRACOTTA: TextureUV = [0.5, 0.25];
61-
const CYAN_TERRACOTTA: TextureUV = [0.75, 0.25];
62-
const GRAY_TERRACOTTA: TextureUV = [0.0, 0.5];
63-
const LIGHT_GRAY_TERRACOTTA: TextureUV = [0.25, 0.5];
64-
const ORANGE_TERRACOTTA: TextureUV = [0.5, 0.5];
65-
const RED_TERRACOTTA: TextureUV = [0.75, 0.5];
66-
const TERRACOTTA: TextureUV = [0.0, 0.75];
67-
const YELLOW_TERRACOTTA: TextureUV = [0.25, 0.75];
68-
69103
impl Block {
70-
pub fn get_block_face_uvs(block_id: BlockId, face: CubeFace) -> Option<[f32; 2]> {
104+
pub fn get_block_face_uvs(block_id: BlockId, face: CubeFace, texture_manager: &TextureManager) -> Option<[f32; 2]> {
71105
let block = &BLOCKS[block_id as usize];
72-
let texture_uv = block.texture_names[face as usize];
73-
Some(*texture_uv)
106+
let texture_name = block.texture_names[face as usize];
107+
texture_manager.get_texture_uv(texture_name).copied()
74108
}
75109
}

‎src/client/terrain/util/mesher.rs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
use terrain_util::TextureManager;
2+
13
use crate::prelude::*;
24

35
pub fn create_cube_mesh_from_data(geometry_data: GeometryData) -> Option<Mesh> {
@@ -32,6 +34,7 @@ pub fn create_cube_geometry_data(
3234
z: f32,
3335
faces: u8,
3436
block_id: BlockId,
37+
texture_manager: &TextureManager,
3538
) -> GeometryData {
3639
let mut position = Vec::new();
3740
let mut uv = Vec::new();
@@ -52,7 +55,7 @@ pub fn create_cube_geometry_data(
5255
vertex.position[2] * 0.5 + z + 0.5,
5356
]);
5457

55-
let block_uvs = Block::get_block_face_uvs(block_id, *face).unwrap();
58+
let block_uvs = Block::get_block_face_uvs(block_id, *face, &texture_manager).unwrap();
5659
uv.push([
5760
block_uvs[0] + vertex.uv[0] * 0.25 - 0.001,
5861
block_uvs[1] + (1.0 - vertex.uv[1]) * 0.25,
@@ -75,7 +78,7 @@ pub fn create_cube_geometry_data(
7578
}
7679
}
7780

78-
pub fn create_chunk_mesh(chunk: &Chunk) -> Option<Mesh> {
81+
pub fn create_chunk_mesh(chunk: &Chunk, texture_manager: &TextureManager) -> Option<Mesh> {
7982
let mut geometry_data = GeometryData {
8083
position: Vec::new(),
8184
uv: Vec::new(),
@@ -110,7 +113,7 @@ pub fn create_chunk_mesh(chunk: &Chunk) -> Option<Mesh> {
110113
update_mask(chunk, &mut mask, 0b100000, x, y, z + 1);
111114

112115
let cube_data =
113-
create_cube_geometry_data(x as f32, y as f32, z as f32, mask, block_id);
116+
create_cube_geometry_data(x as f32, y as f32, z as f32, mask, block_id, &texture_manager);
114117

115118
geometry_data.indices.extend(
116119
cube_data

0 commit comments

Comments
 (0)