biome mapping

game/camera_system/src/lib.rs

@@ -25,8 +25,7 @@ impl Plugin for PhosCameraPlugin {
 	}
 }
 
-fn setup(mut commands: Commands, mut msaa: ResMut<Msaa>) {
-	*msaa = Msaa::Off;
+fn setup(mut commands: Commands) {
 	commands.spawn((
 		Camera3dBundle {
 			transform: Transform::from_xyz(0., 30., 0.)

game/main/src/main.rs

@@ -5,7 +5,7 @@ use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
 mod phos;
 mod prelude;
-
+mod shader_extensions;
 use phos::PhosGamePlugin;
 
 fn main() {

game/main/src/phos.rs

@@ -1,4 +1,5 @@
 use crate::prelude::*;
+use crate::shader_extensions::chunk_material::ChunkMaterial;
 use bevy::asset::LoadState;
 use bevy::core_pipeline::experimental::taa::TemporalAntiAliasPlugin;
 use bevy::pbr::ExtendedMaterial;
@@ -8,7 +9,7 @@ use bevy_rapier3d::render::RapierDebugRenderPlugin;
 use camera_system::PhosCameraPlugin;
 use iyes_perf_ui::prelude::*;
 use world_generation::biome_painter::{
-	self, BiomePainterAsset, BiomePainterLoadState, BiomePainterPlugin,
+	BiomePainterAsset, BiomePainterLoadState, BiomePainterPlugin,
 };
 use world_generation::hex_utils::offset_to_world;
 use world_generation::tile_manager::{TileAsset, TileAssetLoadState, TileAssetPlugin, TileManager};

game/main/src/prelude.rs

@@ -1,9 +1,6 @@
-use bevy::asset::{Asset, Handle};
-use bevy::pbr::{MaterialExtension, MaterialExtensionKey, MaterialExtensionPipeline, MaterialPipeline, MaterialPipelineKey};
-use bevy::prelude::{Component, Image, Mesh, Resource, TypePath};
-use bevy::render::mesh::{Indices, MeshVertexBufferLayout};
-use bevy::render::render_resource::{AsBindGroup, RenderPipelineDescriptor, ShaderRef, SpecializedMeshPipelineError};
-use world_generation::prelude::ATTRIBUTE_TEXTURE_INDEX;
+use bevy::asset::Handle;
+
+use bevy::prelude::{Component, Image, Resource};
 
 #[derive(Resource)]
 pub struct ChunkAtlas {
@@ -19,33 +16,3 @@ pub struct PhosMap {
 
 #[derive(Component)]
 pub struct PhosChunk;
-
-
-#[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
-pub struct ChunkMaterial {
-	#[texture(100, dimension = "2d_array")]
-	#[sampler(101)]
-	pub array_texture: Handle<Image>,
-}
-
-impl MaterialExtension for ChunkMaterial {
-	fn fragment_shader() -> ShaderRef {
-		"shaders/world/chunk.wgsl".into()
-	}
-
-	// fn specialize(
-	// 	_pipeline: &MaterialExtensionPipeline,
-	// 	descriptor: &mut RenderPipelineDescriptor,
-	// 	layout: &MeshVertexBufferLayout,
-	// 	_key: MaterialExtensionKey<Self>,
-	// ) -> Result<(), SpecializedMeshPipelineError> {
-	// 	let vertex_layout = layout.get_layout(&[
-	// 		Mesh::ATTRIBUTE_POSITION.at_shader_location(0),
-	// 		Mesh::ATTRIBUTE_UV_0.at_shader_location(1),
-	// 		Mesh::ATTRIBUTE_NORMAL.at_shader_location(2),
-	// 		ATTRIBUTE_TEXTURE_INDEX.at_shader_location(3),
-	// 	])?;
-	// 	descriptor.vertex.buffers = vec![vertex_layout];
-	// 	Ok(())
-	// }
-}

game/main/src/shader_extensions/chunk_material.rs

@@ -0,0 +1,18 @@
+use bevy::asset::{Asset, Handle};
+use bevy::pbr::MaterialExtension;
+use bevy::reflect::TypePath;
+use bevy::render::render_resource::{AsBindGroup, ShaderRef};
+use bevy::render::texture::Image;
+
+#[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
+pub struct ChunkMaterial {
+	#[texture(100, dimension = "2d_array")]
+	#[sampler(101)]
+	pub array_texture: Handle<Image>,
+}
+
+impl MaterialExtension for ChunkMaterial {
+	fn fragment_shader() -> ShaderRef {
+		"shaders/world/chunk.wgsl".into()
+	}
+}

game/main/src/shader_extensions/mod.rs

@@ -0,0 +1 @@
+pub mod chunk_material;